refactor(core): generate a static application ID (#49422)

alan-agius4 · alxhub · commit 82d6fbb10949 · 2023-03-15T17:08:17.000-07:00
Prior to this change, a random application ID was generated each time which forced users using server rendering to provide an application ID themselves. This was needed to handle rare cases when multiple Angular applications are rendered on the same page. With this change the application ID is no longer generated randomly and instead it is hard coded. BREAKING CHANGE: The `APP_ID` token value is no longer randomly generated. If you are bootstrapping multiple application on the same page you will need to set to provide the `APP_ID` yourself. ```ts bootstrapApplication(ComponentA, { providers: [ { provide: APP_ID, useValue: 'app-a' }, // ... other providers ... ] }); ``` PR Close #49422
diff --git a/packages/core/src/application_tokens.ts b/packages/core/src/application_tokens.ts
@@ -9,35 +9,32 @@
 import {InjectionToken} from './di/injection_token';
 
 /**
- * A [DI token](guide/glossary#di-token "DI token definition") representing a unique string ID, used
+ * A [DI token](guide/glossary#di-token "DI token definition") representing a string ID, used
  * primarily for prefixing application attributes and CSS styles when
  * {@link ViewEncapsulation#Emulated ViewEncapsulation.Emulated} is being used.
  *
- * BY default, the value is randomly generated and assigned to the application by Angular.
- * To provide a custom ID value, use a DI provider <!-- TODO: provider --> to configure
- * the root {@link Injector} that uses this token.
  * The token is needed in cases when multiple applications are bootstrapped on a page
  * (for example, using `bootstrapApplication` calls). In this case, ensure that those applications
  * have different `APP_ID` value setup. For example:
  *
  * ```
  * bootstrapApplication(ComponentA, {
  *   providers: [
- *     {provide: APP_ID, useValue: 'app-a'},
+ *     { provide: APP_ID, useValue: 'app-a' },
  *     // ... other providers ...
  *   ]
  * });
  *
  * bootstrapApplication(ComponentB, {
  *   providers: [
- *     {provide: APP_ID, useValue: 'app-b'},
+ *     { provide: APP_ID, useValue: 'app-b' },
  *     // ... other providers ...
  *   ]
  * });
  * ```
  *
- * By default, when there is only 1 application bootstrapped, you don't need to provide the `APP_ID`
- * token (the `ng` will be used as an app ID).
+ * By default, when there is only one application bootstrapped, you don't need to provide the
+ * `APP_ID` token (the `ng` will be used as an app ID).
  *
  * @publicApi
  */
diff --git a/packages/core/src/core_private_export.ts b/packages/core/src/core_private_export.ts
@@ -7,7 +7,6 @@
  */
 
 export {ALLOW_MULTIPLE_PLATFORMS as ɵALLOW_MULTIPLE_PLATFORMS, internalCreateApplication as ɵinternalCreateApplication, provideNgZoneChangeDetection as ɵprovideNgZoneChangeDetection} from './application_ref';
-export {APP_ID_RANDOM_PROVIDER as ɵAPP_ID_RANDOM_PROVIDER} from './application_tokens';
 export {defaultIterableDiffers as ɵdefaultIterableDiffers, defaultKeyValueDiffers as ɵdefaultKeyValueDiffers} from './change_detection/change_detection';
 export {Console as ɵConsole} from './console';
 export {convertToBitFlags as ɵconvertToBitFlags, setCurrentInjector as ɵsetCurrentInjector} from './di/injector_compatibility';
diff --git a/packages/core/test/bundling/animations/bundle.golden_symbols.json b/packages/core/test/bundling/animations/bundle.golden_symbols.json
@@ -659,9 +659,6 @@
   {
     "name": "_query"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -485,9 +485,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -668,9 +668,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -656,9 +656,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/router/bundle.golden_symbols.json b/packages/core/test/bundling/router/bundle.golden_symbols.json
@@ -860,9 +860,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json b/packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json
@@ -446,9 +446,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -578,9 +578,6 @@
   {
     "name": "_processI18nInsertBefore"
   },
-  {
-    "name": "_randomChar"
-  },
   {
     "name": "_retrieveHydrationInfoImpl"
   },
diff --git a/packages/platform-server/src/utils.ts b/packages/platform-server/src/utils.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_ID, ApplicationRef, EnvironmentProviders, importProvidersFrom, InjectionToken, NgModuleRef, PlatformRef, Provider, Renderer2, StaticProvider, Type, ɵannotateForHydration as annotateForHydration, ɵgetComponentDef as getComponentDef, ɵinternalCreateApplication as internalCreateApplication, ɵIS_HYDRATION_FEATURE_ENABLED as IS_HYDRATION_FEATURE_ENABLED, ɵisPromise} from '@angular/core';
+import {ApplicationRef, EnvironmentProviders, importProvidersFrom, InjectionToken, NgModuleRef, PlatformRef, Provider, Renderer2, StaticProvider, Type, ɵannotateForHydration as annotateForHydration, ɵgetComponentDef as getComponentDef, ɵinternalCreateApplication as internalCreateApplication, ɵIS_HYDRATION_FEATURE_ENABLED as IS_HYDRATION_FEATURE_ENABLED, ɵisPromise} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {first} from 'rxjs/operators';
 
@@ -49,12 +49,6 @@ function _render<T>(
     bootstrapPromise: Promise<NgModuleRef<T>|ApplicationRef>): Promise<string> {
   return bootstrapPromise.then((moduleOrApplicationRef) => {
     const environmentInjector = moduleOrApplicationRef.injector;
-    const transitionId = environmentInjector.get(APP_ID, null);
-    if (!transitionId) {
-      throw new Error(
-          `renderModule[Factory]() requires the use of BrowserModule.withServerTransition() to ensure
-the server-rendered app can be properly bootstrapped into a client app.`);
-    }
     const applicationRef: ApplicationRef = moduleOrApplicationRef instanceof ApplicationRef ?
         moduleOrApplicationRef :
         environmentInjector.get(ApplicationRef);

Original file line number	Diff line number	Diff line change
`@@ -659,9 +659,6 @@`
`659`	`659`	`{`
`660`	`660`	`"name": "_query"`
`661`	`661`	`},`
`662`		`- {`
`663`		`- "name": "_randomChar"`
`664`		`- },`
`665`	`662`	`{`
`666`	`663`	`"name": "_retrieveHydrationInfoImpl"`
`667`	`664`	`},`
Original file line number	Diff line number	Diff line change
`@@ -485,9 +485,6 @@`
`485`	`485`	`{`
`486`	`486`	`"name": "_processI18nInsertBefore"`
`487`	`487`	`},`
`488`		`- {`
`489`		`- "name": "_randomChar"`
`490`		`- },`
`491`	`488`	`{`
`492`	`489`	`"name": "_retrieveHydrationInfoImpl"`
`493`	`490`	`},`
Original file line number	Diff line number	Diff line change
`@@ -668,9 +668,6 @@`
`668`	`668`	`{`
`669`	`669`	`"name": "_processI18nInsertBefore"`
`670`	`670`	`},`
`671`		`- {`
`672`		`- "name": "_randomChar"`
`673`		`- },`
`674`	`671`	`{`
`675`	`672`	`"name": "_retrieveHydrationInfoImpl"`
`676`	`673`	`},`
Original file line number	Diff line number	Diff line change
`@@ -656,9 +656,6 @@`
`656`	`656`	`{`
`657`	`657`	`"name": "_processI18nInsertBefore"`
`658`	`658`	`},`
`659`		`- {`
`660`		`- "name": "_randomChar"`
`661`		`- },`
`662`	`659`	`{`
`663`	`660`	`"name": "_retrieveHydrationInfoImpl"`
`664`	`661`	`},`
Original file line number	Diff line number	Diff line change
`@@ -860,9 +860,6 @@`
`860`	`860`	`{`
`861`	`861`	`"name": "_processI18nInsertBefore"`
`862`	`862`	`},`
`863`		`- {`
`864`		`- "name": "_randomChar"`
`865`		`- },`
`866`	`863`	`{`
`867`	`864`	`"name": "_retrieveHydrationInfoImpl"`
`868`	`865`	`},`
Original file line number	Diff line number	Diff line change
`@@ -446,9 +446,6 @@`
`446`	`446`	`{`
`447`	`447`	`"name": "_processI18nInsertBefore"`
`448`	`448`	`},`
`449`		`- {`
`450`		`- "name": "_randomChar"`
`451`		`- },`
`452`	`449`	`{`
`453`	`450`	`"name": "_retrieveHydrationInfoImpl"`
`454`	`451`	`},`
Original file line number	Diff line number	Diff line change
`@@ -578,9 +578,6 @@`
`578`	`578`	`{`
`579`	`579`	`"name": "_processI18nInsertBefore"`
`580`	`580`	`},`
`581`		`- {`
`582`		`- "name": "_randomChar"`
`583`		`- },`
`584`	`581`	`{`
`585`	`582`	`"name": "_retrieveHydrationInfoImpl"`
`586`	`583`	`},`