miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

chore(angular): bump ngrx to 13.0.0 (#7765)

Browse Source 
* chore(angular): bump ngrx to 13.0.0

* fix(angular): add path filter to resolver for exports

* fix(testing): add mjs to jest module extensions and add dependency on resolve.exports

Co-authored-by: Jason Jean <jasonjean1993@gmail.com>
This commit is contained in:
Colum Ferry 2021-11-18 10:06:30 +00:00 committed by GitHub
parent 2b289ec3fe
commit d110bc77c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 74 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/angular-extensions/src/ngrx.test.ts
View File

@ -10,14 +10,6 @@ import {
} from '@nrwl/e2e/utils';
describe('Angular Package', () => {
// TODO(coly010): remove when ngrx 13 (with ivy) releases
// Run Tests with Yarn then reset back
const previousPackageRunner = process.env.SELECTED_PM;
process.env.SELECTED_PM = 'yarn';
afterAll(() => {
process.env.SELECTED_PM = previousPackageRunner;
});
describe('ngrx', () => {
beforeAll(() => newProject());
afterAll(() => removeProject({ onlyOnCI: true }));

14
package.json
View File

@ -54,13 +54,13 @@
"@nestjs/schematics": "^8.0.0",
"@nestjs/swagger": "^5.0.9",
"@nestjs/testing": "^8.0.0",
"@ngrx/component-store": "12.5.1",
"@ngrx/effects": "12.5.1",
"@ngrx/entity": "12.5.1",
"@ngrx/router-store": "12.5.1",
"@ngrx/schematics": "12.5.1",
"@ngrx/store": "12.5.1",
"@ngrx/store-devtools": "12.5.1",
"@ngrx/component-store": "~13.0.0",
"@ngrx/effects": "~13.0.0",
"@ngrx/entity": "~13.0.0",
"@ngrx/router-store": "~13.0.0",
"@ngrx/schematics": "~13.0.0",
"@ngrx/store": "~13.0.0",
"@ngrx/store-devtools": "~13.0.0",
"@nrwl/cli": "13.2.0-beta.5",
"@nrwl/cypress": "13.2.0-beta.5",
"@nrwl/eslint-plugin-nx": "13.2.0-beta.5",

28
packages/angular/migrations.json
View File

@ -1074,6 +1074,34 @@
"@storybook/addon-essentials": {
"version": "6.4.0-rc.3",
"alwaysAddToPackageJson": false
},
"@ngrx/store": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/effects": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/entity": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/router-store": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/schematics": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/store-devtools": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
},
"@ngrx/component-store": {
"version": "~13.0.0",
"alwaysAddToPackageJson": false
}
}
}

2
packages/angular/src/utils/versions.ts
View File

@ -2,7 +2,7 @@ export const nxVersion = '*';
export const angularVersion = '^13.0.0';
export const angularDevkitVersion = '~13.0.0';
export const angularJsVersion = '1.7.9';
export const ngrxVersion = '~12.5.0';
export const ngrxVersion = '~13.0.0';
export const rxjsVersion = '~7.4.0';
export const jestPresetAngularVersion = '11.0.0-rc.4';
export const angularEslintVersion = '~12.6.0';

1
packages/jest/package.json
View File

@ -36,6 +36,7 @@
"@nrwl/devkit": "*",
"identity-obj-proxy": "3.0.0",
"jest-resolve": "27.2.2",
"resolve.exports": "1.1.0",
"rxjs": "^6.5.4",
"tslib": "^2.3.0",
"@jest/reporters": "27.2.2",

8
packages/jest/plugins/resolver.ts
View File

@ -1,4 +1,5 @@
import { dirname, extname } from 'path';
import { resolve as resolveExports } from 'resolve.exports';
import type defaultResolver from 'jest-resolve/build/defaultResolver';
interface ResolveOptions {
@ -60,6 +61,13 @@ module.exports = function (path: string, options: ResolveOptions) {
...pkg,
main: pkg.main || pkg.es2015 || pkg.module,
}),
pathFilter: (pkg) => {
if (!pkg.exports) {
return path;
}
return resolveExports(pkg, path) || path;
},
});
}
} catch (e) {

2
packages/jest/preset/jest-preset.ts
View File

@ -1,7 +1,7 @@
export = {
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
resolver: '@nrwl/jest/plugins/resolver',
moduleFileExtensions: ['ts', 'js', 'html'],
moduleFileExtensions: ['ts', 'js', 'mjs', 'html'],
coverageReporters: ['html'],
transform: {
'^.+\\.(ts|js|html)$': 'ts-jest',

56
yarn.lock
View File

@ -2520,50 +2520,50 @@
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.0.tgz#c19e6cfdb1cebe088ea663d6405a6ed76fc4e79d"
integrity sha512-NMZRwS59X4+yQT53jROZMcboiPVd6zCGlEN3kuPewelTDVwKAXxzhpLuxCO46e0ssol8UZiOTdgB4NPVbsLK2A==
"@ngrx/component-store@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/component-store/-/component-store-12.5.1.tgz#768b6c427e163a48dff5cefef12f1c7a1cb0c6ed"
integrity sha512-0Jsp9okAHIj3E8MaqmEp0O0/11XnYAUcQ/S8G9UZNFXI2naMPNkOtpuEZ/fxNDOd23hr2PSNJfSv9Em1Q5Eahg==
"@ngrx/component-store@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/component-store/-/component-store-13.0.0.tgz#7a4eb099efbb77b39551ca0dffc886fa245e8e76"
integrity sha512-eqsHJW9FCy6MF6EVqoaCF+DnezWnQLM5ZQqn4E+nYlbOkpD4ZRPDetCsSp7hmF5GC0SBwcC2O0azpJ53d6nUFg==
dependencies:
tslib "^2.0.0"
"@ngrx/effects@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-12.5.1.tgz#acd0ff86d8db514e47337508dde83cc98f7a3416"
integrity sha512-fVNGIIntYLRWW1XWe0os2XOv03L22S4WTkX0OPZ9O6ztwuaNq0yzxWN7UeAC6H385F+g0k76KwRV78zHyP0bfQ==
"@ngrx/effects@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-13.0.0.tgz#4ac832d9aeb7c952f903a16a6f47cb4a71098468"
integrity sha512-lBeWAz/cpsegI581Yncd4jx8bRsUFo6Pk8ktX/KxVr2rBV3NYHinhrEhb15Yw8etEC77MOwRIUPU/JsHnSHeNw==
dependencies:
tslib "^2.0.0"
"@ngrx/entity@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/entity/-/entity-12.5.1.tgz#44924af7158b3506da01c09e8a3f9b909e1d7f4a"
integrity sha512-bjRMMe83onhrhxu5rJo+FhaS0gFY4HbMulSjUpuh0/LJckd0Z3QUDs+UcqYW/tjG/2o2rbNDxkws6w1D0c5ksA==
"@ngrx/entity@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/entity/-/entity-13.0.0.tgz#fa83b1058b3faafc795030c41fb6725e6ec868b2"
integrity sha512-tdnrIUFds0UP8Sh8YqRBP8vc8TJpB8Z3zp3R3pRfdZN54iwpA32m3y92EOe9MOgILZnHR8MJhrF0VEGpjFg0Lw==
dependencies:
tslib "^2.0.0"
"@ngrx/router-store@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-12.5.1.tgz#006e9a05a81a6238b408dfb2de3aeb9a5b8f61e4"
integrity sha512-F3D4lo0HCvzcNUZlMcpkBQOU4dQyqLwFvJBgNetIFT376aPp+LOy7m3gAT4BMRRx6dM0zj9Gosubyc+/DoOymA==
"@ngrx/router-store@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-13.0.0.tgz#2d1354e724b04395284b6c30958b82818d4249a3"
integrity sha512-g5tXh7bfRSYeA7mwKP0TFKO+5qdOIanqYFN52SkOTQF65WE79g0XCkAInWN3JkyO5LA6lMUckeacY8K73cpj+A==
dependencies:
tslib "^2.0.0"
"@ngrx/schematics@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/schematics/-/schematics-12.5.1.tgz#4e7a883b5ba35d4de36d2272a5a35e2e9b981650"
integrity sha512-kXCMOAQrPU09ZrAtUtX4U6IE2B1jgx4qc1OjQUuJzmO2j2/wFfc8ec9IR8OpAEX4utE8/CFRWWAdI/VEkzBtYQ==
"@ngrx/schematics@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/schematics/-/schematics-13.0.0.tgz#470c2ab56b082ae75900271d4c55bd8b9b90e3ac"
integrity sha512-9TOoOcSYvOZFTkYmh7cyb70QEfQpv0hDkCTdDz3NubQGMnpgKCpTqDZKh0cXUtAyPfYtPiqnXIcNwk0PP4Nf5g==
"@ngrx/store-devtools@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-12.5.1.tgz#75f8ef9a4bf4a40d5343ff437651f0f3092914b5"
integrity sha512-SXMxVO3KzQUfB9G20gdNT5t/RcbtbaUySXLuH+b69z/eb34wH9AOYifdSdcEi8oqPjDrWYBq6a8Uh+yDHf9IfA==
"@ngrx/store-devtools@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-13.0.0.tgz#e35afe442054a099ca4a4895da7b84b9e572cb38"
integrity sha512-S9NOtQoOsXqqAy6G19NqbmhYB2pf3VFo1ZTmjmrTdfY8ukReveBMXWpx5q5GYM0xP9yBcPYrLfxu/o5zSEMqsw==
dependencies:
tslib "^2.0.0"
"@ngrx/store@12.5.1":
version "12.5.1"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-12.5.1.tgz#a7c21d7df1d017d2cb7e77804b210cc14bcf8786"
integrity sha512-NLVkHLVeZc7IboXSDZlFoq1QrupmwYTYKRHS6se7ZasAv/lrIjHWsVVdICKSVRBsHZYu3+dmCXmu+YgulP7iHw==
"@ngrx/store@~13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-13.0.0.tgz#3eb6c4be7e09045e80ed19ae5075e588a0fafcb7"
integrity sha512-M2XuZD91ywox7IkMjMKnv00xasbLSYFYc+P8G5YBguQ7ZhWMvKIAOJsz24KDTQGlQxCnJb2nlvjh/zFRW/HHlQ==
dependencies:
tslib "^2.0.0"