Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
19396d1
docs(contributing.md): improve submit issue instructions
IgorMinar Dec 15, 2015
b88a6d9
refactor(testing): move common testing logic into test_injector
juliemr Dec 9, 2015
a79fe05
fix(changelog): fix rxjs operator import paths
tamascsaba Dec 13, 2015
1c779d8
docs(bundles): document existing bundles and their usage
pkozlowski-opensource Dec 14, 2015
5a04ffe
refactor(Directive): drop moduleId
vicb Dec 14, 2015
80a5e47
docs(*): Document a lot more symbols that are missing comments in our…
alxhub Dec 3, 2015
3191fd1
cleanup(linker): Remove vestigial ComponentUrlMapper.
alxhub Dec 4, 2015
2aaef81
Revert "refactor(testing): move common testing logic into test_injector"
alexeagle Dec 15, 2015
e891bae
chore: remove unused decorator
cironunes Dec 14, 2015
d3a79db
build(publish.sh): do not error when tmp/code.angularjs.org already e…
IgorMinar Dec 13, 2015
b803ecf
refactor(testing): reenable injectAsync checking for return value
juliemr Dec 9, 2015
77b7cae
fix(bundles): don't include RxJS in System.register bundles
pkozlowski-opensource Dec 14, 2015
42b74f5
chore(bundles): use RxJS bundles
pkozlowski-opensource Dec 14, 2015
321ed7d
chore(package): update rxjs to beta.0
jeffbcross Dec 15, 2015
e950dd6
refactor(bundles): make rxjs an external dependency in umd bundle
jeffbcross Dec 15, 2015
2835265
docs(cheatsheet) adding JS specific syntax to cheatsheet
gnomeontherun Dec 13, 2015
5b63b67
fix(docs,benchmarks): remove invalid </input> closing tags
IgorMinar Dec 15, 2015
29600c0
docs(bundles): update RxJS info in bundles/overview.md post-#5893
IgorMinar Dec 15, 2015
42ccff8
build(gulp): remove obsolete insertRXLicense bundle transform
IgorMinar Dec 15, 2015
c6f52e3
docs(cheatsheet): fix the ES5 snippets for services
IgorMinar Dec 15, 2015
61b9468
fix(bundles): rename UMD bundles
pkozlowski-opensource Dec 15, 2015
d55655f
fix(bundles): rename the testing.js bundle
pkozlowski-opensource Dec 15, 2015
d5e4686
docs(changelog): add alpha.54 release notes
IgorMinar Dec 15, 2015
059e09c
chore(release): cut alpha.54 - rxjs bundle separation
IgorMinar Dec 15, 2015
de996ec
build(publish.sh): uncomment prepare steps for existing tmp repo
IgorMinar Dec 15, 2015
3dca9d5
feat(core): enable dev mode by default
vsavkin Dec 15, 2015
00822c3
chore(publish): add Rx bundles to code.angularjs.org publish step
jeffbcross Dec 15, 2015
fc75220
fix(router): export ROUTER_LINK_DSL_PROVIDER and hide MockPopStateEvent
IgorMinar Dec 15, 2015
af3ea16
docs(changelog): add release notes for alpha.55
IgorMinar Dec 15, 2015
a45b27e
chore(release): cut 2.0.0-alpha.54
IgorMinar Dec 15, 2015
463754b
docs(changelog): release notes for 2.0.0-beta.0 sonambulent-inauguration
IgorMinar Dec 15, 2015
f50affa
chore(release): cut 2.0.0-beta.0 - sonambulent-inauguration
IgorMinar Dec 15, 2015
b232dde
chore(readme): update README: no longer alpha
alexeagle Dec 15, 2015
17fbbfb
docs(readme): remove angular 1 js & dart links
IgorMinar Dec 15, 2015
3eff7c6
docs(changelog): fix typo in "somnambulant"
jelbourn Dec 15, 2015
8ac9719
Update README.md
naomiblack Dec 15, 2015
909e70b
Update README.md
naomiblack Dec 15, 2015
2a2f9a9
feat(router): support links with just auxiliary routes
btford Dec 7, 2015
9276dad
docs: fix some typos in comments and strings
flyyang Dec 16, 2015
3524946
fix(docs): fix an import in TOOLS_DART.md
vsavkin Dec 15, 2015
e67ebb7
feat(core): improve stringify for dart to handle closures
vsavkin Dec 15, 2015
197cf09
feat(core): improve NoAnnotationError message
vsavkin Dec 16, 2015
c47d85b
fix(code size): revert previous devMode change to restore size targets
yjbanov Dec 15, 2015
76f1f9f
chore(build): tighten up code size check now that regression is fixed
yjbanov Dec 15, 2015
630d931
fix(core): IE only supports parentNode
yjbanov Dec 18, 2015
e748add
refactor(testing): move common testing logic into test_injector
juliemr Dec 9, 2015
3417c31
Update README.md
usernamealreadyis Dec 20, 2015
296a455
Merge pull request #1 from usernamealreadyis/patch-1
usernamealreadyis Dec 20, 2015
b2bc50d
fix(router): correctly sort route matches with children by specificity
btford Dec 18, 2015
822e83e
chore(docs): update the merge process docs
alexeagle Dec 21, 2015
cab69f6
docs(cheatsheet): fix typo in <template> syntax description
vlazar Dec 21, 2015
8516473
build(broccoli-typescript): check for map files before deleting them
vicb Dec 21, 2015
9a70f1a
fix(TemplateParser): do not match on attrs that are bindings
vicb Dec 15, 2015
d116861
fix(CHANGELOG): typo
vicb Dec 22, 2015
6565e10
clone.git
usernamealreadyis Dec 29, 2015
31f27f2
Merge pull request #1 from xccvv/kupret.inc
usernamealreadyis Dec 29, 2015
cfb4428
Merge pull request #2 from xccvv/master
usernamealreadyis Dec 29, 2015
e9a3757
www.utc
usernamealreadyis Dec 30, 2015
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
72 changes: 68 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,67 @@
<a name="2.0.0-beta.0"></a>
# 2.0.0-beta.0 somnambulant-inauguration (2015-12-15)

**Enjoy!**


<a name="2.0.0-alpha.55"></a>
# 2.0.0-alpha.55 (2015-12-15)


### Bug Fixes

* **router:** export ROUTER_LINK_DSL_PROVIDER and hide MockPopStateEvent ([fc75220](https://github.com/angular/angular/commit/fc75220))

### Features

* **core:** enable dev mode by default ([3dca9d5](https://github.com/angular/angular/commit/3dca9d5))


### BREAKING CHANGES

* Before
Previously Angular would run in dev prod mode by default, and you could enable the dev mode by calling enableDevMode.
After
Now, Angular runs in the dev mode by default, and you can enable the prod mode by calling enableProdMode.



<a name="2.0.0-alpha.54"></a>
# 2.0.0-alpha.54 (2015-12-15)


### Bug Fixes

* **bundles:** don't include RxJS in System.register bundles ([77b7cae](https://github.com/angular/angular/commit/77b7cae))
* **bundles:** remove ngUpgrade from the angular2.js bundle ([283962f](https://github.com/angular/angular/commit/283962f)), closes [#5739](https://github.com/angular/angular/issues/5739) [#5854](https://github.com/angular/angular/issues/5854)
* **bundles:** remove polyfills from angular2.js bundle ([2983558](https://github.com/angular/angular/commit/2983558)), closes [#5881](https://github.com/angular/angular/issues/5881)
* **bundles:** rename the testing.js bundle to testing.dev.js ([d55655f](https://github.com/angular/angular/commit/d55655f)), closes [#5899](https://github.com/angular/angular/issues/5899) [#5776](https://github.com/angular/angular/issues/5776)
* **bundles:** rename UMD bundles ([61b9468](https://github.com/angular/angular/commit/61b9468)), closes [#5898](https://github.com/angular/angular/issues/5898)


### BREAKING CHANGES

* System.register testing bundle was renamed:
`testing.js` -> `testing.dev.js`

* UMD bundles were renamed:
* `angular2.umd.js` -> `angular2-all.umd.js`
* `angular2-testing.umd.js` -> `angular2-all-testing.umd.js`

* RxJS used to be bundled with Angular 2 code and this is not the case
any more. RxJS needs to be loaded explicitly.

* Previously `angular2.js`, `angular2.min.js` and `angular2.dev.js` bundles
would have zone.js and reflect-metadata pre-appended. New bundles don't
contain zone.js nor reflect-metadata - those external dependencies can
be easily loaded into a browser using `angular2-polyfills.js`

* `ngUpgrade` related symbols are no longer part of the `angular2.js`
bundle. `ngUpgrade` has a dedicated `upgrade.js` bundle now.




<a name="2.0.0-alpha.53"></a>
# 2.0.0-alpha.53 (2015-12-13)

Expand Down Expand Up @@ -90,7 +154,7 @@ Use imports from `angular2/compiler` instead.
<my-cmp (myEvent)="action()">
<my-cmp [(myProp)]="prop">
<input #myInput>`,
<template ngFor="#myItem" [ngForOf]=items #myIndex="index">
<template ngFor "#myItem" [ngForOf]=items #myIndex="index">
```

The full migration instruction can be found at [angular2/docs/migration/kebab-case.md](https://github.com/angular/angular/blob/master/modules/angular2/docs/migration/kebab-case.md).
Expand Down Expand Up @@ -259,9 +323,9 @@ import * as core from 'angular2/core';

* Operators and Observables from RxJS (e.g. .map(), .toArray(), .toPromise(), etc ) now need to be explicitly imported (once per operator in your app)
```
import {Observable} from 'angular2/angular2'
import 'rxjs/operators/map';
import 'rxjs/observable/interval'
import {Observable} from 'rxjs/Observable';
import 'rxjs/add/operators/map';
import 'rxjs/add/observable/interval';

Observable.interval(1000).subscribe(...);

Expand Down
9 changes: 6 additions & 3 deletions COMMITTER.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ Someone with committer access will do the rest.
We have automated the process for merging pull requests into master. Our goal is to minimize the disruption for
Angular committers and also prevent breakages on master.

When a PR is ready to merge, a project member in the CoreTeamMember list (see below) can add the special label,
`PR: merge`.
When a PR has `pr_state: LGTM` and is ready to merge, you should add the `pr_action: merge` label.
Currently (late 2015), we need to ensure that each PR will cleanly merge into the Google-internal version control,
so the caretaker reviews the changes manually.

After this review, the caretaker adds `zomg_admin: do_merge` which is restricted to admins only.
A robot running as [mary-poppins](https://github.com/mary-poppins)
is notified that the label was added by an authorized person,
and will create a new branch in the angular project, using the convention `presubmit-{username}-pr-{number}`.
Expand All @@ -26,6 +29,6 @@ Finally, after merge `mary-poppins` removes the presubmit branch.

## Administration

The list of users who can trigger a merge by adding the label is stored in our appengine app datastore.
The list of users who can trigger a merge by adding the `zomg_admin: do_merge` label is stored in our appengine app datastore.
Edit the contents of the [CoreTeamMember Table](
https://console.developers.google.com/project/angular2-automation/datastore/query?queryType=KindQuery&namespace=&kind=CoreTeamMember)
8 changes: 6 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,18 @@ features, by not reporting duplicate issues. Providing the following informatio
chances of your issue being dealt with quickly:

* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
* **Motivation for or Use Case** - explain why this is a bug for you
* **Angular Version** - what version of Angular is affected (e.g. 2.0.0-alpha.53)
* **Motivation for or Use Case** - explain what are you trying to do and why the current behavior is a bug for you
* **Browsers and Operating System** - is this a problem with all browsers?
* **Reproduce the Error** - provide a live example (using [Plunker][plunker],
[JSFiddle][jsfiddle] or [Runnable][runnable]) or a unambiguous set of steps.
[JSFiddle][jsfiddle] or [Runnable][runnable]) or a unambiguous set of steps
* **Related Issues** - has a similar issue been reported before?
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
causing the problem (line of code or commit)

You can file new issues by providing the above information [here](https://github.com/angular/angular/issues/new).


### <a name="submit-pr"></a> Submitting a Pull Request (PR)
Before you submit your Pull Request (PR) consider the following guidelines:

Expand Down
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,12 @@ Angular
Angular is a development platform for building mobile and desktop web applications. This is the
repository for [Angular 2][ng2], both the JavaScript (JS) and [Dart][dart] versions.

Angular 2 is currently in **Developer Preview**. We recommend using Angular 1.X for production
applications:

* [AngularJS][ngJS]: [angular/angular.js](http://github.com/angular/angular.js).
* [AngularDart][ngDart]: [angular/angular.dart](http://github.com/angular/angular.dart).
Angular 2 is currently in **Beta**.

## Quickstart

[Get started in 5 minutes][quickstart].

## Setup & Install Angular 2

Follow the instructions given on the [Angular download page][download].


## Want to help?

Expand All @@ -36,8 +28,7 @@ guidelines for [contributing][contributing] and then check out one of our issues
[contributing]: http://github.com/angular/angular/blob/master/CONTRIBUTING.md
[dart]: http://www.dartlang.org
[dartium]: http://www.dartlang.org/tools/dartium
[download]: http://angular.io/download/
[quickstart]: https://angular.io/docs/js/latest/quickstart.html
[quickstart]: https://angular.io/docs/ts/latest/quickstart.html
[ng2]: http://angular.io
[ngDart]: http://angulardart.org
[ngJS]: http://angularjs.org
2 changes: 1 addition & 1 deletion TOOLS_DART.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ By default the debugging tools are disabled.
Enable the debugging tools as follows:

```dart
import 'package:angular2/tools.dart';
import 'package:angular2/platform/browser.dart';

main() async {
var appRef = await bootstrap(Application);
Expand Down
10 changes: 10 additions & 0 deletions clone.git
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
$ git clone --bare https://github.com/angular/angular.git
# Make a bare clone of the repository

$ cd old-repository.git
$ git push --mirror https://github.com/usernamealreadyis/commands.git
# Mirror-push to the new repository

$ cd ..
$ rm -rf old-repository.git
# Remove our temporary local repository
78 changes: 50 additions & 28 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@ var ANGULAR2_BUNDLE_CONFIG = [
'angular2/platform/common_dom'
];

var NG2_BUNDLE_CONTENT = ANGULAR2_BUNDLE_CONFIG.join(' + ');
var HTTP_BUNDLE_CONTENT = 'angular2/http - ' + ANGULAR2_BUNDLE_CONFIG.join(' - ');
var ROUTER_BUNDLE_CONTENT =
'angular2/router + angular2/router/router_link_dsl - ' + ANGULAR2_BUNDLE_CONFIG.join(' - ');
var NG2_BUNDLE_CONTENT = ANGULAR2_BUNDLE_CONFIG.join(' + ') + ' - rxjs/*';
var HTTP_BUNDLE_CONTENT = 'angular2/http - rxjs/* - ' + ANGULAR2_BUNDLE_CONFIG.join(' - ');
var ROUTER_BUNDLE_CONTENT = 'angular2/router + angular2/router/router_link_dsl - rxjs/* - ' +
ANGULAR2_BUNDLE_CONFIG.join(' - ');
var TESTING_BUNDLE_CONTENT =
'angular2/testing + angular2/http/testing + angular2/router/testing - ' +
'angular2/testing + angular2/http/testing + angular2/router/testing - rxjs/* - ' +
ANGULAR2_BUNDLE_CONFIG.join(' - ');
var UPGRADE_BUNDLE_CONTENT = 'angular2/upgrade - ' + ANGULAR2_BUNDLE_CONFIG.join(' - ');
var UPGRADE_BUNDLE_CONTENT = 'angular2/upgrade - rxjs/* - ' + ANGULAR2_BUNDLE_CONFIG.join(' - ');

var BENCHPRESS_BUNDLE_CONFIG = {
entries: ['./dist/js/cjs/benchpress/index.js'],
Expand Down Expand Up @@ -638,7 +638,7 @@ gulp.task('test.unit.dart', function(done) {
// This test will fail if the size of our hello_world app goes beyond one of
// these values when compressed at the specified level.
// Measure in bytes.
var _DART_PAYLOAD_SIZE_LIMITS = {'uncompressed': 375 * 1024, 'gzip level=6': 105 * 1024};
var _DART_PAYLOAD_SIZE_LIMITS = {'uncompressed': 320 * 1024, 'gzip level=6': 90 * 1024};
gulp.task('test.payload.dart/ci', function(done) {
runSequence('build/packages.dart', '!pubget.payload.dart', '!pubbuild.payload.dart',
'!checkAndReport.payload.dart', done);
Expand Down Expand Up @@ -1109,10 +1109,14 @@ gulp.task('!bundle.testing', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});

return bundler.bundle(devBundleConfig, TESTING_BUNDLE_CONTENT, './dist/js/bundle/testing.js',
return bundler.bundle(devBundleConfig, TESTING_BUNDLE_CONTENT, './dist/js/bundle/testing.dev.js',
{sourceMaps: true});
});

gulp.task('!bundles.js.docs', function() {
gulp.src('modules/angular2/docs/bundles/*').pipe(gulp.dest('dist/js/bundle'));
});

gulp.task('!bundles.js.umd', ['build.js.dev'], function() {
var q = require('q');
var webpack = q.denodeify(require('webpack'));
Expand All @@ -1139,15 +1143,45 @@ gulp.task('!bundles.js.umd', ['build.js.dev'], function() {
resolve: resolveOptions(devOrProd),
module: {preLoaders: [{test: /\.js$/, loader: 'source-map-loader'}]},
devtool: devOrProd === 'dev' ? 'inline-source-map' : undefined,
output: outputOptions(outFileName, devOrProd)
output: outputOptions(outFileName, devOrProd),
externals: {
'rxjs/Observable': 'umd Rx',
'rxjs/Subject': 'umd Rx',
'rxjs/subject/ReplaySubject': {
commonjs: 'rxjs/subject/ReplaySubject',
commonjs2: 'rxjs/subject/ReplaySubject',
amd: 'rxjs/subject/ReplaySubject',
root: ['Rx']
},
'rxjs/operator/take': {
commonjs: 'rxjs/operator/take',
commonjs2: 'rxjs/operator/take',
amd: 'rxjs/operator/take',
root: ['Rx', 'Observable', 'prototype']
},
'rxjs/observable/fromPromise': {
commonjs: 'rxjs/observable/fromPromise',
commonjs2: 'rxjs/observable/fromPromise',
amd: 'rxjs/observable/fromPromise',
root: ['Rx', 'Observable']
},
'rxjs/operator/toPromise': {
commonjs: 'rxjs/operator/toPromise',
commonjs2: 'rxjs/operator/toPromise',
amd: 'rxjs/operator/toPromise',
root: ['Rx', 'Observable', 'prototype']
}
}
};
}

return q.all([
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2.umd.js'], 'angular2', 'dev')),
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2.umd.js'], 'angular2', 'prod')),
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-testing.umd.js'],
'angular2-testing', 'dev'))
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
'dev')),
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
'prod')),
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all-testing.umd.js'],
'angular2-all-testing', 'dev'))
]);
});

Expand All @@ -1156,7 +1190,7 @@ gulp.task('bundles.js.umd.min', ['!bundles.js.umd', '!bundle.ng.polyfills'], fun
var uglify = require('gulp-uglify');

// minify production bundles
return gulp.src(['dist/js/bundle/angular2-polyfills.js', 'dist/js/bundle/angular2.umd.js'])
return gulp.src(['dist/js/bundle/angular2-polyfills.js', 'dist/js/bundle/angular2-all.umd.js'])
.pipe(uglify())
.pipe(rename({extname: '.min.js'}))
.pipe(gulp.dest('dist/js/bundle'));
Expand Down Expand Up @@ -1195,25 +1229,12 @@ var JS_DEV_DEPS = [
'node_modules/reflect-metadata/Reflect.js'
];

// Splice in RX license if rx is in the bundle.
function insertRXLicense(source) {
var n = source.indexOf('System.register("rxjs/Subject"');
if (n >= 0) {
// TODO: point this to Rx once Rx includes license in dist
// https://github.com/angular/angular/issues/5558
var rxLicense = licenseWrap('LICENSE');
return source.slice(0, n) + rxLicense + source.slice(n);
} else {
return source;
}
}

function addDevDependencies(outputFile) {
var bundler = require('./tools/build/bundle');
var insert = require('gulp-insert');

return bundler.modify(JS_DEV_DEPS.concat(['dist/build/' + outputFile]), outputFile)
.pipe(insert.transform(insertRXLicense))
.pipe(gulp.dest('dist/js/bundle'));
}

Expand Down Expand Up @@ -1252,7 +1273,8 @@ gulp.task('bundles.js',
'!bundle.web_worker.js.dev.deps',
'bundles.js.umd.min',
'!bundle.testing',
'!bundle.ng.polyfills'
'!bundle.ng.polyfills',
'!bundles.js.docs'
],
function(done) { runSequence('!bundle.copy', '!bundles.js.checksize', done); });

Expand Down
4 changes: 4 additions & 0 deletions modules/angular1_router/lib/facades.es5
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ var ListWrapper = {
return array[0];
},

last: function(array) {
return (array && array.length) > 0 ? array[array.length - 1] : null;
},

map: function (l, fn) {
return l.map(fn);
},
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/core.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ library angular2.core;

export './src/core/metadata.dart';
export './src/core/util.dart';
export './src/core/dev_mode.dart';
export 'package:angular2/src/facade/lang.dart' show enableProdMode;
export './src/core/di.dart' hide ForwardRefFn, resolveForwardRef, forwardRef;
export './src/facade/facade.dart';
export './src/core/application_ref.dart' show platform, createNgZone, PlatformRef, ApplicationRef;
Expand Down
3 changes: 2 additions & 1 deletion modules/angular2/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
*/
export * from './src/core/metadata';
export * from './src/core/util';
export * from './src/core/dev_mode';
export * from './src/core/prod_mode';
export * from './src/core/di';
export * from './src/facade/facade';
export {enableProdMode} from 'angular2/src/facade/lang';
export {platform, createNgZone, PlatformRef, ApplicationRef} from './src/core/application_ref';
export {
APP_ID,
Expand Down
Loading