Webpack 5 fixes

.gitignore

@@ -38,4 +38,7 @@ node_modules
 .node_repl_history
 
 # NYC covergae information
-.nyc_output
+.nyc_output
+
+# WebStorm/IntelliJ Project Files
+*.iml

.travis.yml

@@ -3,9 +3,9 @@ os:
 language: node_js
 node_js:
   - "node"
+  - "14"
   - "12"
   - "10"
-  - "8"
 
 script:
   - npm test

package.json

@@ -48,7 +48,7 @@
     "rimraf": "^2.6.2",
     "standard-version": "^4.4.0",
     "style-loader": "^0.23.0",
-    "webpack": "^4.17.1",
+    "webpack": "^5.39.1",
     "webpack-command": "^0.4.1"
   },
   "dependencies": {

src/extractLoader.js

@@ -206,19 +206,17 @@ function rndNumber() {
  * @returns {string}
  */
 function getPublicPath(options, context) {
-    if ("publicPath" in options) {
-        return typeof options.publicPath === "function" ? options.publicPath(context) : options.publicPath;
-    }
+    let publicPath = "";
 
-    if (context.options && context.options.output && "publicPath" in context.options.output) {
-        return context.options.output.publicPath;
-    }
-
-    if (context._compilation && context._compilation.outputOptions && "publicPath" in context._compilation.outputOptions) {
-        return context._compilation.outputOptions.publicPath;
+    if ("publicPath" in options) {
+        publicPath = typeof options.publicPath === "function" ? options.publicPath(context) : options.publicPath;
+    } else if (context.options && context.options.output && "publicPath" in context.options.output) {
+        publicPath = context.options.output.publicPath;
+    } else if (context._compilation && context._compilation.outputOptions && "publicPath" in context._compilation.outputOptions) {
+        publicPath = context._compilation.outputOptions.publicPath;
     }
 
-    return "";
+    return publicPath === "auto" ? "" : publicPath;
 }
 /* eslint-enable complexity */
 

test/extractLoader.test.js

@@ -133,10 +133,8 @@ describe("extractLoader", () => {
                 dependency => dependency.slice(basePath.length)
             );
 
-            expect(dependencies.sort()).to.eql(
+            expect(dependencies.sort()).to.include.members(
                 [
-                    "/node_modules/css-loader/lib/css-base.js",
-                    "/node_modules/css-loader/lib/url/escape.js",
                     "/test/modules/hi.jpg",
                     "/test/modules/img.css",
                     "/test/modules/stylesheet.html",
@@ -221,15 +219,18 @@ describe("extractLoader", () => {
                 expect(message).to.match(/Error: Can't resolve 'does-not-exist'/);
             }
         ));
-    it("should not leak globals when there is an error during toString()", () =>
-        compile({testModule: "error-to-string.js"}).then(
+    it("should not leak globals when there is an error during toString()", () => {
+        delete global.btoa;
+
+        return compile({testModule: "error-to-string.js"}).then(
             () => {
                 throw new Error("Did not throw expected error");
             },
             () => {
                 expect("btoa" in global).to.be.false;
             }
-        ));
+        );
+    });
     it("should restore the original globals when there is an error during toString()", () => {
         const myBtoa = {};
 

test/support/compile.js

@@ -61,7 +61,7 @@ function compile({testModule, publicPath, loaderOptions}) {
                         },
                         {
                             test: /\.css$/,
-                            loaders: [
+                            use: [
                                 {
                                     loader: "file-loader",
                                     options: {
@@ -82,7 +82,7 @@ function compile({testModule, publicPath, loaderOptions}) {
                         },
                         {
                             test: /\.jpg$/,
-                            loaders: [
+                            use: [
                                 {
                                     loader: "file-loader",
                                     options: {