Merge branch 'master' into loadWithQuery

ngrx · Jan 6, 2023 · 84cdba2 · 84cdba2
2 parents 52295f6 + e267d21
commit 84cdba2
Show file tree

Hide file tree

Showing 46 changed files with 1,327 additions and 1,185 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+<a name="15.1.0"></a>
+
+# [15.1.0](https://github.com/ngrx/platform/compare/15.0.0...15.1.0) (2022-12-21)
+
+### Bug Fixes
+
+- **component-store:** revert throwError usages with factory for RxJS 6 compatibility ([726dfb7](https://github.com/ngrx/platform/commit/726dfb7))
+- **data:** revert throwError usages with factory for RxJS 6 compatibility ([a137b59](https://github.com/ngrx/platform/commit/a137b59)), closes [#3702](https://github.com/ngrx/platform/issues/3702)
+- **eslint-plugin:** remove [@angular-devkit](https://github.com/angular-devkit)/schematics dependency ([#3710](https://github.com/ngrx/platform/issues/3710)) ([f0ae915](https://github.com/ngrx/platform/commit/f0ae915)), closes [#3709](https://github.com/ngrx/platform/issues/3709)
+- **schematics:** disable package json peer dep updates during build ([#3692](https://github.com/ngrx/platform/issues/3692)) ([9cfc103](https://github.com/ngrx/platform/commit/9cfc103)), closes [#3691](https://github.com/ngrx/platform/issues/3691)
+- **store:** support using `createActionGroup` with props typed as unions ([#3713](https://github.com/ngrx/platform/issues/3713)) ([e75fa1a](https://github.com/ngrx/platform/commit/e75fa1a)), closes [#3712](https://github.com/ngrx/platform/issues/3712)
+
+### Features
+
+- **router-store:** add new selectRouteDataParam selector ([#3673](https://github.com/ngrx/platform/issues/3673)) ([#3686](https://github.com/ngrx/platform/issues/3686)) ([81bc0d9](https://github.com/ngrx/platform/commit/81bc0d9))
+- **store:** support using`createSelector` with selectors dictionary ([#3703](https://github.com/ngrx/platform/issues/3703)) ([5c87dda](https://github.com/ngrx/platform/commit/5c87dda)), closes [#3677](https://github.com/ngrx/platform/issues/3677)
+
 <a name="15.0.0"></a>
 
 # [15.0.0](https://github.com/ngrx/platform/compare/15.0.0-rc.0...15.0.0) (2022-11-29)

diff --git a/angular.json b/angular.json
@@ -183,12 +183,6 @@
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "projects/data-example-app/src/environments/environment.ts",
-                  "with": "projects/data-example-app/src/environments/environment.prod.ts"
-                }
-              ],
               "budgets": [
                 {
                   "type": "initial",
@@ -479,6 +473,7 @@
             "tsConfig": "modules/eslint-plugin/tsconfig.build.json",
             "packageJson": "modules/eslint-plugin/package.json",
             "main": "modules/eslint-plugin/src/index.ts",
+            "updateBuildableProjectDepsInPackageJson": false,
             "sourceMap": false,
             "assets": [
               "collection.json",
@@ -552,12 +547,6 @@
                   "maximumWarning": "6kb"
                 }
               ],
-              "fileReplacements": [
-                {
-                  "replace": "projects/example-app/src/environments/environment.ts",
-                  "with": "projects/example-app/src/environments/environment.prod.ts"
-                }
-              ],
               "outputHashing": "all"
             },
             "development": {
@@ -846,12 +835,6 @@
                   "maximumError": "4kb"
                 }
               ],
-              "fileReplacements": [
-                {
-                  "replace": "projects/standalone-app/src/environments/environment.ts",
-                  "with": "projects/standalone-app/src/environments/environment.prod.ts"
-                }
-              ],
               "outputHashing": "all"
             },
             "development": {
@@ -1041,7 +1024,14 @@
           "outputs": ["{workspaceRoot}/coverage/modules/store-devtools"]
         }
       },
-      "schematics": {},
+      "schematics": {
+        "@angular-eslint/schematics:application": {
+          "setParserOptionsProject": true
+        },
+        "@angular-eslint/schematics:library": {
+          "setParserOptionsProject": true
+        }
+      },
       "tags": []
     }
   }

diff --git a/modules/component-store/package.json b/modules/component-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/component-store",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Reactive store for component state",
   "repository": {
     "type": "git",

diff --git a/modules/component-store/schematics-core/utility/libs-version.ts b/modules/component-store/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/component-store/src/component-store.ts b/modules/component-store/src/component-store.ts
@@ -137,7 +137,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
               return EMPTY;
             }
 
-            return throwError(() => error);
+            return throwError(error);
           }),
           takeUntil(this.destroy$)
         )

diff --git a/modules/component/package.json b/modules/component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/component",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Reactive Extensions for Angular Components",
   "repository": {
     "type": "git",

diff --git a/modules/component/schematics-core/utility/libs-version.ts b/modules/component/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/data/package.json b/modules/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/data",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "API management for NgRx",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
   "peerDependencies": {
     "@angular/common": "^15.0.0",
     "@angular/core": "^15.0.0",
-    "@ngrx/store": "15.0.0",
-    "@ngrx/effects": "15.0.0",
-    "@ngrx/entity": "15.0.0",
+    "@ngrx/store": "15.1.0",
+    "@ngrx/effects": "15.1.0",
+    "@ngrx/entity": "15.1.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "schematics": "./schematics/collection.json",

diff --git a/modules/data/schematics-core/utility/libs-version.ts b/modules/data/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/data/src/dataservices/default-data.service.ts b/modules/data/src/dataservices/default-data.service.ts
@@ -168,7 +168,7 @@ export class DefaultDataService<T> implements EntityCollectionDataService<T> {
       }
       default: {
         const error = new Error('Unimplemented HTTP method, ' + method);
-        result$ = throwError(() => error);
+        result$ = throwError(error);
       }
     }
     if (this.timeout) {
@@ -184,7 +184,7 @@ export class DefaultDataService<T> implements EntityCollectionDataService<T> {
         return ok;
       }
       const error = new DataServiceError(err, reqData);
-      return throwError(() => error);
+      return throwError(error);
     };
   }
 

diff --git a/modules/data/src/dataservices/entity-cache-data.service.ts b/modules/data/src/dataservices/entity-cache-data.service.ts
@@ -79,7 +79,7 @@ export class EntityCacheDataService {
   protected handleError(reqData: RequestData) {
     return (err: any) => {
       const error = new DataServiceError(err, reqData);
-      return throwError(() => error);
+      return throwError(error);
     };
   }
 

diff --git a/modules/data/src/dispatchers/entity-cache-dispatcher.ts b/modules/data/src/dispatchers/entity-cache-dispatcher.ts
@@ -206,14 +206,13 @@ export class EntityCacheDispatcher {
       mergeMap((act) => {
         return act.type === EntityCacheAction.SAVE_ENTITIES_CANCEL
           ? throwError(
-              () =>
-                new PersistanceCanceled(
-                  (act as SaveEntitiesCancel).payload.reason
-                )
+              new PersistanceCanceled(
+                (act as SaveEntitiesCancel).payload.reason
+              )
             )
           : act.type === EntityCacheAction.SAVE_ENTITIES_SUCCESS
           ? of((act as SaveEntitiesSuccess).payload.changeSet)
-          : throwError(() => (act as SaveEntitiesError).payload);
+          : throwError((act as SaveEntitiesError).payload);
       })
     );
   }

diff --git a/modules/data/src/dispatchers/entity-dispatcher-base.ts b/modules/data/src/dispatchers/entity-dispatcher-base.ts
@@ -610,10 +610,10 @@ export class EntityDispatcherBase<T> implements EntityDispatcher<T> {
       mergeMap((act) => {
         const { entityOp } = act.payload;
         return entityOp === EntityOp.CANCEL_PERSIST
-          ? throwError(() => new PersistanceCanceled(act.payload.data))
+          ? throwError(new PersistanceCanceled(act.payload.data))
           : entityOp.endsWith(OP_SUCCESS)
           ? of(act.payload.data as D)
-          : throwError(() => act.payload.data.error);
+          : throwError(act.payload.data.error);
       })
     );
   }

diff --git a/modules/effects/package.json b/modules/effects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/effects",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Side effect model for @ngrx/store",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
   "homepage": "https://github.com/ngrx/platform#readme",
   "peerDependencies": {
     "@angular/core": "^15.0.0",
-    "@ngrx/store": "15.0.0",
+    "@ngrx/store": "15.1.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "schematics": "./schematics/collection.json",

diff --git a/modules/effects/schematics-core/utility/libs-version.ts b/modules/effects/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/entity/package.json b/modules/entity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/entity",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Common utilities for entity reducers",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
   "homepage": "https://github.com/ngrx/platform#readme",
   "peerDependencies": {
     "@angular/core": "^15.0.0",
-    "@ngrx/store": "15.0.0",
+    "@ngrx/store": "15.1.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "schematics": "./schematics/collection.json",

diff --git a/modules/entity/schematics-core/utility/libs-version.ts b/modules/entity/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/eslint-plugin/package.json b/modules/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/eslint-plugin",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "NgRx ESLint Plugin",
   "repository": {
     "type": "git",
@@ -36,7 +36,6 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@angular-devkit/schematics": "^14.0.0-rc.0",
     "@typescript-eslint/experimental-utils": "^5.4.0",
     "eslint-etc": "^5.1.0",
     "semver": "^7.3.5",

diff --git a/modules/router-store/package.json b/modules/router-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/router-store",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Bindings to connect @angular/router to @ngrx/store",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "@angular/common": "^15.0.0",
     "@angular/core": "^15.0.0",
     "@angular/router": "^15.0.0",
-    "@ngrx/store": "15.0.0",
+    "@ngrx/store": "15.1.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "schematics": "./schematics/collection.json",

diff --git a/modules/router-store/schematics-core/utility/libs-version.ts b/modules/router-store/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/schematics-core/utility/libs-version.ts b/modules/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/schematics/package.json b/modules/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/schematics",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "NgRx Schematics for Angular",
   "repository": {
     "type": "git",

diff --git a/modules/schematics/schematics-core/utility/libs-version.ts b/modules/schematics/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/store-devtools/package.json b/modules/store-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/store-devtools",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "Developer tools for @ngrx/store",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/ngrx/platform#readme",
   "peerDependencies": {
-    "@ngrx/store": "15.0.0",
+    "@ngrx/store": "15.1.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "schematics": "./schematics/collection.json",

diff --git a/modules/store-devtools/schematics-core/utility/libs-version.ts b/modules/store-devtools/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/store/package.json b/modules/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/store",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "RxJS powered Redux for Angular apps",
   "repository": {
     "type": "git",

diff --git a/modules/store/schematics-core/utility/libs-version.ts b/modules/store/schematics-core/utility/libs-version.ts
@@ -1 +1 @@
-export const platformVersion = '^15.0.0';
+export const platformVersion = '^15.1.0';
diff --git a/modules/store/src/selector.ts b/modules/store/src/selector.ts
@@ -608,7 +608,7 @@ export function createSelectorFactory<T = any, Props = any, V = any>(
  *   return a.reduce(reduceToDetermineIfArraysContainSameContents, true);
  * }
  *
- * export const creactOrderDoesNotMatterSelector = createSelectorFactory(
+ * export const createOrderDoesNotMatterSelector = createSelectorFactory(
  *   (projectionFun) => defaultMemoize(
  *     projectionFun,
  *     orderDoesNotMatterComparer,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngrx/platform",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "monorepo for ngrx development",
   "scripts": {
     "ng": "ng",
@@ -88,11 +88,11 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "15.0.0",
-    "@angular-eslint/builder": "14.0.4",
-    "@angular-eslint/eslint-plugin": "14.0.4",
-    "@angular-eslint/eslint-plugin-template": "14.0.4",
-    "@angular-eslint/schematics": "14.0.4",
-    "@angular-eslint/template-parser": "14.0.4",
+    "@angular-eslint/builder": "15.1.0",
+    "@angular-eslint/eslint-plugin": "15.1.0",
+    "@angular-eslint/eslint-plugin-template": "15.1.0",
+    "@angular-eslint/schematics": "15.1.0",
+    "@angular-eslint/template-parser": "15.1.0",
     "@angular/cli": "15.0.0",
     "@angular/compiler-cli": "15.0.0",
     "@angular/language-service": "15.0.0",
@@ -123,9 +123,9 @@
     "@types/rimraf": "^0.0.28",
     "@types/semver": "^7.3.9",
     "@types/shelljs": "^0.8.5",
-    "@typescript-eslint/eslint-plugin": "5.37.0",
-    "@typescript-eslint/parser": "5.37.0",
-    "@typescript-eslint/utils": "5.37.0",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "@typescript-eslint/utils": "^5.43.0",
     "chokidar": "^1.7.0",
     "chokidar-cli": "^1.2.0",
     "conventional-changelog": "^1.1.4",
@@ -134,7 +134,7 @@
     "cpy-cli": "^1.0.1",
     "cypress": "^11.0.0",
     "deep-freeze": "^0.0.1",
-    "eslint": "8.15.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "2.26.0",

diff --git a/projects/data-example-app/src/environments/environment.prod.ts b/projects/data-example-app/src/environments/environment.prod.ts
diff --git a/projects/data-example-app/src/environments/environment.ts b/projects/data-example-app/src/environments/environment.ts