Use loader.js from bower.

ember-cli · Mar 29, 2014 · 0c1e8d2 · 0c1e8d2
1 parent b39f06b
commit 0c1e8d2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 97 deletions.
diff --git a/blueprint/.gitignore b/blueprint/.gitignore
@@ -7,7 +7,6 @@
 # dependencies
 /node_modules
 /vendor/*
-!/vendor/loader.js
 !/vendor/ember-shim.js
 !/vendor/qunit-shim.js
 

diff --git a/blueprint/Brocfile.js b/blueprint/Brocfile.js
@@ -90,7 +90,7 @@ module.exports = function (broccoli) {
   appAndDependencies = preprocessJs(appAndDependencies, '/', '<%= modulePrefix %>');
 
   var applicationJs = compileES6(appAndDependencies, {
-    loaderFile: 'loader.js',
+    loaderFile: 'loader/loader.js',
     ignoredModules: [
       'ember/resolver',
       'ember-qunit'

diff --git a/blueprint/bower.json b/blueprint/bower.json
@@ -9,6 +9,7 @@
     "ember-data": "1.0.0-beta.7",
     "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#master",
     "ic-ajax": "~0.3.0",
-    "ember-testing-httpRespond": "~0.1.2"
+    "ember-testing-httpRespond": "~0.1.2",
+    "loader": "git://github.com/stefanpenner/loader.js#1.0.0"
   }
 }
diff --git a/blueprint/vendor/loader.js b/blueprint/vendor/loader.js