angular · alan-agius4 · Jun 5, 2023
diff --git a/goldens/size-tracking/integration-payloads.json b/goldens/size-tracking/integration-payloads.json
@@ -2,7 +2,7 @@
   "cli-hello-world": {
     "uncompressed": {
       "runtime": 908,
-      "main": 129295,
+      "main": 134468,
       "polyfills": 33792
     }
   },
@@ -24,14 +24,14 @@
   "forms": {
     "uncompressed": {
       "runtime": 888,
-      "main": 160778,
+      "main": 166256,
       "polyfills": 33772
     }
   },
   "animations": {
     "uncompressed": {
       "runtime": 898,
-      "main": 159461,
+      "main": 164757,
       "polyfills": 33782
     }
   },
@@ -56,4 +56,4 @@
       "polyfills": 33802
     }
   }
-}
+}
diff --git a/integration/platform-server/e2e/src/http-transferstate-lazy-on-init-spec.ts b/integration/platform-server/e2e/src/http-transferstate-lazy-on-init-spec.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {browser, by, element} from 'protractor';
+import {bootstrapClientApp, navigateTo, verifyNoBrowserErrors} from './util';
+
+describe('Http TransferState Lazy On Init', () => {
+  beforeEach(async () => {
+    // Don't wait for Angular since it is not bootstrapped automatically.
+    await browser.waitForAngularEnabled(false);
+
+    // Load the page without waiting for Angular since it is not bootstrapped automatically.
+    await navigateTo('http-transferstate-lazy-on-init');
+  });
+
+  afterEach(async () => {
+    // Make sure there were no client side errors.
+    await verifyNoBrowserErrors();
+  });
+
+  it('should transfer http state in lazy component', async () => {
+    // Test the contents from the server.
+    expect(await element(by.css('div.one')).getText()).toBe('API 1 response');
+
+    // Bootstrap the client side app and retest the contents
+    await bootstrapClientApp();
+    expect(await element(by.css('div.one')).getText()).toBe('API 1 response');
+
+    // Validate that there were no HTTP calls to '/api'.
+    const requests = await browser.executeScript(() => {
+      return performance.getEntriesByType('resource');
+    });
+    const apiRequests = (requests as {name: string}[])
+      .filter(({name}) => name.includes('/api'))
+      .map(({name}) => name);
+
+    expect(apiRequests).toEqual([]);
+  });
+});
diff --git a/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts b/integration/platform-server/projects/ngmodule/src/app/app-routing.module.ts
@@ -19,6 +19,13 @@ const routes: Routes = [
         (m) => m.HttpTransferStateModule
       ),
   },
+  {
+    path: 'http-transferstate-lazy-on-init',
+    loadChildren: () =>
+      import('./http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.module').then(
+        (m) => m.HttpTransferStateOnInitModule
+      ),
+  },
 ];
 
 @NgModule({

diff --git a/...dule/src/app/http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.component.ts b/...dule/src/app/http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.component.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {HttpClient} from '@angular/common/http';
+import {Component, OnInit} from '@angular/core';
+
+@Component({
+  selector: 'transfer-state-http-on-init',
+  template: ` <div class="one">{{ responseOne }}</div> `,
+})
+export class TransferStateComponentOnInit implements OnInit {
+  responseOne: string = '';
+
+  constructor(private readonly httpClient: HttpClient) {}
+
+  ngOnInit(): void {
+    // Test that HTTP cache works when HTTP call is made in a lifecycle hook.
+    this.httpClient.get<any>('http://localhost:4206/api').subscribe((response) => {
+      this.responseOne = response.data;
+    });
+  }
+}
diff --git a/...gmodule/src/app/http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.module.ts b/...gmodule/src/app/http-transferstate-lazy-on-init/http-transferstate-lazy-on-init.module.ts
@@ -0,0 +1,18 @@
+import {CommonModule} from '@angular/common';
+import {HttpClientModule} from '@angular/common/http';
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {TransferStateComponentOnInit} from './http-transferstate-lazy-on-init.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: TransferStateComponentOnInit,
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes), HttpClientModule, CommonModule],
+  declarations: [TransferStateComponentOnInit],
+})
+export class HttpTransferStateOnInitModule {}
diff --git a/integration/platform-server/projects/standalone/src/app/app.routes.ts b/integration/platform-server/projects/standalone/src/app/app.routes.ts
@@ -18,4 +18,11 @@ export const routes: Routes = [
         (c) => c.TransferStateComponent
       ),
   },
+  {
+    path: 'http-transferstate-lazy-on-init',
+    loadComponent: () =>
+      import('./http-transferstate-lazy-on-init/http-transfer-state-on-init.component').then(
+        (c) => c.TransferStateOnInitComponent
+      ),
+  },
 ];
diff --git a/...andalone/src/app/http-transferstate-lazy-on-init/http-transfer-state-on-init.component.ts b/...andalone/src/app/http-transferstate-lazy-on-init/http-transfer-state-on-init.component.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {HttpClient} from '@angular/common/http';
+import {Component, OnInit} from '@angular/core';
+
+@Component({
+  selector: 'transfer-state-http',
+  standalone: true,
+  template: ` <div class="one">{{ responseOne }}</div> `,
+  providers: [HttpClient],
+})
+export class TransferStateOnInitComponent implements OnInit {
+  responseOne: string = '';
+
+  constructor(private readonly httpClient: HttpClient) {}
+
+  ngOnInit(): void {
+    // Test that HTTP cache works when HTTP call is made in a lifecycle hook.
+    this.httpClient.get<any>('http://localhost:4206/api').subscribe((response) => {
+      this.responseOne = response.data;
+    });
+  }
+}
diff --git a/packages/core/src/application_ref.ts b/packages/core/src/application_ref.ts
@@ -9,7 +9,7 @@
 import './util/ng_jit_mode';
 
 import {Observable, of, Subscription} from 'rxjs';
-import {distinctUntilChanged, mergeMap, share} from 'rxjs/operators';
+import {distinctUntilChanged, share, switchMap} from 'rxjs/operators';
 
 import {ApplicationInitStatus} from './application_init';
 import {PLATFORM_INITIALIZER} from './application_tokens';
@@ -847,7 +847,7 @@ export class ApplicationRef {
   public readonly isStable: Observable<boolean> =
       inject(InitialRenderPendingTasks)
           .hasPendingTasks.pipe(
-              mergeMap(hasPendingTasks => hasPendingTasks ? of(false) : this.zoneIsStable),
+              switchMap(hasPendingTasks => hasPendingTasks ? of(false) : this.zoneIsStable),
               distinctUntilChanged(),
               share(),
           );

diff --git a/packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json b/packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json
@@ -500,6 +500,12 @@
   {
     "name": "Subscription"
   },
+  {
+    "name": "SwitchMapOperator"
+  },
+  {
+    "name": "SwitchMapSubscriber"
+  },
   {
     "name": "TESTABILITY"
   },
@@ -863,6 +869,9 @@
   {
     "name": "forwardRef"
   },
+  {
+    "name": "from"
+  },
   {
     "name": "fromArray"
   },
@@ -1046,6 +1055,9 @@
   {
     "name": "injectableDefOrInjectorDefFactory"
   },
+  {
+    "name": "innerSubscribe"
+  },
   {
     "name": "insertBloom"
   },
@@ -1187,6 +1199,9 @@
   {
     "name": "makeTimingAst"
   },
+  {
+    "name": "map"
+  },
   {
     "name": "markAsComponentHost"
   },
@@ -1199,6 +1214,9 @@
   {
     "name": "maybeWrapInNotSelector"
   },
+  {
+    "name": "mergeAll"
+  },
   {
     "name": "mergeHostAttribute"
   },
@@ -1421,6 +1439,9 @@
   {
     "name": "subscribeToArray"
   },
+  {
+    "name": "switchMap"
+  },
   {
     "name": "throwProviderNotFoundError"
   },

diff --git a/packages/core/test/bundling/animations/bundle.golden_symbols.json b/packages/core/test/bundling/animations/bundle.golden_symbols.json
@@ -542,6 +542,12 @@
   {
     "name": "Subscription"
   },
+  {
+    "name": "SwitchMapOperator"
+  },
+  {
+    "name": "SwitchMapSubscriber"
+  },
   {
     "name": "TESTABILITY"
   },
@@ -926,6 +932,9 @@
   {
     "name": "forwardRef"
   },
+  {
+    "name": "from"
+  },
   {
     "name": "fromArray"
   },
@@ -1112,6 +1121,9 @@
   {
     "name": "injectableDefOrInjectorDefFactory"
   },
+  {
+    "name": "innerSubscribe"
+  },
   {
     "name": "insertBloom"
   },
@@ -1253,6 +1265,9 @@
   {
     "name": "makeTimingAst"
   },
+  {
+    "name": "map"
+  },
   {
     "name": "markAsComponentHost"
   },
@@ -1265,6 +1280,9 @@
   {
     "name": "maybeWrapInNotSelector"
   },
+  {
+    "name": "mergeAll"
+  },
   {
     "name": "mergeHostAttribute"
   },
@@ -1496,6 +1514,9 @@
   {
     "name": "subscribeToArray"
   },
+  {
+    "name": "switchMap"
+  },
   {
     "name": "throwProviderNotFoundError"
   },

diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -407,6 +407,12 @@
   {
     "name": "Subscription"
   },
+  {
+    "name": "SwitchMapOperator"
+  },
+  {
+    "name": "SwitchMapSubscriber"
+  },
   {
     "name": "TESTABILITY"
   },
@@ -701,6 +707,9 @@
   {
     "name": "forwardRef"
   },
+  {
+    "name": "from"
+  },
   {
     "name": "fromArray"
   },
@@ -878,6 +887,9 @@
   {
     "name": "injectableDefOrInjectorDefFactory"
   },
+  {
+    "name": "innerSubscribe"
+  },
   {
     "name": "insertBloom"
   },
@@ -992,6 +1004,9 @@
   {
     "name": "makeRecord"
   },
+  {
+    "name": "map"
+  },
   {
     "name": "markAsComponentHost"
   },
@@ -1004,6 +1019,9 @@
   {
     "name": "maybeWrapInNotSelector"
   },
+  {
+    "name": "mergeAll"
+  },
   {
     "name": "mergeHostAttribute"
   },
@@ -1187,6 +1205,9 @@
   {
     "name": "subscribeToArray"
   },
+  {
+    "name": "switchMap"
+  },
   {
     "name": "throwProviderNotFoundError"
   },