refactor(core): make LOCALE_ID and other tokens from `ApplicationMo…

…dule` tree-shakable

The `ApplicationModule` module has a number of tokens declared as non-tree-shakable providers. This commit updates them to make tree-shakable.

packages/core/src/application_module.ts

@@ -7,70 +7,16 @@
  */
 
 import {ApplicationRef} from './application_ref';
-import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
-import {StaticProvider} from './di';
-import {Inject, Optional, SkipSelf} from './di/metadata';
-import {DEFAULT_LOCALE_ID, USD_CURRENCY_CODE} from './i18n/localization';
-import {DEFAULT_CURRENCY_CODE, LOCALE_ID} from './i18n/tokens';
 import {NgModule} from './metadata';
 
-declare const $localize: {locale?: string};
-
-export function _localeFactory(locale?: string): string {
-  return locale || getGlobalLocale();
-}
 /**
- * Work out the locale from the potential global properties.
- *
- * * Closure Compiler: use `goog.getLocale()`.
- * * Ivy enabled: use `$localize.locale`
- */
-export function getGlobalLocale(): string {
-  if (typeof ngI18nClosureMode !== 'undefined' && ngI18nClosureMode &&
-      typeof goog !== 'undefined' && goog.getLocale() !== 'en') {
-    // * The default `goog.getLocale()` value is `en`, while Angular used `en-US`.
-    // * In order to preserve backwards compatibility, we use Angular default value over
-    //   Closure Compiler's one.
-    return goog.getLocale();
-  } else {
-    // KEEP `typeof $localize !== 'undefined' && $localize.locale` IN SYNC WITH THE LOCALIZE
-    // COMPILE-TIME INLINER.
-    //
-    // * During compile time inlining of translations the expression will be replaced
-    //   with a string literal that is the current locale. Other forms of this expression are not
-    //   guaranteed to be replaced.
-    //
-    // * During runtime translation evaluation, the developer is required to set `$localize.locale`
-    //   if required, or just to provide their own `LOCALE_ID` provider.
-    return (typeof $localize !== 'undefined' && $localize.locale) || DEFAULT_LOCALE_ID;
-  }
-}
-
-/**
- * A built-in [dependency injection token](guide/glossary#di-token)
- * that is used to configure the root injector for bootstrapping.
- */
-export const APPLICATION_MODULE_PROVIDERS: StaticProvider[] = [
-  APP_ID_RANDOM_PROVIDER,
-  {
-    provide: LOCALE_ID,
-    useFactory: _localeFactory,
-    deps: [[new Inject(LOCALE_ID), new Optional(), new SkipSelf()]]
-  },
-  {provide: DEFAULT_CURRENCY_CODE, useValue: USD_CURRENCY_CODE},
-];
-
-/**
- * Configures the root injector for an app with
- * providers of `@angular/core` dependencies that `ApplicationRef` needs
- * to bootstrap components.
- *
  * Re-exported by `BrowserModule`, which is included automatically in the root
- * `AppModule` when you create a new app with the CLI `new` command.
+ * `AppModule` when you create a new app with the CLI `new` command. Eagerly injects
+ * `ApplicationRef` to instantiate it.
  *
  * @publicApi
  */
-@NgModule({providers: APPLICATION_MODULE_PROVIDERS})
+@NgModule()
 export class ApplicationModule {
   // Inject ApplicationRef to make it eager...
   constructor(appRef: ApplicationRef) {}

packages/core/src/application_tokens.ts

@@ -21,7 +21,10 @@ import {ComponentRef} from './linker/component_factory';
  *
  * @publicApi
  */
-export const APP_ID = new InjectionToken<string>('AppId');
+export const APP_ID = new InjectionToken<string>('AppId', {
+  providedIn: 'root',
+  factory: _appIdRandomProviderFactory,
+});
 
 export function _appIdRandomProviderFactory() {
   return `${_randomChar()}${_randomChar()}${_randomChar()}`;

packages/core/src/i18n/tokens.ts

@@ -7,6 +7,39 @@
  */
 
 import {InjectionToken} from '../di/injection_token';
+import {inject} from '../di/injector_compatibility';
+import {InjectFlags} from '../di/interface/injector';
+
+import {DEFAULT_LOCALE_ID, USD_CURRENCY_CODE} from './localization';
+
+declare const $localize: {locale?: string};
+
+/**
+ * Work out the locale from the potential global properties.
+ *
+ * * Closure Compiler: use `goog.getLocale()`.
+ * * Ivy enabled: use `$localize.locale`
+ */
+export function getGlobalLocale(): string {
+  if (typeof ngI18nClosureMode !== 'undefined' && ngI18nClosureMode &&
+      typeof goog !== 'undefined' && goog.getLocale() !== 'en') {
+    // * The default `goog.getLocale()` value is `en`, while Angular used `en-US`.
+    // * In order to preserve backwards compatibility, we use Angular default value over
+    //   Closure Compiler's one.
+    return goog.getLocale();
+  } else {
+    // KEEP `typeof $localize !== 'undefined' && $localize.locale` IN SYNC WITH THE LOCALIZE
+    // COMPILE-TIME INLINER.
+    //
+    // * During compile time inlining of translations the expression will be replaced
+    //   with a string literal that is the current locale. Other forms of this expression are not
+    //   guaranteed to be replaced.
+    //
+    // * During runtime translation evaluation, the developer is required to set `$localize.locale`
+    //   if required, or just to provide their own `LOCALE_ID` provider.
+    return (typeof $localize !== 'undefined' && $localize.locale) || DEFAULT_LOCALE_ID;
+  }
+}
 
 /**
  * Provide this token to set the locale of your application.
@@ -30,7 +63,11 @@ import {InjectionToken} from '../di/injection_token';
  *
  * @publicApi
  */
-export const LOCALE_ID = new InjectionToken<string>('LocaleId');
+export const LOCALE_ID: InjectionToken<string> = new InjectionToken('LocaleId', {
+  providedIn: 'root',
+  factory: () =>
+      inject(LOCALE_ID, InjectFlags.Optional | InjectFlags.SkipSelf) || getGlobalLocale(),
+});
 
 /**
  * Provide this token to set the default currency code your application uses for
@@ -70,7 +107,10 @@ export const LOCALE_ID = new InjectionToken<string>('LocaleId');
  *
  * @publicApi
  */
-export const DEFAULT_CURRENCY_CODE = new InjectionToken<string>('DefaultCurrencyCode');
+export const DEFAULT_CURRENCY_CODE = new InjectionToken<string>('DefaultCurrencyCode', {
+  providedIn: 'root',
+  factory: () => USD_CURRENCY_CODE,
+});
 
 /**
  * Use this token at bootstrap to provide the content of your translation file (`xtb`,

packages/core/test/bundling/animations/bundle.golden_symbols.json

@@ -5,18 +5,12 @@
   {
     "name": "ANIMATION_MODULE_TYPE"
   },
-  {
-    "name": "APPLICATION_MODULE_PROVIDERS"
-  },
   {
     "name": "APP_BOOTSTRAP_LISTENER"
   },
   {
     "name": "APP_ID"
   },
-  {
-    "name": "APP_ID_RANDOM_PROVIDER"
-  },
   {
     "name": "APP_INITIALIZER"
   },
@@ -149,9 +143,6 @@
   {
     "name": "DASH_CASE_REGEXP"
   },
-  {
-    "name": "DEFAULT_CURRENCY_CODE"
-  },
   {
     "name": "DEFAULT_NOOP_PREVIOUS_NODE"
   },
@@ -233,9 +224,6 @@
   {
     "name": "INJECTOR_SCOPE"
   },
-  {
-    "name": "Inject"
-  },
   {
     "name": "InjectFlags"
   },
@@ -371,9 +359,6 @@
   {
     "name": "Observable"
   },
-  {
-    "name": "Optional"
-  },
   {
     "name": "PARAM_REGEX"
   },
@@ -440,9 +425,6 @@
   {
     "name": "SimpleOuterSubscriber"
   },
-  {
-    "name": "SkipSelf"
-  },
   {
     "name": "SpecialCasedStyles"
   },
@@ -614,9 +596,6 @@
   {
     "name": "applyView"
   },
-  {
-    "name": "attachInjectFlag"
-  },
   {
     "name": "attachPatchData"
   },
@@ -965,6 +944,9 @@
   {
     "name": "initTNodeFlags"
   },
+  {
+    "name": "inject"
+  },
   {
     "name": "injectArgs"
   },
@@ -1109,9 +1091,6 @@
   {
     "name": "makeLambdaFromStates"
   },
-  {
-    "name": "makeParamDecorator"
-  },
   {
     "name": "makeRecord"
   },

packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json

@@ -2,18 +2,12 @@
   {
     "name": "ALLOW_MULTIPLE_PLATFORMS"
   },
-  {
-    "name": "APPLICATION_MODULE_PROVIDERS"
-  },
   {
     "name": "APP_BOOTSTRAP_LISTENER"
   },
   {
     "name": "APP_ID"
   },
-  {
-    "name": "APP_ID_RANDOM_PROVIDER"
-  },
   {
     "name": "APP_INITIALIZER"
   },
@@ -113,9 +107,6 @@
   {
     "name": "ControlContainer"
   },
-  {
-    "name": "DEFAULT_CURRENCY_CODE"
-  },
   {
     "name": "DEFAULT_VALUE_ACCESSOR"
   },
@@ -212,9 +203,6 @@
   {
     "name": "INJECTOR_SCOPE"
   },
-  {
-    "name": "Inject"
-  },
   {
     "name": "InjectFlags"
   },
@@ -1058,6 +1046,9 @@
   {
     "name": "initTNodeFlags"
   },
+  {
+    "name": "inject"
+  },
   {
     "name": "injectArgs"
   },

packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json

@@ -2,18 +2,12 @@
   {
     "name": "ALLOW_MULTIPLE_PLATFORMS"
   },
-  {
-    "name": "APPLICATION_MODULE_PROVIDERS"
-  },
   {
     "name": "APP_BOOTSTRAP_LISTENER"
   },
   {
     "name": "APP_ID"
   },
-  {
-    "name": "APP_ID_RANDOM_PROVIDER"
-  },
   {
     "name": "APP_INITIALIZER"
   },
@@ -119,9 +113,6 @@
   {
     "name": "ControlContainer"
   },
-  {
-    "name": "DEFAULT_CURRENCY_CODE"
-  },
   {
     "name": "DEFAULT_VALUE_ACCESSOR"
   },
@@ -203,9 +194,6 @@
   {
     "name": "INJECTOR_SCOPE"
   },
-  {
-    "name": "Inject"
-  },
   {
     "name": "InjectFlags"
   },
@@ -1031,6 +1019,9 @@
   {
     "name": "initTNodeFlags"
   },
+  {
+    "name": "inject"
+  },
   {
     "name": "injectArgs"
   },

packages/core/test/bundling/router/bundle.golden_symbols.json

@@ -5,9 +5,6 @@
   {
     "name": "ANALYZE_FOR_ENTRY_COMPONENTS"
   },
-  {
-    "name": "APPLICATION_MODULE_PROVIDERS"
-  },
   {
     "name": "APP_BASE_HREF"
   },
@@ -17,9 +14,6 @@
   {
     "name": "APP_ID"
   },
-  {
-    "name": "APP_ID_RANDOM_PROVIDER"
-  },
   {
     "name": "APP_INITIALIZER"
   },
@@ -137,9 +131,6 @@
   {
     "name": "DATA_URL_PATTERN"
   },
-  {
-    "name": "DEFAULT_CURRENCY_CODE"
-  },
   {
     "name": "DEFAULT_SERIALIZER"
   },
@@ -1364,6 +1355,9 @@
   {
     "name": "initTNodeFlags"
   },
+  {
+    "name": "inject"
+  },
   {
     "name": "injectArgs"
   },