diff --git a/gulpfile.js b/gulpfile.js index f5de18752b..247a8dc6f7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,6 +5,7 @@ const package = require('./package.json'); const fs = require('fs'); const paths = { + node_modules: './node_modules/', src: './src/', build: './build/', cssDir: './src/css/', @@ -29,8 +30,17 @@ function version(cb) { cb(); } +// ref: https://github.com/t4t5/sweetalert/issues/890 +function fixSweetAlert(cb) { + fs.writeFileSync(paths.node_modules + 'sweetalert/typings/sweetalert.d.ts', + 'import swal, { SweetAlert } from "./core";export default swal;export as namespace swal;'); + cb(); +} + exports.clean = clean; exports.webfonts = gulp.series(clean, webfonts); exports.prebuild = gulp.series(clean, webfonts); exports.version = version; exports.postdist = version; +exports.fixSweetAlert = fixSweetAlert; +exports.postinstall = fixSweetAlert; diff --git a/package-lock.json b/package-lock.json index 02276310d1..f26bc788bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3361,15 +3361,30 @@ "webpack-sources": "^1.1.0" }, "dependencies": { - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "big.js": "^3.1.3", + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", + "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", "emojis-list": "^2.0.0", - "json5": "^0.5.0" + "json5": "^1.0.1" } } } @@ -4052,14 +4067,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4074,20 +4087,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4204,8 +4214,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4217,7 +4226,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4232,7 +4240,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4344,8 +4351,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -4357,7 +4363,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4479,7 +4484,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -10133,9 +10137,9 @@ } }, "sweetalert": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sweetalert/-/sweetalert-2.1.0.tgz", - "integrity": "sha512-9YKj0SvjKyBfRWco50UOsIbXVeifYbxzT9Qda7EsqC01eafHGCSG0IR7g942ufjzt7lnwO8ZZBwr6emXv2fQrg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/sweetalert/-/sweetalert-2.1.2.tgz", + "integrity": "sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==", "requires": { "es6-object-assign": "^1.1.0", "promise-polyfill": "^6.0.2" diff --git a/package.json b/package.json index b0facf62aa..d61929326d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "sub:init": "git submodule update --init --recursive", "sub:update": "git submodule update --remote", "sub:pull": "git submodule foreach git pull", - "postinstall": "npm run sub:init", + "postinstall": "npm run sub:init && gulp postinstall", "build": "gulp prebuild && webpack", "build:watch": "gulp prebuild && webpack-dev-server", "build:prod": "gulp prebuild && cross-env NODE_ENV=production webpack", @@ -85,7 +85,7 @@ "popper.js": "1.14.4", "qrious": "4.0.2", "rxjs": "6.3.3", - "sweetalert": "2.1.0", + "sweetalert": "2.1.2", "web-animations-js": "2.3.1", "webcrypto-shim": "0.1.4", "whatwg-fetch": "3.0.0",