fix: support Windows paths

See: bazel-contrib/rules_nodejs#1604
alan-agius4 · Feb 5, 2020 · b838d12 · b838d12
1 parent 1ad2017
commit b838d12
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/main.js b/src/main.js
@@ -24,6 +24,8 @@ function findElementByName(d, name) {
 
 function normalizePath(p) {
   p = path.normalize(p);
+  // Convert paths to posix
+  p = p.replace(/\\/g, '/');
   if (p[0] !== '/' && p[0] !== '.') {
     p = `./${p}`;
   }
@@ -166,7 +168,7 @@ function main(params, read = fs.readFileSync, write = mkdirpWrite, timestamp = D
   const rootedOutputDir = removeRootPath(outputDir).replace(/^\//, "./");
   function relativeToHtml(p) {
     // Ignore absolute
-    if (p.startsWith("/")) {
+    if (path.isAbsolute(p)) {
       return p;
     }
 

diff --git a/test/spec.js b/test/spec.js
@@ -1,9 +1,10 @@
+const path = require('path');
 const {main, parseArgs} = require('../src/main');
 
-const inFile = './data/some/index.html';
+const inFile = path.normalize('./data/some/index.html');
 
 function read(file) {
-  if (file === inFile) return `<html><head></head><body></body></html>`;
+  if (path.normalize(file) === inFile) return `<html><head></head><body></body></html>`;
   throw new Error(`no content for ${file}`);
 }
 
@@ -108,7 +109,17 @@ describe('HTML inserter', () => {
       "--roots", 'npm/node_modules/zone.js/dist',
       '--assets', 'external/npm/node_modules/zone.js/dist/zone.min.js'], read, write, stamper)).toBe(0);
     expect(output).toBe(scriptHtml('/zone.min.js'));
-
+  });
+
+  it('should strip the external workspaces prefix in Windows', () => {
+    if (path.win32.normalize !== path.normalize) {
+      spyOn(path, 'normalize').and.callFake(path.win32.normalize);
+    }
+
+    expect(main(["--out", "index.html", "--html", inFile,
+      "--roots", 'npm/node_modules/zone.js/dist',
+      '--assets', 'external/npm/node_modules/zone.js/dist/zone.min.js'], read, write, stamper)).toBe(0);
+    expect(output).toBe(scriptHtml('/zone.min.js'));
   });
 
   it('should inject .css files as stylesheet link tags', () => {