From 5f3b570da7003bea3987fca1dac58afc9c62d10c Mon Sep 17 00:00:00 2001 From: cap-Bernardito Date: Tue, 20 Oct 2020 15:15:40 +0300 Subject: [PATCH] fix: onerror request --- src/CssLoadingRuntimeModule.js | 8 ++++---- src/index.js | 2 +- test/cases/hmr/expected/webpack-5/main.js | 8 ++++---- test/cases/insert-function/expected/webpack-4/main.js | 2 +- test/cases/insert-function/expected/webpack-5/main.js | 6 +++--- test/cases/insert-string/expected/webpack-4/main.js | 2 +- test/cases/insert-string/expected/webpack-5/main.js | 6 +++--- test/cases/insert-undefined/expected/webpack-4/main.js | 2 +- test/cases/insert-undefined/expected/webpack-5/main.js | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/CssLoadingRuntimeModule.js b/src/CssLoadingRuntimeModule.js index e04c5b38..e259fc5d 100644 --- a/src/CssLoadingRuntimeModule.js +++ b/src/CssLoadingRuntimeModule.js @@ -52,7 +52,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule { return Template.asString([ `var createStylesheet = ${runtimeTemplate.basicFunction( - 'fullhref, resolve, reject', + 'chunkId, fullhref, resolve, reject', [ 'var linkTag = document.createElement("link");', this.runtimeOptions.attributes, @@ -61,7 +61,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule { 'linkTag.onload = resolve;', 'linkTag.onerror = function(event) {', Template.indent([ - 'var request = event && event.target && event.target.src || fullhref;', + 'var request = event && event.target && event.target.href || fullhref;', 'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");', 'err.code = "CSS_CHUNK_LOAD_FAILED";', 'err.request = request;', @@ -107,7 +107,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule { `var href = ${RuntimeGlobals.require}.miniCssF(chunkId);`, `var fullhref = ${RuntimeGlobals.publicPath} + href;`, 'if(findStylesheet(href, fullhref)) return resolve();', - 'createStylesheet(fullhref, resolve, reject);', + 'createStylesheet(chunkId, fullhref, resolve, reject);', ])});` )}`, withLoading @@ -171,7 +171,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule { `promises.push(new Promise(${runtimeTemplate.basicFunction( 'resolve, reject', [ - `var tag = createStylesheet(fullhref, ${runtimeTemplate.basicFunction( + `var tag = createStylesheet(chunkId, fullhref, ${runtimeTemplate.basicFunction( '', [ 'tag.as = "style";', diff --git a/src/index.js b/src/index.js index 91f2104c..03acebe2 100644 --- a/src/index.js +++ b/src/index.js @@ -402,7 +402,7 @@ class MiniCssExtractPlugin { 'linkTag.onload = resolve;', 'linkTag.onerror = function(event) {', Template.indent([ - 'var request = event && event.target && event.target.src || fullhref;', + 'var request = event && event.target && event.target.href || fullhref;', 'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");', 'err.code = "CSS_CHUNK_LOAD_FAILED";', 'err.request = request;', diff --git a/test/cases/hmr/expected/webpack-5/main.js b/test/cases/hmr/expected/webpack-5/main.js index c222e3cf..7441653f 100644 --- a/test/cases/hmr/expected/webpack-5/main.js +++ b/test/cases/hmr/expected/webpack-5/main.js @@ -818,14 +818,14 @@ module.exports = function (urlString) { /******/ /******/ /* webpack/runtime/css loading */ /******/ (() => { -/******/ var createStylesheet = (fullhref, resolve, reject) => { +/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => { /******/ var linkTag = document.createElement("link"); /******/ /******/ linkTag.rel = "stylesheet"; /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; @@ -857,7 +857,7 @@ module.exports = function (urlString) { /******/ var href = __webpack_require__.miniCssF(chunkId); /******/ var fullhref = __webpack_require__.p + href; /******/ if(findStylesheet(href, fullhref)) return resolve(); -/******/ createStylesheet(fullhref, resolve, reject); +/******/ createStylesheet(chunkId, fullhref, resolve, reject); /******/ }); /******/ } /******/ // no chunk loading @@ -884,7 +884,7 @@ module.exports = function (urlString) { /******/ const oldTag = findStylesheet(href, fullhref); /******/ if(!oldTag) return; /******/ promises.push(new Promise((resolve, reject) => { -/******/ var tag = createStylesheet(fullhref, () => { +/******/ var tag = createStylesheet(chunkId, fullhref, () => { /******/ tag.as = "style"; /******/ tag.rel = "preload"; /******/ resolve(); diff --git a/test/cases/insert-function/expected/webpack-4/main.js b/test/cases/insert-function/expected/webpack-4/main.js index 9ff258ac..a23de8ce 100644 --- a/test/cases/insert-function/expected/webpack-4/main.js +++ b/test/cases/insert-function/expected/webpack-4/main.js @@ -106,7 +106,7 @@ /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; diff --git a/test/cases/insert-function/expected/webpack-5/main.js b/test/cases/insert-function/expected/webpack-5/main.js index 12f8e74a..12c5aded 100644 --- a/test/cases/insert-function/expected/webpack-5/main.js +++ b/test/cases/insert-function/expected/webpack-5/main.js @@ -157,14 +157,14 @@ /******/ /******/ /* webpack/runtime/css loading */ /******/ (() => { -/******/ var createStylesheet = (fullhref, resolve, reject) => { +/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => { /******/ var linkTag = document.createElement("link"); /******/ /******/ linkTag.rel = "stylesheet"; /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; @@ -201,7 +201,7 @@ /******/ var href = __webpack_require__.miniCssF(chunkId); /******/ var fullhref = __webpack_require__.p + href; /******/ if(findStylesheet(href, fullhref)) return resolve(); -/******/ createStylesheet(fullhref, resolve, reject); +/******/ createStylesheet(chunkId, fullhref, resolve, reject); /******/ }); /******/ } /******/ // object to store loaded CSS chunks diff --git a/test/cases/insert-string/expected/webpack-4/main.js b/test/cases/insert-string/expected/webpack-4/main.js index dcad6f63..3da28c65 100644 --- a/test/cases/insert-string/expected/webpack-4/main.js +++ b/test/cases/insert-string/expected/webpack-4/main.js @@ -106,7 +106,7 @@ /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; diff --git a/test/cases/insert-string/expected/webpack-5/main.js b/test/cases/insert-string/expected/webpack-5/main.js index df8d9cb5..54d848cc 100644 --- a/test/cases/insert-string/expected/webpack-5/main.js +++ b/test/cases/insert-string/expected/webpack-5/main.js @@ -157,14 +157,14 @@ /******/ /******/ /* webpack/runtime/css loading */ /******/ (() => { -/******/ var createStylesheet = (fullhref, resolve, reject) => { +/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => { /******/ var linkTag = document.createElement("link"); /******/ /******/ linkTag.rel = "stylesheet"; /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; @@ -196,7 +196,7 @@ /******/ var href = __webpack_require__.miniCssF(chunkId); /******/ var fullhref = __webpack_require__.p + href; /******/ if(findStylesheet(href, fullhref)) return resolve(); -/******/ createStylesheet(fullhref, resolve, reject); +/******/ createStylesheet(chunkId, fullhref, resolve, reject); /******/ }); /******/ } /******/ // object to store loaded CSS chunks diff --git a/test/cases/insert-undefined/expected/webpack-4/main.js b/test/cases/insert-undefined/expected/webpack-4/main.js index 18948b0c..40e53f2a 100644 --- a/test/cases/insert-undefined/expected/webpack-4/main.js +++ b/test/cases/insert-undefined/expected/webpack-4/main.js @@ -106,7 +106,7 @@ /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; diff --git a/test/cases/insert-undefined/expected/webpack-5/main.js b/test/cases/insert-undefined/expected/webpack-5/main.js index a2b6d0fb..318b496c 100644 --- a/test/cases/insert-undefined/expected/webpack-5/main.js +++ b/test/cases/insert-undefined/expected/webpack-5/main.js @@ -157,14 +157,14 @@ /******/ /******/ /* webpack/runtime/css loading */ /******/ (() => { -/******/ var createStylesheet = (fullhref, resolve, reject) => { +/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => { /******/ var linkTag = document.createElement("link"); /******/ /******/ linkTag.rel = "stylesheet"; /******/ linkTag.type = "text/css"; /******/ linkTag.onload = resolve; /******/ linkTag.onerror = function(event) { -/******/ var request = event && event.target && event.target.src || fullhref; +/******/ var request = event && event.target && event.target.href || fullhref; /******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")"); /******/ err.code = "CSS_CHUNK_LOAD_FAILED"; /******/ err.request = request; @@ -196,7 +196,7 @@ /******/ var href = __webpack_require__.miniCssF(chunkId); /******/ var fullhref = __webpack_require__.p + href; /******/ if(findStylesheet(href, fullhref)) return resolve(); -/******/ createStylesheet(fullhref, resolve, reject); +/******/ createStylesheet(chunkId, fullhref, resolve, reject); /******/ }); /******/ } /******/ // object to store loaded CSS chunks