X Tutup
Skip to content

Replace traceur with es6-shim #4148

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
rkirov wants to merge 1 commit into from
Closed

Replace traceur with es6-shim #4148

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
121 changes: 57 additions & 64 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,18 @@ var treatTestErrorsAsFatal = true;

function runJasmineTests(globs, done) {
var args = ['--'].concat(globs);
fork('./tools/traceur-jasmine', args, {
stdio: 'inherit'
}).on('close', function jasmineCloseHandler(exitCode) {
if (exitCode && treatTestErrorsAsFatal) {
var err = new Error('Jasmine tests failed');
// Mark the error for gulp similar to how gulp-utils.PluginError does it.
// The stack is not useful in this context.
err.showStack = false;
done(err);
} else {
done();
}
});
fork('./tools/cjs-jasmine', args, {stdio: 'inherit'})
.on('close', function jasmineCloseHandler(exitCode) {
if (exitCode && treatTestErrorsAsFatal) {
var err = new Error('Jasmine tests failed');
// Mark the error for gulp similar to how gulp-utils.PluginError does it.
// The stack is not useful in this context.
err.showStack = false;
done(err);
} else {
done();
}
});
}

// Note: when DART_SDK is not found, all gulp tasks ending with `.dart` will be skipped.
Expand Down Expand Up @@ -141,11 +140,8 @@ var BENCHPRESS_BUNDLE_CONFIG = {
'angular2'
],
excludes: [
'traceur',
'traceur/bin/traceur-runtime',
'reflect-metadata',
'selenium-webdriver',
'rtts_assert',
'zone.js'
],
ignore: [
Expand Down Expand Up @@ -837,47 +833,46 @@ gulp.task('build/pure-packages.dart', function() {
])
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));

var moveStream = gulp
.src([
'modules_dart/**/*.dart',
'modules_dart/**/pubspec.yaml',
'!modules_dart/transform/**'
])
.pipe(through2.obj(function(file, enc, done) {
if (file.path.endsWith('pubspec.yaml')) {
// Pure packages specify dependency_overrides relative to
// `modules_dart`, so they have to walk up and into `dist`.
//
// Example:
//
// dependency_overrides:
// angular2:
// path: ../../dist/dart/angular2
//
// When we copy a pure package into `dist` the relative path
// must be updated. The code below replaces paths accordingly.
// So the example above is turned into:
//
// dependency_overrides:
// angular2:
// path: ../angular2
//
var pubspec = yaml.safeLoad(file.contents.toString());
var overrides = pubspec.dependency_overrides;
if (overrides) {
Object.keys(overrides).forEach(function(pkg) {
var overridePath = overrides[pkg].path;
if (overridePath.startsWith(originalPrefix)) {
overrides[pkg].path = overridePath.replace(originalPrefix, '../');
}
});
file.contents = new Buffer(yaml.safeDump(pubspec));
}
}
this.push(file);
done();
}))
.pipe(gulp.dest(CONFIG.dest.dart));
var moveStream = gulp.src([
'modules_dart/**/*.dart',
'modules_dart/**/pubspec.yaml',
'!modules_dart/transform/**'
])
.pipe(through2.obj(function(file, enc, done) {
Copy link
Copy Markdown
Contributor

@alexeagle alexeagle Sep 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this deep intent is a sign that some expression should be extracted to a local var

if (/pubspec.yaml$/.test(file.path)) {
// Pure packages specify dependency_overrides relative to
// `modules_dart`, so they have to walk up and into `dist`.
//
// Example:
//
// dependency_overrides:
// angular2:
// path: ../../dist/dart/angular2
//
// When we copy a pure package into `dist` the relative path
// must be updated. The code below replaces paths accordingly.
// So the example above is turned into:
//
// dependency_overrides:
// angular2:
// path: ../angular2
//
var pubspec = yaml.safeLoad(file.contents.toString());
var overrides = pubspec.dependency_overrides;
if (overrides) {
Object.keys(overrides).forEach(function(pkg) {
var overridePath = overrides[pkg].path;
if ((new RegExp('^' + originalPrefix)).test(overridePath)) {
overrides[pkg].path = overridePath.replace(originalPrefix, '../');
}
});
file.contents = new Buffer(yaml.safeDump(pubspec));
}
}
this.push(file);
done();
}))
.pipe(gulp.dest(CONFIG.dest.dart));


return merge2(transformStream, moveStream);
Expand Down Expand Up @@ -1145,13 +1140,11 @@ gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
});

var JS_DEV_DEPS = [
licenseWrap('node_modules/zone.js/LICENSE', true),
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
licenseWrap('node_modules/reflect-metadata/LICENSE', true),
'node_modules/reflect-metadata/Reflect.js',
// traceur-runtime is always first in the bundle
licenseWrap('node_modules/traceur/LICENSE', true)
licenseWrap('node_modules/zone.js/LICENSE', true),
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
licenseWrap('node_modules/reflect-metadata/LICENSE', true),
'node_modules/reflect-metadata/Reflect.js'
];

// Splice in RX license if rx is in the bundle.
Expand Down
7 changes: 2 additions & 5 deletions karma-js.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = function(config) {
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/jasmine-patch.js',

'node_modules/traceur/bin/traceur-runtime.js',
'node_modules/es6-shim/es6-shim.js',
// Including systemjs because it defines `__eval`, which produces correct stack traces.
'modules/angular2/src/test_lib/shims_for_IE.js',
'node_modules/systemjs/dist/system.src.js',
Expand All @@ -28,10 +28,7 @@ module.exports = function(config) {
{pattern: 'modules/**/test/**/static_assets/**', included: false, watched: false}
],

exclude: [
'dist/js/dev/es5/**/e2e_test/**',
'dist/angular1_router.js'
],
exclude: ['dist/js/dev/es5/**/e2e_test/**', 'dist/angular1_router.js'],

customLaunchers: sauceConf.customLaunchers,

Expand Down
4 changes: 2 additions & 2 deletions modules/angular1_router/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ var files = [
var PRELUDE = '(function(){\n';
var POSTLUDE = '\n}());\n';
var FACADES = fs.readFileSync(__dirname + '/lib/facades.es5', 'utf8');
var TRACEUR_RUNTIME = fs.readFileSync(__dirname + '/../../node_modules/traceur/bin/traceur-runtime.js', 'utf8');
var DIRECTIVES = fs.readFileSync(__dirname + '/src/ng_outlet.js', 'utf8');
var ES6_SHIM = fs.readFileSync(__dirname + '/../../node_modules/es6-shim/es6-shim.js', 'utf8');
function main() {
var dir = __dirname + '/../angular2/src/router/';

Expand Down Expand Up @@ -85,7 +85,7 @@ function main() {
"return router;"
].join('\n'));

return PRELUDE + TRACEUR_RUNTIME + DIRECTIVES + out + POSTLUDE;
return PRELUDE + ES6_SHIM + DIRECTIVES + out + POSTLUDE;
}


Expand Down
2 changes: 1 addition & 1 deletion modules/angular1_router/lib/facades.es5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ var StringMapWrapper = {
},

forEach: function (m, fn) {
for (prop in m) {
for (var prop in m) {
if (m.hasOwnProperty(prop)) {
fn(m[prop], prop);
}
Expand Down
4 changes: 2 additions & 2 deletions modules/angular2/docs/web_workers/web_workers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To bootstrap Hello World in a WebWorker we do the following in TypeScript
```HTML
<html>
<head>
<script src="https://github.jspm.io/jmcriffey/bower-traceur-runtime@0.0.87/traceur-runtime.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.33.3/es6-shim.js"></script>
<script src="https://jspm.io/system@0.16.js"></script>
<script src="angular2/web_worker/ui.js"></script>
</head>
Expand All @@ -44,7 +44,7 @@ bootstrap("loader.js");
```
```JavaScript
// loader.js
importScripts("https://github.jspm.io/jmcriffey/bower-traceur-runtime@0.0.87/traceur-runtime.js", "https://jspm.io/system@0.16.js", "angular2/web_worker/worker.js");
importScripts("https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.33.3/es6-shim.js", "https://jspm.io/system@0.16.js", "angular2/web_worker/worker.js");
System.import("app");
```
```TypeScript
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/manual_typings/traceur-runtime.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
interface PromiseLike<T> extends Thenable<T> {}

// Extend the ES5 standard library with some ES6 features we polyfill at runtime
// by loading traceur-runtime.js
// by loading es6-shim.js

// These are mostly copied from lib.es6.d.ts

Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/http/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Index to be used if Http is ever configured as a standalone npm package.
// require('reflect-metadata');
// require('traceur-runtime');
// require('es6-shim');
// import {HTTP_BINDINGS, JSONP_BINDINGS, Http, Jsonp} from './http';
// import {Injector} from 'angular2/angular2';
// export * from './http';
Expand Down
2 changes: 1 addition & 1 deletion modules/benchpress/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require('reflect-metadata');
require('traceur/bin/traceur-runtime');
require('es6-shim');
module.exports = require('./benchpress.js');
// when bundling benchpress to one file, this is used
// for getting exports out of browserify's scope.
Expand Down
1 change: 0 additions & 1 deletion modules/benchpress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"repository": <%= JSON.stringify(packageJson.repository) %>,
"dependencies": {
"angular2": "<%= packageJson.version %>",
"traceur": "<%= packageJson.dependencies.traceur %>",
"selenium-webdriver": "<%= packageJson.dependencies['selenium-webdriver'] %>",
"reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/benchpress/test/firefox_extension/conf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference path="../../../angular2/typings/node/node.d.ts" />
require('traceur/bin/traceur-runtime.js');
require('es6-shim/es6-shim.js');
require('reflect-metadata');
var testHelper = require('../../src/firefox_extension/lib/test_helper.js');

Expand Down
56 changes: 4 additions & 52 deletions npm-shrinkwrap.clean.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2999,6 +2999,9 @@
}
}
},
"es6-shim": {
"version": "0.33.3"
},
"event-stream": {
"version": "3.3.1",
"dependencies": {
Expand Down Expand Up @@ -9776,57 +9779,6 @@
}
}
},
"traceur": {
"version": "0.0.87",
"dependencies": {
"commander": {
"version": "2.6.0"
},
"glob": {
"version": "4.3.5",
"dependencies": {
"inflight": {
"version": "1.0.4",
"dependencies": {
"wrappy": {
"version": "1.0.1"
}
}
},
"inherits": {
"version": "2.0.1"
},
"once": {
"version": "1.3.2",
"dependencies": {
"wrappy": {
"version": "1.0.1"
}
}
}
}
},
"rsvp": {
"version": "3.0.18"
},
"semver": {
"version": "2.3.2"
},
"source-map-support": {
"version": "0.2.10",
"dependencies": {
"source-map": {
"version": "0.1.32",
"dependencies": {
"amdefine": {
"version": "0.1.0"
}
}
}
}
}
}
},
"ts2dart": {
"version": "0.7.4",
"dependencies": {
Expand Down Expand Up @@ -10509,5 +10461,5 @@
}
},
"name": "angular",
"version": "2.0.0-alpha.36"
"version": "2.0.0-alpha.37"
}
Loading
X Tutup