Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ES6 module transpiler and proper sourcemap concatenation #10

Merged
merged 1 commit into from
Jan 22, 2015
Merged

Update ES6 module transpiler and proper sourcemap concatenation #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Brocfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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', {
Expand All @@ -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'
});

Expand Down Expand Up @@ -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]);
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 1 addition & 0 deletions testem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script src="/assets/loader.js"></script>
<script src="/assets/vendor.js"></script>
<script src="/assets/qunit.js"></script>
<script src="/assets/ember-test-helpers-tests.amd.js"></script>
Expand Down