Merge branch 'master' into patch-2

Author: alexander-akait

package.json

@@ -31,7 +31,7 @@
     "test:only": "cross-env NODE_ENV=test jest",
     "test:watch": "npm run test:only -- --watch",
     "test:coverage": "npm run test:only -- --collectCoverageFrom=\"src/**/*.js\" --coverage",
-    "test:manual": "npm run build && webpack-dev-server test/manual/src/index.js --open --config test/manual/webpack.config.js",
+    "test:manual": "npm run build && webpack serve ./test/manual/src/index.js --open --config ./test/manual/webpack.config.js",
     "pretest": "npm run lint",
     "test": "cross-env NODE_ENV=test npm run test:coverage",
     "defaults": "webpack-defaults"

src/loader.js

@@ -50,16 +50,22 @@ export function pitch(request) {
   const childFilename = '*';
   const publicPath =
     typeof options.publicPath === 'string'
-      ? options.publicPath === '' || options.publicPath.endsWith('/')
+      ? options.publicPath === 'auto'
+        ? ''
+        : options.publicPath === '' || options.publicPath.endsWith('/')
         ? options.publicPath
         : `${options.publicPath}/`
       : typeof options.publicPath === 'function'
       ? options.publicPath(this.resourcePath, this.rootContext)
+      : this._compilation.outputOptions.publicPath === 'auto'
+      ? ''
       : this._compilation.outputOptions.publicPath;
+
   const outputOptions = {
     filename: childFilename,
     publicPath,
   };
+
   const childCompiler = this._compilation.createChildCompiler(
     `${pluginName} ${request}`,
     outputOptions

test/cases/publicpath-compiler-auto/expected/main.css

@@ -0,0 +1,5 @@
+body {
+  background: red;
+  background-image: url(c9e192c015437a21dea1faa1d30f4941.svg);
+}
+

test/cases/publicpath-compiler-auto/index.js

@@ -0,0 +1 @@
+import './style.css';

test/cases/publicpath-compiler-auto/react.svg

@@ -0,0 +1,4 @@
+body {
+  background: red;
+  background-image: url(./react.svg);
+}

test/cases/publicpath-compiler-auto/style.css

@@ -0,0 +1,38 @@
+import Self from '../../../src';
+
+module.exports = {
+  entry: './index.js',
+  output: {
+    publicPath: 'auto',
+  },
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [
+          {
+            loader: Self.loader,
+            options: {},
+          },
+          'css-loader',
+        ],
+      },
+      {
+        test: /\.(svg|png)$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              filename: '[name].[ext]',
+            },
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [
+    new Self({
+      filename: '[name].css',
+    }),
+  ],
+};

test/cases/publicpath-compiler-auto/webpack.config.js

@@ -0,0 +1,5 @@
+body {
+  background: red;
+  background-image: url(c9e192c015437a21dea1faa1d30f4941.svg);
+}
+

test/cases/publicpath-loader-auto/expected/main.css

@@ -0,0 +1 @@
+import './style.css';

test/cases/publicpath-loader-auto/index.js

@@ -0,0 +1,4 @@
+body {
+  background: red;
+  background-image: url(./react.svg);
+}

test/cases/publicpath-loader-auto/react.svg

@@ -0,0 +1,37 @@
+import Self from '../../../src';
+
+module.exports = {
+  entry: './index.js',
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [
+          {
+            loader: Self.loader,
+            options: {
+              publicPath: 'auto',
+            },
+          },
+          'css-loader',
+        ],
+      },
+      {
+        test: /\.(svg|png)$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              filename: '[name].[ext]',
+            },
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [
+    new Self({
+      filename: '[name].css',
+    }),
+  ],
+};