Merge branch 'main' into master

Author: JelleBruisten

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
   "name": "Platform",
-  "image": "mcr.microsoft.com/devcontainers/typescript-node:1.0-20-bullseye",
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:22-bullseye",
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {

.devcontainer/ngrx.io/devcontainer.json

@@ -102,12 +102,6 @@ export function getPackageFilePath(pkg: string, filename: string) {
   return baseDir(`./modules/${pkg}/${filename}`);
 }
 
-const sorcery = require('sorcery');
-export async function mapSources(file: string) {
-  const chain = await sorcery.load(file);
-  chain.write();
-}
-
 const ora = require('ora');
 async function runTask(name: string, taskFn: () => Promise<any>) {
   const spinner = ora(name);

Dockerfile

@@ -29,7 +29,6 @@ const reducer = createReducer(
 const reducer = createReducer(
   initialState,
   on(increment, incrementFunc),
-  on(increment, s => incrementFunc(s)),
   on(increment, (s): State => incrementFunc(s)),
 )`,
   `
@@ -174,6 +173,57 @@ const reducer = createReducer(
 const reducer = createReducer(
   initialState,
   on(reset, (): State =>   initialState  ),
+)`,
+          },
+        ],
+      },
+    ],
+  },
+  {
+    code: `
+const reducer = createReducer(
+  initialState,
+  on(reset, s => foo(s)),
+)`,
+    errors: [
+      {
+        column: 13,
+        endColumn: 24,
+        line: 4,
+        messageId: onFunctionExplicitReturnType,
+        suggestions: [
+          {
+            messageId: onFunctionExplicitReturnTypeSuggest,
+            output: `
+const reducer = createReducer(
+  initialState,
+  on(reset, (s): State => foo(s)),
+)`,
+          },
+        ],
+      },
+    ],
+  },
+  // https://github.com/ngrx/platform/issues/4901
+  {
+    code: `
+const reducer = createReducer(
+  initialState,
+  on(reset, s => ({ ...s, counter: Number(1) })),
+)`,
+    errors: [
+      {
+        column: 13,
+        endColumn: 48,
+        line: 4,
+        messageId: onFunctionExplicitReturnType,
+        suggestions: [
+          {
+            messageId: onFunctionExplicitReturnTypeSuggest,
+            output: `
+const reducer = createReducer(
+  initialState,
+  on(reset, (s): State => ({ ...s, counter: Number(1) })),
 )`,
           },
         ],

build/util.ts

@@ -69,7 +69,7 @@ export const dispatchInEffects = (name: RegExp | string) =>
 export const createReducer = `CallExpression[callee.name='createReducer']`;
 
 export const onFunctionWithoutType =
-  `${createReducer} CallExpression[callee.name='on'] > ArrowFunctionExpression:not([returnType.typeAnnotation], :has(CallExpression))` as const;
+  `${createReducer} CallExpression[callee.name='on'] > ArrowFunctionExpression:not([returnType.typeAnnotation])` as const;
 
 export const storeActionReducerMap =
   `${ngModuleImports} CallExpression[callee.object.name='StoreModule'][callee.property.name=/^for(Root|Feature)$/] > ObjectExpression:first-child` as const;

migrate-content.js

@@ -80,26 +80,9 @@
     "@angular/platform-browser-dynamic": "20.0.0",
     "@angular/platform-server": "20.0.0",
     "@angular/router": "20.0.0",
-    "@codemirror/autocomplete": "^6.16.2",
-    "@codemirror/commands": "^6.6.0",
-    "@codemirror/lang-angular": "^0.1.3",
-    "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/lang-sass": "^6.0.2",
-    "@codemirror/language": "^6.10.2",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/tooltip": "^0.19.16",
-    "@codemirror/view": "^6.28.1",
-    "@lezer/common": "^1.2.1",
-    "@lezer/javascript": "^1.4.17",
     "@microsoft/api-extractor": "^7.52.4",
     "@microsoft/tsdoc": "^0.15.1",
     "@nx/angular": "21.1.2",
-    "@typescript/vfs": "^1.5.3",
-    "ajv-formats": "^2.1.1",
-    "core-js": "^2.5.4",
-    "eslint-etc": "^5.1.0",
-    "fast-glob": "^3.3.3",
     "firebase-admin": "^12.1.1",
     "firebase-functions": "^5.0.1",
     "front-matter": "^4.0.2",
@@ -109,9 +92,7 @@
     "marked-highlight": "^2.2.1",
     "marked-mangle": "^1.1.10",
     "marked-shiki": "^1.2.0",
-    "mermaid": "^10.2.4",
     "opencollective": "^1.0.3",
-    "prismjs": "^1.29.0",
     "rxjs": "7.8.0",
     "semver": "^7.3.6",
     "shiki": "~1.6.1",
@@ -155,7 +136,6 @@
     "@types/jasmine": "4.0.3",
     "@types/jasminewd2": "^2.0.2",
     "@types/jest": "29.5.13",
-    "@types/lodash": "^4.14.80",
     "@types/ncp": "^2.0.1",
     "@types/node": "^18.16.9",
     "@types/ora": "^1.3.1",
@@ -170,13 +150,10 @@
     "chokidar-cli": "^1.2.0",
     "conventional-changelog": "^1.1.4",
     "conventional-changelog-cli": "^1.3.21",
-    "coveralls": "^2.13.0",
     "cpy-cli": "^1.0.1",
     "cypress": "14.2.1",
     "deep-freeze": "^0.0.1",
     "eslint": "8.57.0",
-    "eslint-config-prettier": "10.0.0",
-    "eslint-plugin-cypress": "2.14.0",
     "eslint-plugin-import": "2.26.0",
     "express": "4.21.2",
     "fs-extra": "^10.1.0",
@@ -201,32 +178,23 @@
     "mkdirp": "^3.0.1",
     "ncp": "^2.0.0",
     "ng-packagr": "19.2.0",
-    "npm-run-all": "^4.1.5",
     "nx": "21.1.2",
-    "nyc": "^10.1.2",
     "ora": "^1.3.0",
     "prettier": "^2.7.1",
-    "protractor": "7.0.0",
-    "reflect-metadata": "^0.1.9",
-    "replace-in-file": "^3.1.1",
     "rimraf": "^2.5.4",
     "rollup": "~2.59.0",
     "rollup-plugin-alias": "^1.4.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rxjs-marbles": "^7.0.1",
-    "sorcery": "^0.10.0",
     "ts-jest": "29.1.0",
     "ts-loader": "^5.3.3",
     "ts-node": "10.9.1",
     "ts-snippet": "5.0.2",
     "tsconfig-paths": "^3.1.3",
-    "tsickle": "^0.37.0",
-    "tsutils": "2.27.2",
     "typescript": "5.8.2",
     "typescript-eslint": "8.19.0",
-    "uglify-js": "^3.1.9",
     "vite": "^6.3.0",
     "vite-tsconfig-paths": "^4.2.0",
     "vitest": "2.1.9",
@@ -236,8 +204,5 @@
     "type": "opencollective",
     "url": "https://opencollective.com/ngrx",
     "logo": "https://opencollective.com/opencollective/logo.txt"
-  },
-  "overrides": {
-    "lodash": "^4.17.11"
   }
 }