Fixed import path resolve not wokring on win32

lolleko · lolleko · commit b47578fe974c · 2018-02-21T09:15:37.000+01:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -93,9 +93,9 @@ export class LuaTranspiler {
         let absolutePathToImport = path.resolve(path.dirname(this.sourceFile.fileName), relativePath);
         if (this.options.rootDir) {
             // Calculate path realtive to project root and replace path.sep with dots (lua doesn't know paths)
-            return `"${absolutePathToImport.replace(this.options.rootDir, "").replace(new RegExp(path.sep, "g"), ".").slice(1)}"`;
+            return `"${absolutePathToImport.replace(this.options.rootDir, "").replace(new RegExp("\\\\|\/", "g"), ".").slice(1)}"`;
         }
-        return `"${relativePath.replace(new RegExp(path.sep, "g"), ".")}"`;
+        return `"${relativePath.replace(new RegExp("\\\\|\/", "g"), ".")}"`;
     }
 
     // Transpile a block

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ export class LuaTranspiler {`
`93`	`93`	`let absolutePathToImport = path.resolve(path.dirname(this.sourceFile.fileName), relativePath);`
`94`	`94`	`if (this.options.rootDir) {`
`95`	`95`	`// Calculate path realtive to project root and replace path.sep with dots (lua doesn't know paths)`
`96`		- return `"${absolutePathToImport.replace(this.options.rootDir, "").replace(new RegExp(path.sep, "g"), ".").slice(1)}"`;
	`96`	+ return `"${absolutePathToImport.replace(this.options.rootDir, "").replace(new RegExp("\\\\\|\/", "g"), ".").slice(1)}"`;
`97`	`97`	`}`
`98`		- return `"${relativePath.replace(new RegExp(path.sep, "g"), ".")}"`;
	`98`	+ return `"${relativePath.replace(new RegExp("\\\\\|\/", "g"), ".")}"`;
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`// Transpile a block`