Skip to content

Commit

Permalink
feat(angular): support ngrx 15.3 (#15226)
Browse files Browse the repository at this point in the history
  • Loading branch information
Coly010 committed Feb 24, 2023
1 parent d8f9f32 commit f9564e0
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 17 deletions.
2 changes: 1 addition & 1 deletion e2e/angular-core/src/module-federation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ describe('Angular Projects', () => {
} catch (err) {
expect(err).toBeFalsy();
}
}, 10_000_000);
}, 20_000_000);

it('Custom Webpack Config for SSR - should serve the app correctly', async () => {
// ARRANGE
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"@nestjs/schematics": "^9.0.0",
"@nestjs/swagger": "^6.0.0",
"@nestjs/testing": "^9.0.0",
"@ngrx/effects": "~15.0.0",
"@ngrx/router-store": "~15.0.0",
"@ngrx/store": "~15.0.0",
"@ngrx/effects": "~15.3.0",
"@ngrx/router-store": "~15.3.0",
"@ngrx/store": "~15.3.0",
"@nguniversal/builders": "~15.2.0",
"@nrwl/cypress": "15.7.2",
"@nrwl/devkit": "15.7.2",
Expand Down
36 changes: 36 additions & 0 deletions packages/angular/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1920,6 +1920,42 @@
"alwaysAddToPackageJson": false
}
}
},
"15.8.0-ngrx": {
"version": "15.8.0-beta.6",
"requires": {
"@angular/core": "^15.0.0"
},
"packages": {
"@ngrx/store": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/effects": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/entity": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/router-store": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/schematics": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/store-devtools": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
},
"@ngrx/component-store": {
"version": "~15.3.0",
"alwaysAddToPackageJson": false
}
}
}
}
}
2 changes: 1 addition & 1 deletion packages/angular/src/utils/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const nxVersion = require('../../package.json').version;
export const angularVersion = '~15.2.0';
export const angularDevkitVersion = '~15.2.0';
export const ngPackagrVersion = '~15.2.2';
export const ngrxVersion = '~15.0.0';
export const ngrxVersion = '~15.3.0';
export const rxjsVersion = '~7.8.0';
export const zoneJsVersion = '~0.12.0';
export const angularJsVersion = '1.7.9';
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4344,24 +4344,24 @@
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.1.tgz#c209a37da13be27b722f9c40c40ab4b094866244"
integrity sha512-mVF0/3/5QAc5EGVnb8ll31nNvf3BWpPY4pBb84tk+BfQglWLqc5AC9q1Ht/YMWiEgs8ALNKEQ3GQnbY0bJF2Gg==

"@ngrx/effects@~15.0.0":
version "15.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-15.0.0.tgz#9d4ab000ca8af8fa9012e4586425541de8b79ec4"
integrity sha512-EfYmGYFF1bNLPCRPnfAZnppT47RPwpprZK6HSQQ1fvV0sA0FYKQilg93ictNhDv+0IhMBZJEbR/hBMYyi4rkBg==
"@ngrx/effects@~15.3.0":
version "15.3.0"
resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-15.3.0.tgz#96af2d8121384d782e278a08b8b3643c1d08ae82"
integrity sha512-L+Ie4XFrzYBJOV7hNQvR5hUvG1PSCDd6niwOOJg5nm9zEjSnAxveJ/a3B52pRwge6EYOnrQne97jyArxOzPCJA==
dependencies:
tslib "^2.0.0"

"@ngrx/router-store@~15.0.0":
version "15.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-15.0.0.tgz#6f132798a421631f9b2015d5273f95a0cc2658d3"
integrity sha512-WBgT2uI/CejfYfdi3cjDsp9Q5UZTFnTcTGMTDFT8HujrCD75PxVw8ad9k2GMqp7j96qE13xi+8VRknQyUPx3HA==
"@ngrx/router-store@~15.3.0":
version "15.3.0"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-15.3.0.tgz#f932ebcde48a6401c6939f97910a26b9ede75466"
integrity sha512-rAaKm6oToXF9pj/IRwsEdv/EYgQscHBfDpiAmPufFwRi/nM/NSfxtV0viZLyOw4buZi0xFwucd3aTFtaqY//vQ==
dependencies:
tslib "^2.0.0"

"@ngrx/store@~15.0.0":
version "15.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-15.0.0.tgz#aec52a4139f6bb11e71752630e437001a77f5dd6"
integrity sha512-zGEK7pgL9X1M2d+tF5tJRjN9dUibfPnyAFcI0+375gBkUSU2gJxuphB0NoGPVJMtLFsW+5yI4+kjui7M6nsaYQ==
"@ngrx/store@~15.3.0":
version "15.3.0"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-15.3.0.tgz#7feb22134dcea6cf779149850078c98be1d70125"
integrity sha512-8cd0zWkOZ3TedDQHyOzUxZD1HHa0fU8fgzVX/2eIq6wmnleUxHVOKSJvA+DdE4GRoryFqVhAp17L1r5eC2QYHA==
dependencies:
tslib "^2.0.0"

Expand Down

1 comment on commit f9564e0

@vercel
Copy link

@vercel vercel bot commented on f9564e0 Feb 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx.dev
nx-five.vercel.app
nx-dev-git-master-nrwl.vercel.app
nx-dev-nrwl.vercel.app

Please sign in to comment.