Skip to content

Commit f9da3c9

Browse files
mheveryalxhub
mhevery
authored and
alxhub
committed
chore: remove deprecated router 2/2
1 parent a20a420 commit f9da3c9

File tree

14 files changed

+20
-46
lines changed

14 files changed

+20
-46
lines changed

‎build.sh‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ for PACKAGE in \
5050
platform-server \
5151
http \
5252
router \
53-
router-deprecated \
5453
upgrade \
5554
compiler-cli
5655
do
@@ -60,13 +59,8 @@ do
6059
UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
6160
UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
6261

63-
if [[ ${PACKAGE} == "router-deprecated" ]]; then
64-
echo "====== COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json ====="
65-
$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json
66-
else
67-
echo "====== COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json ====="
68-
$TSC -p ${SRCDIR}/tsconfig-es5.json
69-
fi
62+
echo "====== COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json ====="
63+
$TSC -p ${SRCDIR}/tsconfig-es5.json
7064

7165
cp ${SRCDIR}/package.json ${DESTDIR}/
7266

@@ -83,13 +77,8 @@ do
8377

8478
if [[ ${PACKAGE} != compiler-cli ]]; then
8579

86-
if [[ ${PACKAGE} == "router-deprecated" ]]; then
87-
echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
88-
$(npm bin)/tsc --emitDecoratorMetadata -p ${SRCDIR}/tsconfig-es2015.json
89-
else
90-
echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
91-
$TSC -p ${SRCDIR}/tsconfig-es2015.json
92-
fi
80+
echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
81+
$TSC -p ${SRCDIR}/tsconfig-es2015.json
9382

9483
echo "====== BUNDLING: ${SRCDIR} ====="
9584
mkdir ${DESTDIR}/bundles

‎modules/@angular/compiler-cli/test/reflector_host_spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,12 @@ describe('reflector_host', () => {
173173
});
174174

175175
it('should be able to produce a symbol for an exported symbol', () => {
176-
expect(reflectorNestedGenDir.findDeclaration('@angular/router-deprecated', 'foo', 'main.ts'))
176+
expect(reflectorNestedGenDir.findDeclaration('@angular/router', 'foo', 'main.ts'))
177177
.toBeDefined();
178178
});
179179

180180
it('should be able to produce a symbol for values space only reference', () => {
181-
expect(reflectorNestedGenDir.findDeclaration(
182-
'@angular/router-deprecated/src/providers', 'foo', 'main.ts'))
181+
expect(reflectorNestedGenDir.findDeclaration('@angular/router/src/providers', 'foo', 'main.ts'))
183182
.toBeDefined();
184183
});
185184

@@ -245,7 +244,7 @@ const FILES: Entry = {
245244
'src': {
246245
'main.ts': `
247246
import * as c from '@angular/core';
248-
import * as r from '@angular/router-deprecated';
247+
import * as r from '@angular/router';
249248
import * as u from './lib/utils';
250249
import * as cs from './lib/collections';
251250
import * as u2 from './lib2/utils2';
@@ -328,7 +327,7 @@ const FILES: Entry = {
328327
'core.d.ts': dummyModule,
329328
'core.metadata.json':
330329
`{"__symbolic":"module", "version": 1, "metadata": {"foo": {"__symbolic": "class"}}}`,
331-
'router-deprecated': {'index.d.ts': dummyModule, 'src': {'providers.d.ts': dummyModule}},
330+
'router': {'index.d.ts': dummyModule, 'src': {'providers.d.ts': dummyModule}},
332331
'unused.d.ts': dummyModule
333332
}
334333
}

‎modules/@angular/core/test/fake_async_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {BaseException} from '@angular/core';
910
import {discardPeriodicTasks, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
1011
import {Log, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
1112
import {expect} from '@angular/platform-browser/testing/matchers';
1213

1314
import {Parser} from '../../compiler/src/expression_parser/parser';
14-
import {BaseException} from '../../router-deprecated/src/facade/exceptions';
1515

1616
const resolvedPromise = Promise.resolve(null);
1717

‎modules/@angular/platform-browser-dynamic/test/testing_public_browser_spec.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
import {XHR} from '@angular/compiler';
1010
import {Component, bind} from '@angular/core';
11-
import {TestComponentBuilder, addProviders, async, fakeAsync, flushMicrotasks, inject, tick} from '@angular/core/testing';
12-
import {ROUTER_DIRECTIVES, Route} from '@angular/router-deprecated';
11+
import {TestComponentBuilder, addProviders, async, fakeAsync, inject, tick} from '@angular/core/testing';
1312

1413
import {XHRImpl} from '../src/xhr/xhr_impl';
1514

@@ -36,15 +35,6 @@ class ExternalTemplateComp {
3635
class BadTemplateUrl {
3736
}
3837

39-
@Component({
40-
selector: 'test-router-cmp',
41-
template:
42-
`<a [routerLink]="['One']">one</a> <a [routerLink]="['Two']">two</a><router-outlet></router-outlet>`,
43-
directives: [ROUTER_DIRECTIVES]
44-
})
45-
class TestRouterComponent {
46-
}
47-
4838
// Tests for angular2/testing bundle specific to the browser environment.
4939
// For general tests, see test/testing/testing_public_spec.ts.
5040
export function main() {

‎modules/playground/src/bootstrap.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ declare var System: any;
3535
'/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
3636
'@angular/http': '/packages-dist/http/bundles/http.umd.js',
3737
'@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
38-
'@angular/router-deprecated':
39-
'/packages-dist/router-deprecated/bundles/router-deprecated.umd.js',
4038
'@angular/router': '/packages-dist/router/bundles/router.umd.js',
4139
'@angular/core/src/facade': '/all/@angular/core/src/facade',
4240
'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs'

‎modules/playground/src/web_workers/images/loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ System.config({
1616
'@angular/compiler': {main: 'index.js', defaultExtension: 'js'},
1717
'@angular/common': {main: 'index.js', defaultExtension: 'js'},
1818
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
19-
'@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
19+
'@angular/router': {main: 'index.js', defaultExtension: 'js'},
2020
'rxjs': {
2121
defaultExtension: 'js'
2222
}

‎modules/playground/src/web_workers/kitchen_sink/loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ System.config({
1616
'@angular/common': {main: 'index.js', defaultExtension: 'js'},
1717
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
1818
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
19-
'@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
19+
'@angular/router': {main: 'index.js', defaultExtension: 'js'},
2020
'rxjs': {
2121
defaultExtension: 'js'
2222
},

‎modules/playground/src/web_workers/message_broker/loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ System.config({
1616
'@angular/common': {main: 'index.js', defaultExtension: 'js'},
1717
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
1818
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
19-
'@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
19+
'@angular/router': {main: 'index.js', defaultExtension: 'js'},
2020
'rxjs': {
2121
defaultExtension: 'js'
2222
},

‎modules/playground/src/web_workers/todo/loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ System.config({
1616
'@angular/common': {main: 'index.js', defaultExtension: 'js'},
1717
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
1818
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
19-
'@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
19+
'@angular/router': {main: 'index.js', defaultExtension: 'js'},
2020
'rxjs': {
2121
defaultExtension: 'js'
2222
}

‎publish-packages.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ for PACKAGE in \
2626
http \
2727
platform-browser \
2828
platform-server \
29-
router-deprecated \
3029
upgrade
3130
do
3231
DESTDIR=./dist/packages-dist/${PACKAGE}

0 commit comments

Comments
 (0)