Skip to content

Commit 883079e

Browse files
cap-Bernarditocap-Bernardito
authored
fix: onerror request (#629)
1 parent 6ebe51d commit 883079e

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎src/CssLoadingRuntimeModule.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule {
5252

5353
return Template.asString([
5454
`var createStylesheet = ${runtimeTemplate.basicFunction(
55-
'fullhref, resolve, reject',
55+
'chunkId, fullhref, resolve, reject',
5656
[
5757
'var linkTag = document.createElement("link");',
5858
this.runtimeOptions.attributes,
@@ -61,7 +61,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule {
6161
'linkTag.onload = resolve;',
6262
'linkTag.onerror = function(event) {',
6363
Template.indent([
64-
'var request = event && event.target && event.target.src || fullhref;',
64+
'var request = event && event.target && event.target.href || fullhref;',
6565
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");',
6666
'err.code = "CSS_CHUNK_LOAD_FAILED";',
6767
'err.request = request;',
@@ -107,7 +107,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule {
107107
`var href = ${RuntimeGlobals.require}.miniCssF(chunkId);`,
108108
`var fullhref = ${RuntimeGlobals.publicPath} + href;`,
109109
'if(findStylesheet(href, fullhref)) return resolve();',
110-
'createStylesheet(fullhref, resolve, reject);',
110+
'createStylesheet(chunkId, fullhref, resolve, reject);',
111111
])});`
112112
)}`,
113113
withLoading
@@ -171,7 +171,7 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule {
171171
`promises.push(new Promise(${runtimeTemplate.basicFunction(
172172
'resolve, reject',
173173
[
174-
`var tag = createStylesheet(fullhref, ${runtimeTemplate.basicFunction(
174+
`var tag = createStylesheet(chunkId, fullhref, ${runtimeTemplate.basicFunction(
175175
'',
176176
[
177177
'tag.as = "style";',

‎src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class MiniCssExtractPlugin {
402402
'linkTag.onload = resolve;',
403403
'linkTag.onerror = function(event) {',
404404
Template.indent([
405-
'var request = event && event.target && event.target.src || fullhref;',
405+
'var request = event && event.target && event.target.href || fullhref;',
406406
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");',
407407
'err.code = "CSS_CHUNK_LOAD_FAILED";',
408408
'err.request = request;',

‎test/cases/hmr/expected/webpack-5/main.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -818,14 +818,14 @@ module.exports = function (urlString) {
818818
/******/
819819
/******/ /* webpack/runtime/css loading */
820820
/******/ (() => {
821-
/******/ var createStylesheet = (fullhref, resolve, reject) => {
821+
/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => {
822822
/******/ var linkTag = document.createElement("link");
823823
/******/
824824
/******/ linkTag.rel = "stylesheet";
825825
/******/ linkTag.type = "text/css";
826826
/******/ linkTag.onload = resolve;
827827
/******/ linkTag.onerror = function(event) {
828-
/******/ var request = event && event.target && event.target.src || fullhref;
828+
/******/ var request = event && event.target && event.target.href || fullhref;
829829
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
830830
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
831831
/******/ err.request = request;
@@ -857,7 +857,7 @@ module.exports = function (urlString) {
857857
/******/ var href = __webpack_require__.miniCssF(chunkId);
858858
/******/ var fullhref = __webpack_require__.p + href;
859859
/******/ if(findStylesheet(href, fullhref)) return resolve();
860-
/******/ createStylesheet(fullhref, resolve, reject);
860+
/******/ createStylesheet(chunkId, fullhref, resolve, reject);
861861
/******/ });
862862
/******/ }
863863
/******/ // no chunk loading
@@ -884,7 +884,7 @@ module.exports = function (urlString) {
884884
/******/ const oldTag = findStylesheet(href, fullhref);
885885
/******/ if(!oldTag) return;
886886
/******/ promises.push(new Promise((resolve, reject) => {
887-
/******/ var tag = createStylesheet(fullhref, () => {
887+
/******/ var tag = createStylesheet(chunkId, fullhref, () => {
888888
/******/ tag.as = "style";
889889
/******/ tag.rel = "preload";
890890
/******/ resolve();

‎test/cases/insert-function/expected/webpack-4/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
/******/ linkTag.type = "text/css";
107107
/******/ linkTag.onload = resolve;
108108
/******/ linkTag.onerror = function(event) {
109-
/******/ var request = event && event.target && event.target.src || fullhref;
109+
/******/ var request = event && event.target && event.target.href || fullhref;
110110
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
111111
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
112112
/******/ err.request = request;

‎test/cases/insert-function/expected/webpack-5/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@
157157
/******/
158158
/******/ /* webpack/runtime/css loading */
159159
/******/ (() => {
160-
/******/ var createStylesheet = (fullhref, resolve, reject) => {
160+
/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => {
161161
/******/ var linkTag = document.createElement("link");
162162
/******/
163163
/******/ linkTag.rel = "stylesheet";
164164
/******/ linkTag.type = "text/css";
165165
/******/ linkTag.onload = resolve;
166166
/******/ linkTag.onerror = function(event) {
167-
/******/ var request = event && event.target && event.target.src || fullhref;
167+
/******/ var request = event && event.target && event.target.href || fullhref;
168168
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
169169
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
170170
/******/ err.request = request;
@@ -201,7 +201,7 @@
201201
/******/ var href = __webpack_require__.miniCssF(chunkId);
202202
/******/ var fullhref = __webpack_require__.p + href;
203203
/******/ if(findStylesheet(href, fullhref)) return resolve();
204-
/******/ createStylesheet(fullhref, resolve, reject);
204+
/******/ createStylesheet(chunkId, fullhref, resolve, reject);
205205
/******/ });
206206
/******/ }
207207
/******/ // object to store loaded CSS chunks

‎test/cases/insert-string/expected/webpack-4/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
/******/ linkTag.type = "text/css";
107107
/******/ linkTag.onload = resolve;
108108
/******/ linkTag.onerror = function(event) {
109-
/******/ var request = event && event.target && event.target.src || fullhref;
109+
/******/ var request = event && event.target && event.target.href || fullhref;
110110
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
111111
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
112112
/******/ err.request = request;

‎test/cases/insert-string/expected/webpack-5/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@
157157
/******/
158158
/******/ /* webpack/runtime/css loading */
159159
/******/ (() => {
160-
/******/ var createStylesheet = (fullhref, resolve, reject) => {
160+
/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => {
161161
/******/ var linkTag = document.createElement("link");
162162
/******/
163163
/******/ linkTag.rel = "stylesheet";
164164
/******/ linkTag.type = "text/css";
165165
/******/ linkTag.onload = resolve;
166166
/******/ linkTag.onerror = function(event) {
167-
/******/ var request = event && event.target && event.target.src || fullhref;
167+
/******/ var request = event && event.target && event.target.href || fullhref;
168168
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
169169
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
170170
/******/ err.request = request;
@@ -196,7 +196,7 @@
196196
/******/ var href = __webpack_require__.miniCssF(chunkId);
197197
/******/ var fullhref = __webpack_require__.p + href;
198198
/******/ if(findStylesheet(href, fullhref)) return resolve();
199-
/******/ createStylesheet(fullhref, resolve, reject);
199+
/******/ createStylesheet(chunkId, fullhref, resolve, reject);
200200
/******/ });
201201
/******/ }
202202
/******/ // object to store loaded CSS chunks

‎test/cases/insert-undefined/expected/webpack-4/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
/******/ linkTag.type = "text/css";
107107
/******/ linkTag.onload = resolve;
108108
/******/ linkTag.onerror = function(event) {
109-
/******/ var request = event && event.target && event.target.src || fullhref;
109+
/******/ var request = event && event.target && event.target.href || fullhref;
110110
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
111111
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
112112
/******/ err.request = request;

‎test/cases/insert-undefined/expected/webpack-5/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@
157157
/******/
158158
/******/ /* webpack/runtime/css loading */
159159
/******/ (() => {
160-
/******/ var createStylesheet = (fullhref, resolve, reject) => {
160+
/******/ var createStylesheet = (chunkId, fullhref, resolve, reject) => {
161161
/******/ var linkTag = document.createElement("link");
162162
/******/
163163
/******/ linkTag.rel = "stylesheet";
164164
/******/ linkTag.type = "text/css";
165165
/******/ linkTag.onload = resolve;
166166
/******/ linkTag.onerror = function(event) {
167-
/******/ var request = event && event.target && event.target.src || fullhref;
167+
/******/ var request = event && event.target && event.target.href || fullhref;
168168
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
169169
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
170170
/******/ err.request = request;
@@ -196,7 +196,7 @@
196196
/******/ var href = __webpack_require__.miniCssF(chunkId);
197197
/******/ var fullhref = __webpack_require__.p + href;
198198
/******/ if(findStylesheet(href, fullhref)) return resolve();
199-
/******/ createStylesheet(fullhref, resolve, reject);
199+
/******/ createStylesheet(chunkId, fullhref, resolve, reject);
200200
/******/ });
201201
/******/ }
202202
/******/ // object to store loaded CSS chunks

0 commit comments

Comments
 (0)