mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-15 23:54:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #831 from hedgedoc/maint/upgrade-webpack-loaders

Browse source
This commit is contained in:
David Mehren 2021-02-08 22:07:10 +01:00 • committed by GitHub
commit 69b3929a1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -184,10 +184,10 @@
"eslint-plugin-node": "8.0.1", "eslint-plugin-node": "8.0.1",
"eslint-plugin-promise": "4.2.1", "eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.1.0", "eslint-plugin-standard": "4.1.0",
"expose-loader": "0.7.5", "expose-loader": "1.0.3",
"file-loader": "4.3.0", "file-loader": "4.3.0",
"html-webpack-plugin": "4.5.1", "html-webpack-plugin": "4.5.1",
"imports-loader": "0.8.0", "imports-loader": "1.2.0",
"jsonlint": "1.6.3", "jsonlint": "1.6.3",
"less": "3.13.1", "less": "3.13.1",
"less-loader": "5.0.0", "less-loader": "5.0.0",

68
webpack.common.js
View file

@ -187,9 +187,9 @@ module.exports = {
font: path.join(__dirname, 'public/css/google-font.css'), font: path.join(__dirname, 'public/css/google-font.css'),
'font-pack': path.join(__dirname, 'public/css/font.css'), 'font-pack': path.join(__dirname, 'public/css/font.css'),
common: [ common: [
'expose-loader?jQuery!expose-loader?$!jquery', 'expose-loader?exposes[]=$&exposes[]=jQuery!jquery',
'velocity-animate', 'velocity-animate',
'imports-loader?$=jquery!jquery-mousewheel', 'imports-loader?imports=default|jquery|$!jquery-mousewheel',
'bootstrap' 'bootstrap'
], ],
cover: [ cover: [
@ -206,15 +206,15 @@ module.exports = {
'cover-pack': [ 'cover-pack': [
'babel-polyfill', 'babel-polyfill',
'bootstrap-validator', 'bootstrap-validator',
'expose-loader?select2!select2', 'expose-loader?exposes=select2!select2',
'expose-loader?moment!moment', 'expose-loader?exposes=moment!moment',
path.join(__dirname, 'public/js/cover.js') path.join(__dirname, 'public/js/cover.js')
], ],
index: [ index: [
'babel-polyfill', 'babel-polyfill',
'script-loader!jquery-ui-resizable', 'script-loader!jquery-ui-resizable',
'script-loader!Idle.Js', 'script-loader!Idle.Js',
'expose-loader?LZString!lz-string', 'expose-loader?exposes=LZString!lz-string',
'script-loader!codemirror', 'script-loader!codemirror',
'script-loader!inlineAttachment', 'script-loader!inlineAttachment',
'script-loader!jqueryTextcomplete', 'script-loader!jqueryTextcomplete',
@ -223,7 +223,7 @@ module.exports = {
'script-loader!ot', 'script-loader!ot',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/index.js') path.join(__dirname, 'public/js/index.js')
], ],
'index-styles': [ 'index-styles': [
@ -253,18 +253,18 @@ module.exports = {
], ],
'index-pack': [ 'index-pack': [
'babel-polyfill', 'babel-polyfill',
'expose-loader?Spinner!spin.js', 'expose-loader?exposes=Spinner!spin.js',
'script-loader!jquery-ui-resizable', 'script-loader!jquery-ui-resizable',
'bootstrap-validator', 'bootstrap-validator',
'expose-loader?jsyaml!js-yaml', 'expose-loader?exposes=jsyaml!js-yaml',
'script-loader!mermaid', 'script-loader!mermaid',
'expose-loader?moment!moment', 'expose-loader?exposes=moment!moment',
'script-loader!handlebars', 'script-loader!handlebars',
'expose-loader?hljs!highlight.js', 'expose-loader?exposes=hljs!highlight.js',
'expose-loader?emojify!emojify.js', 'expose-loader?exposes=emojify!emojify.js',
'script-loader!Idle.Js', 'script-loader!Idle.Js',
'script-loader!gist-embed', 'script-loader!gist-embed',
'expose-loader?LZString!lz-string', 'expose-loader?exposes=LZString!lz-string',
'script-loader!codemirror', 'script-loader!codemirror',
'script-loader!inlineAttachment', 'script-loader!inlineAttachment',
'script-loader!jqueryTextcomplete', 'script-loader!jqueryTextcomplete',
@ -273,17 +273,17 @@ module.exports = {
'script-loader!ot', 'script-loader!ot',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?Viz!viz.js', 'expose-loader?exposes=Viz!viz.js',
'script-loader!abcjs', 'script-loader!abcjs',
'expose-loader?io!socket.io-client', 'expose-loader?exposes=io!socket.io-client',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/index.js') path.join(__dirname, 'public/js/index.js')
], ],
pretty: [ pretty: [
'babel-polyfill', 'babel-polyfill',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/pretty.js') path.join(__dirname, 'public/js/pretty.js')
], ],
'pretty-styles': [ 'pretty-styles': [
@ -299,18 +299,18 @@ module.exports = {
], ],
'pretty-pack': [ 'pretty-pack': [
'babel-polyfill', 'babel-polyfill',
'expose-loader?jsyaml!js-yaml', 'expose-loader?exposes=jsyaml!js-yaml',
'script-loader!mermaid', 'script-loader!mermaid',
'expose-loader?moment!moment', 'expose-loader?exposes=moment!moment',
'script-loader!handlebars', 'script-loader!handlebars',
'expose-loader?hljs!highlight.js', 'expose-loader?exposes=hljs!highlight.js',
'expose-loader?emojify!emojify.js', 'expose-loader?exposes=emojify!emojify.js',
'script-loader!gist-embed', 'script-loader!gist-embed',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?Viz!viz.js', 'expose-loader?exposes=Viz!viz.js',
'script-loader!abcjs', 'script-loader!abcjs',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/pretty.js') path.join(__dirname, 'public/js/pretty.js')
], ],
slide: [ slide: [
@ -318,7 +318,7 @@ module.exports = {
'bootstrap-tooltip', 'bootstrap-tooltip',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/slide.js') path.join(__dirname, 'public/js/slide.js')
], ],
'slide-styles': [ 'slide-styles': [
@ -333,23 +333,23 @@ module.exports = {
], ],
'slide-pack': [ 'slide-pack': [
'babel-polyfill', 'babel-polyfill',
'expose-loader?jQuery!expose-loader?$!jquery', 'expose-loader?exposes[]=$&exposes[]=jQuery!jquery',
'velocity-animate', 'velocity-animate',
'imports-loader?$=jquery!jquery-mousewheel', 'imports-loader?imports=default|jquery|$!jquery-mousewheel',
'bootstrap-tooltip', 'bootstrap-tooltip',
'expose-loader?jsyaml!js-yaml', 'expose-loader?exposes=jsyaml!js-yaml',
'script-loader!mermaid', 'script-loader!mermaid',
'expose-loader?moment!moment', 'expose-loader?exposes=moment!moment',
'script-loader!handlebars', 'script-loader!handlebars',
'expose-loader?hljs!highlight.js', 'expose-loader?exposes=hljs!highlight.js',
'expose-loader?emojify!emojify.js', 'expose-loader?exposes=emojify!emojify.js',
'script-loader!gist-embed', 'script-loader!gist-embed',
'flowchart.js', 'flowchart.js',
'js-sequence-diagrams', 'js-sequence-diagrams',
'expose-loader?Viz!viz.js', 'expose-loader?exposes=Viz!viz.js',
'script-loader!abcjs', 'script-loader!abcjs',
'expose-loader?Reveal!reveal.js', 'expose-loader?exposes=Reveal!reveal.js',
'expose-loader?RevealMarkdown!reveal-markdown', 'expose-loader?exposes=RevealMarkdown!reveal-markdown',
path.join(__dirname, 'public/js/slide.js') path.join(__dirname, 'public/js/slide.js')
] ]
}, },
@ -423,7 +423,9 @@ module.exports = {
test: require.resolve('js-sequence-diagrams'), test: require.resolve('js-sequence-diagrams'),
use: [{ use: [{
loader: 'imports-loader', 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+)?$/, test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,

28
yarn.lock
View file

@ -4012,10 +4012,13 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
dependencies: dependencies:
homedir-polyfill "^1.0.1" homedir-polyfill "^1.0.1"
expose-loader@0.7.5: expose-loader@1.0.3:
version "0.7.5" version "1.0.3"
resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f" resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-1.0.3.tgz#5686d3b78cac8831c4af11c3dc361563deb8a9c0"
integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw== integrity sha512-gP6hs3vYeWIqyoVfsApGQcgCEpbcI1xe+celwI31zeDhXz2q03ycBC1+75IlQUGaYvj6rAloFIe/NIBnEElLsQ==
dependencies:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
express-session@^1.14.2: express-session@^1.14.2:
version "1.17.1" version "1.17.1"
@ -5205,13 +5208,15 @@ import-local@^2.0.0:
pkg-dir "^3.0.0" pkg-dir "^3.0.0"
resolve-cwd "^2.0.0" resolve-cwd "^2.0.0"
imports-loader@0.8.0: imports-loader@1.2.0:
version "0.8.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69" resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f"
integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ== integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ==
dependencies: dependencies:
loader-utils "^1.0.2" loader-utils "^2.0.0"
schema-utils "^3.0.0"
source-map "^0.6.1" source-map "^0.6.1"
strip-comments "^2.0.1"
imurmurhash@^0.1.4: imurmurhash@^0.1.4:
version "0.1.4" version "0.1.4"
@ -10404,6 +10409,11 @@ strip-bom@^3.0.0:
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= 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: strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"