diff --git a/package-lock.json b/package-lock.json index 4cbc360..8b6f0e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6900,12 +6900,12 @@ ] }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { diff --git a/patches/webpack+5.90.3.patch b/patches/webpack+5.94.0.patch similarity index 79% rename from patches/webpack+5.90.3.patch rename to patches/webpack+5.94.0.patch index 4b809f4..36052be 100644 --- a/patches/webpack+5.90.3.patch +++ b/patches/webpack+5.94.0.patch @@ -1,8 +1,5 @@ -diff --git a/node_modules/webpack/.DS_Store b/node_modules/webpack/.DS_Store -new file mode 100644 -index 0000000..e69de29 diff --git a/node_modules/webpack/lib/ProvidePlugin.js b/node_modules/webpack/lib/ProvidePlugin.js -index 1487dec..a17fe98 100644 +index 28c3ce5..5cfa897 100644 --- a/node_modules/webpack/lib/ProvidePlugin.js +++ b/node_modules/webpack/lib/ProvidePlugin.js @@ -52,6 +52,24 @@ class ProvidePlugin { @@ -30,17 +27,17 @@ index 1487dec..a17fe98 100644 /** * @param {JavascriptParser} parser the parser * @param {JavascriptParserOptions} parserOptions options -@@ -60,6 +78,7 @@ class ProvidePlugin { - const handler = (parser, parserOptions) => { - Object.keys(definitions).forEach(name => { - const request = [].concat(definitions[name]); +@@ -62,6 +80,7 @@ class ProvidePlugin { + const request = + /** @type {string[]} */ + ([]).concat(definitions[name]); + const originalRequest = request const splittedName = name.split("."); if (splittedName.length > 0) { - splittedName.slice(1).forEach((_, i) => { -@@ -69,6 +88,9 @@ class ProvidePlugin { + for (const [i, _] of splittedName.slice(1).entries()) { +@@ -71,6 +90,9 @@ class ProvidePlugin { } - + parser.hooks.expression.for(name).tap(PLUGIN_NAME, expr => { + // Wavebox - rewrite dynamic imports + const request = rewriteWaveboxDynamicRequest(parser, originalRequest) @@ -48,9 +45,9 @@ index 1487dec..a17fe98 100644 const nameIdentifier = name.includes(".") ? `__webpack_provided_${name.replace(/\./g, "_dot_")}` : name; -@@ -84,6 +106,9 @@ class ProvidePlugin { +@@ -86,6 +108,9 @@ class ProvidePlugin { }); - + parser.hooks.call.for(name).tap(PLUGIN_NAME, expr => { + // Wavebox - rewrite dynamic imports + const request = rewriteWaveboxDynamicRequest(parser, originalRequest)