(configured by Angular)
has special things like DomSanitizer => providedIn 'platform' + rootInjector: root EnvironmentInjector
(configured by AppConfig)
has things for your app => bootstrapApplication(..., AppConfig) + nullInjector: NullInjector
always throws an error unless
you use @Optional() direction BT rootInjector --> elementInjector diff --git a/adev/src/content/guide/ngmodules/overview.md b/adev/src/content/guide/ngmodules/overview.md index 9a4e61b7322f..0d538affc5fe 100644 --- a/adev/src/content/guide/ngmodules/overview.md +++ b/adev/src/content/guide/ngmodules/overview.md @@ -152,7 +152,7 @@ boorstrapApplication(MyApplicationRoot, { }); ``` -Similarly, some NgModules may before a static `forChild` that indicates the providers are intended to be added to components within your application hierarchy. +Similarly, some NgModules may define a static `forChild` that indicates the providers are intended to be added to components within your application hierarchy. ```typescript @Component({ diff --git a/adev/src/content/reference/errors/NG0913.md b/adev/src/content/reference/errors/NG0913.md index 083e7664d0d5..7100277a49d0 100644 --- a/adev/src/content/reference/errors/NG0913.md +++ b/adev/src/content/reference/errors/NG0913.md @@ -20,7 +20,7 @@ Use the image URL provided in the console warning to find the `
-
-
@@ -82,15 +78,6 @@ function getRequiredElementById(id: string) {
return element!;
}
-function createEventContractMultiContainer(
- container: Element,
- {stopPropagation = false}: {stopPropagation?: boolean} = {},
-) {
- const eventContractContainerManager = new EventContractMultiContainer(stopPropagation);
- eventContractContainerManager.addContainer(container);
- return eventContractContainerManager;
-}
-
function createEventContract({
eventContractContainerManager,
eventTypes,
@@ -176,45 +163,14 @@ describe('EventContract', () => {
spyOn(Date, 'now').and.returnValue(0);
});
- it('adds event listener after adding container', () => {
- const container = getRequiredElementById('container');
- const container2 = getRequiredElementById('container2');
- const addEventListenerSpy = spyOn(container, 'addEventListener');
- const addEventListenerSpy2 = spyOn(container2, 'addEventListener');
-
- const eventContractContainerManager = new EventContractMultiContainer();
- const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
- eventContract.addEvent('click');
-
- expect(addEventListenerSpy).not.toHaveBeenCalled();
-
- eventContractContainerManager.addContainer(container);
- eventContractContainerManager.addContainer(container2);
-
- const registeredEventTypes = addEventListenerSpy.calls
- .allArgs()
- .map(([eventType]) => eventType);
- expect(registeredEventTypes).toEqual(['click']);
-
- const registeredEventTypes2 = addEventListenerSpy2.calls
- .allArgs()
- .map(([eventType]) => eventType);
- expect(registeredEventTypes2).toEqual(['click']);
- });
-
it('adds event listener to added containers', () => {
const container = getRequiredElementById('container');
- const container2 = getRequiredElementById('container2');
const addEventListenerSpy = spyOn(container, 'addEventListener');
- const addEventListenerSpy2 = spyOn(container2, 'addEventListener');
- const eventContractContainerManager = new EventContractMultiContainer();
+ const eventContractContainerManager = new EventContractContainer(container);
const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
- eventContractContainerManager.addContainer(container);
- eventContractContainerManager.addContainer(container2);
expect(addEventListenerSpy).not.toHaveBeenCalled();
- expect(addEventListenerSpy2).not.toHaveBeenCalled();
eventContract.addEvent('click');
@@ -222,21 +178,15 @@ describe('EventContract', () => {
.allArgs()
.map(([eventType]) => eventType);
expect(registeredEventTypes).toEqual(['click']);
-
- const registeredEventTypes2 = addEventListenerSpy2.calls
- .allArgs()
- .map(([eventType]) => eventType);
- expect(registeredEventTypes2).toEqual(['click']);
});
it('adds event listener for aliased event', () => {
const container = getRequiredElementById('container');
const addEventListenerSpy = spyOn(container, 'addEventListener');
- const eventContractContainerManager = new EventContractMultiContainer();
+ const eventContractContainerManager = new EventContractContainer(container);
const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
eventContract.addEvent('animationend', 'webkitanimationend');
- eventContractContainerManager.addContainer(container);
const registeredEventTypes = addEventListenerSpy.calls
.allArgs()
@@ -248,10 +198,9 @@ describe('EventContract', () => {
const container = getRequiredElementById('container');
const addEventListenerSpy = spyOn(container, 'addEventListener');
- const eventContractContainerManager = new EventContractMultiContainer();
+ const eventContractContainerManager = new EventContractContainer(container);
const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
eventContract.addEvent('touchstart');
- eventContractContainerManager.addContainer(container);
expect(addEventListenerSpy).toHaveBeenCalledOnceWith(
'touchstart',
@@ -264,10 +213,9 @@ describe('EventContract', () => {
const container = getRequiredElementById('container');
const addEventListenerSpy = spyOn(container, 'addEventListener');
- const eventContractContainerManager = new EventContractMultiContainer();
+ const eventContractContainerManager = new EventContractContainer(container);
const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
eventContract.addEvent('touchstart', '', false);
- eventContractContainerManager.addContainer(container);
expect(addEventListenerSpy).toHaveBeenCalledOnceWith('touchstart', jasmine.any(Function), {
capture: false,
@@ -279,10 +227,9 @@ describe('EventContract', () => {
const container = getRequiredElementById('container');
const addEventListenerSpy = spyOn(container, 'addEventListener');
- const eventContractContainerManager = new EventContractMultiContainer();
+ const eventContractContainerManager = new EventContractContainer(container);
const eventContract = createEventContract({eventContractContainerManager, eventTypes: []});
eventContract.addEvent('touchstart', '', true);
- eventContractContainerManager.addContainer(container);
expect(addEventListenerSpy).toHaveBeenCalledOnceWith('touchstart', jasmine.any(Function), {
capture: false,
@@ -447,155 +394,6 @@ describe('EventContract', () => {
expect(clickEvent.preventDefault).not.toHaveBeenCalled();
});
- describe('nested containers', () => {
- let outerContainer: Element;
- let outerTargetElement: Element;
- let innerContainer: Element;
- let innerTargetElement: Element;
-
- beforeEach(() => {
- outerContainer = getRequiredElementById('nested-outer-container');
- outerTargetElement = getRequiredElementById('nested-outer-target-element');
- innerContainer = getRequiredElementById('nested-inner-container');
- innerTargetElement = getRequiredElementById('nested-inner-target-element');
- });
-
- it('dispatches events in outer container', () => {
- const documentListener = jasmine.createSpy('documentListener');
- window.document.documentElement.addEventListener('click', documentListener);
- const dispatcher = createDispatcherSpy();
- const eventContractContainerManager = createEventContractMultiContainer(outerContainer);
- createEventContract({
- eventContractContainerManager,
- eventTypes: ['click'],
- dispatcher,
- });
- eventContractContainerManager.addContainer(innerContainer);
-
- const clickEvent = dispatchMouseEvent(outerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- const eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(outerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
- expect(documentListener).toHaveBeenCalledTimes(1);
- });
-
- it('dispatches events in inner container', () => {
- const documentListener = jasmine.createSpy('documentListener');
- window.document.documentElement.addEventListener('click', documentListener);
- const dispatcher = createDispatcherSpy();
- const eventContractContainerManager = createEventContractMultiContainer(outerContainer);
- createEventContract({
- eventContractContainerManager,
- eventTypes: ['click'],
- dispatcher,
- });
- eventContractContainerManager.addContainer(innerContainer);
-
- const clickEvent = dispatchMouseEvent(innerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- const eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(innerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
- expect(documentListener).toHaveBeenCalledTimes(1);
- });
-
- it('dispatches events in outer container, inner registered first', () => {
- const documentListener = jasmine.createSpy('documentListener');
- window.document.documentElement.addEventListener('click', documentListener);
- const dispatcher = createDispatcherSpy();
- const eventContractContainerManager = createEventContractMultiContainer(innerContainer);
- createEventContract({
- eventContractContainerManager,
- eventTypes: ['click'],
- dispatcher,
- });
- eventContractContainerManager.addContainer(outerContainer);
-
- const clickEvent = dispatchMouseEvent(outerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- const eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(outerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
-
- expect(documentListener).toHaveBeenCalledTimes(1);
- });
-
- it('dispatches events in inner container, inner container registered first', () => {
- const documentListener = jasmine.createSpy('documentListener');
- window.document.documentElement.addEventListener('click', documentListener);
- const dispatcher = createDispatcherSpy();
- const eventContractContainerManager = createEventContractMultiContainer(innerContainer);
- createEventContract({
- eventContractContainerManager,
- eventTypes: ['click'],
- dispatcher,
- });
- eventContractContainerManager.addContainer(outerContainer);
-
- const clickEvent = dispatchMouseEvent(innerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- const eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(innerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
-
- expect(documentListener).toHaveBeenCalledTimes(1);
- });
-
- it('dispatches events in inner container, inner container removed', () => {
- const documentListener = jasmine.createSpy('documentListener');
- window.document.documentElement.addEventListener('click', documentListener);
- const dispatcher = createDispatcherSpy();
- const eventContractContainerManager = createEventContractMultiContainer(outerContainer);
- createEventContract({
- eventContractContainerManager,
- eventTypes: ['click'],
- dispatcher,
- });
- const innerEventContractContainer =
- eventContractContainerManager.addContainer(innerContainer);
-
- let clickEvent = dispatchMouseEvent(innerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- let eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(innerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
-
- expect(documentListener).toHaveBeenCalledTimes(1);
-
- dispatcher.calls.reset();
- documentListener.calls.reset();
-
- eventContractContainerManager.removeContainer(innerEventContractContainer);
-
- clickEvent = dispatchMouseEvent(innerTargetElement);
-
- expect(dispatcher).toHaveBeenCalledTimes(1);
- eventInfoWrapper = getLastDispatchedEventInfoWrapper(dispatcher);
- expect(eventInfoWrapper.getEventType()).toBe('click');
- expect(eventInfoWrapper.getEvent()).toBe(clickEvent);
- expect(eventInfoWrapper.getTargetElement()).toBe(innerTargetElement);
- expect(eventInfoWrapper.getAction()).toBeUndefined();
-
- expect(documentListener).toHaveBeenCalledTimes(1);
- });
- });
-
describe('early events', () => {
it('early events are dispatched', () => {
const container = getRequiredElementById('click-container');
diff --git a/packages/core/rxjs-interop/test/pending_until_event_spec.ts b/packages/core/rxjs-interop/test/pending_until_event_spec.ts
index bf7625769a80..7fffbc306d64 100644
--- a/packages/core/rxjs-interop/test/pending_until_event_spec.ts
+++ b/packages/core/rxjs-interop/test/pending_until_event_spec.ts
@@ -6,7 +6,11 @@
* found in the LICENSE file at https://angular.io/license
*/
-import {EnvironmentInjector, ɵPendingTasks as PendingTasks, ApplicationRef} from '@angular/core';
+import {
+ EnvironmentInjector,
+ ɵPendingTasksInternal as PendingTasks,
+ ApplicationRef,
+} from '@angular/core';
import {
BehaviorSubject,
EMPTY,
diff --git a/packages/core/src/change_detection/differs/default_iterable_differ.ts b/packages/core/src/change_detection/differs/default_iterable_differ.ts
index 5351147a3da2..d37948b1095f 100644
--- a/packages/core/src/change_detection/differs/default_iterable_differ.ts
+++ b/packages/core/src/change_detection/differs/default_iterable_differ.ts
@@ -11,7 +11,7 @@ import {Writable} from '../../interface/type';
import {isListLikeIterable, iterateListLike} from '../../util/iterable';
import {stringify} from '../../util/stringify';
-import {
+import type {
IterableChangeRecord,
IterableChanges,
IterableDiffer,
diff --git a/packages/core/src/change_detection/differs/default_keyvalue_differ.ts b/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
index 2a2c13547e0a..9be4c094d23b 100644
--- a/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
+++ b/packages/core/src/change_detection/differs/default_keyvalue_differ.ts
@@ -10,7 +10,7 @@ import {RuntimeError, RuntimeErrorCode} from '../../errors';
import {isJsObject} from '../../util/iterable';
import {stringify} from '../../util/stringify';
-import {
+import type {
KeyValueChangeRecord,
KeyValueChanges,
KeyValueDiffer,
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
index 9ef6d446bb72..76e14ab5c3a2 100644
--- a/packages/core/src/core_private_export.ts
+++ b/packages/core/src/core_private_export.ts
@@ -103,10 +103,7 @@ export {
resolveComponentResources as ɵresolveComponentResources,
restoreComponentResolutionQueue as ɵrestoreComponentResolutionQueue,
} from './metadata/resource_loading';
-export {
- PendingTasksInternal as ɵPendingTasks, // TODO(atscott): remove once there is a release with PendingTasksInternal so adev can be updated
- PendingTasksInternal as ɵPendingTasksInternal,
-} from './pending_tasks';
+export {PendingTasksInternal as ɵPendingTasksInternal} from './pending_tasks';
export {ALLOW_MULTIPLE_PLATFORMS as ɵALLOW_MULTIPLE_PLATFORMS} from './platform/platform';
export {ReflectionCapabilities as ɵReflectionCapabilities} from './reflection/reflection_capabilities';
export {AnimationRendererType as ɵAnimationRendererType} from './render/api';
diff --git a/packages/core/src/di/jit/injectable.ts b/packages/core/src/di/jit/injectable.ts
index 22693e5987d3..f010d93e4a11 100644
--- a/packages/core/src/di/jit/injectable.ts
+++ b/packages/core/src/di/jit/injectable.ts
@@ -15,7 +15,7 @@ import {Type} from '../../interface/type';
import {NG_FACTORY_DEF} from '../../render3/fields';
import {getClosureSafeProperty} from '../../util/property';
import {resolveForwardRef} from '../forward_ref';
-import {Injectable} from '../injectable';
+import type {Injectable} from '../injectable';
import {NG_PROV_DEF} from '../interface/defs';
import {
ClassSansProvider,
diff --git a/packages/core/src/linker/component_factory.ts b/packages/core/src/linker/component_factory.ts
index c5d127025916..b3eae21cc7cb 100644
--- a/packages/core/src/linker/component_factory.ts
+++ b/packages/core/src/linker/component_factory.ts
@@ -6,14 +6,14 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ChangeDetectorRef} from '../change_detection/change_detection';
-import {Injector} from '../di/injector';
-import {EnvironmentInjector} from '../di/r3_injector';
+import type {ChangeDetectorRef} from '../change_detection/change_detection';
+import type {Injector} from '../di/injector';
+import type {EnvironmentInjector} from '../di/r3_injector';
import {Type} from '../interface/type';
-import {ElementRef} from './element_ref';
-import {NgModuleRef} from './ng_module_factory';
-import {ViewRef} from './view_ref';
+import type {ElementRef} from './element_ref';
+import type {NgModuleRef} from './ng_module_factory';
+import type {ViewRef} from './view_ref';
/**
* Represents a component created by a `ComponentFactory`.
diff --git a/packages/core/src/linker/component_factory_resolver.ts b/packages/core/src/linker/component_factory_resolver.ts
index 20abce0b1e42..e3772a66c926 100644
--- a/packages/core/src/linker/component_factory_resolver.ts
+++ b/packages/core/src/linker/component_factory_resolver.ts
@@ -9,7 +9,7 @@
import {Type} from '../interface/type';
import {stringify} from '../util/stringify';
-import {ComponentFactory} from './component_factory';
+import type {ComponentFactory} from './component_factory';
class _NullComponentFactoryResolver implements ComponentFactoryResolver {
resolveComponentFactory(component: {new (...args: any[]): T}): ComponentFactory {
diff --git a/packages/core/src/metadata/resource_loading.ts b/packages/core/src/metadata/resource_loading.ts
index c17a1ab4f64e..fb36e545965f 100644
--- a/packages/core/src/metadata/resource_loading.ts
+++ b/packages/core/src/metadata/resource_loading.ts
@@ -8,7 +8,7 @@
import {Type} from '../interface/type';
-import {Component} from './directives';
+import type {Component} from './directives';
/**
* Used to resolve resource URLs on `@Component` when used with JIT compilation.
diff --git a/packages/core/src/render3/after_render/manager.ts b/packages/core/src/render3/after_render/manager.ts
index dba8bf559329..8472188da363 100644
--- a/packages/core/src/render3/after_render/manager.ts
+++ b/packages/core/src/render3/after_render/manager.ts
@@ -135,7 +135,7 @@ export class AfterRenderImpl {
protected maybeTrace(fn: () => T, snapshot: TracingSnapshot | null): T {
// Only trace the execution if the snapshot is defined.
- return snapshot?.run(TracingAction.AFTER_NEXT_RENDER, fn) ?? fn();
+ return snapshot ? snapshot.run(TracingAction.AFTER_NEXT_RENDER, fn) : fn();
}
/** @nocollapse */
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index d6a091fc2906..9a22a958927e 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -13,11 +13,10 @@ import {ProviderToken} from '../../di/provider_token';
import {DehydratedView} from '../../hydration/interfaces';
import {SchemaMetadata} from '../../metadata/schema';
import {Sanitizer} from '../../sanitization/sanitizer';
-import type {AfterRenderManager} from '../after_render/manager';
import type {ReactiveLViewConsumer} from '../reactive_lview_consumer';
import type {ViewEffectNode} from '../reactivity/effect';
-import {LContainer} from './container';
+import type {LContainer} from './container';
import {
ComponentDef,
ComponentTemplate,
diff --git a/packages/core/src/render3/jit/directive.ts b/packages/core/src/render3/jit/directive.ts
index bc5c40877542..f51c2f25ea28 100644
--- a/packages/core/src/render3/jit/directive.ts
+++ b/packages/core/src/render3/jit/directive.ts
@@ -18,8 +18,8 @@ import {
import {resolveForwardRef} from '../../di/forward_ref';
import {getReflect, reflectDependencies} from '../../di/jit/util';
import {Type} from '../../interface/type';
-import {Query} from '../../metadata/di';
-import {Component, Directive, Input} from '../../metadata/directives';
+import type {Query} from '../../metadata/di';
+import type {Component, Directive, Input} from '../../metadata/directives';
import {
componentNeedsResolution,
maybeQueueResolutionOfComponentResources,
diff --git a/packages/core/src/render3/jit/module.ts b/packages/core/src/render3/jit/module.ts
index 148800a8b6b7..05ac7a8940c8 100644
--- a/packages/core/src/render3/jit/module.ts
+++ b/packages/core/src/render3/jit/module.ts
@@ -13,13 +13,16 @@ import {
} from '../../compiler/compiler_facade';
import {resolveForwardRef} from '../../di/forward_ref';
import {NG_INJ_DEF} from '../../di/interface/defs';
-import {ModuleWithProviders} from '../../di/interface/provider';
+import type {ModuleWithProviders} from '../../di/interface/provider';
import {reflectDependencies} from '../../di/jit/util';
import {Type} from '../../interface/type';
import {registerNgModuleType} from '../../linker/ng_module_registration';
-import {Component} from '../../metadata/directives';
-import {NgModule} from '../../metadata/ng_module';
-import {NgModuleDef, NgModuleTransitiveScopes, NgModuleType} from '../../metadata/ng_module_def';
+import type {NgModule} from '../../metadata/ng_module';
+import type {
+ NgModuleDef,
+ NgModuleTransitiveScopes,
+ NgModuleType,
+} from '../../metadata/ng_module_def';
import {deepForEach, flatten} from '../../util/array_utils';
import {assertDefined} from '../../util/assert';
import {EMPTY_ARRAY} from '../../util/empty';
@@ -33,7 +36,7 @@ import {
} from '../def_getters';
import {depsTracker, USE_RUNTIME_DEPS_TRACKER_FOR_JIT} from '../deps_tracker/deps_tracker';
import {NG_COMP_DEF, NG_DIR_DEF, NG_FACTORY_DEF, NG_MOD_DEF, NG_PIPE_DEF} from '../fields';
-import {ComponentDef} from '../interfaces/definition';
+import type {ComponentDef} from '../interfaces/definition';
import {maybeUnwrapFn} from '../util/misc_utils';
import {stringifyForError} from '../util/stringify_utils';
diff --git a/packages/core/src/render3/jit/pipe.ts b/packages/core/src/render3/jit/pipe.ts
index 60d832e52fca..e0c1f6c41f77 100644
--- a/packages/core/src/render3/jit/pipe.ts
+++ b/packages/core/src/render3/jit/pipe.ts
@@ -13,7 +13,7 @@ import {
} from '../../compiler/compiler_facade';
import {reflectDependencies} from '../../di/jit/util';
import {Type} from '../../interface/type';
-import {Pipe} from '../../metadata/directives';
+import type {Pipe} from '../../metadata/directives';
import {NG_FACTORY_DEF, NG_PIPE_DEF} from '../fields';
import {angularCoreEnv} from './environment';
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
index ba4000656253..e871ac5fd078 100644
--- a/packages/core/src/render3/view_ref.ts
+++ b/packages/core/src/render3/view_ref.ts
@@ -6,11 +6,11 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ChangeDetectorRef} from '../change_detection/change_detector_ref';
+import type {ChangeDetectorRef} from '../change_detection/change_detector_ref';
import {NotificationSource} from '../change_detection/scheduling/zoneless_scheduling';
import type {ApplicationRef} from '../core';
import {RuntimeError, RuntimeErrorCode} from '../errors';
-import {EmbeddedViewRef} from '../linker/view_ref';
+import type {EmbeddedViewRef} from '../linker/view_ref';
import {removeFromArray} from '../util/array_utils';
import {assertEqual} from '../util/assert';
diff --git a/packages/core/test/defer_fixture_spec.ts b/packages/core/test/defer_fixture_spec.ts
index e43b4a3d1268..9a84c8c26a8a 100644
--- a/packages/core/test/defer_fixture_spec.ts
+++ b/packages/core/test/defer_fixture_spec.ts
@@ -7,7 +7,7 @@
*/
import {ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
-import {Component, PLATFORM_ID, ɵPendingTasks as PendingTasks} from '@angular/core';
+import {Component, PLATFORM_ID, ɵPendingTasksInternal as PendingTasks} from '@angular/core';
import {DeferBlockBehavior, DeferBlockState, TestBed} from '@angular/core/testing';
import {expect} from '@angular/platform-browser/testing/src/matchers';
diff --git a/packages/core/testing/src/component_fixture.ts b/packages/core/testing/src/component_fixture.ts
index 7a01006c3740..4c4e773acbee 100644
--- a/packages/core/testing/src/component_fixture.ts
+++ b/packages/core/testing/src/component_fixture.ts
@@ -23,7 +23,7 @@ import {
ɵgetDeferBlocks as getDeferBlocks,
ɵNoopNgZone as NoopNgZone,
ɵZONELESS_ENABLED as ZONELESS_ENABLED,
- ɵPendingTasks as PendingTasks,
+ ɵPendingTasksInternal as PendingTasks,
ɵEffectScheduler as EffectScheduler,
ɵMicrotaskEffectScheduler as MicrotaskEffectScheduler,
} from '@angular/core';
diff --git a/packages/platform-browser/src/dom/shared_styles_host.ts b/packages/platform-browser/src/dom/shared_styles_host.ts
index b34ed4c0da4c..d9829e1f9455 100644
--- a/packages/platform-browser/src/dom/shared_styles_host.ts
+++ b/packages/platform-browser/src/dom/shared_styles_host.ts
@@ -57,22 +57,31 @@ function createStyleElement(style: string, doc: Document): HTMLStyleElement {
* identifier attribute (`ng-app-id`) to the provide identifier and adds usage records for each.
* @param doc An HTML DOM document instance.
* @param appId A string containing an Angular application identifer.
- * @param usages A Map object for tracking style usage.
+ * @param inline A Map object for tracking inline (defined via `styles` in component decorator) style usage.
+ * @param external A Map object for tracking external (defined via `styleUrls` in component decorator) style usage.
*/
function addServerStyles(
doc: Document,
appId: string,
- usages: Map>,
+ inline: Map>,
+ external: Map>,
): void {
- const styleElements = doc.head?.querySelectorAll(
- `style[${APP_ID_ATTRIBUTE_NAME}="${appId}"]`,
+ const elements = doc.head?.querySelectorAll(
+ `style[${APP_ID_ATTRIBUTE_NAME}="${appId}"],link[${APP_ID_ATTRIBUTE_NAME}="${appId}"]`,
);
- if (styleElements) {
- for (const styleElement of styleElements) {
- if (styleElement.textContent) {
- styleElement.removeAttribute(APP_ID_ATTRIBUTE_NAME);
- usages.set(styleElement.textContent, {usage: 0, elements: [styleElement]});
+ if (elements) {
+ for (const styleElement of elements) {
+ styleElement.removeAttribute(APP_ID_ATTRIBUTE_NAME);
+ if (styleElement instanceof HTMLLinkElement) {
+ // Only use filename from href
+ // The href is build time generated with a unique value to prevent duplicates.
+ external.set(styleElement.href.slice(styleElement.href.lastIndexOf('/') + 1), {
+ usage: 0,
+ elements: [styleElement],
+ });
+ } else if (styleElement.textContent) {
+ inline.set(styleElement.textContent, {usage: 0, elements: [styleElement]});
}
}
}
@@ -123,7 +132,7 @@ export class SharedStylesHost implements OnDestroy {
@Inject(PLATFORM_ID) platformId: object = {},
) {
this.isServer = isPlatformServer(platformId);
- addServerStyles(doc, appId, this.inline);
+ addServerStyles(doc, appId, this.inline, this.external);
this.hosts.add(doc.head);
}
diff --git a/packages/platform-browser/test/dom/shared_styles_host_spec.ts b/packages/platform-browser/test/dom/shared_styles_host_spec.ts
index 38ffd2765ef3..04a19937a009 100644
--- a/packages/platform-browser/test/dom/shared_styles_host_spec.ts
+++ b/packages/platform-browser/test/dom/shared_styles_host_spec.ts
@@ -61,6 +61,18 @@ describe('SharedStylesHost', () => {
ssh.addHost(someHost);
expect(someHost.innerHTML).toEqual('');
});
+
+ it(`should reuse SSR generated element`, () => {
+ const style = doc.createElement('style');
+ style.setAttribute('ng-app-id', 'app-id');
+ style.textContent = 'a {};';
+ doc.head.appendChild(style);
+
+ ssh = new SharedStylesHost(doc, 'app-id');
+ ssh.addStyles(['a {};']);
+ expect(doc.head.innerHTML).toContain('');
+ expect(doc.head.innerHTML).not.toContain('ng-app-id');
+ });
});
describe('external', () => {
@@ -114,5 +126,20 @@ describe('SharedStylesHost', () => {
'',
);
});
+
+ it(`should reuse SSR generated element`, () => {
+ const link = doc.createElement('link');
+ link.setAttribute('rel', 'stylesheet');
+ link.setAttribute('href', 'component-1.css');
+ link.setAttribute('ng-app-id', 'app-id');
+ doc.head.appendChild(link);
+
+ ssh = new SharedStylesHost(doc, 'app-id');
+ ssh.addStyles([], ['component-1.css']);
+ expect(doc.head.innerHTML).toContain(
+ '',
+ );
+ expect(doc.head.innerHTML).not.toContain('ng-app-id');
+ });
});
});
diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts
index 89493027f551..4cd59f32e185 100644
--- a/packages/platform-server/test/integration_spec.ts
+++ b/packages/platform-server/test/integration_spec.ts
@@ -40,7 +40,7 @@ import {
TransferState,
Type,
ViewEncapsulation,
- ɵPendingTasks as PendingTasks,
+ ɵPendingTasksInternal as PendingTasks,
APP_INITIALIZER,
inject,
getPlatform,
diff --git a/packages/router/src/components/empty_outlet.ts b/packages/router/src/components/empty_outlet.ts
index 445bca900d12..949d390a3396 100644
--- a/packages/router/src/components/empty_outlet.ts
+++ b/packages/router/src/components/empty_outlet.ts
@@ -25,7 +25,6 @@ export {ɵEmptyOutletComponent as EmptyOutletComponent};
@Component({
template: `;
diff --git a/packages/router/src/directives/router_outlet.ts b/packages/router/src/directives/router_outlet.ts
index 93e46b61697a..50d117e163a9 100644
--- a/packages/router/src/directives/router_outlet.ts
+++ b/packages/router/src/directives/router_outlet.ts
@@ -26,7 +26,6 @@ import {
ɵRuntimeError as RuntimeError,
Signal,
input,
- computed,
} from '@angular/core';
import {combineLatest, of, Subscription} from 'rxjs';
import {switchMap} from 'rxjs/operators';
@@ -206,7 +205,6 @@ export interface RouterOutletContract {
@Directive({
selector: 'router-outlet',
exportAs: 'outlet',
- standalone: true,
})
export class RouterOutlet implements OnDestroy, OnInit, RouterOutletContract {
private activated: ComponentRef | null = null;
diff --git a/packages/router/src/models.ts b/packages/router/src/models.ts
index e692b2e5cf19..96746601d198 100644
--- a/packages/router/src/models.ts
+++ b/packages/router/src/models.ts
@@ -16,8 +16,8 @@ import {
} from '@angular/core';
import {Observable} from 'rxjs';
-import {ActivatedRouteSnapshot, RouterStateSnapshot} from './router_state';
-import {UrlSegment, UrlSegmentGroup, UrlTree} from './url_tree';
+import type {ActivatedRouteSnapshot, RouterStateSnapshot} from './router_state';
+import type {UrlSegment, UrlSegmentGroup, UrlTree} from './url_tree';
/**
* How to handle a navigation request to the current URL. One of:
diff --git a/packages/router/src/navigation_transition.ts b/packages/router/src/navigation_transition.ts
index 60b289143ba1..f209a3a98546 100644
--- a/packages/router/src/navigation_transition.ts
+++ b/packages/router/src/navigation_transition.ts
@@ -81,7 +81,7 @@ import {
RouterState,
RouterStateSnapshot,
} from './router_state';
-import {Params} from './shared';
+import type {Params} from './shared';
import {UrlHandlingStrategy} from './url_handling_strategy';
import {isUrlTree, UrlSerializer, UrlTree} from './url_tree';
import {Checks, getAllRouteGuards} from './utils/preactivation';
diff --git a/packages/router/src/operators/activate_routes.ts b/packages/router/src/operators/activate_routes.ts
index 46e74a8f7494..ff46e0975ab3 100644
--- a/packages/router/src/operators/activate_routes.ts
+++ b/packages/router/src/operators/activate_routes.ts
@@ -10,11 +10,10 @@ import {MonoTypeOperatorFunction} from 'rxjs';
import {map} from 'rxjs/operators';
import {ActivationEnd, ChildActivationEnd, Event} from '../events';
-import {NavigationTransition} from '../navigation_transition';
-import {DetachedRouteHandleInternal, RouteReuseStrategy} from '../route_reuse_strategy';
-import {ChildrenOutletContexts} from '../router_outlet_context';
+import type {NavigationTransition} from '../navigation_transition';
+import type {DetachedRouteHandleInternal, RouteReuseStrategy} from '../route_reuse_strategy';
+import type {ChildrenOutletContexts} from '../router_outlet_context';
import {ActivatedRoute, advanceActivatedRoute, RouterState} from '../router_state';
-import {getClosestRouteInjector} from '../utils/config';
import {nodeChildrenAsMap, TreeNode} from '../utils/tree';
let warnedAboutUnsupportedInputBinding = false;
diff --git a/packages/router/src/operators/check_guards.ts b/packages/router/src/operators/check_guards.ts
index 8b6c9284b83b..c14aeb186272 100644
--- a/packages/router/src/operators/check_guards.ts
+++ b/packages/router/src/operators/check_guards.ts
@@ -29,10 +29,10 @@ import {
CanMatchFn,
Route,
} from '../models';
-import {navigationCancelingError, redirectingNavigationError} from '../navigation_canceling_error';
-import {NavigationTransition} from '../navigation_transition';
-import {ActivatedRouteSnapshot, RouterStateSnapshot} from '../router_state';
-import {isUrlTree, UrlSegment, UrlSerializer, UrlTree} from '../url_tree';
+import {redirectingNavigationError} from '../navigation_canceling_error';
+import type {NavigationTransition} from '../navigation_transition';
+import type {ActivatedRouteSnapshot, RouterStateSnapshot} from '../router_state';
+import {UrlSegment, UrlSerializer} from '../url_tree';
import {wrapIntoObservable} from '../utils/collection';
import {getClosestRouteInjector} from '../utils/config';
import {
diff --git a/packages/router/src/operators/recognize.ts b/packages/router/src/operators/recognize.ts
index 3d13c43997cc..233fc17f5c2b 100644
--- a/packages/router/src/operators/recognize.ts
+++ b/packages/router/src/operators/recognize.ts
@@ -10,11 +10,11 @@ import {EnvironmentInjector, Type} from '@angular/core';
import {MonoTypeOperatorFunction} from 'rxjs';
import {map, mergeMap} from 'rxjs/operators';
-import {Route} from '../models';
-import {NavigationTransition} from '../navigation_transition';
+import type {Route} from '../models';
+import type {NavigationTransition} from '../navigation_transition';
import {recognize as recognizeFn} from '../recognize';
-import {RouterConfigLoader} from '../router_config_loader';
-import {UrlSerializer} from '../url_tree';
+import type {RouterConfigLoader} from '../router_config_loader';
+import type {UrlSerializer} from '../url_tree';
export function recognize(
injector: EnvironmentInjector,
diff --git a/packages/router/src/operators/resolve_data.ts b/packages/router/src/operators/resolve_data.ts
index 771e172856dc..641aabc1a6b4 100644
--- a/packages/router/src/operators/resolve_data.ts
+++ b/packages/router/src/operators/resolve_data.ts
@@ -11,7 +11,7 @@ import {EMPTY, from, MonoTypeOperatorFunction, Observable, of, throwError} from
import {catchError, concatMap, first, map, mapTo, mergeMap, takeLast, tap} from 'rxjs/operators';
import {RedirectCommand, ResolveData} from '../models';
-import {NavigationTransition} from '../navigation_transition';
+import type {NavigationTransition} from '../navigation_transition';
import {
ActivatedRouteSnapshot,
getInherited,
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index a08e68cffb4c..669c43e939d0 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -12,7 +12,7 @@ import {
Injectable,
Type,
ɵConsole as Console,
- ɵPendingTasks as PendingTasks,
+ ɵPendingTasksInternal as PendingTasks,
ɵRuntimeError as RuntimeError,
} from '@angular/core';
import {Observable, Subject, Subscription, SubscriptionLike} from 'rxjs';
diff --git a/packages/router/src/router_outlet_context.ts b/packages/router/src/router_outlet_context.ts
index 59e9cd931253..17bba693125d 100644
--- a/packages/router/src/router_outlet_context.ts
+++ b/packages/router/src/router_outlet_context.ts
@@ -8,7 +8,7 @@
import {ComponentRef, EnvironmentInjector, Injectable} from '@angular/core';
-import {RouterOutletContract} from './directives/router_outlet';
+import type {RouterOutletContract} from './directives/router_outlet';
import {ActivatedRoute} from './router_state';
import {getClosestRouteInjector} from './utils/config';
diff --git a/packages/router/src/shared.ts b/packages/router/src/shared.ts
index f4b31af81b6a..0cfc5924ecf5 100644
--- a/packages/router/src/shared.ts
+++ b/packages/router/src/shared.ts
@@ -6,8 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Route, UrlMatchResult} from './models';
-import {UrlSegment, UrlSegmentGroup} from './url_tree';
+import type {Route, UrlMatchResult} from './models';
+import type {UrlSegment, UrlSegmentGroup} from './url_tree';
/**
* The primary routing outlet.
diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts
index 7d0e3528ac73..877128c8a4f6 100644
--- a/packages/router/test/bootstrap.spec.ts
+++ b/packages/router/test/bootstrap.spec.ts
@@ -150,7 +150,6 @@ describe('bootstrap', () => {
it('should finish navigation when initial navigation is enabledBlocking and component renavigates on render', async () => {
@Component({
template: '',
- standalone: true,
})
class Renavigate {
constructor(router: Router) {
@@ -159,7 +158,6 @@ describe('bootstrap', () => {
}
@Component({
template: '',
- standalone: true,
})
class BlankCmp {}
diff --git a/packages/router/test/create_url_tree.spec.ts b/packages/router/test/create_url_tree.spec.ts
index 81ddda6f4fa0..ec5a79adbe3e 100644
--- a/packages/router/test/create_url_tree.spec.ts
+++ b/packages/router/test/create_url_tree.spec.ts
@@ -642,7 +642,6 @@ describe('createUrlTreeFromSnapshot', async () => {
it('can create a UrlTree relative to empty path named parent', fakeAsync(() => {
@Component({
template: `('');
@Component({
template: '',
- standalone: true,
})
class Child {
constructor() {
@@ -449,7 +433,6 @@ describe('injectors', () => {
@Component({
template: '
simple standalone
', standalone: true})
+@Component({template: 'simple standalone
'})
export class SimpleStandaloneComponent {}
@Component({
template: 'simple standalone
', standalone: true})
+@Component({template: 'simple standalone
'})
export class SimpleStandaloneComponent {}
@Component({template: 'not standalone
', standalone: false})
@@ -19,7 +19,6 @@ export class NotStandaloneComponent {}
@Component({
template: '