windows path fix

Author: ShMcK

lib/importPaths.js

@@ -1,6 +1,5 @@
 "use strict";
 var path_1 = require('path');
-var system_1 = require('./system');
 var importPathRegex = /require\(["'](BASE.+)["']\)([a-zA-Z0-9\-\_]+)?|^import.+?\s?["'](BASE.+)["'];?$/m;
 var relativePathRegex = /^BASE/;
 function fixImportPaths(_a) {
@@ -12,14 +11,8 @@ function fixImportPaths(_a) {
         }
         var importPath = isMatch[1] || isMatch[2] || isMatch[3];
         if (importPath.match(relativePathRegex)) {
-            var newPath = void 0;
-            if (system_1.isWindows) {
-                newPath = path_1.join(dir, importPath.replace('BASE', ''))
-                    .split('\\').join('\\\\');
-            }
-            else {
-                newPath = path_1.join(dir, importPath.replace('BASE', ''));
-            }
+            var newPath = path_1.join(dir, importPath.replace('BASE', ''))
+                .split('\\').join('\\\\');
             return line.replace(importPath, newPath);
         }
         return line;

lib/index.js

@@ -1,11 +1,8 @@
 "use strict";
 var importPaths_1 = require('./importPaths');
-var system_1 = require('./system');
 var jsCodeRoad = function (_a) {
     var dir = _a.dir, content = _a.content;
-    if (system_1.isWindows) {
-        dir = dir.split('\\').join('\\\\');
-    }
+    dir = dir.split('\\').join('\\\\');
     return "(function(){'use strict';\nrequire('babel-register')({plugins:[\n  ['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'" + dir + "'}]\n]});\n" + require('process-console-log').logger + "\nconst _f_e = require('node-file-exists').default;\nconst _join = require('path').join;\nfunction exists(p) { return _f_e(_join('" + dir + "',p)); }\nrequire = require('rewire-coderoad');\n\n" + importPaths_1.default({ dir: dir, content: content }) + "\n\n}());";
 };
 Object.defineProperty(exports, "__esModule", { value: true });

lib/system.js

@@ -1,6 +1,6 @@
 {
   "name": "js-coderoad",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "bundled javascript features for coderoad test runners",
   "keywords": [
     "coderoad",
@@ -33,7 +33,7 @@
     "babel-register": "^6.14.0",
     "node-file-exists": "^1.1.0",
     "process-console-log": "^0.2.5",
-    "rewire-coderoad": "^3.1.3"
+    "rewire-coderoad": "^3.1.4"
   },
   "devDependencies": {
     "ava": "^0.16.0",

package.json

@@ -1,5 +1,4 @@
 import { join } from 'path';
-import { isWindows } from './system';
 
 /*
   import paths won't match the context of the test runner
@@ -24,18 +23,9 @@ export default function fixImportPaths({dir, content}): string {
 
     // is a relative path
     if (importPath.match(relativePathRegex)) {
-      let newPath;
-
-      if (isWindows) {
-        // fix buggy Windows paths
-        // note: necessary to split and join before newPath is set to
-        // a variable or backslashes are interpreted as escaped characters
-        newPath = join(dir, importPath.replace('BASE', ''))
-          .split('\\').join('\\\\');
-      } else {
-         newPath = join(dir, importPath.replace('BASE', ''));
-      }
-
+      let newPath = join(dir, importPath.replace('BASE', ''))
+        // fix windows paths
+        .split('\\').join('\\\\');
       return line.replace(importPath, newPath);
     }
 		// no match, return line

src/importPaths.ts

@@ -1,12 +1,9 @@
 import fixImportPaths from './importPaths';
-import { isWindows } from './system';
 
 const jsCodeRoad = ({dir, content}) => {
 
   // fix Windows paths
-  if (isWindows) {
-    dir = dir.split('\\').join('\\\\');
-  }
+  dir = dir.split('\\').join('\\\\');
 
   return `(function(){'use strict';
 require('babel-register')({plugins:[

src/index.ts

@@ -18,7 +18,6 @@
     "files": [
         "src/importPaths.ts",
         "src/index.ts",
-        "src/system.ts",
         "src/typings/chai/chai.d.ts",
         "src/typings/cr/cr.d.ts",
         "src/typings/cr/globals.d.ts",