Skip to content

Commit c365aa2

Browse files
authored
chore: update nx monorepo (#678)
closes #612
1 parent 3b4cc7e commit c365aa2

File tree

12 files changed

+1544
-1718
lines changed

12 files changed

+1544
-1718
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ playwright-report
4747
**/playwright/.cache
4848

4949
.nx/cache
50-
.swc
50+
.nx/workspace-data
51+
.swc
52+
vite.config.*.timestamp*

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
.angular
77

8-
/.nx/cache
8+
/.nx/cache
9+
/.nx/workspace-data
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
import 'jest-preset-angular/setup-jest';
1+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
2+
3+
setupZoneTestEnv();

apps/sandbox/src/test-setup.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
import 'jest-preset-angular/setup-jest';
1+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
2+
3+
setupZoneTestEnv();

jest.config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
const { getJestProjects } = require('@nx/jest');
1+
import { getJestProjectsAsync } from '@nx/jest';
22

3-
module.exports = { projects: getJestProjects() };
3+
export default async () => ({
4+
projects: await getJestProjectsAsync(),
5+
});

nx.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,5 @@
128128
"createRelease": "github"
129129
}
130130
}
131-
},
132-
"plugins": [
133-
{
134-
"plugin": "@nx/vite/plugin",
135-
"exclude": ["tests/swc-angular-wide/**/*"]
136-
}
137-
]
131+
}
138132
}

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
},
3434
"private": true,
3535
"dependencies": {
36-
"@angular/animations": "18.0.1",
37-
"@angular/cdk": "18.0.1",
38-
"@angular/common": "18.0.1",
39-
"@angular/compiler": "18.0.1",
40-
"@angular/core": "18.0.1",
41-
"@angular/forms": "18.0.1",
42-
"@angular/material": "18.0.1",
43-
"@angular/platform-browser": "18.0.1",
44-
"@angular/platform-browser-dynamic": "18.0.1",
45-
"@angular/router": "18.0.1",
36+
"@angular/animations": "18.2.9",
37+
"@angular/cdk": "18.2.9",
38+
"@angular/common": "18.2.9",
39+
"@angular/compiler": "18.2.9",
40+
"@angular/core": "18.2.9",
41+
"@angular/forms": "18.2.9",
42+
"@angular/material": "18.2.9",
43+
"@angular/platform-browser": "18.2.9",
44+
"@angular/platform-browser-dynamic": "18.2.9",
45+
"@angular/router": "18.2.9",
4646
"@babel/core": "7.26.0",
4747
"@babel/helper-plugin-utils": "^7.25.9",
4848
"@types/babel__helper-plugin-utils": "^7.10.3",
@@ -52,35 +52,34 @@
5252
},
5353
"devDependencies": {
5454
"@analogjs/vite-plugin-angular": "1.9.4",
55-
"@angular-devkit/build-angular": "18.2.12",
56-
"@angular-devkit/core": "18.2.12",
57-
"@angular-devkit/schematics": "18.2.12",
55+
"@angular-devkit/build-angular": "18.2.9",
56+
"@angular-devkit/core": "18.2.9",
57+
"@angular-devkit/schematics": "18.2.9",
5858
"@angular-eslint/eslint-plugin": "18.4.1",
5959
"@angular-eslint/eslint-plugin-template": "18.4.1",
6060
"@angular-eslint/template-parser": "18.4.1",
61-
"@angular/cli": "~18.0.0",
62-
"@angular/compiler-cli": "18.0.1",
63-
"@angular/language-service": "18.0.1",
61+
"@angular/cli": "~18.2.0",
62+
"@angular/compiler-cli": "18.2.9",
63+
"@angular/language-service": "18.2.9",
6464
"@commitlint/cli": "^19.0.0",
6565
"@commitlint/config-angular": "^19.0.0",
6666
"@jscutlery/playwright-ct-angular": "link:dist/packages/playwright-ct-angular",
6767
"@jscutlery/swc-angular": "link:dist/packages/swc-angular",
6868
"@jscutlery/swc-angular-plugin": "link:dist/packages/swc-angular-plugin",
6969
"@monodon/rust": "2.1.1",
70-
"@nx/angular": "19.1.2",
71-
"@nx/cypress": "19.1.2",
72-
"@nx/devkit": "19.1.2",
73-
"@nx/eslint": "19.1.2",
74-
"@nx/eslint-plugin": "19.1.2",
75-
"@nx/jest": "19.1.2",
76-
"@nx/js": "19.1.2",
77-
"@nx/linter": "19.1.2",
78-
"@nx/node": "19.1.2",
79-
"@nx/plugin": "19.1.2",
80-
"@nx/rollup": "19.1.2",
81-
"@nx/vite": "19.1.2",
82-
"@nx/web": "19.1.2",
83-
"@nx/workspace": "19.1.2",
70+
"@nx/angular": "20.1.4",
71+
"@nx/cypress": "20.1.4",
72+
"@nx/devkit": "20.1.4",
73+
"@nx/eslint": "20.1.4",
74+
"@nx/eslint-plugin": "20.1.4",
75+
"@nx/jest": "20.1.4",
76+
"@nx/js": "20.1.4",
77+
"@nx/node": "20.1.4",
78+
"@nx/plugin": "20.1.4",
79+
"@nx/rollup": "20.1.4",
80+
"@nx/vite": "20.1.4",
81+
"@nx/web": "20.1.4",
82+
"@nx/workspace": "20.1.4",
8483
"@playwright/experimental-ct-core": "1.49.0",
8584
"@playwright/test": "1.49.0",
8685
"@schematics/angular": "18.2.12",
@@ -93,6 +92,7 @@
9392
"@types/node": "^22.0.0",
9493
"@typescript-eslint/eslint-plugin": "7.18.0",
9594
"@typescript-eslint/parser": "7.18.0",
95+
"@typescript-eslint/utils": "^7.18.0",
9696
"@vitest/coverage-v8": "2.1.6",
9797
"@vitest/ui": "2.1.6",
9898
"autoprefixer": "^10.4.0",
@@ -106,18 +106,18 @@
106106
"husky": "^9.0.0",
107107
"jest": "29.7.0",
108108
"jest-environment-jsdom": "29.7.0",
109-
"jest-preset-angular": "14.3.3",
109+
"jest-preset-angular": "14.4.1",
110110
"mock-fs": "^5.1.1",
111111
"ng-packagr": "18.2.1",
112-
"nx": "19.1.2",
112+
"nx": "20.1.4",
113113
"postcss": "^8.4.5",
114114
"postcss-import": "16.1.0",
115115
"postcss-preset-env": "~10.1.0",
116116
"postcss-url": "10.1.3",
117117
"prettier": "3.4.1",
118118
"ts-jest": "29.2.5",
119119
"ts-node": "10.9.2",
120-
"typescript": "5.4.5",
120+
"typescript": "5.5.4",
121121
"unplugin-swc": "1.5.1",
122122
"vite": "5.4.11",
123123
"vitest": "2.1.6"
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
import 'jest-preset-angular/setup-jest';
1+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
2+
3+
setupZoneTestEnv();

packages/rx-computed/src/test-setup.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ globalThis.ngJest = {
55
errorOnUnknownProperties: true,
66
},
77
};
8-
import 'jest-preset-angular/setup-jest';
8+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
9+
10+
setupZoneTestEnv();

tests/swc-angular-wide/src/test-setup.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ globalThis.ngJest = {
55
errorOnUnknownProperties: true,
66
},
77
};
8-
import 'jest-preset-angular/setup-jest';
98
import 'reflect-metadata';
9+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
1010
import { it } from '@jest/globals';
1111

1212
(globalThis as any).it.fails = it.failing;
13+
setupZoneTestEnv();

0 commit comments

Comments
 (0)