refactor(upgrade): use correct paths for imports (#22167)
`packages/upgrade/static/src` is anymlink to `packages/upgrade/src`. Still, using the correct paths (e.g. using `@angular/upgrade/static/src/...` for `@angula/upgrade/static` specs ensures that the module loader (e.g. SystemJS) can map the imports to the same instances. PR Close #22167
This commit is contained in:
parent
0d248079ba
commit
28240625e6
|
@ -6,8 +6,8 @@
|
||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {Ng1Token} from '@angular/upgrade/src/common/angular1';
|
import {Ng1Token} from '@angular/upgrade/static/src/common/angular1';
|
||||||
import {compileFactory, injectorFactory, parseFactory, rootScopeFactory, setTempInjectorRef} from '@angular/upgrade/src/static/angular1_providers';
|
import {compileFactory, injectorFactory, parseFactory, rootScopeFactory, setTempInjectorRef} from '@angular/upgrade/static/src/static/angular1_providers';
|
||||||
|
|
||||||
{
|
{
|
||||||
describe('upgrade angular1_providers', () => {
|
describe('upgrade angular1_providers', () => {
|
||||||
|
|
|
@ -10,8 +10,8 @@ import {Component, Directive, ElementRef, Injector, Input, NgModule, NgZone, Sim
|
||||||
import {async} from '@angular/core/testing';
|
import {async} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
|
||||||
import {bootstrap, html} from '../test_helpers';
|
import {bootstrap, html} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ import {Component, Directive, ElementRef, Injector, Input, NgModule, destroyPlat
|
||||||
import {async} from '@angular/core/testing';
|
import {async} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
|
||||||
import {bootstrap, html, multiTrim} from '../test_helpers';
|
import {bootstrap, html, multiTrim} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ import {ChangeDetectorRef, Compiler, Component, ComponentFactoryResolver, EventE
|
||||||
import {async, fakeAsync, tick} from '@angular/core/testing';
|
import {async, fakeAsync, tick} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
import {UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
|
||||||
import {$apply, bootstrap, html, multiTrim} from '../test_helpers';
|
import {$apply, bootstrap, html, multiTrim} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ import {async, fakeAsync, tick} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import {browserDetection} from '@angular/platform-browser/testing/src/browser_util';
|
import {browserDetection} from '@angular/platform-browser/testing/src/browser_util';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {$ROOT_SCOPE, INJECTOR_KEY, LAZY_MODULE_REF} from '@angular/upgrade/src/common/constants';
|
|
||||||
import {LazyModuleRef} from '@angular/upgrade/src/common/util';
|
|
||||||
import {downgradeComponent, downgradeModule} from '@angular/upgrade/static';
|
import {downgradeComponent, downgradeModule} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
import {$ROOT_SCOPE, INJECTOR_KEY, LAZY_MODULE_REF} from '@angular/upgrade/static/src/common/constants';
|
||||||
|
import {LazyModuleRef} from '@angular/upgrade/static/src/common/util';
|
||||||
|
|
||||||
import {html, multiTrim} from '../test_helpers';
|
import {html, multiTrim} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ import {Component, Directive, ElementRef, Injector, Input, NgModule, destroyPlat
|
||||||
import {async} from '@angular/core/testing';
|
import {async} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
|
||||||
import {bootstrap, html, multiTrim} from '../test_helpers';
|
import {bootstrap, html, multiTrim} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@ import {InjectionToken, Injector, NgModule, destroyPlatform} from '@angular/core
|
||||||
import {async} from '@angular/core/testing';
|
import {async} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {$INJECTOR, INJECTOR_KEY} from '@angular/upgrade/src/common/constants';
|
|
||||||
import {UpgradeModule, downgradeInjectable, getAngularJSGlobal, setAngularJSGlobal} from '@angular/upgrade/static';
|
import {UpgradeModule, downgradeInjectable, getAngularJSGlobal, setAngularJSGlobal} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
import {$INJECTOR, INJECTOR_KEY} from '@angular/upgrade/static/src/common/constants';
|
||||||
|
|
||||||
import {bootstrap, html} from '../test_helpers';
|
import {bootstrap, html} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,8 @@ import {NgZone} from '@angular/core/src/zone/ng_zone';
|
||||||
import {fakeAsync, tick} from '@angular/core/testing';
|
import {fakeAsync, tick} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {UpgradeModule} from '@angular/upgrade/static';
|
import {UpgradeModule} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
|
||||||
import {bootstrap, html} from '../test_helpers';
|
import {bootstrap, html} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@ import {Component, Directive, ElementRef, ErrorHandler, EventEmitter, Inject, In
|
||||||
import {async, fakeAsync, tick} from '@angular/core/testing';
|
import {async, fakeAsync, tick} from '@angular/core/testing';
|
||||||
import {BrowserModule} from '@angular/platform-browser';
|
import {BrowserModule} from '@angular/platform-browser';
|
||||||
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {$SCOPE} from '@angular/upgrade/src/common/constants';
|
|
||||||
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
import {UpgradeComponent, UpgradeModule, downgradeComponent} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
import {$SCOPE} from '@angular/upgrade/static/src/common/constants';
|
||||||
|
|
||||||
import {$digest, bootstrap, html, multiTrim} from '../test_helpers';
|
import {$digest, bootstrap, html, multiTrim} from '../test_helpers';
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {NgZone, PlatformRef, Type} from '@angular/core';
|
import {NgZone, PlatformRef, Type} from '@angular/core';
|
||||||
import * as angular from '@angular/upgrade/src/common/angular1';
|
|
||||||
import {$ROOT_SCOPE} from '@angular/upgrade/src/common/constants';
|
|
||||||
import {UpgradeModule} from '@angular/upgrade/static';
|
import {UpgradeModule} from '@angular/upgrade/static';
|
||||||
|
import * as angular from '@angular/upgrade/static/src/common/angular1';
|
||||||
|
import {$ROOT_SCOPE} from '@angular/upgrade/static/src/common/constants';
|
||||||
|
|
||||||
export * from '../common/test_helpers';
|
export * from '../common/test_helpers';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue