build: update to Angular 15 rc (#3630)

Closes #3614
ngrx · Oct 24, 2022 · ea13560 · ea13560
1 parent f7dfeab
commit ea13560
Show file tree

Hide file tree

Showing 31 changed files with 1,315 additions and 1,468 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,10 +13,10 @@ version: 2.1
 var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.14.1
 var_2: &run_in_node
   docker:
-    - image: cimg/node:14.17.0
+    - image: cimg/node:14.20.0
 var_5: &run_in_browser
   docker:
-    - image: cimg/node:14.17.0-browsers
+    - image: cimg/node:14.20.0-browsers
 
 orbs:
   browser-tools: circleci/browser-tools@1.3.0

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.17
+14.20
diff --git a/modules/component-store/tsconfig.build.json b/modules/component-store/tsconfig.build.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "stripInternal": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -15,8 +15,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2018", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/component/tsconfig.build.json b/modules/component/tsconfig.build.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "strictPropertyInitialization": true,
     "strictNullChecks": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -17,8 +17,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2015", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/data/tsconfig.build.json b/modules/data/tsconfig.build.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "stripInternal": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -15,8 +15,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2018", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/effects/spec/provide_effects.spec.ts b/modules/effects/spec/provide_effects.spec.ts
@@ -29,10 +29,10 @@ describe('provideEffects', () => {
           multi: true,
           useValue: () => jest.spyOn(inject(EffectsRunner), 'start'),
         },
-        provideStore({}).ɵproviders,
+        provideStore(),
         // provide effects twice
-        provideEffects().ɵproviders,
-        provideEffects().ɵproviders,
+        provideEffects(),
+        provideEffects(),
       ],
     });
 
@@ -48,10 +48,10 @@ describe('provideEffects', () => {
           multi: true,
           useValue: () => jest.spyOn(inject(Store), 'dispatch'),
         },
-        provideStore().ɵproviders,
+        provideStore(),
         // provide effects twice
-        provideEffects().ɵproviders,
-        provideEffects().ɵproviders,
+        provideEffects(),
+        provideEffects(),
       ],
     });
 
@@ -63,18 +63,15 @@ describe('provideEffects', () => {
   it('throws an error when store is not provided', () => {
     TestBed.configureTestingModule({
       // provide only effects
-      providers: [provideEffects(TestEffects).ɵproviders],
+      providers: [provideEffects(TestEffects)],
     });
 
     expect(() => TestBed.inject(TestEffects)).toThrowError();
   });
 
   it('runs provided effects', (done) => {
     TestBed.configureTestingModule({
-      providers: [
-        provideStore().ɵproviders,
-        provideEffects(TestEffects).ɵproviders,
-      ],
+      providers: [provideStore(), provideEffects(TestEffects)],
     });
 
     const store = TestBed.inject(Store);
@@ -91,9 +88,9 @@ describe('provideEffects', () => {
   it('runs provided effects after root state registration', (done) => {
     TestBed.configureTestingModule({
       providers: [
-        provideEffects(TestEffects).ɵproviders,
+        provideEffects(TestEffects),
         // provide store after effects
-        provideStore({ [rootSliceKey]: createReducer('ngrx') }).ɵproviders,
+        provideStore({ [rootSliceKey]: createReducer('ngrx') }),
       ],
     });
 
@@ -113,10 +110,10 @@ describe('provideEffects', () => {
   it('runs provided effects after feature state registration', (done) => {
     TestBed.configureTestingModule({
       providers: [
-        provideStore().ɵproviders,
-        provideEffects(TestEffects).ɵproviders,
+        provideStore(),
+        provideEffects(TestEffects),
         // provide feature state after effects
-        provideState(featureSliceKey, createReducer('effects')).ɵproviders,
+        provideState(featureSliceKey, createReducer('effects')),
       ],
     });
 

diff --git a/modules/effects/src/provide_effects.ts b/modules/effects/src/provide_effects.ts
@@ -1,6 +1,11 @@
-import { ENVIRONMENT_INITIALIZER, inject, Type } from '@angular/core';
 import {
+  ENVIRONMENT_INITIALIZER,
   EnvironmentProviders,
+  inject,
+  makeEnvironmentProviders,
+  Type,
+} from '@angular/core';
+import {
   FEATURE_STATE_PROVIDER,
   ROOT_STORE_PROVIDER,
   Store,
@@ -41,35 +46,33 @@ import { rootEffectsInit as effectsInit } from './effects_actions';
 export function provideEffects(
   ...effects: Type<unknown>[]
 ): EnvironmentProviders {
-  return {
-    ɵproviders: [
-      effects,
-      {
-        provide: ENVIRONMENT_INITIALIZER,
-        multi: true,
-        useValue: () => {
-          inject(ROOT_STORE_PROVIDER);
-          inject(FEATURE_STATE_PROVIDER, { optional: true });
+  return makeEnvironmentProviders([
+    effects,
+    {
+      provide: ENVIRONMENT_INITIALIZER,
+      multi: true,
+      useValue: () => {
+        inject(ROOT_STORE_PROVIDER);
+        inject(FEATURE_STATE_PROVIDER, { optional: true });
 
-          const effectsRunner = inject(EffectsRunner);
-          const effectSources = inject(EffectSources);
-          const shouldInitEffects = !effectsRunner.isStarted;
+        const effectsRunner = inject(EffectsRunner);
+        const effectSources = inject(EffectSources);
+        const shouldInitEffects = !effectsRunner.isStarted;
 
-          if (shouldInitEffects) {
-            effectsRunner.start();
-          }
+        if (shouldInitEffects) {
+          effectsRunner.start();
+        }
 
-          for (const effectsClass of effects) {
-            const effectsInstance = inject(effectsClass);
-            effectSources.addEffects(effectsInstance);
-          }
+        for (const effectsClass of effects) {
+          const effectsInstance = inject(effectsClass);
+          effectSources.addEffects(effectsInstance);
+        }
 
-          if (shouldInitEffects) {
-            const store = inject(Store);
-            store.dispatch(effectsInit());
-          }
-        },
+        if (shouldInitEffects) {
+          const store = inject(Store);
+          store.dispatch(effectsInit());
+        }
       },
-    ],
-  };
+    },
+  ]);
 }
diff --git a/modules/effects/tsconfig.build.json b/modules/effects/tsconfig.build.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "stripInternal": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -15,8 +15,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2018", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/entity/tsconfig.build.json b/modules/entity/tsconfig.build.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "stripInternal": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -15,8 +15,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2018", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/router-store/src/provide_router_store.ts b/modules/router-store/src/provide_router_store.ts
@@ -1,4 +1,9 @@
-import { ENVIRONMENT_INITIALIZER, inject } from '@angular/core';
+import {
+  ENVIRONMENT_INITIALIZER,
+  EnvironmentProviders,
+  inject,
+  makeEnvironmentProviders,
+} from '@angular/core';
 import {
   _createRouterConfig,
   _ROUTER_CONFIG,
@@ -16,7 +21,6 @@ import {
   RouterStateSerializer,
 } from './serializers/base';
 import { StoreRouterConnectingService } from './store_router_connecting.service';
-import { EnvironmentProviders } from '@ngrx/store';
 
 /**
  * Connects the Angular Router to the Store.
@@ -35,30 +39,28 @@ import { EnvironmentProviders } from '@ngrx/store';
 export function provideRouterStore<
   T extends BaseRouterStoreState = SerializedRouterStateSnapshot
 >(config: StoreRouterConfig<T> = {}): EnvironmentProviders {
-  return {
-    ɵproviders: [
-      { provide: _ROUTER_CONFIG, useValue: config },
-      {
-        provide: ROUTER_CONFIG,
-        useFactory: _createRouterConfig,
-        deps: [_ROUTER_CONFIG],
-      },
-      {
-        provide: RouterStateSerializer,
-        useClass: config.serializer
-          ? config.serializer
-          : config.routerState === RouterState.Full
-          ? FullRouterStateSerializer
-          : MinimalRouterStateSerializer,
-      },
-      {
-        provide: ENVIRONMENT_INITIALIZER,
-        multi: true,
-        useFactory() {
-          return () => inject(StoreRouterConnectingService);
-        },
+  return makeEnvironmentProviders([
+    { provide: _ROUTER_CONFIG, useValue: config },
+    {
+      provide: ROUTER_CONFIG,
+      useFactory: _createRouterConfig,
+      deps: [_ROUTER_CONFIG],
+    },
+    {
+      provide: RouterStateSerializer,
+      useClass: config.serializer
+        ? config.serializer
+        : config.routerState === RouterState.Full
+        ? FullRouterStateSerializer
+        : MinimalRouterStateSerializer,
+    },
+    {
+      provide: ENVIRONMENT_INITIALIZER,
+      multi: true,
+      useFactory() {
+        return () => inject(StoreRouterConnectingService);
       },
-      StoreRouterConnectingService,
-    ],
-  };
+    },
+    StoreRouterConnectingService,
+  ]);
 }
diff --git a/modules/router-store/src/router_store_module.ts b/modules/router-store/src/router_store_module.ts
@@ -55,7 +55,7 @@ export class StoreRouterConnectingModule {
   ): ModuleWithProviders<StoreRouterConnectingModule> {
     return {
       ngModule: StoreRouterConnectingModule,
-      providers: [...provideRouterStore(config).ɵproviders],
+      providers: [provideRouterStore(config)],
     };
   }
 }
diff --git a/modules/router-store/src/serializers/full_serializer.ts b/modules/router-store/src/serializers/full_serializer.ts
@@ -26,6 +26,7 @@ export class FullRouterStateSerializer
       data: route.data,
       url: route.url,
       outlet: route.outlet,
+      title: route.title,
       routeConfig: route.routeConfig
         ? {
             component: route.routeConfig.component,

diff --git a/modules/router-store/tsconfig.build.json b/modules/router-store/tsconfig.build.json
@@ -4,7 +4,7 @@
     "declaration": true,
     "stripInternal": true,
     "experimentalDecorators": true,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noImplicitAny": true,
@@ -15,8 +15,9 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "lib": ["es2018", "dom"],
-    "target": "es2020",
+    "lib": ["ES2022", "dom"],
+    "target": "ES2022",
+    "useDefineForClassFields": false,
     "skipLibCheck": true
   },
   "files": ["public_api.ts"],

diff --git a/modules/schematics/src/container/index.spec.ts b/modules/schematics/src/container/index.spec.ts
@@ -104,7 +104,7 @@ describe('Container Schematic', () => {
       `${projectPath}/src/app/foo/foo.component.ts`
     );
 
-    expect(content).toMatch(/constructor\(private store: Store\) { }\n\n/);
+    expect(content).toMatch(/constructor\(private store: Store\) {}\n/);
   });
 
   it('should update the component spec', async () => {