honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(build): remove traceur from node_tree (cjs build)

Browse Source 
Fixes #3094
This commit is contained in:
Alex Eagle 2015-07-16 11:36:23 -07:00
parent 2147ce45c2
commit 3f6dd6cd42
1 changed files with 14 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/broccoli/trees/node_tree.ts
View File

@ -2,7 +2,6 @@
import destCopy from '../broccoli-dest-copy'; import destCopy from '../broccoli-dest-copy';
import compileWithTypescript from '../broccoli-typescript'; import compileWithTypescript from '../broccoli-typescript';
import transpileWithTraceur from '../traceur/index';
var Funnel = require('broccoli-funnel'); var Funnel = require('broccoli-funnel');
import mergeTrees from '../broccoli-merge-trees'; import mergeTrees from '../broccoli-merge-trees';
var path = require('path'); var path = require('path');
@ -28,26 +27,24 @@ module.exports = function makeNodeTree(destinationPath) {
] ]
}); });
var nodeTree = transpileWithTraceur(modulesTree, { var typescriptTree = compileWithTypescript(modulesTree, {
destExtension: '.js', allowNonTsExtensions: false,
destSourceMapExtension: '.map', emitDecoratorMetadata: true,
traceurOptions: { declaration: true,
sourceMaps: true, mapRoot: '', /* force sourcemaps to use relative path */
annotations: true, // parse annotations module: 'commonjs',
types: true, // parse types noEmitOnError: true,
script: false, // parse as a module rootDir: '.',
memberVariables: true, // parse class fields rootFilePaths: ['angular2/traceur-runtime.d.ts', 'angular2/globals.d.ts'],
typeAssertionModule: 'rtts_assert/rtts_assert', sourceMap: true,
// Don't use type assertions since this is partly transpiled by typescript sourceRoot: '.',
typeAssertions: false, target: 'ES5'
modules: 'commonjs'
}
}); });
// Now we add the LICENSE file into all the folders that will become npm packages // Now we add the LICENSE file into all the folders that will become npm packages
outputPackages.forEach(function(destDir) { outputPackages.forEach(function(destDir) {
var license = new Funnel('.', {files: ['LICENSE'], destDir: destDir}); var license = new Funnel('.', {files: ['LICENSE'], destDir: destDir});
nodeTree = mergeTrees([nodeTree, license]); typescriptTree = mergeTrees([typescriptTree, license]);
}); });
// Get all docs and related assets and prepare them for js build // Get all docs and related assets and prepare them for js build
@ -78,40 +75,7 @@ module.exports = function makeNodeTree(destinationPath) {
packageJsons = packageJsons =
renderLodashTemplate(packageJsons, {context: {'packageJson': COMMON_PACKAGE_JSON}}); renderLodashTemplate(packageJsons, {context: {'packageJson': COMMON_PACKAGE_JSON}});
// HACK: workaround for Traceur behavior. var nodeTree = mergeTrees([typescriptTree, docs, packageJsons]);
// It expects all transpiled modules to contain this marker.
// TODO: remove this when we no longer use traceur
var traceurCompatibleTsModulesTree = replace(modulesTree, {
files: ['**/*.ts'],
patterns: [
{
match: /$/,
replacement: function(_, relativePath) {
var content = ""; // we're matching an empty line
if (!relativePath.endsWith('.d.ts')) {
content += '\r\nexport var __esModule = true;\n';
}
return content;
}
}
]
});
var typescriptTree = compileWithTypescript(traceurCompatibleTsModulesTree, {
allowNonTsExtensions: false,
emitDecoratorMetadata: true,
declaration: true,
mapRoot: '', /* force sourcemaps to use relative path */
module: 'commonjs',
noEmitOnError: true,
rootDir: '.',
rootFilePaths: ['angular2/traceur-runtime.d.ts', 'angular2/globals.d.ts'],
sourceMap: true,
sourceRoot: '.',
target: 'ES5'
});
nodeTree = mergeTrees([nodeTree, typescriptTree, docs, packageJsons]);
// Transform all tests to make them runnable in node // Transform all tests to make them runnable in node
nodeTree = replace(nodeTree, { nodeTree = replace(nodeTree, {