fix(compat): fix window path resolution compatibility issues

jgranstrom · Jul 20, 2017 · 835f542 · 835f542
1 parent 2004cd5
commit 835f542
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 38 deletions.
diff --git a/src/extract.js b/src/extract.js
@@ -1,30 +1,12 @@
 import Promise from 'bluebird';
 import sass from 'node-sass';
-import path from 'path';
+import { normalizePath, makeAbsolute } from './util';
 import { loadCompiledFiles, loadCompiledFilesSync } from './load';
 import { processFiles } from './process';
 import { makeImporter, makeSyncImporter } from './importer';
 
 Promise.promisifyAll(sass);
 
-const NORMALIZED_PATH_SEPARATOR = '/';
-const PLATFORM_PATH_SEPARATOR = path.sep;
-
-/**
- * Normalize path across platforms
- */
-export function normalizePath(path) {
-  return path.split(PLATFORM_PATH_SEPARATOR).join(NORMALIZED_PATH_SEPARATOR);
-}
-
-export function makeAbsolute(maybeRelativePath) {
-  if(path.posix.isAbsolute(maybeRelativePath)) {
-    return maybeRelativePath;
-  } else {
-    return path.posix.join(process.cwd(), maybeRelativePath);
-  }
-}
-
 /**
  * Get rendered stats required for extraction
  */

diff --git a/src/importer.js b/src/importer.js
@@ -1,4 +1,5 @@
 import path from 'path';
+import { normalizePath, makeAbsolute } from './util';
 
 /**
  * Search for the imported file in order of included paths
@@ -14,13 +15,8 @@ function findImportedPath(url, prev, includedFilesMap, includedPaths) {
   }
 
   for(let i = 0; i < candidateFromPaths.length; i++) {
-    let candidateFromPath = candidateFromPaths[i];
-
-    // Ensure we get absolute included path
-    if(!path.posix.isAbsolute(candidateFromPath)) {
-      candidateFromPath = path.posix.join(process.cwd(), candidateFromPath);
-    }
-
+    // Get normalize absolute candidate from path
+    let candidateFromPath = normalizePath(makeAbsolute(candidateFromPaths[i]));
     let candidatePath = path.posix.join(candidateFromPath, url);
 
     if(includedFilesMap[candidatePath]) {

diff --git a/src/util.js b/src/util.js
@@ -0,0 +1,23 @@
+import path from 'path';
+
+const NORMALIZED_PATH_SEPARATOR = '/';
+const PLATFORM_PATH_SEPARATOR = path.sep;
+
+/**
+ * Normalize path across platforms
+ */
+export function normalizePath(path) {
+  return path.split(PLATFORM_PATH_SEPARATOR).join(NORMALIZED_PATH_SEPARATOR);
+}
+
+/**
+ * Make a potentially relative path absolute relative to cwd
+ */
+export function makeAbsolute(maybeRelativePath) {
+  if(path.isAbsolute(maybeRelativePath)) {
+    return maybeRelativePath;
+  } else {
+    return path.posix.join(process.cwd(), maybeRelativePath);
+  }
+}
+
diff --git a/test/basic.js b/test/basic.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 const { EOL } = require('os');
 
 const basicImplicitFile = path.join(__dirname, 'sass', 'basic-implicit.scss');
@@ -62,7 +62,7 @@ function verifyBasic(rendered, sourceFile, mapIncluded) {
   expect(rendered.vars.global.$list.value[2].value.b).to.equal(0);
   expect(rendered.vars.global.$list.value[2].value.a).to.equal(1);
   expect(rendered.vars.global.$list.value[2].value.hex).to.equal('#000000');
-  expect(rendered.vars.global.$list.value[2].type).to.equal('SassColor');
+  expect(rendered.vars.global.$list.value[2].type).to.equal('SassColor'); 
 
   expect(rendered.vars.global.$string.value).to.equal('string');
   expect(rendered.vars.global.$string.type).to.equal('SassString');

diff --git a/test/comments.js b/test/comments.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 
 const commentFile = path.join(__dirname, 'sass', 'comments.scss');
 

diff --git a/test/functions.js b/test/functions.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 const { types } = require('node-sass');
 
 const functionsFile = path.join(__dirname, 'sass', 'functions.scss');

diff --git a/test/include.js b/test/include.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 
 const includeRootFile = path.join(__dirname, 'sass', 'include', 'root.scss');
 const includeRoot2File = path.join(__dirname, 'sass', 'include', 'root2.scss');
@@ -45,10 +45,10 @@ function verifyFunctions(rendered, sourceFile, includedColor, separateColor, inc
 describe('include', () => {
   describe('sub only', () => {
     describe('root1', () => {
-    describe('sync', () => {
-      it('should extract all variables', () => {
-        const rendered = renderSync({ file: includeRootFile, includePaths: [includeSubDir] });
-        verifyFunctions(rendered, includeRootFile, SUB_INCLUDED_COLOR, SUB_INCLUDED2_COLOR, includeSubFile,  includeSubFile2);
+      describe('sync', () => {
+        it('should extract all variables', () => {
+          const rendered = renderSync({ file: includeRootFile, includePaths: [includeSubDir] });
+          verifyFunctions(rendered, includeRootFile, SUB_INCLUDED_COLOR, SUB_INCLUDED2_COLOR, includeSubFile,  includeSubFile2);
         });
       });
 

diff --git a/test/inline.js b/test/inline.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 
 const inlineData = `
   $number1: 123px;

diff --git a/test/nested.js b/test/nested.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 
 const nestedBasicFile = path.join(__dirname, 'sass', 'nested', 'nested-basic.scss');
 const nestedSubFile = path.join(__dirname, 'sass', 'nested', 'sub', 'sub.scss');

diff --git a/test/partial.js b/test/partial.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const path = require('path');
 const { render, renderSync } = require('../lib');
-const { normalizePath } = require('../lib/extract');
+const { normalizePath } = require('../lib/util');
 
 const partialFile = path.join(__dirname, 'sass', 'partial.scss');
 const somePartialFile = path.join(__dirname, 'sass', '_somepartial.scss');