Merge pull request #299 from Gaurav0/ember-resolver-addon

Use latest ember-resolver addon instead of legacy bower_component

Author: Gaurav0

app/services/ember-cli.js

@@ -376,12 +376,6 @@ function babelOpts(moduleName) {
  * @return {Array}          Code buffer
  */
 function contentForAppBoot (content, config) {
-  // Add in a shim for ember-resolver => ember/resolver for now since we are still bringing in old bower component
-  // TODO: Once we support included addons, bring in new ember-resolver addon
-  content.push('    define("ember-resolver", ["exports", "ember/resolver"],\n' +
-    '      function(exports, Resolver) {\n' +
-    '        exports["default"] = Resolver;\n' +
-    '      });\n');
 
   // Some modules are not actually transpiled so Babel
   // doesn't recognize them properly...

bower.json

@@ -7,7 +7,6 @@
     "ember-data": "2.2.1",
     "ember-load-initializers": "0.1.7",
     "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "0.1.21",
     "jquery": "^1.11.3",
     "loader.js": "ember-cli/loader.js#3.5.0",
     "qunit": "~1.20.0",

ember-cli-build.js

@@ -5,6 +5,7 @@ module.exports = function() {
   var concat = require('broccoli-concat');
   var mergeTrees = require('broccoli-merge-trees');
   var pickFiles = require('broccoli-static-compiler');
+  var babelTranspiler = require('broccoli-babel-transpiler');
   var env = EmberApp.env();
   var isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1;
   var prepend = null;
@@ -58,12 +59,24 @@ module.exports = function() {
     destDir: '/assets'
   });
 
-  var twiddleVendorTree = concat(funnel('bower_components'),{
+  var bowerTree = funnel('bower_components');
+  var baseResolverTree = funnel('node_modules/ember-resolver/addon', {
+    destDir: 'ember-resolver'
+  });
+
+  var transpiledResolverTree = babelTranspiler(baseResolverTree, {
+    loose: true,
+    moduleIds: true,
+    modules: 'amdStrict'
+  });
+  var mergedDepsTree = mergeTrees([bowerTree, transpiledResolverTree]);
+
+  var twiddleVendorTree = concat(mergedDepsTree, {
     inputFiles: [
       'loader.js/loader.js',
-      'ember-resolver/dist/modules/ember-resolver.js',
       'ember-cli-shims/app-shims.js',
-      'ember-load-initializers/ember-load-initializers.js'
+      'ember-load-initializers/ember-load-initializers.js',
+      'ember-resolver/**/*.js'
     ],
     outputFile: '/assets/twiddle-deps.js'
   });

package.json

@@ -20,6 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
+    "broccoli-babel-transpiler": "~5.4.5",
     "broccoli-concat": "0.0.13",
     "broccoli-funnel": "^1.0.0",
     "broccoli-merge-trees": "^1.0.0",