refactor(platform-browser): remove internal TRANSITION_ID token (#48253)

alan-agius4 · thePunderWoman · commit 86fc4d3e9825 · 2023-03-09T09:33:34.000-08:00
This was a mirror copy of the `APP_ID` token. PR Close #48253
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
@@ -309,9 +309,11 @@ export function ɵɵdefineComponent<T>(componentDefinition: ComponentDefinition<
       _: null,
       schemas: componentDefinition.schemas || null,
       tView: null,
-      id: getComponentId(def),
+      id: '',
     };
 
+    def.id = getComponentId(def);
+
     initFeatures(def);
     const dependencies = componentDefinition.dependencies;
     def.directiveDefs = extractDefListOrFactory(dependencies, /* pipeDef */ false);
diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json
@@ -350,9 +350,6 @@
   {
     "name": "RuntimeError"
   },
-  {
-    "name": "SERVER_TRANSITION_PROVIDERS"
-  },
   {
     "name": "SIMPLE_CHANGES_STORE"
   },
@@ -410,9 +407,6 @@
   {
     "name": "TRACKED_LVIEWS"
   },
-  {
-    "name": "TRANSITION_ID"
-  },
   {
     "name": "TYPE"
   },
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -491,9 +491,6 @@
   {
     "name": "RuntimeError"
   },
-  {
-    "name": "SERVER_TRANSITION_PROVIDERS"
-  },
   {
     "name": "SIMPLE_CHANGES_STORE"
   },
@@ -557,9 +554,6 @@
   {
     "name": "TRACKED_LVIEWS"
   },
-  {
-    "name": "TRANSITION_ID"
-  },
   {
     "name": "TYPE"
   },
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
@@ -479,9 +479,6 @@
   {
     "name": "RuntimeError"
   },
-  {
-    "name": "SERVER_TRANSITION_PROVIDERS"
-  },
   {
     "name": "SIMPLE_CHANGES_STORE"
   },
@@ -545,9 +542,6 @@
   {
     "name": "TRACKED_LVIEWS"
   },
-  {
-    "name": "TRANSITION_ID"
-  },
   {
     "name": "TYPE"
   },
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -377,9 +377,6 @@
   {
     "name": "RuntimeError"
   },
-  {
-    "name": "SERVER_TRANSITION_PROVIDERS"
-  },
   {
     "name": "SIMPLE_CHANGES_STORE"
   },
@@ -443,16 +440,10 @@
   {
     "name": "TRACKED_LVIEWS"
   },
-  {
-<<<<<<< HEAD
-    "name": "TRANSITION_ID"
-  },
   {
     "name": "TYPE"
   },
   {
-=======
->>>>>>> 0bd0ef957b (fix(core): generate consistent component IDs)
     "name": "TemplateRef"
   },
   {
@@ -1457,4 +1448,4 @@
   {
     "name": "ɵɵtextInterpolate1"
   }
-]
+]
diff --git a/packages/platform-browser/src/browser.ts b/packages/platform-browser/src/browser.ts
@@ -10,7 +10,6 @@ import {CommonModule, DOCUMENT, XhrFactory, ɵPLATFORM_BROWSER_ID as PLATFORM_BR
 import {APP_ID, ApplicationConfig as ApplicationConfigFromCore, ApplicationModule, ApplicationRef, createPlatformFactory, ErrorHandler, Inject, InjectionToken, ModuleWithProviders, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, platformCore, PlatformRef, Provider, RendererFactory2, SkipSelf, StaticProvider, Testability, TestabilityRegistry, Type, ɵINJECTOR_SCOPE as INJECTOR_SCOPE, ɵinternalCreateApplication as internalCreateApplication, ɵsetDocument, ɵTESTABILITY as TESTABILITY, ɵTESTABILITY_GETTER as TESTABILITY_GETTER} from '@angular/core';
 
 import {BrowserDomAdapter} from './browser/browser_adapter';
-import {TRANSITION_ID} from './browser/server-transition';
 import {BrowserGetTestability} from './browser/testability';
 import {BrowserXhr} from './browser/xhr';
 import {DomRendererFactory2, REMOVE_STYLES_ON_COMPONENT_DESTROY} from './dom/dom_renderer';
@@ -252,7 +251,6 @@ export class BrowserModule {
       ngModule: BrowserModule,
       providers: [
         {provide: APP_ID, useValue: params.appId},
-        {provide: TRANSITION_ID, useExisting: APP_ID},
       ],
     };
   }
diff --git a/packages/platform-browser/src/browser/server-transition.ts b/packages/platform-browser/src/browser/server-transition.ts
diff --git a/packages/platform-browser/src/private_export.ts b/packages/platform-browser/src/private_export.ts
@@ -9,7 +9,6 @@
 export {ɵgetDOM} from '@angular/common';
 export {initDomAdapter as ɵinitDomAdapter, INTERNAL_BROWSER_PLATFORM_PROVIDERS as ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS} from './browser';
 export {BrowserDomAdapter as ɵBrowserDomAdapter} from './browser/browser_adapter';
-export {TRANSITION_ID as ɵTRANSITION_ID} from './browser/server-transition';
 export {BrowserGetTestability as ɵBrowserGetTestability} from './browser/testability';
 export {DomRendererFactory2 as ɵDomRendererFactory2, NAMESPACE_URIS as ɵNAMESPACE_URIS, shimContentAttribute as ɵshimContentAttribute, shimHostAttribute as ɵshimHostAttribute, shimStylesContent as ɵshimStyles} from './dom/dom_renderer';
 export {DomEventsPlugin as ɵDomEventsPlugin} from './dom/events/dom_events';
diff --git a/packages/platform-server/src/styles_host.ts b/packages/platform-server/src/styles_host.ts
@@ -7,17 +7,15 @@
  */
 
 import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common';
-import {Inject, Injectable, Optional} from '@angular/core';
-import {ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID} from '@angular/platform-browser';
+import {APP_ID, Inject, Injectable} from '@angular/core';
+import {ɵSharedStylesHost as SharedStylesHost} from '@angular/platform-browser';
 
 @Injectable()
 export class ServerStylesHost extends SharedStylesHost {
   private head: any = null;
   private _styleNodes = new Set<HTMLElement>();
 
-  constructor(
-      @Inject(DOCUMENT) private doc: any,
-      @Optional() @Inject(ɵTRANSITION_ID) private transitionId: string) {
+  constructor(@Inject(DOCUMENT) doc: any, @Inject(APP_ID) private appId: string) {
     super();
     this.head = doc.getElementsByTagName('head')[0];
   }
@@ -26,8 +24,8 @@ export class ServerStylesHost extends SharedStylesHost {
     const adapter = getDOM();
     const el = adapter.createElement('style');
     el.textContent = style;
-    if (!!this.transitionId) {
-      el.setAttribute('ng-transition', this.transitionId);
+    if (!!this.appId) {
+      el.setAttribute('ng-app', this.appId);
     }
     this.head.appendChild(el);
     this._styleNodes.add(el);
diff --git a/packages/platform-server/src/utils.ts b/packages/platform-server/src/utils.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-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, ɵTRANSITION_ID} from '@angular/platform-browser';
+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 {BrowserModule} from '@angular/platform-browser';
 import {first} from 'rxjs/operators';
 
 import {PlatformState} from './platform_state';
@@ -49,7 +49,7 @@ function _render<T>(
     bootstrapPromise: Promise<NgModuleRef<T>|ApplicationRef>): Promise<string> {
   return bootstrapPromise.then((moduleOrApplicationRef) => {
     const environmentInjector = moduleOrApplicationRef.injector;
-    const transitionId = environmentInjector.get(ɵTRANSITION_ID, null);
+    const transitionId = environmentInjector.get(APP_ID, null);
     if (!transitionId) {
       throw new Error(
           `renderModule[Factory]() requires the use of BrowserModule.withServerTransition() to ensure

Original file line number	Diff line number	Diff line change
`@@ -350,9 +350,6 @@`
`350`	`350`	`{`
`351`	`351`	`"name": "RuntimeError"`
`352`	`352`	`},`
`353`		`- {`
`354`		`- "name": "SERVER_TRANSITION_PROVIDERS"`
`355`		`- },`
`356`	`353`	`{`
`357`	`354`	`"name": "SIMPLE_CHANGES_STORE"`
`358`	`355`	`},`
`@@ -410,9 +407,6 @@`
`410`	`407`	`{`
`411`	`408`	`"name": "TRACKED_LVIEWS"`
`412`	`409`	`},`
`413`		`- {`
`414`		`- "name": "TRANSITION_ID"`
`415`		`- },`
`416`	`410`	`{`
`417`	`411`	`"name": "TYPE"`
`418`	`412`	`},`
Original file line number	Diff line number	Diff line change
`@@ -491,9 +491,6 @@`
`491`	`491`	`{`
`492`	`492`	`"name": "RuntimeError"`
`493`	`493`	`},`
`494`		`- {`
`495`		`- "name": "SERVER_TRANSITION_PROVIDERS"`
`496`		`- },`
`497`	`494`	`{`
`498`	`495`	`"name": "SIMPLE_CHANGES_STORE"`
`499`	`496`	`},`
`@@ -557,9 +554,6 @@`
`557`	`554`	`{`
`558`	`555`	`"name": "TRACKED_LVIEWS"`
`559`	`556`	`},`
`560`		`- {`
`561`		`- "name": "TRANSITION_ID"`
`562`		`- },`
`563`	`557`	`{`
`564`	`558`	`"name": "TYPE"`
`565`	`559`	`},`
Original file line number	Diff line number	Diff line change
`@@ -479,9 +479,6 @@`
`479`	`479`	`{`
`480`	`480`	`"name": "RuntimeError"`
`481`	`481`	`},`
`482`		`- {`
`483`		`- "name": "SERVER_TRANSITION_PROVIDERS"`
`484`		`- },`
`485`	`482`	`{`
`486`	`483`	`"name": "SIMPLE_CHANGES_STORE"`
`487`	`484`	`},`
`@@ -545,9 +542,6 @@`
`545`	`542`	`{`
`546`	`543`	`"name": "TRACKED_LVIEWS"`
`547`	`544`	`},`
`548`		`- {`
`549`		`- "name": "TRANSITION_ID"`
`550`		`- },`
`551`	`545`	`{`
`552`	`546`	`"name": "TYPE"`
`553`	`547`	`},`
Original file line number	Diff line number	Diff line change
`@@ -377,9 +377,6 @@`
`377`	`377`	`{`
`378`	`378`	`"name": "RuntimeError"`
`379`	`379`	`},`
`380`		`- {`
`381`		`- "name": "SERVER_TRANSITION_PROVIDERS"`
`382`		`- },`
`383`	`380`	`{`
`384`	`381`	`"name": "SIMPLE_CHANGES_STORE"`
`385`	`382`	`},`
`@@ -443,16 +440,10 @@`
`443`	`440`	`{`
`444`	`441`	`"name": "TRACKED_LVIEWS"`
`445`	`442`	`},`
`446`		`- {`
`447`		`-<<<<<<< HEAD`
`448`		`- "name": "TRANSITION_ID"`
`449`		`- },`
`450`	`443`	`{`
`451`	`444`	`"name": "TYPE"`
`452`	`445`	`},`
`453`	`446`	`{`
`454`		`-=======`
`455`		`->>>>>>> 0bd0ef957b (fix(core): generate consistent component IDs)`
`456`	`447`	`"name": "TemplateRef"`
`457`	`448`	`},`
`458`	`449`	`{`
`@@ -1457,4 +1448,4 @@`
`1457`	`1448`	`{`
`1458`	`1449`	`"name": "ɵɵtextInterpolate1"`
`1459`	`1450`	`}`
`1460`		`-]`
	`1451`	`+]`