X Tutup
Skip to content

chore(build): remove the es6 output #4454

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

Closed
alexeagle wants to merge 1 commit into from
Closed

chore(build): remove the es6 output #4454

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
13 changes: 4 additions & 9 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,9 @@ var CONFIG = {
js: {
all: 'dist/js',
dev: {
es6: 'dist/js/dev/es6',
es5: 'dist/js/dev/es5'
},
prod: {
es6: 'dist/js/prod/es6',
es5: 'dist/js/prod/es5'
},
cjs: 'dist/js/cjs',
Expand Down Expand Up @@ -309,13 +307,10 @@ gulp.task('lint', ['build.tools'], function() {
// ------------
// check circular dependencies in Node.js context
gulp.task('build/checkCircularDependencies', function (done) {
var dependencyObject = madge(CONFIG.dest.js.dev.es6, {
format: 'es6',
paths: [CONFIG.dest.js.dev.es6],
extensions: ['.js'],
onParseFile: function(data) {
data.src = data.src.replace(/import \* as/g, "//import * as");
}
var dependencyObject = madge(CONFIG.dest.js.dev.es5, {
format: 'cjs',
paths: [CONFIG.dest.js.dev.es5],
extensions: ['.js']
});
var circularDependencies = dependencyObject.circular().getArray();
if (circularDependencies.length > 0) {
Expand Down
3 changes: 0 additions & 3 deletions modules/angular2/README.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ This package contains different sources for different users:
* `prod/`: a production version that does not include runtime type assertions
3. The files under `/ts` are the TypeScript source files.

As a convenience, we provide you with `/es6/{dev|prod}/es5build.js`, a script to transpile the es6 sources into es5
using [Google Traceur](https://github.com/google/traceur-compiler/).

License: Apache MIT 2.0
3 changes: 0 additions & 3 deletions modules/benchpress/README.js.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ This package contains different sources for different users:
* `prod/`: a production version that does not include runtime type assertions
3. The files under `/ts` are the Typescript source files

As a convenience, we provide you with `/es6/{dev|prod}/es5build.js`, a script to transpile the es6 sources into es5
using [Google Traceur](https://github.com/google/traceur-compiler/).

License: Apache MIT 2.0
22 changes: 1 addition & 21 deletions tools/broccoli/trees/browser_tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,6 @@ module.exports = function makeBrowserTree(options, destinationPath) {
patterns: [{match: /\$SCRIPTS\$/, replacement: jsReplace('SCRIPTS')}]
});

// Use TypeScript to transpile the *.ts files to ES6
var es6Tree = compileWithTypescript(modulesTree, {
allowNonTsExtensions: false,
declaration: false,
emitDecoratorMetadata: true,
mapRoot: '', // force sourcemaps to use relative path
noEmitOnError: false,
rootDir: '.',
sourceMap: true,
sourceRoot: '.',
target: 'ES6'
});

// Use TypeScript to transpile the *.ts files to ES5
var es5Tree = compileWithTypescript(es5ModulesTree, {
allowNonTsExtensions: false,
Expand All @@ -133,10 +120,6 @@ module.exports = function makeBrowserTree(options, destinationPath) {
target: 'ES5'
});

// Now we add a few more files to the es6 tree that the es5 tree should not see
var extras = new Funnel('tools/build', {files: ['es5build.js'], destDir: 'angular2'});
es6Tree = mergeTrees([es6Tree, extras]);

var vendorScriptsTree = flatten(new Funnel('.', {
files: [
'node_modules/es6-shim/es6-shim.js',
Expand Down Expand Up @@ -211,9 +194,6 @@ module.exports = function makeBrowserTree(options, destinationPath) {
htmlTree = mergeTrees([htmlTree, scripts, polymer, react]);

es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, rxJs]);
es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, rxJs]);

var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);

return destCopy(mergedTree, destinationPath);
return destCopy(stew.mv(es5Tree, '/es5'), destinationPath);
};
75 changes: 0 additions & 75 deletions tools/build/es5build.js
View file
Open in desktop

This file was deleted.

X Tutup