Skip to content

Commit

Permalink
feat: added the type property for loading errors (#651)
Browse files Browse the repository at this point in the history
  • Loading branch information
@evilebottnawi
evilebottnawi authored Nov 6, 2020
1 parent 5889d43 commit be9ddcb
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 27 deletions.
8 changes: 5 additions & 3 deletions src/CssLoadingRuntimeModule.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ module.exports = class CssLoadingRuntimeModule extends RuntimeModule {
Template.indent(['resolve();']),
'} else {',
Template.indent([
'var request = event && event.target && event.target.href || fullhref;',
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");',
"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
'var realHref = event && event.target && event.target.href || fullhref;',
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + realHref + ")");',
'err.code = "CSS_CHUNK_LOAD_FAILED";',
'err.request = request;',
'err.type = errorType;',
'err.request = realHref;',
'linkTag.parentNode.removeChild(linkTag)',
'reject(err);',
]),
Expand Down
8 changes: 5 additions & 3 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,12 @@ class MiniCssExtractPlugin {
Template.indent(['resolve();']),
'} else {',
Template.indent([
'var request = event && event.target && event.target.href || fullhref;',
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + request + ")");',
"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
'var realHref = event && event.target && event.target.href || fullhref;',
'var err = new Error("Loading CSS chunk " + chunkId + " failed.\\n(" + realHref + ")");',
'err.code = "CSS_CHUNK_LOAD_FAILED";',
'err.request = request;',
'err.type = errorType;',
'err.request = realHref;',
'delete installedCssChunks[chunkId]',
'linkTag.parentNode.removeChild(linkTag)',
'reject(err);',
Expand Down
8 changes: 5 additions & 3 deletions test/cases/hmr/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -833,10 +833,12 @@ module.exports = function (urlString) {
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ }
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-function/expected/webpack-4/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-function/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ }
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-string/expected/webpack-4/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-string/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ }
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-undefined/expected/webpack-4/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
Expand Down
8 changes: 5 additions & 3 deletions test/cases/insert-undefined/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@
/******/ if (event.type === 'load') {
/******/ resolve();
/******/ } else {
/******/ var request = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ var errorType = event && (event.type === 'load' ? 'missing' : event.type);
/******/ var realHref = event && event.target && event.target.href || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + realHref + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ err.type = errorType;
/******/ err.request = realHref;
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ }
Expand Down

0 comments on commit be9ddcb

Please sign in to comment.