From 20e9136a9f27a0b77f076ea5997b71d89ce3cfca Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 3 Jan 2021 23:25:18 +0800 Subject: fix: Fix html-webpack-plugin incompatible problem with workbox. --- FrontEnd/.pnp.js | 59 ++++++++++++++++------------------------ FrontEnd/package.json | 2 +- FrontEnd/yarn.lock | 74 +++++++++++++++++++++------------------------------ 3 files changed, 55 insertions(+), 80 deletions(-) (limited to 'FrontEnd') diff --git a/FrontEnd/.pnp.js b/FrontEnd/.pnp.js index 5d19c794..82d7716d 100644 --- a/FrontEnd/.pnp.js +++ b/FrontEnd/.pnp.js @@ -79,7 +79,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint-plugin-react", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:7.22.0"], ["eslint-plugin-react-hooks", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.2.0"], ["file-loader", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:6.2.0"], - ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.5.0"], + ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:5.0.0-beta.2"], ["http-server", "npm:0.12.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-server%2Fdownload%2Fhttp-server-0.12.3.tgz"], ["i18next", "npm:19.8.4"], ["i18next-browser-languagedetector", "npm:6.0.1::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fi18next-browser-languagedetector%2Fdownload%2Fi18next-browser-languagedetector-6.0.1.tgz"], @@ -8201,29 +8201,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["html-webpack-plugin", [ - ["npm:4.5.0", { - "packageLocation": "./.yarn/cache/html-webpack-plugin-npm-4.5.0-a74a71941d-df4dd38bd8.zip/node_modules/html-webpack-plugin/", + ["npm:5.0.0-beta.2", { + "packageLocation": "./.yarn/cache/html-webpack-plugin-npm-5.0.0-beta.2-eee0c2c6f4-028abbdedf.zip/node_modules/html-webpack-plugin/", "packageDependencies": [ - ["html-webpack-plugin", "npm:4.5.0"] + ["html-webpack-plugin", "npm:5.0.0-beta.2"] ], "linkType": "SOFT", }], - ["virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.5.0", { - "packageLocation": "./.yarn/$$virtual/html-webpack-plugin-virtual-2b27d71d56/0/cache/html-webpack-plugin-npm-4.5.0-a74a71941d-df4dd38bd8.zip/node_modules/html-webpack-plugin/", + ["virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:5.0.0-beta.2", { + "packageLocation": "./.yarn/$$virtual/html-webpack-plugin-virtual-ac2869c51e/0/cache/html-webpack-plugin-npm-5.0.0-beta.2-eee0c2c6f4-028abbdedf.zip/node_modules/html-webpack-plugin/", "packageDependencies": [ - ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.5.0"], + ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:5.0.0-beta.2"], ["@types/html-minifier-terser", "npm:5.1.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fhtml-minifier-terser%2Fdownload%2F%40types%2Fhtml-minifier-terser-5.1.0.tgz"], - ["@types/tapable", "npm:1.0.6::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Ftapable%2Fdownload%2F%40types%2Ftapable-1.0.6.tgz"], - ["@types/webpack", "npm:4.41.21::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fwebpack%2Fdownload%2F%40types%2Fwebpack-4.41.21.tgz"], + ["@types/webpack", null], ["html-minifier-terser", "npm:5.1.1::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-minifier-terser%2Fdownload%2Fhtml-minifier-terser-5.1.1.tgz"], - ["loader-utils", "npm:1.4.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz"], - ["lodash", "npm:4.17.19::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.19.tgz"], + ["loader-utils", "npm:2.0.0"], + ["lodash", "npm:4.17.20::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz"], ["pretty-error", "npm:2.1.1::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fpretty-error%2Fdownload%2Fpretty-error-2.1.1.tgz"], - ["tapable", "npm:1.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz"], - ["util.promisify", "npm:1.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.0.tgz"], + ["tapable", "npm:2.0.0"], ["webpack", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:5.11.1"] ], "packagePeers": [ + "@types/webpack", "webpack" ], "linkType": "HARD", @@ -9460,6 +9459,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], + ["npm:2.0.0", { + "packageLocation": "./.yarn/cache/loader-utils-npm-2.0.0-cf7d5aadbf-a1c2e48781.zip/node_modules/loader-utils/", + "packageDependencies": [ + ["loader-utils", "npm:2.0.0"], + ["big.js", "npm:5.2.2::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fbig.js%2Fdownload%2Fbig.js-5.2.2.tgz"], + ["emojis-list", "npm:3.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Femojis-list%2Fdownload%2Femojis-list-3.0.0.tgz"], + ["json5", "npm:2.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.1.3.tgz"] + ], + "linkType": "HARD", + }], ["npm:2.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-2.0.0.tgz", { "packageLocation": "./.yarn/cache/loader-utils-npm-2.0.0-bb7bf40a1d-a1c2e48781.zip/node_modules/loader-utils/", "packageDependencies": [ @@ -10456,17 +10465,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["object.getownpropertydescriptors", [ - ["npm:2.1.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.0.tgz", { - "packageLocation": "./.yarn/cache/object.getownpropertydescriptors-npm-2.1.0-ec838cd170-c33dcc3061.zip/node_modules/object.getownpropertydescriptors/", - "packageDependencies": [ - ["object.getownpropertydescriptors", "npm:2.1.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.0.tgz"], - ["define-properties", "npm:1.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz"], - ["es-abstract", "npm:1.17.6::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.6.tgz"] - ], - "linkType": "HARD", - }] - ]], ["object.pick", [ ["npm:1.3.0", { "packageLocation": "./.yarn/cache/object.pick-npm-1.3.0-dad8eae8fb-e22d555d3b.zip/node_modules/object.pick/", @@ -14041,7 +14039,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint-plugin-react", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:7.22.0"], ["eslint-plugin-react-hooks", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.2.0"], ["file-loader", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:6.2.0"], - ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:4.5.0"], + ["html-webpack-plugin", "virtual:71f98ed0939a4e8e7ea376e302a494701bc5b6aa7a7eb81870139ee3950a7c417a3d13b346b5b526d93952a598dffe628a0fac2148047debade23536cb3d7957#npm:5.0.0-beta.2"], ["http-server", "npm:0.12.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-server%2Fdownload%2Fhttp-server-0.12.3.tgz"], ["i18next", "npm:19.8.4"], ["i18next-browser-languagedetector", "npm:6.0.1::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fi18next-browser-languagedetector%2Fdownload%2Fi18next-browser-languagedetector-6.0.1.tgz"], @@ -14624,17 +14622,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["util.promisify", [ - ["npm:1.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.0.tgz", { - "packageLocation": "./.yarn/cache/util.promisify-npm-1.0.0-5303b5a40d-0dffbe1af6.zip/node_modules/util.promisify/", - "packageDependencies": [ - ["util.promisify", "npm:1.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.0.tgz"], - ["define-properties", "npm:1.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz"], - ["object.getownpropertydescriptors", "npm:2.1.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.0.tgz"] - ], - "linkType": "HARD", - }] - ]], ["utila", [ ["npm:0.4.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futila%2Fdownload%2Futila-0.4.0.tgz", { "packageLocation": "./.yarn/cache/utila-npm-0.4.0-02d7c2417d-6799b0a566.zip/node_modules/utila/", diff --git a/FrontEnd/package.json b/FrontEnd/package.json index fab51ae1..cf74d1ba 100644 --- a/FrontEnd/package.json +++ b/FrontEnd/package.json @@ -88,7 +88,7 @@ "eslint-plugin-react": "^7.22.0", "eslint-plugin-react-hooks": "^4.2.0", "file-loader": "^6.2.0", - "html-webpack-plugin": "^4.5.0", + "html-webpack-plugin": "5.0.0-beta.2", "http-server": "^0.12.3", "mini-css-extract-plugin": "^1.3.3", "postcss": "^8.2.2", diff --git a/FrontEnd/yarn.lock b/FrontEnd/yarn.lock index bd3903f3..d10e4c73 100644 --- a/FrontEnd/yarn.lock +++ b/FrontEnd/yarn.lock @@ -2171,7 +2171,7 @@ __metadata: languageName: node linkType: hard -"@types/tapable@npm:*, @types/tapable@npm:^1.0.5": +"@types/tapable@npm:*": version: 1.0.6 resolution: "@types/tapable@npm:1.0.6::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Ftapable%2Fdownload%2F%40types%2Ftapable-1.0.6.tgz" checksum: 01709a2f8dbea665a39c008ba6995c76210fabb52434815e7632c7fff22ecad1dd49a1d75b8f5b2e9b365c6d7a6407127bed834587df4777b800110c2a74fc36 @@ -2219,7 +2219,7 @@ __metadata: languageName: node linkType: hard -"@types/webpack@npm:^4.4.31, @types/webpack@npm:^4.41.8": +"@types/webpack@npm:^4.4.31": version: 4.41.21 resolution: "@types/webpack@npm:4.41.21::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fwebpack%2Fdownload%2F%40types%2Fwebpack-4.41.21.tgz" dependencies: @@ -6254,22 +6254,19 @@ fsevents@~2.1.2: languageName: node linkType: hard -"html-webpack-plugin@npm:^4.5.0": - version: 4.5.0 - resolution: "html-webpack-plugin@npm:4.5.0" +"html-webpack-plugin@npm:5.0.0-beta.2": + version: 5.0.0-beta.2 + resolution: "html-webpack-plugin@npm:5.0.0-beta.2" dependencies: "@types/html-minifier-terser": ^5.0.0 - "@types/tapable": ^1.0.5 - "@types/webpack": ^4.41.8 html-minifier-terser: ^5.0.1 - loader-utils: ^1.2.3 - lodash: ^4.17.15 + loader-utils: 2.0.0 + lodash: ^4.17.20 pretty-error: ^2.1.1 - tapable: ^1.1.3 - util.promisify: 1.0.0 + tapable: 2.0.0 peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - checksum: df4dd38bd886aaac4cdcfa40f80fd35eb310810c8cad5bf1f7b8ca91550ad7d9f277c80dd4015fd2b0ef235d0384e9708b92a9c39f33d1b09090ca6fd8fdb53b + webpack: ^5.1.2 + checksum: 028abbdedf504171177061722edc299072bdacef64dc7b6d53238f1e31e804a22168d32bd6b636cc2d69a43e4806821fe361e79bd3e22e12e073fcd4f7c707de languageName: node linkType: hard @@ -7366,7 +7363,18 @@ fsevents@~2.1.2: languageName: node linkType: hard -"loader-utils@npm:^1.0.2, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0": +"loader-utils@npm:2.0.0": + version: 2.0.0 + resolution: "loader-utils@npm:2.0.0" + dependencies: + big.js: ^5.2.2 + emojis-list: ^3.0.0 + json5: ^2.1.2 + checksum: a1c2e48781e1501e126a32c39bc1fb1a7e2f02bd99e5aeb8853ddaf3c121fffefcc4579367f97ca6890b58369e571af1c9ec82e4e20db238d560ab359ff25c33 + languageName: node + linkType: hard + +"loader-utils@npm:^1.0.2, loader-utils@npm:^1.4.0": version: 1.4.0 resolution: "loader-utils@npm:1.4.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz" dependencies: @@ -8276,16 +8284,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"object.getownpropertydescriptors@npm:^2.0.3": - version: 2.1.0 - resolution: "object.getownpropertydescriptors@npm:2.1.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.0.tgz" - dependencies: - define-properties: ^1.1.3 - es-abstract: ^1.17.0-next.1 - checksum: c33dcc3061b56ec4d9f6d30620a364a5218aba8f592662f5ce346fcf523eb0483bc865d3f52848e267217285d831ca0a3d85836787bef5f86ecfa29f77dc249e - languageName: node - linkType: hard - "object.pick@npm:^1.3.0": version: 1.3.0 resolution: "object.pick@npm:1.3.0" @@ -11194,20 +11192,20 @@ fsevents@~2.1.2: languageName: node linkType: hard -"tapable@npm:^1.0.0, tapable@npm:^1.1.3": - version: 1.1.3 - resolution: "tapable@npm:1.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz" - checksum: b2c2ab20260394b867fd249d8b6ab3e4645e00f9cce16b558b0de5a86291ef05f536f578744549d1618c9032c7f99bc1d6f68967e4aa11cb0dca4461dc4714bc - languageName: node - linkType: hard - -"tapable@npm:^2.0.0": +"tapable@npm:2.0.0, tapable@npm:^2.0.0": version: 2.0.0 resolution: "tapable@npm:2.0.0" checksum: e6321280f9ace1043b2d2e893b998454227f27da05e5e1f7c92a67752d6a87e2ca529aeb516f31a21c1a92d2532a77518423b7df7aaf7acd3a8df925f02b4c66 languageName: node linkType: hard +"tapable@npm:^1.0.0": + version: 1.1.3 + resolution: "tapable@npm:1.1.3::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz" + checksum: b2c2ab20260394b867fd249d8b6ab3e4645e00f9cce16b558b0de5a86291ef05f536f578744549d1618c9032c7f99bc1d6f68967e4aa11cb0dca4461dc4714bc + languageName: node + linkType: hard + "tapable@npm:^2.1.1": version: 2.2.0 resolution: "tapable@npm:2.2.0" @@ -11376,7 +11374,7 @@ fsevents@~2.1.2: eslint-plugin-react: ^7.22.0 eslint-plugin-react-hooks: ^4.2.0 file-loader: ^6.2.0 - html-webpack-plugin: ^4.5.0 + html-webpack-plugin: 5.0.0-beta.2 http-server: ^0.12.3 i18next: ^19.8.4 i18next-browser-languagedetector: ^6.0.1 @@ -11850,16 +11848,6 @@ typescript@^4.1.3: languageName: node linkType: hard -"util.promisify@npm:1.0.0": - version: 1.0.0 - resolution: "util.promisify@npm:1.0.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.0.tgz" - dependencies: - define-properties: ^1.1.2 - object.getownpropertydescriptors: ^2.0.3 - checksum: 0dffbe1af61c9c034b5e7b411461e46c17c788d855fb02bcbf96cd0f603c086eb83160a3c878c4d69bede9a42118a7ce2b3cc05ed5a235e1c1c04c93bd5608e7 - languageName: node - linkType: hard - "utila@npm:^0.4.0, utila@npm:~0.4": version: 0.4.0 resolution: "utila@npm:0.4.0::__archiveUrl=https%3A%2F%2Fregistry.npm.taobao.org%2Futila%2Fdownload%2Futila-0.4.0.tgz" -- cgit v1.2.3