From 8c60e2159cbb22b470ca881e6d1a20ef363ec140 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Wed, 3 Feb 2021 22:22:11 +0100 Subject: Upgrade to imports-loader 1.2.0 Signed-off-by: David Mehren --- package.json | 2 +- webpack.common.js | 8 +++++--- 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+)?$/, diff --git a/yarn.lock b/yarn.lock index 45273dc0..db91bda2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" -- cgit v1.2.3 From fea78d8ef00b6eef1472bd7b8fc489835e6f2b01 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Wed, 3 Feb 2021 22:39:19 +0100 Subject: Upgrade to expose-loader 1.0.3 Signed-off-by: David Mehren --- package.json | 2 +- webpack.common.js | 60 +++++++++++++++++++++++++++---------------------------- yarn.lock | 11 ++++++---- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index b4ea54a3..b0109891 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ "eslint-plugin-node": "8.0.1", "eslint-plugin-promise": "4.2.1", "eslint-plugin-standard": "4.1.0", - "expose-loader": "0.7.5", + "expose-loader": "1.0.3", "file-loader": "4.3.0", "html-webpack-plugin": "4.5.1", "imports-loader": "1.2.0", diff --git a/webpack.common.js b/webpack.common.js index 5d441b1e..35fdba08 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -187,7 +187,7 @@ module.exports = { font: path.join(__dirname, 'public/css/google-font.css'), 'font-pack': path.join(__dirname, 'public/css/font.css'), common: [ - 'expose-loader?jQuery!expose-loader?$!jquery', + 'expose-loader?exposes[]=$&exposes[]=jQuery!jquery', 'velocity-animate', 'imports-loader?imports=default|jquery|$!jquery-mousewheel', 'bootstrap' @@ -206,15 +206,15 @@ module.exports = { 'cover-pack': [ 'babel-polyfill', 'bootstrap-validator', - 'expose-loader?select2!select2', - 'expose-loader?moment!moment', + 'expose-loader?exposes=select2!select2', + 'expose-loader?exposes=moment!moment', path.join(__dirname, 'public/js/cover.js') ], index: [ 'babel-polyfill', 'script-loader!jquery-ui-resizable', 'script-loader!Idle.Js', - 'expose-loader?LZString!lz-string', + 'expose-loader?exposes=LZString!lz-string', 'script-loader!codemirror', 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', @@ -223,7 +223,7 @@ module.exports = { 'script-loader!ot', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/index.js') ], 'index-styles': [ @@ -253,18 +253,18 @@ module.exports = { ], 'index-pack': [ 'babel-polyfill', - 'expose-loader?Spinner!spin.js', + 'expose-loader?exposes=Spinner!spin.js', 'script-loader!jquery-ui-resizable', 'bootstrap-validator', - 'expose-loader?jsyaml!js-yaml', + 'expose-loader?exposes=jsyaml!js-yaml', 'script-loader!mermaid', - 'expose-loader?moment!moment', + 'expose-loader?exposes=moment!moment', 'script-loader!handlebars', - 'expose-loader?hljs!highlight.js', - 'expose-loader?emojify!emojify.js', + 'expose-loader?exposes=hljs!highlight.js', + 'expose-loader?exposes=emojify!emojify.js', 'script-loader!Idle.Js', 'script-loader!gist-embed', - 'expose-loader?LZString!lz-string', + 'expose-loader?exposes=LZString!lz-string', 'script-loader!codemirror', 'script-loader!inlineAttachment', 'script-loader!jqueryTextcomplete', @@ -273,17 +273,17 @@ module.exports = { 'script-loader!ot', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?Viz!viz.js', + 'expose-loader?exposes=Viz!viz.js', 'script-loader!abcjs', - 'expose-loader?io!socket.io-client', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=io!socket.io-client', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/index.js') ], pretty: [ 'babel-polyfill', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/pretty.js') ], 'pretty-styles': [ @@ -299,18 +299,18 @@ module.exports = { ], 'pretty-pack': [ 'babel-polyfill', - 'expose-loader?jsyaml!js-yaml', + 'expose-loader?exposes=jsyaml!js-yaml', 'script-loader!mermaid', - 'expose-loader?moment!moment', + 'expose-loader?exposes=moment!moment', 'script-loader!handlebars', - 'expose-loader?hljs!highlight.js', - 'expose-loader?emojify!emojify.js', + 'expose-loader?exposes=hljs!highlight.js', + 'expose-loader?exposes=emojify!emojify.js', 'script-loader!gist-embed', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?Viz!viz.js', + 'expose-loader?exposes=Viz!viz.js', 'script-loader!abcjs', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/pretty.js') ], slide: [ @@ -318,7 +318,7 @@ module.exports = { 'bootstrap-tooltip', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/slide.js') ], 'slide-styles': [ @@ -333,23 +333,23 @@ module.exports = { ], 'slide-pack': [ 'babel-polyfill', - 'expose-loader?jQuery!expose-loader?$!jquery', + 'expose-loader?exposes[]=$&exposes[]=jQuery!jquery', 'velocity-animate', 'imports-loader?imports=default|jquery|$!jquery-mousewheel', 'bootstrap-tooltip', - 'expose-loader?jsyaml!js-yaml', + 'expose-loader?exposes=jsyaml!js-yaml', 'script-loader!mermaid', - 'expose-loader?moment!moment', + 'expose-loader?exposes=moment!moment', 'script-loader!handlebars', - 'expose-loader?hljs!highlight.js', - 'expose-loader?emojify!emojify.js', + 'expose-loader?exposes=hljs!highlight.js', + 'expose-loader?exposes=emojify!emojify.js', 'script-loader!gist-embed', 'flowchart.js', 'js-sequence-diagrams', - 'expose-loader?Viz!viz.js', + 'expose-loader?exposes=Viz!viz.js', 'script-loader!abcjs', - 'expose-loader?Reveal!reveal.js', - 'expose-loader?RevealMarkdown!reveal-markdown', + 'expose-loader?exposes=Reveal!reveal.js', + 'expose-loader?exposes=RevealMarkdown!reveal-markdown', path.join(__dirname, 'public/js/slide.js') ] }, diff --git a/yarn.lock b/yarn.lock index db91bda2..18f27453 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4012,10 +4012,13 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expose-loader@0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f" - integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw== +expose-loader@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-1.0.3.tgz#5686d3b78cac8831c4af11c3dc361563deb8a9c0" + integrity sha512-gP6hs3vYeWIqyoVfsApGQcgCEpbcI1xe+celwI31zeDhXz2q03ycBC1+75IlQUGaYvj6rAloFIe/NIBnEElLsQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" express-session@^1.14.2: version "1.17.1" -- cgit v1.2.3