From f004b075a7dad089ab7438a73455698fb34138a9 Mon Sep 17 00:00:00 2001 From: Chad Hietala Date: Thu, 22 Jan 2015 08:29:42 -0800 Subject: [PATCH] Update ES6 module transpiler --- Brocfile.js | 16 ++++++++-------- package.json | 4 ++-- testem.json | 1 + tests/index.html | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Brocfile.js b/Brocfile.js index b90df1fbb..fa5336dee 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -1,14 +1,14 @@ -var concat = require('broccoli-concat'); var pickFiles = require('broccoli-static-compiler'); var mergeTrees = require('broccoli-merge-trees'); -var compileES6 = require('broccoli-es6-concatenator'); +var compileES6 = require('broccoli-es6modules'); +var concat = require('broccoli-sourcemap-concat'); // --- Compile ES6 modules --- var loader = pickFiles('bower_components', { srcDir: 'loader', files: ['loader.js'], - destDir: '/' + destDir: '/assets' }); var klassy = pickFiles('bower_components', { @@ -29,11 +29,11 @@ var tests = pickFiles('tests', { destDir: '/tests' }); -var main = mergeTrees([loader, klassy, lib, tests]); -main = compileES6(main, { - loaderFile: '/loader.js', +var main = mergeTrees([klassy, lib, tests]); +main = new compileES6(main); + +main = concat(main, { inputFiles: ['**/*.js'], - ignoredModules: ['ember'], outputFile: '/assets/ember-test-helpers-tests.amd.js' }); @@ -65,4 +65,4 @@ var testSupport = concat('bower_components', { outputFile: '/assets/test-support.js' }); -module.exports = mergeTrees([main, vendor, testIndex, qunit, testSupport]); +module.exports = mergeTrees([main, vendor, testIndex, qunit, loader, testSupport]); diff --git a/package.json b/package.json index 9995aa9d3..cd2e54ab3 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "readmeFilename": "README.md", "devDependencies": { "broccoli": "^0.13.0", - "broccoli-concat": "^0.0.11", - "broccoli-es6-concatenator": "^0.1.7", + "broccoli-es6modules": "^0.4.0", "broccoli-merge-trees": "^0.1.4", + "broccoli-sourcemap-concat": "^0.4.3", "broccoli-static-compiler": "^0.1.4", "testem": "^0.6.19" } diff --git a/testem.json b/testem.json index a012c8e05..0c67b13e5 100644 --- a/testem.json +++ b/testem.json @@ -2,6 +2,7 @@ "framework": "qunit", "cwd": "build/", "serve_files": [ + "assets/loader.js", "assets/vendor.js", "assets/ember-test-helpers-tests.amd.js", "assets/test-support.js" diff --git a/tests/index.html b/tests/index.html index a664d3698..ab3a72788 100644 --- a/tests/index.html +++ b/tests/index.html @@ -8,6 +8,7 @@
+