Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libs/ngrx-toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"url": "https://github.com/angular-architects/ngrx-toolkit"
},
"peerDependencies": {
"@angular/core": "^20.0.0",
"@angular/common": "^20.0.0",
"@ngrx/signals": "^20.0.0",
"@ngrx/store": "^20.0.0",
"@angular/core": "^21.0.0",
"@angular/common": "^21.0.0",
"@ngrx/signals": "^21.0.0-beta.0",
"@ngrx/store": "^21.0.0-beta.0",
"rxjs": "^7.0.0"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 1 addition & 3 deletions libs/ngrx-toolkit/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"production": {
"tsConfig": "libs/ngrx-toolkit/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "libs/ngrx-toolkit/tsconfig.lib.json"
}
"development": {}
},
"defaultConfiguration": "production"
},
Expand Down
2 changes: 1 addition & 1 deletion libs/ngrx-toolkit/redux-connector/src/lib/create-redux.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
makeEnvironmentProviders,
provideEnvironmentInitializer,
} from '@angular/core';
import { ActionCreator, ActionType } from '@ngrx/store/src/models';
import { ActionCreator, ActionType } from '@ngrx/store';
import {
CreateReduxState,
ExtractActionTypes,
Expand Down
12 changes: 4 additions & 8 deletions libs/ngrx-toolkit/redux-connector/src/lib/model.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { EnvironmentProviders, Signal, Type } from '@angular/core';
import { DeepSignal } from '@ngrx/signals/src/deep-signal';
import {
DeepSignal,
Prettify,
SignalStoreFeatureResult,
StateSignals,
} from '@ngrx/signals/src/signal-store-models';
import {
Action,
ActionCreator,
ActionType,
Prettify,
} from '@ngrx/store/src/models';
} from '@ngrx/signals';
import { Action, ActionCreator, ActionType } from '@ngrx/store';
import { Observable, Unsubscribable } from 'rxjs';

export type IncludePropType<
Expand Down
1 change: 1 addition & 0 deletions libs/ngrx-toolkit/src/lib/devtools/tests/types.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { patchState, signalStore, withState } from '@ngrx/signals';
import { withDevtools } from '../with-devtools';

it('should compile when signalStore is extended from', () => {
// eslint-disable-next-line unused-imports/no-unused-vars
class CounterStore extends signalStore(
{ protectedState: false },
withState({ count: 0 }),
Expand Down
1 change: 1 addition & 0 deletions libs/ngrx-toolkit/src/lib/devtools/with-devtools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ declare global {
export const renameDevtoolsMethodName = '___renameDevtoolsName';
export const uniqueDevtoolsId = '___uniqueDevtoolsId';

// eslint-disable-next-line unused-imports/no-unused-vars
const EXISTING_NAMES = new InjectionToken(
'Array contain existing names for the signal stores',
{ factory: () => [] as string[], providedIn: 'root' },
Expand Down
2 changes: 1 addition & 1 deletion libs/ngrx-toolkit/src/lib/with-feature-factory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('withFeatureFactory', () => {
const UserStore = signalStore(
{ providedIn: 'root' },
withMethods(() => ({
findById(id: number) {
findById(_id: number) {
return of({ id: 1, name: 'Konrad' });
},
})),
Expand Down
31 changes: 10 additions & 21 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
{
"migrations": [
{
"version": "21.3.0-beta.3",
"requires": { "jest": ">=30.0.0" },
"description": "Rename the CLI option `testPathPattern` to `testPathPatterns`.",
"implementation": "./src/migrations/update-21-3-0/rename-test-path-pattern",
"package": "@nx/jest",
"name": "rename-test-path-pattern"
"version": "21.0.0-0",
"description": "Updates the Angular CDK to v21",
"factory": "./ng-update/index#updateToV21",
"package": "@angular/cdk",
"name": "migration-v21"
},
{
"version": "21.3.0-beta.3",
"requires": { "jest": ">=30.0.0" },
"description": "Replace removed matcher aliases in Jest v30 with their corresponding matcher",
"implementation": "./src/migrations/update-21-3-0/replace-removed-matcher-aliases",
"package": "@nx/jest",
"name": "replace-removed-matcher-aliases"
},
{
"cli": "nx",
"version": "21.3.0-beta.4",
"requires": { "@angular/core": ">=20.1.0" },
"description": "Update the @angular/cli package version to ~20.1.0.",
"factory": "./src/migrations/update-21-3-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-20-1-0"
"version": "21.0.0-0",
"description": "Updates Angular Material to v21",
"factory": "./ng-update/index_bundled#updateToV21",
"package": "@angular/material",
"name": "migration-v21"
}
]
}
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,53 @@
"pnpm": ">=10"
},
"dependencies": {
"@angular/animations": "20.1.3",
"@angular/cdk": "20.1.3",
"@angular/common": "20.1.3",
"@angular/compiler": "20.1.3",
"@angular/core": "20.1.3",
"@angular/forms": "20.1.3",
"@angular/material": "20.1.3",
"@angular/platform-browser": "20.1.3",
"@angular/platform-browser-dynamic": "20.1.3",
"@angular/router": "20.1.3",
"@ngrx/signals": "20.0.0",
"@ngrx/store": "20.0.0",
"@nx/angular": "21.3.7",
"@angular/animations": "21.0.3",
"@angular/cdk": "21.0.2",
"@angular/common": "21.0.3",
"@angular/compiler": "21.0.3",
"@angular/core": "21.0.3",
"@angular/forms": "21.0.3",
"@angular/material": "21.0.2",
"@angular/platform-browser": "21.0.3",
"@angular/platform-browser-dynamic": "21.0.3",
"@angular/router": "21.0.3",
"@ngrx/signals": "21.0.0-beta.0",
"@ngrx/store": "21.0.0-beta.0",
"@nx/angular": "22.1.3",
"core-js": "^3.40.0",
"flush-promises": "^1.0.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "20.1.3",
"@angular-devkit/core": "20.1.3",
"@angular-devkit/schematics": "20.1.3",
"@angular/cli": "~20.1.0",
"@angular/compiler-cli": "20.1.3",
"@angular/language-service": "20.1.3",
"@angular-devkit/build-angular": "21.0.2",
"@angular-devkit/core": "21.0.2",
"@angular-devkit/schematics": "21.0.2",
"@angular/cli": "21.0.2",
"@angular/compiler-cli": "21.0.3",
"@angular/language-service": "21.0.3",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@eslint/eslintrc": "^2.1.1",
"@eslint/js": "~8.57.0",
"@nx/devkit": "21.3.7",
"@nx/eslint": "21.3.7",
"@nx/eslint-plugin": "21.3.7",
"@nx/jest": "21.3.7",
"@nx/js": "21.3.7",
"@nx/playwright": "21.3.7",
"@nx/workspace": "21.3.7",
"@nx/devkit": "22.1.3",
"@nx/eslint": "22.1.3",
"@nx/eslint-plugin": "22.1.3",
"@nx/jest": "22.1.3",
"@nx/js": "22.1.3",
"@nx/playwright": "22.1.3",
"@nx/workspace": "22.1.3",
"@playwright/test": "^1.36.0",
"@schematics/angular": "20.1.3",
"@schematics/angular": "20.3.9",
"@softarc/eslint-plugin-sheriff": "^0.15.1",
"@softarc/sheriff-core": "^0.15.1",
"@swc-node/register": "~1.9.1",
"@swc/core": "~1.5.7",
"@swc/helpers": "~0.5.11",
"@types/jest": "30.0.0",
"@types/node": "18.16.9",
"angular-eslint": "20.1.1",
"angular-eslint": "20.3.0",
"autoprefixer": "^10.4.19",
"eslint": "^9.8.0",
"eslint-config-prettier": "10.1.5",
Expand All @@ -75,10 +75,11 @@
"jest": "30.0.5",
"jest-environment-jsdom": "30.0.5",
"jest-preset-angular": "15.0.0",
"jest-util": "30.0.5",
"jsonc-eslint-parser": "^2.4.0",
"lint-staged": "^15.3.0",
"ng-packagr": "20.1.0",
"nx": "21.3.7",
"ng-packagr": "20.3.2",
"nx": "22.1.3",
"postcss": "^8.4.39",
"postcss-import": "^16.1.0",
"postcss-preset-env": "^9.5.15",
Expand All @@ -87,8 +88,7 @@
"prettier-plugin-organize-imports": "^4.2.0",
"ts-jest": "^29.1.0",
"ts-node": "10.9.1",
"typescript": "5.8.3",
"typescript-eslint": "8.35.1",
"jest-util": "30.0.5"
"typescript": "5.9.3",
"typescript-eslint": "8.40.0"
}
}
Loading
Loading