build: fix file paths after moving modules/@angular/* to packages/*

packages/router/upgrade/index.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the router/upgrade package.
+ */
+
+export * from './src/upgrade';

packages/router/upgrade/package.json

@@ -0,0 +1,6 @@
+{
+  "typings": "../typings/upgrade/upgrade.d.ts",
+  "main": "../bundles/router-upgrade.umd.js",
+  "module": "../@angular/router/upgrade.es5.js",
+  "es2015": "../@angular/router/upgrade.js"
+}

packages/router/upgrade/src/upgrade.ts

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {APP_BOOTSTRAP_LISTENER, ComponentRef, InjectionToken} from '@angular/core';
+import {Router} from '@angular/router';
+import {UpgradeModule} from '@angular/upgrade/static';
+
+
+
+/**
+ * @whatItDoes Creates an initializer that in addition to setting up the Angular
+ * router sets up the ngRoute integration.
+ *
+ * @howToUse
+ *
+ * ```
+ * @NgModule({
+ *  imports: [
+ *   RouterModule.forRoot(SOME_ROUTES),
+ *   UpgradeModule
+ * ],
+ * providers: [
+ *   RouterUpgradeInitializer
+ * ]
+ * })
+ * export class AppModule {
+ *   ngDoBootstrap() {}
+ * }
+ * ```
+ *
+ * @experimental
+ */
+export const RouterUpgradeInitializer = {
+  provide: APP_BOOTSTRAP_LISTENER,
+  multi: true,
+  useFactory: locationSyncBootstrapListener,
+  deps: [UpgradeModule]
+};
+
+/**
+ * @internal
+ */
+export function locationSyncBootstrapListener(ngUpgrade: UpgradeModule) {
+  return () => { setUpLocationSync(ngUpgrade); };
+}
+
+/**
+ * @whatItDoes Sets up a location synchronization.
+ *
+ * History.pushState does not fire onPopState, so the angular2 location
+ * doesn't detect it. The workaround is to attach a location change listener
+ *
+ * @experimental
+ */
+export function setUpLocationSync(ngUpgrade: UpgradeModule) {
+  if (!ngUpgrade.$injector) {
+    throw new Error(`
+        RouterUpgradeInitializer can be used only after UpgradeModule.bootstrap has been called.
+        Remove RouterUpgradeInitializer and call setUpLocationSync after UpgradeModule.bootstrap.
+      `);
+  }
+
+  const router: Router = ngUpgrade.injector.get(Router);
+  const url = document.createElement('a');
+
+  ngUpgrade.$injector.get('$rootScope')
+      .$on('$locationChangeStart', (_: any, next: string, __: string) => {
+        url.href = next;
+        router.navigateByUrl(url.pathname);
+      });
+}

packages/router/upgrade/tsconfig-build.json

@@ -1,16 +1,15 @@
 {
-  "extends": "./tsconfig-build",
+  "extends": "../tsconfig-build",
   "compilerOptions": {
-    "outDir": "../../../dist/packages-dist/router/upgrade",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core"],
-      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
-      "@angular/router": ["../../../dist/packages-dist/router"],
-      "@angular/upgrade/static": ["../../../dist/packages-dist/upgrade/static"]
+      "@angular/core": ["../../dist/packages/core"],
+      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
+      "@angular/router": ["../../dist/packages/router"],
+      "@angular/upgrade/static": ["../../dist/packages/upgrade/static"]
     }
   },
   "files": [
-    "upgrade.ts"
+    "index.ts"
   ],
   "angularCompilerOptions": {
     "strictMetadataEmit": true