From 582ebfecb975c5e72d1644f16bf1109877a6d5e1 Mon Sep 17 00:00:00 2001
From: Rasmus Melchior Jacobsen <rmja@laesoe.org>
Date: Tue, 14 May 2019 12:01:37 +0200
Subject: [PATCH] fix(loader): fix `publicPath` regression (#384)

---
 src/loader.js                                 |  2 +-
 .../publicpath-emptystring/expected/main.css  |  2 +
 test/cases/publicpath-emptystring/index.js    |  1 +
 test/cases/publicpath-emptystring/react.svg   |  1 +
 test/cases/publicpath-emptystring/style.css   |  1 +
 .../publicpath-emptystring/webpack.config.js  | 37 +++++++++++++++++++
 6 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 test/cases/publicpath-emptystring/expected/main.css
 create mode 100644 test/cases/publicpath-emptystring/index.js
 create mode 100644 test/cases/publicpath-emptystring/react.svg
 create mode 100644 test/cases/publicpath-emptystring/style.css
 create mode 100644 test/cases/publicpath-emptystring/webpack.config.js

diff --git a/src/loader.js b/src/loader.js
index 04181c42..a91dd787 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -68,7 +68,7 @@ export function pitch(request) {
   const childFilename = '*'; // eslint-disable-line no-path-concat
   const publicPath =
     typeof options.publicPath === 'string'
-      ? options.publicPath.endsWith('/')
+      ? options.publicPath === '' || options.publicPath.endsWith('/')
         ? options.publicPath
         : `${options.publicPath}/`
       : typeof options.publicPath === 'function'
diff --git a/test/cases/publicpath-emptystring/expected/main.css b/test/cases/publicpath-emptystring/expected/main.css
new file mode 100644
index 00000000..f6674281
--- /dev/null
+++ b/test/cases/publicpath-emptystring/expected/main.css
@@ -0,0 +1,2 @@
+body { background: red; background-image: url(cd0bb358c45b584743d8ce4991777c42.svg); }
+
diff --git a/test/cases/publicpath-emptystring/index.js b/test/cases/publicpath-emptystring/index.js
new file mode 100644
index 00000000..aa3357bf
--- /dev/null
+++ b/test/cases/publicpath-emptystring/index.js
@@ -0,0 +1 @@
+import './style.css';
diff --git a/test/cases/publicpath-emptystring/react.svg b/test/cases/publicpath-emptystring/react.svg
new file mode 100644
index 00000000..5b3b22a4
--- /dev/null
+++ b/test/cases/publicpath-emptystring/react.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3046.7 875.7"><title>logo-on-dark-bg</title><path fill="#FFF" d="M387 0l387 218.9v437.9L387 875.7 0 656.8V218.9L387 0z"/><path fill="#8ED6FB" d="M704.9 641.7L399.8 814.3V679.9l190.1-104.6 115 66.4zm20.9-18.9V261.9l-111.6 64.5v232l111.6 64.4zM67.9 641.7L373 814.3V679.9L182.8 575.3 67.9 641.7zM47 622.8V261.9l111.6 64.5v232L47 622.8zm13.1-384.3L373 61.5v129.9L172.5 301.7l-1.6.9-110.8-64.1zm652.6 0l-312.9-177v129.9l200.5 110.2 1.6.9 110.8-64z"/><path fill="#1C78C0" d="M373 649.3L185.4 546.1V341.8L373 450.1v199.2zm26.8 0l187.6-103.1V341.8L399.8 450.1v199.2zM198.1 318.2l188.3-103.5 188.3 103.5-188.3 108.7-188.3-108.7z"/><path fill="#F5FAFA" d="M1164.3 576.3h82.5l84.1-280.2h-80.4l-49.8 198.8-53.1-198.8H1078l-53.6 198.8-49.3-198.8h-80.4l83.6 280.2h82.5l52-179.5 51.5 179.5zM1335.2 437c0 84.1 57.3 146.3 147.4 146.3 69.7 0 107.2-41.8 117.9-61.6l-48.8-37c-8 11.8-30 34.3-68.1 34.3-41.3 0-71.3-26.8-72.9-64.3H1608c.5-5.4.5-10.7.5-16.1 0-91.6-49.3-149.5-136.1-149.5-79.9 0-137.2 63.2-137.2 147.9zm77.7-30.6c3.2-32.1 25.7-56.8 60.6-56.8 33.8 0 58.4 22.5 60 56.8h-120.6zm223.5 169.9h69.7v-28.9c7.5 9.1 35.4 35.9 83.1 35.9 80.4 0 137.2-60.5 137.2-146.8 0-86.8-52.5-147.3-132.9-147.3-48.2 0-76.1 26.8-83.1 36.4V188.9h-73.9v387.4h-.1zm71.8-139.3c0-52.5 31.1-82.5 71.8-82.5 42.9 0 71.8 33.8 71.8 82.5 0 49.8-30 80.9-71.8 80.9-45 0-71.8-36.5-71.8-80.9zm247 239.5h73.9V547.3c7 9.1 34.8 35.9 83.1 35.9 80.4 0 132.9-60.5 132.9-147.3 0-85.7-56.8-146.8-137.2-146.8-47.7 0-75.6 26.8-83.1 36.4V296h-69.7v380.5h.1zm71.8-241.1c0-44.5 26.8-80.9 71.8-80.9 41.8 0 71.8 31.1 71.8 80.9 0 48.8-28.9 82.5-71.8 82.5-40.7 0-71.8-30-71.8-82.5zm231.5 54.1c0 58.9 48.2 93.8 105 93.8 32.2 0 53.6-9.6 68.1-25.2l4.8 18.2h65.4V398.9c0-62.7-26.8-109.8-116.8-109.8-42.9 0-85.2 16.1-110.4 33.2l27.9 50.4c20.9-10.7 46.6-19.8 74.5-19.8 32.7 0 50.9 16.6 50.9 41.3v18.2c-10.2-7-32.2-15.5-60.6-15.5-65.4-.1-108.8 37.4-108.8 92.6zm73.9-2.2c0-23 19.8-39.1 48.2-39.1s48.8 14.5 48.8 39.1c0 23.6-20.4 38.6-48.2 38.6s-48.8-15.5-48.8-38.6zm348.9 30.6c-46.6 0-79.8-33.8-79.8-81.4 0-45 29.5-82 77.2-82 31.6 0 53.1 15.5 65.4 26.8l20.9-62.2c-18.2-13.9-47.2-30-88.4-30-85.2 0-149 62.7-149 147.9s62.2 146.3 149.5 146.3c40.7 0 71.3-17.1 87.3-30l-19.8-60.5c-12.4 10.1-34.9 25.1-63.3 25.1zm110.9 58.4h73.9V431.6l93.8 144.7h86.8L2940.6 423l98.6-127h-83.1l-90 117.9v-225h-73.9v387.4z"/></svg>
\ No newline at end of file
diff --git a/test/cases/publicpath-emptystring/style.css b/test/cases/publicpath-emptystring/style.css
new file mode 100644
index 00000000..edcbc24a
--- /dev/null
+++ b/test/cases/publicpath-emptystring/style.css
@@ -0,0 +1 @@
+body { background: red; background-image: url(./react.svg); }
diff --git a/test/cases/publicpath-emptystring/webpack.config.js b/test/cases/publicpath-emptystring/webpack.config.js
new file mode 100644
index 00000000..eb6125c8
--- /dev/null
+++ b/test/cases/publicpath-emptystring/webpack.config.js
@@ -0,0 +1,37 @@
+import Self from '../../../src';
+
+module.exports = {
+  entry: './index.js',
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [
+          {
+            loader: Self.loader,
+            options: {
+              publicPath: '',
+            },
+          },
+          'css-loader',
+        ],
+      },
+      {
+        test: /\.(svg|png)$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              filename: '[name].[ext]',
+            },
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [
+    new Self({
+      filename: '[name].css',
+    }),
+  ],
+};