@@ -41,7 +41,8 @@ exports.TnsResolver = {
41
41
var plugin = this ;
42
42
resolver . plugin ( 'module' , function ( request , callback ) {
43
43
var resolvedFile = null ;
44
- var moduleName = request . request ;
44
+ //Remove leading backslash on Windows!
45
+ var moduleName = request . request . replace ( / ^ \\ / , "" ) ;
45
46
if ( plugin . isCoreDirModule ( moduleName ) ) {
46
47
resolvedFile = plugin . resolveCoreDirModule ( moduleName ) ;
47
48
} else if ( plugin . isCoreFileModule ( moduleName ) ) {
@@ -67,6 +68,9 @@ exports.TnsResolver = {
67
68
return ;
68
69
}
69
70
71
+ //Turn Windows backslashes to slashes
72
+ resolvedFile = resolvedFile . replace ( / \\ / g, "/" ) ;
73
+
70
74
// Resolve to discovered "real" module name.
71
75
//
72
76
// Taken from "enhanced-resolve@0.9.1", ModuleAliasPlugin.js
@@ -122,7 +126,8 @@ exports.TnsResolver = {
122
126
throw new Error ( "File module not found for: " + tnsModule ) ;
123
127
}
124
128
}
125
- return result . replace ( / ^ n o d e _ m o d u l e s \/ ? / i, "" ) ;
129
+ //Make sure we strip both slashes and backslashes after node_modules!
130
+ return result . replace ( / ^ n o d e _ m o d u l e s [ \/ \\ ] ? / i, "" ) ;
126
131
} ,
127
132
resolveNonCoreFileModule : function ( moduleName ) {
128
133
var nodeModulesPath = path . join ( "node_modules" , moduleName ) ;
0 commit comments