Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ env:
- DBUS_SESSION_BUS_ADDRESS=/dev/null
- DISPLAY=:99.0
- CHROME_BIN=chromium-browser
# using SHA instead of version to fix build-compile issue
- LATEST_RELEASE=2.1.0
- LATEST_RELEASE=2.1.1
- TASK_FLAGS="--dgeni-log=warn"
matrix:
- TASK=lint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'rxjs': 'npm:rxjs',
'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
'ts': 'npm:[email protected]/lib/plugin.js',
'typescript': 'npm:[email protected].2/lib/typescript.js',
'typescript': 'npm:[email protected].3/lib/typescript.js',

},
// packages tells the System loader how to load when no filename and/or no extension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
'rxjs': 'npm:rxjs',
'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
'ts': 'npm:[email protected]/lib/plugin.js',
'typescript': 'npm:[email protected].2/lib/typescript.js',
'typescript': 'npm:[email protected].3/lib/typescript.js',

},
// packages tells the System loader how to load when no filename and/or no extension
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-hello-world/ts/index.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/[email protected].27/dist/system.src.js"></script>
<script src="https://unpkg.com/[email protected].39/dist/system.src.js"></script>
<script src="https://unpkg.com/[email protected]/lib/typescript.js"></script>

<!-- 2. Configure SystemJS -->
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-tabs/ts/index.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/[email protected].27/dist/system.src.js"></script>
<script src="https://unpkg.com/[email protected].39/dist/system.src.js"></script>
<script src="https://unpkg.com/[email protected]/lib/typescript.js"></script>

<!-- 2. Configure SystemJS -->
Expand Down
22 changes: 11 additions & 11 deletions public/docs/_examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
}
],
"dependencies": {
"@angular/common": "~2.1.0",
"@angular/compiler": "~2.1.0",
"@angular/compiler-cli": "~2.1.0",
"@angular/core": "~2.1.0",
"@angular/forms": "~2.1.0",
"@angular/http": "~2.1.0",
"@angular/platform-browser": "~2.1.0",
"@angular/platform-browser-dynamic": "~2.1.0",
"@angular/platform-server": "~2.1.0",
"@angular/router": "~3.1.0",
"@angular/upgrade": "~2.1.0",
"@angular/common": "~2.1.1",
"@angular/compiler": "~2.1.1",
"@angular/compiler-cli": "~2.1.1",
"@angular/core": "~2.1.1",
"@angular/forms": "~2.1.1",
"@angular/http": "~2.1.1",
"@angular/platform-browser": "~2.1.1",
"@angular/platform-browser-dynamic": "~2.1.1",
"@angular/platform-server": "~2.1.1",
"@angular/router": "~3.1.1",
"@angular/upgrade": "~2.1.1",

"angular-in-memory-web-api": "~0.1.13",
"bootstrap": "^3.3.7",
Expand Down
18 changes: 9 additions & 9 deletions public/docs/_examples/quickstart/js/package.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
}
],
"dependencies": {
"@angular/common": "~2.1.0",
"@angular/compiler": "~2.1.0",
"@angular/core": "~2.1.0",
"@angular/forms": "~2.1.0",
"@angular/http": "~2.1.0",
"@angular/platform-browser": "~2.1.0",
"@angular/platform-browser-dynamic": "~2.1.0",
"@angular/router": "~3.1.0",
"@angular/upgrade": "~2.1.0",
"@angular/common": "~2.1.1",
"@angular/compiler": "~2.1.1",
"@angular/core": "~2.1.1",
"@angular/forms": "~2.1.1",
"@angular/http": "~2.1.1",
"@angular/platform-browser": "~2.1.1",
"@angular/platform-browser-dynamic": "~2.1.1",
"@angular/router": "~3.1.1",
"@angular/upgrade": "~2.1.1",

"angular-in-memory-web-api": "~0.1.5",
"bootstrap": "^3.3.7",
Expand Down
18 changes: 9 additions & 9 deletions public/docs/_examples/quickstart/ts/package.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
}
],
"dependencies": {
"@angular/common": "~2.1.0",
"@angular/compiler": "~2.1.0",
"@angular/core": "~2.1.0",
"@angular/forms": "~2.1.0",
"@angular/http": "~2.1.0",
"@angular/platform-browser": "~2.1.0",
"@angular/platform-browser-dynamic": "~2.1.0",
"@angular/router": "~3.1.0",
"@angular/upgrade": "~2.1.0",
"@angular/common": "~2.1.1",
"@angular/compiler": "~2.1.1",
"@angular/core": "~2.1.1",
"@angular/forms": "~2.1.1",
"@angular/http": "~2.1.1",
"@angular/platform-browser": "~2.1.1",
"@angular/platform-browser-dynamic": "~2.1.1",
"@angular/router": "~3.1.1",
"@angular/upgrade": "~2.1.1",

"angular-in-memory-web-api": "~0.1.13",
"bootstrap": "^3.3.7",
Expand Down
18 changes: 9 additions & 9 deletions public/docs/_examples/webpack/ts/package.webpack.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
}
],
"dependencies": {
"@angular/common": "~2.1.0",
"@angular/compiler": "~2.1.0",
"@angular/core": "~2.1.0",
"@angular/forms": "~2.1.0",
"@angular/http": "~2.1.0",
"@angular/platform-browser": "~2.1.0",
"@angular/platform-browser-dynamic": "~2.1.0",
"@angular/router": "~3.1.0",
"@angular/common": "~2.1.1",
"@angular/compiler": "~2.1.1",
"@angular/core": "~2.1.1",
"@angular/forms": "~2.1.1",
"@angular/http": "~2.1.1",
"@angular/platform-browser": "~2.1.1",
"@angular/platform-browser-dynamic": "~2.1.1",
"@angular/router": "~3.1.1",
"core-js": "^2.4.1",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.25"
Expand All @@ -48,7 +48,7 @@
"raw-loader": "^0.5.1",
"rimraf": "^2.5.2",
"style-loader": "^0.13.1",
"typescript": "^2.0.2",
"typescript": "^2.0.3",
"webpack": "^1.13.0",
"webpack-dev-server": "^1.14.1",
"webpack-merge": "^0.14.0"
Expand Down
3 changes: 3 additions & 0 deletions public/docs/ts/latest/guide/change-log.jade
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ block includes
The Angular documentation is a living document with continuous improvements.
This log calls attention to recent significant changes.

## Sync with Angular v.2.1.1 (2016-10-21)
Docs and code samples updated and tested with Angular v.2.1.0

## npm _@types_ packages replace _typings_ (2016-10-20)
Documentation samples now get TypeScript type information for 3rd party libraries
from npm `@types` packages rather than with the _typings_ tooling.
Expand Down
4 changes: 2 additions & 2 deletions tools/plunker-builder/indexHtmlTranslator.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var _rxData = [
{
pattern: 'script',
from: 'node_modules/reflect-metadata/Reflect.js',
to: 'https://unpkg.com/[email protected].3'
to: 'https://unpkg.com/[email protected].8'
},
{
pattern: 'script',
Expand All @@ -60,7 +60,7 @@ var _rxData = [
{
pattern: 'script',
from: 'node_modules/systemjs/dist/system.src.js',
to: 'https://unpkg.com/[email protected].27/dist/system.src.js'
to: 'https://unpkg.com/[email protected].39/dist/system.src.js'
},
{
pattern: 'script',
Expand Down