Merge 3bdd2d4 into 5c38ee5

ember-cli · Oct 27, 2015 · 8591c42 · 8591c42
2 parents 5c38ee5 + 3bdd2d4
commit 8591c42
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 153 deletions.
diff --git a/lib/broccoli/broccoli-config-loader.js b/lib/broccoli/broccoli-config-loader.js
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -27,7 +27,7 @@ var preprocessMinifyCss = p.preprocessMinifyCss;
 var Babel  = require('broccoli-babel-transpiler');
 var concatFilesWithSourcemaps = require('broccoli-sourcemap-concat');
 
-var ConfigLoader  = require('./broccoli-config-loader');
+var ConfigLoader  = require('broccoli-config-loader');
 var ConfigReplace = require('./broccoli-config-replace');
 var mergeTrees    = require('./merge-trees');
 var WatchedDir    = require('broccoli-source').WatchedDir;

diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "bower-endpoint-parser": "0.2.2",
     "broccoli": "0.16.8",
     "broccoli-babel-transpiler": "^5.4.5",
-    "broccoli-caching-writer": "^2.0.0",
+    "broccoli-config-loader": "^1.0.0",
     "broccoli-es3-safe-recast": "^2.0.0",
     "broccoli-funnel": "0.2.8",
     "broccoli-kitchen-sink-helpers": "^0.2.7",

diff --git a/tests/unit/broccoli/config-loader-test.js b/tests/unit/broccoli/config-loader-test.js