@@ -5,7 +5,6 @@ module.exports = function() {
55 var concat = require ( 'broccoli-concat' ) ;
66 var mergeTrees = require ( 'broccoli-merge-trees' ) ;
77 var pickFiles = require ( 'broccoli-static-compiler' ) ;
8- var babelTranspiler = require ( 'broccoli-babel-transpiler' ) ;
98 var env = EmberApp . env ( ) ;
109 var isProductionLikeBuild = [ 'production' , 'staging' ] . indexOf ( env ) > - 1 ;
1110 var prepend = null ;
@@ -59,23 +58,12 @@ module.exports = function() {
5958 destDir : '/assets'
6059 } ) ;
6160
62- var bowerTree = funnel ( 'bower_components' ) ;
63- var baseResolverTree = funnel ( 'node_modules/ember-resolver/addon' , {
64- destDir : 'ember-resolver'
65- } ) ;
66-
67- var transpiledResolverTree = babelTranspiler ( baseResolverTree , {
68- loose : true ,
69- moduleIds : true ,
70- modules : 'amdStrict'
71- } ) ;
72-
73- var twiddleVendorTree = concat ( mergeTrees ( [ bowerTree , transpiledResolverTree ] ) , {
61+ var twiddleVendorTree = concat ( funnel ( 'bower_components' ) , {
7462 inputFiles : [
7563 'loader.js/loader.js' ,
64+ 'ember-resolver/dist/modules/ember-resolver.js' ,
7665 'ember-cli-shims/app-shims.js' ,
7766 'ember-load-initializers/ember-load-initializers.js' ,
78- 'ember-resolver/**/*.js'
7967 ] ,
8068 outputFile : '/assets/twiddle-deps.js' ,
8169 } ) ;
@@ -108,12 +96,6 @@ function getEmberCLIBlueprints() {
10896 fileMap [ blueprintName ] = fs . readFileSync ( filePath ) . toString ( ) ;
10997 }
11098
111- // ember-cli 1.13.x uses ember/resolver
112- fileMap [ 'app' ] = fileMap . app . replace ( '\'ember/resolver\'' , '\'ember-resolver/resolver\'' ) ;
113-
114- // ember-cli 2.x uses ember-resolver
115- fileMap [ 'app' ] = fileMap . app . replace ( '\'ember-resolver\'' , '\'ember-resolver/resolver\'' ) ;
116-
11799 fileMap [ 'twiddle.json' ] = fs . readFileSync ( 'blueprints/twiddle.json' ) . toString ( ) ;
118100 fileMap [ 'initializers/router' ] = fs . readFileSync ( 'blueprints/router_initializer.js' ) . toString ( ) ;
119101 fileMap [ 'initializers/mouse-events' ] = fs . readFileSync ( 'blueprints/mouse_events_initializer.js' ) . toString ( ) ;
0 commit comments