Merge pull request #146 from Turbo87/update-loader

Update and pin "loader.js" to v4.1.0
emberjs · Apr 17, 2017 · bdcd67a · bdcd67a
2 parents 72ccd5a + d4fb774
commit bdcd67a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "mocha": "^2.5.3",
     "chai": "^3.5.0",
-    "loader": "stefanpenner/loader.js#1.0.1",
+    "loader.js": "4.1.0",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
     "pretender": "^0.6.0",
     "jquery": "~2.1.1",

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -20,7 +20,7 @@ module.exports = function(defaults) {
   // --- Compile ES6 modules ---
 
   var loader = new Funnel('bower_components', {
-    srcDir: 'loader',
+    srcDir: 'loader.js/lib/loader',
     files: ['loader.js'],
     destDir: '/assets/'
   });