Merge pull request #12 from cloverinteractive/hotfix/baseDir

baseDir should override file dirname
yeojz · Feb 27, 2018 · 2ed6eca · 2ed6eca
2 parents 8b1c644 + 832e6c9
commit 2ed6eca
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 187 deletions.
diff --git a/src/index.js b/src/index.js
@@ -2,6 +2,7 @@ import {dirname, extname, resolve} from'path';
 import transform from './transform';
 
 export const defaultOptions = {
+  flatten: false,
   extensions: [
     '.gif',
     '.jpeg',

diff --git a/src/transform.js b/src/transform.js
@@ -10,7 +10,7 @@ function getHash(str) {
     .slice(0, 8);
 }
 
-function getFile(absPath, baseDir, uri) {
+function getFile(absPath, baseDir, uri, flatten) {
   const file = absPath
     .split(baseDir || path.sep)
     .pop();
@@ -19,7 +19,9 @@ function getFile(absPath, baseDir, uri) {
     return (uri) ? '/' + file : file;
   }
 
-  return path.join(baseDir, file)
+  const fileName = flatten ? path.basename(file) : file;
+
+  return path.join(baseDir, fileName)
     .replace(/\\/g, '/')
     .replace(/\/\/g/, '/');
 }
@@ -35,7 +37,7 @@ const getVariableName = (p) => {
 }
 
 export default (p, t, opts, absPath, calleeName) => {
-  const file = getFile(absPath, opts.baseDir, opts.baseUri);
+  const file = getFile(absPath, opts.baseDir, opts.baseUri, opts.flatten);
   let hash = '';
 
   if (opts.hash === 1) {

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -17,6 +17,14 @@ describe('index', function () {
     expect(result).to.equal('const test = \'http://cdn.address/assets/path/to/icon.svg\';');
   });
 
+  it('should let you flatten the file path', function () {
+    const config = Object.assign({}, baseConfig, {
+      flatten: true
+    });
+    const result = transformCode(getFixtures('import-image.js'), config).code;
+    expect(result).to.equal('const test = \'http://cdn.address/assets/icon.svg\';');
+  });
+
   it('should replace import statements with uri and hash of content', function () {
     const config = Object.assign({}, baseConfig, {
       hash: 1,