diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.common.js | 8 | ||||
| -rw-r--r-- | yarn.lock | 17 |
3 files changed, 18 insertions, 9 deletions
diff --git a/package.json b/package.json index 3ec5f17e..b4ea54a3 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "expose-loader": "0.7.5", "file-loader": "4.3.0", "html-webpack-plugin": "4.5.1", - "imports-loader": "0.8.0", + "imports-loader": "1.2.0", "jsonlint": "1.6.3", "less": "3.13.1", "less-loader": "5.0.0", diff --git a/webpack.common.js b/webpack.common.js index f84a6a13..5d441b1e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -189,7 +189,7 @@ module.exports = { common: [ 'expose-loader?jQuery!expose-loader?$!jquery', 'velocity-animate', - 'imports-loader?$=jquery!jquery-mousewheel', + 'imports-loader?imports=default|jquery|$!jquery-mousewheel', 'bootstrap' ], cover: [ @@ -335,7 +335,7 @@ module.exports = { 'babel-polyfill', 'expose-loader?jQuery!expose-loader?$!jquery', 'velocity-animate', - 'imports-loader?$=jquery!jquery-mousewheel', + 'imports-loader?imports=default|jquery|$!jquery-mousewheel', 'bootstrap-tooltip', 'expose-loader?jsyaml!js-yaml', 'script-loader!mermaid', @@ -423,7 +423,9 @@ module.exports = { test: require.resolve('js-sequence-diagrams'), use: [{ loader: 'imports-loader', - options: { _: 'lodash', Raphael: 'raphael', eve: 'eve' } + options: { + imports: ['default lodash _', 'default raphael Raphael', 'default eve eve'] + } }] }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, @@ -5205,13 +5205,15 @@ import-local@^2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" -imports-loader@0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69" - integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ== +imports-loader@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f" + integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ== dependencies: - loader-utils "^1.0.2" + loader-utils "^2.0.0" + schema-utils "^3.0.0" source-map "^0.6.1" + strip-comments "^2.0.1" imurmurhash@^0.1.4: version "0.1.4" @@ -10404,6 +10406,11 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= +strip-comments@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" + integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== + strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" |