refactor(core): Remove hybrid mode flag

this flag is not used anymore so it's being removed
atscott · May 7, 2024 · 5e705f8 · 5e705f8
1 parent 67bb310
commit 5e705f8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/packages/core/src/application/create_application.ts b/packages/core/src/application/create_application.ts
@@ -26,6 +26,8 @@ import {NgZone} from '../zone/ng_zone';
 
 import {ApplicationInitStatus} from './application_init';
 import {_callAndReportToErrorHandler, ApplicationRef} from './application_ref';
+import {ChangeDetectionScheduler} from '../change_detection/scheduling/zoneless_scheduling';
+import {ChangeDetectionSchedulerImpl} from '../change_detection/scheduling/zoneless_scheduling_impl';
 
 /**
  * Internal create application API that implements the core application creation logic and optional
@@ -55,7 +57,11 @@ export function internalCreateApplication(config: {
 
     // Create root application injector based on a set of providers configured at the platform
     // bootstrap level as well as providers passed to the bootstrap call by a user.
-    const allAppProviders = [provideZoneChangeDetection(), ...(appProviders || [])];
+    const allAppProviders = [
+      provideZoneChangeDetection(),
+      {provide: ChangeDetectionScheduler, useExisting: ChangeDetectionSchedulerImpl},
+      ...(appProviders || []),
+    ];
     const adapter = new EnvironmentNgModuleRefAdapter({
       providers: allAppProviders,
       parent: platformInjector as EnvironmentInjector,

diff --git a/packages/core/src/change_detection/scheduling/flags.ts b/packages/core/src/change_detection/scheduling/flags.ts
diff --git a/packages/core/src/change_detection/scheduling/ng_zone_scheduling.ts b/packages/core/src/change_detection/scheduling/ng_zone_scheduling.ts
@@ -25,7 +25,6 @@ import {performanceMarkFeature} from '../../util/performance';
 import {NgZone} from '../../zone';
 import {InternalNgZoneOptions} from '../../zone/ng_zone';
 
-import {alwaysProvideZonelessScheduler} from './flags';
 import {ChangeDetectionScheduler, ZONELESS_SCHEDULER_DISABLED} from './zoneless_scheduling';
 import {ChangeDetectionSchedulerImpl} from './zoneless_scheduling_impl';
 
@@ -113,11 +112,6 @@ export function internalProvideZoneChangeDetection({
     // Always disable scheduler whenever explicitly disabled, even if another place called
     // `provideZoneChangeDetection` without the 'ignore' option.
     ignoreChangesOutsideZone === true ? {provide: ZONELESS_SCHEDULER_DISABLED, useValue: true} : [],
-    // TODO(atscott): This should move to the same places that zone change detection is provided by
-    // default instead of being in the zone scheduling providers.
-    alwaysProvideZonelessScheduler || ignoreChangesOutsideZone === false
-      ? {provide: ChangeDetectionScheduler, useExisting: ChangeDetectionSchedulerImpl}
-      : [],
   ];
 }
 

diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
@@ -21,6 +21,7 @@ export {
   defaultIterableDiffers as ɵdefaultIterableDiffers,
   defaultKeyValueDiffers as ɵdefaultKeyValueDiffers,
 } from './change_detection/change_detection';
+export {ChangeDetectionSchedulerImpl as ɵChangeDetectionSchedulerImpl} from './change_detection/scheduling/zoneless_scheduling_impl';
 export {
   ChangeDetectionScheduler as ɵChangeDetectionScheduler,
   NotificationSource as ɵNotificationSource,

diff --git a/packages/core/testing/src/test_bed_compiler.ts b/packages/core/testing/src/test_bed_compiler.ts
@@ -9,6 +9,8 @@
 import {ResourceLoader} from '@angular/compiler';
 import {
   ApplicationInitStatus,
+  ɵChangeDetectionScheduler as ChangeDetectionScheduler,
+  ɵChangeDetectionSchedulerImpl as ChangeDetectionSchedulerImpl,
   Compiler,
   COMPILER_OPTIONS,
   Component,
@@ -927,7 +929,11 @@ export class TestBedCompiler {
   private compileTestModule(): void {
     class RootScopeModule {}
     compileNgModuleDefs(RootScopeModule as NgModuleType<any>, {
-      providers: [...this.rootProviderOverrides, provideZoneChangeDetection()],
+      providers: [
+        ...this.rootProviderOverrides,
+        provideZoneChangeDetection(),
+        {provide: ChangeDetectionScheduler, useExisting: ChangeDetectionSchedulerImpl},
+      ],
     });
 
     const providers = [

diff --git a/packages/platform-browser/testing/src/browser.ts b/packages/platform-browser/testing/src/browser.ts
@@ -15,6 +15,8 @@ import {
   platformCore,
   provideZoneChangeDetection,
   StaticProvider,
+  ɵChangeDetectionScheduler as ChangeDetectionScheduler,
+  ɵChangeDetectionSchedulerImpl as ChangeDetectionSchedulerImpl,
 } from '@angular/core';
 import {BrowserModule, ɵBrowserDomAdapter as BrowserDomAdapter} from '@angular/platform-browser';
 
@@ -47,6 +49,7 @@ export const platformBrowserTesting = createPlatformFactory(
   providers: [
     {provide: APP_ID, useValue: 'a'},
     provideZoneChangeDetection(),
+    {provide: ChangeDetectionScheduler, useExisting: ChangeDetectionSchedulerImpl},
     {provide: PlatformLocation, useClass: MockPlatformLocation},
   ],
 })