fixup! fix(common): add upgrade sub-package to ng_package rule for @a…

…ngular/common
angular · Apr 25, 2019 · dbdb0c1 · dbdb0c1
1 parent d0d355f
commit dbdb0c1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json
@@ -10,6 +10,7 @@
     "@angular/platform-browser": "packages-dist:platform-browser",
     "@angular/platform-browser-dynamic": "packages-dist:platform-browser-dynamic",
     "@angular/router": "packages-dist:router",
+    "@angular/upgrade": "packages-dist:upgrade",
     "reflect-metadata": "0.1.12",
     "rxjs": "6.4.0",
     "tslib": "1.9.3",
@@ -30,4 +31,4 @@
     "postinstall": "ngc -p ./angular-metadata.tsconfig.json",
     "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
   }
-}
+}
diff --git a/packages/common/testing/src/mock_platform_location.ts b/packages/common/testing/src/mock_platform_location.ts
@@ -7,7 +7,7 @@
  */
 
 import {LocationChangeEvent, LocationChangeListener, PlatformLocation} from '@angular/common';
-import {Injectable, InjectionToken, Optional} from '@angular/core';
+import {Inject, Injectable, InjectionToken, Optional} from '@angular/core';
 import {Subject} from 'rxjs';
 
 /**
@@ -109,7 +109,8 @@ export class MockPlatformLocation implements PlatformLocation {
     state: unknown
   }[] = [{hostname: '', protocol: '', port: '', pathname: '/', search: '', hash: '', state: null}];
 
-  constructor(@Optional() config?: MockPlatformLocationConfig) {
+  constructor(@Inject(MOCK_PLATFORM_LOCATION_CONFIG) @Optional() config?:
+                  MockPlatformLocationConfig) {
     if (config) {
       this.baseHref = config.appBaseHref || '';
 

diff --git a/packages/common/testing/src/testing.ts b/packages/common/testing/src/testing.ts
@@ -13,4 +13,4 @@
  */
 export {SpyLocation} from './location_mock';
 export {MockLocationStrategy} from './mock_location_strategy';
-export {MockPlatformLocation, MockPlatformLocationConfig} from './mock_platform_location';
+export {MOCK_PLATFORM_LOCATION_CONFIG, MockPlatformLocation, MockPlatformLocationConfig} from './mock_platform_location';
diff --git a/packages/common/upgrade/src/index.ts b/packages/common/upgrade/src/index.ts
@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {$locationShim, $locationShimProvider} from './$location_shim';
+export {$locationShim, $locationShimProvider} from './location_shim';
 export {LOCATION_UPGRADE_CONFIGURATION, LocationUpgradeConfig, LocationUpgradeModule} from './location_upgrade_module';
 export {AngularJSUrlCodec, UrlCodec} from './params';
diff --git a/...ages/common/upgrade/src/$location_shim.ts → packages/common/upgrade/src/location_shim.ts b/...ages/common/upgrade/src/$location_shim.ts → packages/common/upgrade/src/location_shim.ts
diff --git a/packages/common/upgrade/src/location_upgrade_module.ts b/packages/common/upgrade/src/location_upgrade_module.ts
@@ -10,7 +10,7 @@ import {APP_BASE_HREF, CommonModule, HashLocationStrategy, Location, LocationStr
 import {Inject, InjectionToken, ModuleWithProviders, NgModule, Optional} from '@angular/core';
 import {UpgradeModule} from '@angular/upgrade/static';
 
-import {$locationShim, $locationShimProvider} from './$location_shim';
+import {$locationShim, $locationShimProvider} from './location_shim';
 import {AngularJSUrlCodec, UrlCodec} from './params';
 
 

diff --git a/packages/common/upgrade/test/upgrade.spec.ts b/packages/common/upgrade/test/upgrade.spec.ts
@@ -10,7 +10,7 @@ import {CommonModule, PathLocationStrategy} from '@angular/common';
 import {TestBed, inject} from '@angular/core/testing';
 import {UpgradeModule} from '@angular/upgrade/static';
 
-import {$locationShim} from '../src/$location_shim';
+import {$locationShim} from '../src/location_shim';
 
 import {LocationUpgradeTestModule} from './upgrade_location_test_module';
 

diff --git a/packages/common/upgrade/test/upgrade_location_test_module.ts b/packages/common/upgrade/test/upgrade_location_test_module.ts
@@ -11,7 +11,7 @@ import {MockPlatformLocation} from '@angular/common/testing';
 import {Inject, InjectionToken, ModuleWithProviders, NgModule, Optional} from '@angular/core';
 import {UpgradeModule} from '@angular/upgrade/static';
 
-import {$locationShim, $locationShimProvider} from '../src/$location_shim';
+import {$locationShim, $locationShimProvider} from '../src/location_shim';
 import {LocationUpgradeModule} from '../src/location_upgrade_module';
 import {UrlCodec} from '../src/params';