Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit f1c1069

Browse files
teropateropa
committed
docs(upgrade): bring phonecat up to speed with rc.1. Use router-deprecated.
1 parent 8b1683f commit f1c1069

16 files changed

+46
-37
lines changed

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/app.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ angular.module('phonecatApp', [
2424

2525
configure.$inject = ['$routeProvider'];
2626

27-
function configure($routeProvider) { }
27+
function configure($routeProvider) {
2828
// #docregion list-route
2929
$routeProvider.
3030
when('/phones', {

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/systemjs.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ System.config({
1717
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
1818
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
1919
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
20+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
2021
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
2122
'rxjs': { defaultExtension: 'js' }
2223

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
"repository": "https://github.com/angular/angular-phonecat",
77
"license": "MIT",
88
"dependencies": {
9-
"@angular/common": "0.0.0-3",
10-
"@angular/compiler": "0.0.0-3",
11-
"@angular/core": "0.0.0-3",
12-
"@angular/http": "0.0.0-3",
13-
"@angular/platform-browser": "0.0.0-3",
14-
"@angular/platform-browser-dynamic": "0.0.0-3",
15-
"@angular/router": "0.0.0-3",
16-
"@angular/upgrade": "0.0.0-3",
9+
"@angular/common": "2.0.0-rc.1",
10+
"@angular/compiler": "2.0.0-rc.1",
11+
"@angular/core": "2.0.0-rc.1",
12+
"@angular/http": "2.0.0-rc.1",
13+
"@angular/platform-browser": "2.0.0-rc.1",
14+
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
15+
"@angular/router": "2.0.0-rc.1",
16+
"@angular/router-deprecated": "2.0.0-rc.1",
17+
"@angular/upgrade": "2.0.0-rc.1",
1718

1819
"es6-shim": "^0.35.0",
1920
"reflect-metadata": "0.1.3",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma_test_shim.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ System.config({
2929
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
3030
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
3131
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
32+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
3233
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
3334
'rxjs': { defaultExtension: 'js' }
3435
}
@@ -37,8 +38,8 @@ System.config({
3738
// #docregion ng2
3839
System.import('@angular/core/testing').then(function(testing) {
3940
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
40-
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS,
41-
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS);
41+
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
42+
browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
4243
});
4344
}).then(function() {
4445
return Promise.all(

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/app.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// #docregion
22
import { Component } from '@angular/core';
3-
import { RouteConfig, ROUTER_DIRECTIVES } from '@angular/router';
3+
import { RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
44

55
import PhoneList from './phone_list/phone_list.component';
66
import PhoneDetail from './phone_detail/phone_detail.component';

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { provide } from '@angular/core';
44
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
55
import { bootstrap } from '@angular/platform-browser-dynamic';
6-
import { ROUTER_PROVIDERS } from '@angular/router';
6+
import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
77

88
import { Phones } from './core/phones.service';
99
import AppComponent from './app.component';

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #docregion
22
// #docregion top
33
import { Component, Inject } from '@angular/core';
4-
import { RouteParams } from '@angular/router';
4+
import { RouteParams } from '@angular/router-deprecated';
55

66
import { Phones, Phone } from '../core/phones.service';
77
import { CheckmarkPipe } from '../core/checkmark.pipe';

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #docregion full
22
// #docregion top
33
import { Component } from '@angular/core';
4-
import { RouterLink } from '@angular/router';
4+
import { RouterLink } from '@angular/router-deprecated';
55
import { Observable } from 'rxjs';
66

77
import { Phones, Phone } from '../core/phones.service';

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/systemjs.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ System.config({
1717
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
1818
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
1919
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
20+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
2021
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
2122
'rxjs': { defaultExtension: 'js' }
2223

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
"repository": "https://github.com/angular/angular-phonecat",
77
"license": "MIT",
88
"dependencies": {
9-
"@angular/common": "0.0.0-3",
10-
"@angular/compiler": "0.0.0-3",
11-
"@angular/core": "0.0.0-3",
12-
"@angular/http": "0.0.0-3",
13-
"@angular/platform-browser": "0.0.0-3",
14-
"@angular/platform-browser-dynamic": "0.0.0-3",
15-
"@angular/router": "0.0.0-3",
16-
"@angular/upgrade": "0.0.0-3",
9+
"@angular/common": "2.0.0-rc.1",
10+
"@angular/compiler": "2.0.0-rc.1",
11+
"@angular/core": "2.0.0-rc.1",
12+
"@angular/http": "2.0.0-rc.1",
13+
"@angular/platform-browser": "2.0.0-rc.1",
14+
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
15+
"@angular/router": "2.0.0-rc.1",
16+
"@angular/router-deprecated": "2.0.0-rc.1",
17+
"@angular/upgrade": "2.0.0-rc.1",
1718

1819
"es6-shim": "^0.35.0",
1920
"reflect-metadata": "0.1.3",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma_test_shim.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ System.config({
2929
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
3030
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
3131
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
32+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
3233
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
3334
'rxjs': { defaultExtension: 'js' }
3435
}
@@ -37,8 +38,8 @@ System.config({
3738
// #docregion ng2
3839
System.import('@angular/core/testing').then(function(testing) {
3940
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
40-
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS,
41-
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS);
41+
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
42+
browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
4243
});
4344
}).then(function() {
4445
return Promise.all(

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_detail.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { provide } from '@angular/core';
22
// #docregion routeparams
3-
import { RouteParams } from '@angular/router';
3+
import { RouteParams } from '@angular/router-deprecated';
44
// #enddocregion routeparams
55
import { HTTP_PROVIDERS } from '@angular/http';
66
import { Observable } from 'rxjs/Rx';

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { provide, ApplicationRef } from '@angular/core';
33
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
44
import { HTTP_PROVIDERS } from '@angular/http';
5-
import { ROUTER_PROVIDERS, ROUTER_PRIMARY_COMPONENT } from '@angular/router';
5+
import { ROUTER_PROVIDERS, ROUTER_PRIMARY_COMPONENT } from '@angular/router-deprecated';
66
import { Observable } from 'rxjs/Rx';
77
import {
88
describe,

‎public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/systemjs.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ System.config({
1818
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
1919
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
2020
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
21+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
2122
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
2223
'rxjs': { defaultExtension: 'js' }
2324

‎public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
"repository": "https://github.com/angular/angular-phonecat",
77
"license": "MIT",
88
"dependencies": {
9-
"@angular/common": "0.0.0-3",
10-
"@angular/compiler": "0.0.0-3",
11-
"@angular/core": "0.0.0-3",
12-
"@angular/http": "0.0.0-3",
13-
"@angular/platform-browser": "0.0.0-3",
14-
"@angular/platform-browser-dynamic": "0.0.0-3",
15-
"@angular/router": "0.0.0-3",
16-
"@angular/upgrade": "0.0.0-3",
9+
"@angular/common": "2.0.0-rc.1",
10+
"@angular/compiler": "2.0.0-rc.1",
11+
"@angular/core": "2.0.0-rc.1",
12+
"@angular/http": "2.0.0-rc.1",
13+
"@angular/platform-browser": "2.0.0-rc.1",
14+
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
15+
"@angular/router": "2.0.0-rc.1",
16+
"@angular/router-deprecated": "2.0.0-rc.1",
17+
"@angular/upgrade": "2.0.0-rc.1",
1718

1819
"es6-shim": "^0.35.0",
1920
"reflect-metadata": "0.1.3",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma_test_shim.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ System.config({
2929
'@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' },
3030
'@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' },
3131
'@angular/router': { main: 'index.js', defaultExtension: 'js' },
32+
'@angular/router-deprecated': { main: 'index.js', defaultExtension: 'js' },
3233
'@angular/upgrade': { main: 'index.js', defaultExtension: 'js' },
3334
'rxjs': { defaultExtension: 'js' }
3435
}
@@ -37,8 +38,8 @@ System.config({
3738
// #docregion ng2
3839
System.import('@angular/core/testing').then(function(testing) {
3940
return System.import('@angular/platform-browser-dynamic/testing').then(function(browserTesting) {
40-
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_PLATFORM_PROVIDERS,
41-
browserTesting.TEST_BROWSER_APPLICATION_PROVIDERS);
41+
testing.setBaseTestProviders(browserTesting.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
42+
browserTesting.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
4243
});
4344
}).then(function() {
4445
return Promise.all(

0 commit comments

Comments
 (0)