Skip to content

Commit

Permalink
Use broccoli-es6modules (Esperanto) to transpile ember-debug
Browse files Browse the repository at this point in the history
  • Loading branch information
teddyzeenny committed Mar 21, 2015
1 parent 717e25c commit 415c776
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 16 deletions.
37 changes: 23 additions & 14 deletions Brocfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* global require, module */

var EmberApp = require('ember-cli/lib/broccoli/ember-app');
var compileES6 = require('broccoli-es6-concatenator');
var ES6Modules = require('broccoli-es6modules');
var mergeTrees = require('broccoli-merge-trees');
var wrapFiles = require('broccoli-wrap');
var pickFiles = require('broccoli-static-compiler');
Expand Down Expand Up @@ -39,7 +39,9 @@ emberDebug = pickFiles(emberDebug, {
});

emberDebug = removeFile(emberDebug, {
files: ['ember-debug/vendor/source-map.js']
files: [
'ember-debug/vendor/source-map.js',
]
});

if (env === 'test') {
Expand All @@ -53,39 +55,46 @@ if (env === 'test') {
emberDebug = mergeTrees([emberDebug, jshintedEmberDebug]);
}

emberDebug = compileES6(emberDebug, {
inputFiles: ['ember-debug/**/*.js'],
loaderFile: 'ember-debug/vendor/loader.js',
outputFile: '/ember_debug.js',
wrapInEval: false,
ignoredModules: [
'ember-debug/vendor/loader',
'ember-debug/vendor/startup-wrapper',
emberDebug = removeFile(emberDebug, {
files: [
'ember-debug/vendor/startup-wrapper.js',
'ember-debug/vendor/loader.js'
]
});

emberDebug = new ES6Modules(emberDebug, {
esperantoOptions: {
absolutePaths: true,
strict: true
}
});

var startupWrapper = pickFiles('ember_debug', {
srcDir: '/vendor',
files: ['startup-wrapper.js'],
destDir: '/'
});


var sourceMap = pickFiles('ember_debug', {
srcDir: '/vendor',
files: ['source-map.js'],
destDir: '/'
});

var loader = pickFiles('ember_debug', {
srcDir: '/vendor',
files: ['loader.js'],
destDir: '/'
});

sourceMap = wrapFiles(sourceMap, {
wrapper: ["(function() {\n", "\n}());"]
});

emberDebug = mergeTrees([startupWrapper, emberDebug]);
emberDebug = mergeTrees([sourceMap, emberDebug]);
emberDebug = mergeTrees([loader, startupWrapper, sourceMap, emberDebug]);

emberDebug = concatFiles(emberDebug, {
inputFiles: ['**/*.js'],
inputFiles: ['loader.js', '**/*.js'],
outputFile: '/ember_debug.js',
wrapInFunction: false
});
Expand Down
2 changes: 1 addition & 1 deletion ember_debug/libs/promise-assembler.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
and Yapp Labs (@yapplabs).
*/

import Promise from '/ember-debug/models/promise';
import Promise from 'ember-debug/models/promise';
var Ember = window.Ember;

var PromiseAssembler = Ember.Object.extend(Ember.Evented, {
Expand Down
4 changes: 4 additions & 0 deletions ember_debug/vendor/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ if (typeof define !== 'function' || typeof requireModule !== 'function') {
var registry = {}, seen = {};

define = function(name, deps, callback) {
if (arguments.length < 3) {
callback = deps;
deps = [];
}
registry[name] = { deps: deps, callback: callback };
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"broccoli-asset-rev": "^2.0.0",
"broccoli-concat": "0.0.12",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"broccoli-es6-concatenator": "^0.1.11",
"broccoli-es6modules": "^0.5.1",
"broccoli-file-remover": "^0.3.1",
"broccoli-jshint": "^0.5.3",
"broccoli-merge-trees": "^0.2.1",
Expand Down

0 comments on commit 415c776

Please sign in to comment.