v.6.0.3

- fixed error with hash url

Author: sergcen

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.0.3 - 2017-04-04
+Fixed: hash url error
+  ([#89])(https://github.com/postcss/postcss-url/issues/89)
+  
 # 6.0.2 - 2017-04-04
 Fixed: match options before analyzing
   ([pull-88](https://github.com/postcss/postcss-url/pull/88))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-url",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "PostCSS plugin to rebase or inline on url().",
   "keywords": [
     "css",

src/index.js

@@ -61,13 +61,15 @@ const getPattern = (decl) =>
  * @returns {String|undefined}
  */
 const replaceUrl = (url, dir, options, result, decl) => {
-    const asset = prepareAsset(url, dir, options.basePath);
+    const asset = prepareAsset(url, dir, decl);
     const relativeToRoot = path.relative(process.cwd(), asset.absolutePath);
 
     const matchedOptions = matchOptions(relativeToRoot, options);
+
     if (!matchedOptions) return;
 
     const isFunction = typeof matchedOptions.url === 'function';
+
     if (!isFunction && isUrlShouldBeIgnored(url, matchedOptions)) return;
 
     const mode = isFunction ? 'custom' : (matchedOptions.url || 'rebase');
@@ -114,7 +116,7 @@ module.exports = postcss.plugin('postcss-url', (options) => {
 
             return declProcessor(options, result, dir, decl);
         });
-    }
+    };
 });
 
 /**

src/lib/paths.js

@@ -16,20 +16,27 @@ const normalize = (assetUrl) => {
 };
 
 /**
- * Check if url is absolute, hash or data-uri
- *
  * @param {String} assetUrl
- * @param {PostcssUrl~Options} options
  * @returns {Boolean}
  */
-const isUrlShouldBeIgnored = (assetUrl, options) => {
+const isUrlWithoutPathname = (assetUrl) => {
     return assetUrl[0] === '#'
         || assetUrl.indexOf('%23') === 0
-        || (assetUrl[0] === '/' && !options.basePath)
         || assetUrl.indexOf('data:') === 0
         || /^[a-z]+:\/\//.test(assetUrl);
 };
 
+/**
+ * Check if url is absolute, hash or data-uri
+ *
+ * @param {String} assetUrl
+ * @param {PostcssUrl~Options} options
+ * @returns {Boolean}
+ */
+const isUrlShouldBeIgnored = (assetUrl, options) => {
+    return isUrlWithoutPathname(assetUrl) || (assetUrl[0] === '/' && !options.basePath);
+};
+
 /**
  * @param {String} baseDir - absolute target path
  * @param {String} assetsPath - extend asset path, can be absolute path
@@ -48,14 +55,23 @@ const getAssetsPath = (baseDir, assetsPath, relative) =>
 const getTargetDir = (dir) =>
     dir.from !== dir.to ? dir.to : process.cwd();
 
+/**
+ * Stylesheet file path from decl
+ *
+ * @param {Decl} decl
+ * @returns {String}
+ */
+const getPathDeclFile = (decl) =>
+    decl.source && decl.source.input && decl.source.input.file;
+
 /**
  * Stylesheet file dir from decl
  *
  * @param {Decl} decl
  * @returns {String}
  */
 const getDirDeclFile = (decl) => {
-    const filename = decl.source && decl.source.input && decl.source.input.file;
+    const filename = getPathDeclFile(decl);
 
     return filename ? path.dirname(filename) : process.cwd();
 };
@@ -85,11 +101,15 @@ const getPathByBasePath = (basePath, dirFrom, relPath) => {
  *
  * @param {String} assetUrl
  * @param {PostcssUrl~Dir} dir
+ * @param {Decl} decl
  * @returns {PostcssUrl~Asset}
  */
-const prepareAsset = (assetUrl, dir) => {
+const prepareAsset = (assetUrl, dir, decl) => {
     const parsedUrl = url.parse(assetUrl);
-    const absolutePath = path.join(dir.file, parsedUrl.pathname);
+    const pathname = !isUrlWithoutPathname(assetUrl) ? parsedUrl.pathname : null;
+    const absolutePath = pathname
+        ? path.join(dir.file, pathname)
+        : getPathDeclFile(decl);
 
     return {
         url: assetUrl,
@@ -106,6 +126,7 @@ module.exports = {
     prepareAsset,
     getAssetsPath,
     getDirDeclFile,
+    getPathDeclFile,
     getTargetDir,
     getPathByBasePath,
     isUrlShouldBeIgnored

test/fixtures/rebase-to-from.css

@@ -1,3 +1,4 @@
 body {
   background: url("./one"), url("./two");
+  filter: url("#one");
 }

test/fixtures/rebase-to-from.expected.css

@@ -1,3 +1,4 @@
 body {
   background: url("one"), url("two");
-}
+  filter: url("#one");
+}

test/lib/paths.js

@@ -133,4 +133,23 @@ describe('paths', () => {
             hash: '#23'
         });
     });
+
+    it('should prepare custom assets', () => {
+        const dirs = {
+            from: '/project/css',
+            file: '/project/css/imported'
+        };
+        const decl = {
+            source: { input: { file: '/project/styles/style.css' } }
+        };
+
+        const checkCustomAsset = (assetUrl) => {
+            const asset = paths.prepareAsset(assetUrl, dirs, decl);
+
+            assert.equal(asset.absolutePath, path.resolve('/project/styles/style.css'));
+            assert.equal(asset.relativePath, '../styles/style.css');
+        };
+
+        ['#hash', '%23ecodedhash', 'data:'].forEach(checkCustomAsset);
+    });
 });