Merge pull request #4205 from emberjs/fix-windows

[BUGFIX release] ensure import paths are resolved \w posix separators
emberjs · Mar 5, 2016 · bc446a1 · bc446a1
2 parents b329be6 + 9def562
commit bc446a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/lib/babel-build.js b/lib/babel-build.js
@@ -25,13 +25,7 @@ function babelOptions(libraryName, _options) {
     getModuleId: function (name) {
       return name.replace(/\/index$/g, '');
     },
-    resolveModuleSource: function(name, filename) {
-      if (name.indexOf('.') === 0) {
-        return libraryName + '/' + path.join(path.dirname(filename), name);
-      } else {
-        return name;
-      }
-    }
+    resolveModuleSource: require('amd-name-resolver').moduleResolve
   };
 
   Object.keys(_options).forEach(function(opt) {

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "amd-name-resolver": "0.0.5",
     "babel-plugin-feature-flags": "^0.2.0",
     "babel-plugin-filter-imports": "^0.2.0",
     "broccoli-babel-transpiler": "^5.5.0",