Upgrade to expose-loader 1.0.3

Signed-off-by: David Mehren <git@herrmehren.de>

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"