chore: remove deprecated router 2/2

build.sh

@@ -50,7 +50,6 @@ for PACKAGE in \
   platform-server \
   http \
   router \
-  router-deprecated \
   upgrade \
   compiler-cli
 do
@@ -60,13 +59,8 @@ do
   UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
   UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
 
-  if [[ ${PACKAGE} == "router-deprecated" ]]; then
+  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json        ====="
-    echo "======      COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json        ====="
+  $TSC -p ${SRCDIR}/tsconfig-es5.json
-    $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es5.json
-  else
-    echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-es5.json        ====="
-    $TSC -p ${SRCDIR}/tsconfig-es5.json
-  fi
 
   cp ${SRCDIR}/package.json ${DESTDIR}/
 
@@ -83,13 +77,8 @@ do
 
   if [[ ${PACKAGE} != compiler-cli ]]; then
 
-    if [[ ${PACKAGE} == "router-deprecated" ]]; then
+    echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
-      echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
+    $TSC -p ${SRCDIR}/tsconfig-es2015.json
-      $(npm bin)/tsc --emitDecoratorMetadata -p ${SRCDIR}/tsconfig-es2015.json
-    else
-      echo "====== (esm)COMPILING: $TSC -p ${SRCDIR}/tsconfig-es2015.json ====="
-      $TSC -p ${SRCDIR}/tsconfig-es2015.json
-    fi
 
     echo "======      BUNDLING: ${SRCDIR} ====="
     mkdir ${DESTDIR}/bundles

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

@@ -173,13 +173,12 @@ describe('reflector_host', () => {
   });
 
   it('should be able to produce a symbol for an exported symbol', () => {
-    expect(reflectorNestedGenDir.findDeclaration('@angular/router-deprecated', 'foo', 'main.ts'))
+    expect(reflectorNestedGenDir.findDeclaration('@angular/router', 'foo', 'main.ts'))
         .toBeDefined();
   });
 
   it('should be able to produce a symbol for values space only reference', () => {
-    expect(reflectorNestedGenDir.findDeclaration(
+    expect(reflectorNestedGenDir.findDeclaration('@angular/router/src/providers', 'foo', 'main.ts'))
-               '@angular/router-deprecated/src/providers', 'foo', 'main.ts'))
         .toBeDefined();
   });
 
@@ -245,7 +244,7 @@ const FILES: Entry = {
     'src': {
       'main.ts': `
         import * as c from '@angular/core';
-        import * as r from '@angular/router-deprecated';
+        import * as r from '@angular/router';
         import * as u from './lib/utils';
         import * as cs from './lib/collections';
         import * as u2 from './lib2/utils2';
@@ -328,7 +327,7 @@ const FILES: Entry = {
           'core.d.ts': dummyModule,
           'core.metadata.json':
               `{"__symbolic":"module", "version": 1, "metadata": {"foo": {"__symbolic": "class"}}}`,
-          'router-deprecated': {'index.d.ts': dummyModule, 'src': {'providers.d.ts': dummyModule}},
+          'router': {'index.d.ts': dummyModule, 'src': {'providers.d.ts': dummyModule}},
           'unused.d.ts': dummyModule
         }
       }

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

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
 import {discardPeriodicTasks, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
 import {Log, beforeEach, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
 import {Parser} from '../../compiler/src/expression_parser/parser';
-import {BaseException} from '../../router-deprecated/src/facade/exceptions';
 
 const resolvedPromise = Promise.resolve(null);
 

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

@@ -8,8 +8,7 @@
 
 import {XHR} from '@angular/compiler';
 import {Component, bind} from '@angular/core';
-import {TestComponentBuilder, addProviders, async, fakeAsync, flushMicrotasks, inject, tick} from '@angular/core/testing';
+import {TestComponentBuilder, addProviders, async, fakeAsync, inject, tick} from '@angular/core/testing';
-import {ROUTER_DIRECTIVES, Route} from '@angular/router-deprecated';
 
 import {XHRImpl} from '../src/xhr/xhr_impl';
 
@@ -36,15 +35,6 @@ class ExternalTemplateComp {
 class BadTemplateUrl {
 }
 
-@Component({
-  selector: 'test-router-cmp',
-  template:
-      `<a [routerLink]="['One']">one</a> <a [routerLink]="['Two']">two</a><router-outlet></router-outlet>`,
-  directives: [ROUTER_DIRECTIVES]
-})
-class TestRouterComponent {
-}
-
 // Tests for angular2/testing bundle specific to the browser environment.
 // For general tests, see test/testing/testing_public_spec.ts.
 export function main() {

modules/playground/src/bootstrap.ts

@@ -35,8 +35,6 @@ declare var System: any;
               '/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
           '@angular/http': '/packages-dist/http/bundles/http.umd.js',
           '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
-          '@angular/router-deprecated':
-              '/packages-dist/router-deprecated/bundles/router-deprecated.umd.js',
           '@angular/router': '/packages-dist/router/bundles/router.umd.js',
           '@angular/core/src/facade': '/all/@angular/core/src/facade',
           'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs'

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

@@ -16,7 +16,7 @@ System.config({
     '@angular/compiler': {main: 'index.js', defaultExtension: 'js'},
     '@angular/common': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     'rxjs': {
       defaultExtension: 'js'
     }

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

@@ -16,7 +16,7 @@ System.config({
     '@angular/common': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     'rxjs': {
       defaultExtension: 'js'
     },

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

@@ -16,7 +16,7 @@ System.config({
     '@angular/common': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     'rxjs': {
       defaultExtension: 'js'
     },

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

@@ -16,7 +16,7 @@ System.config({
     '@angular/common': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
     '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
-    '@angular/router-deprecated': {main: 'index.js', defaultExtension: 'js'},
+    '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     'rxjs': {
       defaultExtension: 'js'
     }

publish-packages.sh

@@ -26,7 +26,6 @@ for PACKAGE in \
   http \
   platform-browser \
   platform-server \
-  router-deprecated \
   upgrade
 do
   DESTDIR=./dist/packages-dist/${PACKAGE}

scripts/windows/packages.txt

@@ -6,4 +6,3 @@ http
 platform-browser
 platform-browser-dynamic
 platform-server
-router-deprecated

test-main.js

@@ -41,7 +41,7 @@ System.config({
       main: 'index.js',
       defaultExtension: 'js'
     },
-    '@angular/router-deprecated': {
+    '@angular/router': {
       main: 'index.js',
       defaultExtension: 'js'
     },

tools/typings-test/include-all.ts

@@ -9,8 +9,8 @@ import * as platformBrowserDynmic from '@angular/platform-browser-dynamic';
 import * as platformBrowser from '@angular/platform-browser/testing';
 import * as platfomrServerTesting from '@angular/platform-server';
 import * as platfomrServer from '@angular/platform-server/testing';
-import * as routerDeprecatedTesting from '@angular/router-deprecated';
+import * as routerTesting from '@angular/router';
-import * as routerDeprecated from '@angular/router-deprecated/testing';
+import * as router from '@angular/router/testing';
 import * as upgrade from '@angular/upgrade';
 
 export default {
@@ -25,7 +25,7 @@ export default {
   platformBrowserDynmic,
   platfomrServer,
   platfomrServerTesting,
-  routerDeprecated,
+  router,
-  routerDeprecatedTesting,
+  routerTesting,
   upgrade
 }

tools/typings-test/test.sh

@@ -4,7 +4,7 @@ set -ex -o pipefail
 # These ones can be `npm link`ed for fast development
 # Note that compiler-cli does not support TS 1.8 because tsc-wrapped uses 1.9 features
 LINKABLE_PKGS=(
-  $(pwd)/dist/packages-dist/{common,core,compiler,http,router,router-deprecated,upgrade,platform-{browser,browser-dynamic,server}}
+  $(pwd)/dist/packages-dist/{common,core,compiler,http,router,upgrade,platform-{browser,browser-dynamic,server}}
 )
 
 TMPDIR=${TMPDIR:-/tmp/angular-build/}