Correctly build URLs for CSS

Fix real core issue of #2518
parcel-bundler · Mar 7, 2019 · b1165bf · b1165bf
1 parent 95dfb33
commit b1165bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/core/integration-tests/test/css.js b/packages/core/integration-tests/test/css.js
@@ -282,11 +282,7 @@ describe('css', function() {
 
     assert(
       await fs.exists(
-        path.join(
-          __dirname,
-          path.dirname('/dist/a/style1.css'),
-          css.match(/url\(([^)]*)\)/)[1]
-        )
+        path.join(__dirname, 'dist', css.match(/url\(([^)]*)\)/)[1])
       ),
       'path specified in url() exists'
     );

diff --git a/packages/core/parcel-bundler/src/Asset.js b/packages/core/parcel-bundler/src/Asset.js
@@ -257,8 +257,7 @@ class Asset {
         // Replace temporary bundle names in the output with the final content-hashed names.
         let newValue = value;
         for (let [name, map] of bundleNameMap) {
-          let mapRelative = path.relative(path.dirname(this.relativeName), map);
-          newValue = newValue.split(name).join(mapRelative);
+          newValue = newValue.split(name).join(map);
         }
 
         // Copy `this.generated` on write so we don't end up writing the final names to the cache.

diff --git a/packages/core/parcel-bundler/src/assets/CSSAsset.js b/packages/core/parcel-bundler/src/assets/CSSAsset.js
@@ -6,6 +6,8 @@ const CssSyntaxError = require('postcss/lib/css-syntax-error');
 const SourceMap = require('../SourceMap');
 const loadSourceMap = require('../utils/loadSourceMap');
 const path = require('path');
+const urlJoin = require('../utils/urlJoin');
+const isURL = require('../utils/is-url');
 
 const URL_RE = /url\s*\("?(?![a-z]+:)/;
 const IMPORT_RE = /@import/;
@@ -91,6 +93,9 @@ class CSSAsset extends Asset {
             let url = this.addURLDependency(node.nodes[0].value, {
               loc: decl.source.start
             });
+            if (!isURL(url)) {
+              url = urlJoin(this.options.publicURL, url);
+            }
             dirty = node.nodes[0].value !== url;
             node.nodes[0].value = url;
           }