Skip to content

Commit 3f0ac0e

Browse files
committed
chore: update Nx
1 parent 0d05aa2 commit 3f0ac0e

9 files changed

+3288
-1437
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ libs/anchor/target/.rustc_info.json
4646
test-ledger
4747
.yarn
4848
nx-cloud.env
49+
50+
vite.config.*.timestamp*
51+
vitest.config.*.timestamp*

jest.config.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getJestProjects } from '@nx/jest'
1+
import { getJestProjectsAsync } from '@nx/jest'
22

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

libs/tools/src/lib/api/create-mock-api-app.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,30 @@ export async function createMockApiApp(tree: Tree, app: string) {
66
await applicationGenerator(tree, {
77
directory: `apps/${app}`,
88
name: app,
9-
projectNameAndRootFormat: 'as-provided',
109
skipFormat: true,
1110
})
1211
// Create the core data access lib
1312
await libraryGenerator(tree, {
1413
directory: `libs/${app}/core/data-access`,
1514
name: `${app}-core-data-access`,
16-
projectNameAndRootFormat: 'as-provided',
1715
skipFormat: true,
1816
})
1917
const p = getProjects(tree).get(`${app}-core-data-access`)
2018
// Create the core service
2119
await serviceGenerator(tree, {
22-
directory: `${p.sourceRoot}/lib`,
23-
name: `${app}-core`,
24-
nameAndDirectoryFormat: 'as-provided',
20+
path: `$${p.sourceRoot}/lib/${app}-core`,
2521
skipFormat: true,
2622
})
2723
// Create the core feature lib
2824
await libraryGenerator(tree, {
2925
directory: `libs/${app}/core/feature`,
3026
name: `${app}-core-feature`,
31-
projectNameAndRootFormat: 'as-provided',
3227
skipFormat: true,
3328
})
3429
// Create the sdk lib
3530
await libraryGenerator(tree, {
3631
directory: `libs/${app}/sdk`,
3732
name: `sdk`,
38-
projectNameAndRootFormat: 'as-provided',
3933
skipFormat: true,
4034
})
4135

libs/tools/src/lib/api/generate-api-lib.ts

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { NormalizedApiFeatureSchema } from './normalized-api-feature-schema'
99
export async function generateApiLib(tree: Tree, type: ApiLibType, options: NormalizedApiFeatureSchema) {
1010
const generated = await libraryGenerator(tree, {
1111
name: `${options.app}-${options.model}-${type}`,
12-
projectNameAndRootFormat: 'as-provided',
1312
directory: `libs/${options.app}/${options.model}/${type}`,
1413
tags: `app:${options.app},type:${type}`,
1514
skipFormat: true,

libs/tools/src/lib/web/create-mock-web-app.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export async function createMockWebApp(tree: Tree, app: string) {
99
e2eTestRunner: 'none',
1010
linter: Linter.EsLint,
1111
name: app,
12-
projectNameAndRootFormat: 'as-provided',
1312
routing: true,
1413
skipFormat: true,
1514
style: 'css',
@@ -19,7 +18,6 @@ export async function createMockWebApp(tree: Tree, app: string) {
1918
directory: `libs/${app}/core/data-access`,
2019
linter: Linter.EsLint,
2120
name: `${app}-core-data-access`,
22-
projectNameAndRootFormat: 'as-provided',
2321
skipFormat: true,
2422
style: 'css',
2523
})
@@ -29,7 +27,6 @@ export async function createMockWebApp(tree: Tree, app: string) {
2927
directory: `libs/${app}/core/feature`,
3028
linter: Linter.EsLint,
3129
name: `${app}-core-feature`,
32-
projectNameAndRootFormat: 'as-provided',
3330
skipFormat: true,
3431
style: 'css',
3532
})
@@ -39,7 +36,6 @@ export async function createMockWebApp(tree: Tree, app: string) {
3936
directory: `libs/${app}/user/feature`,
4037
linter: Linter.EsLint,
4138
name: `${app}-user-feature`,
42-
projectNameAndRootFormat: 'as-provided',
4339
skipFormat: true,
4440
style: 'css',
4541
})
@@ -73,8 +69,7 @@ async function createMockComponent(tree: Tree, project: string, name: string, co
7369
const config = getProjects(tree).get(project)
7470
await componentGenerator(tree, {
7571
name,
76-
directory: `${config.sourceRoot}/lib/`,
77-
nameAndDirectoryFormat: 'as-provided',
72+
path: `${config.sourceRoot}/lib/`,
7873
style: 'none',
7974
skipTests: true,
8075
skipFormat: true,

libs/tools/src/lib/web/generate-web-lib.ts

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { NormalizedWebFeatureSchema } from './normalized-web-feature-schema'
99
export async function generateWebLib(tree: Tree, type: WebLibType, options: NormalizedWebFeatureSchema) {
1010
const generated = await libraryGenerator(tree, {
1111
name: `${options.app}-${options.model}-${type}`,
12-
projectNameAndRootFormat: 'as-provided',
1312
directory: `libs/${options.app}/${options.model}/${type}`,
1413
tags: `app:${options.app},type:${type}`,
1514
skipFormat: true,

nx.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
"version": {
5252
"preVersionCommand": "pnpm dlx nx run-many -t build"
5353
}
54-
}
54+
},
55+
"useLegacyCache": true
5556
}

package.json

+27-27
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@nestjs/platform-express": "10.3.9",
5050
"@nestjs/schedule": "^4.0.2",
5151
"@nestjs/serve-static": "^4.0.2",
52-
"@nx/devkit": "19.3.0",
52+
"@nx/devkit": "20.3.3",
5353
"@prisma/client": "5.15.1",
5454
"@pubkey-ui/core": "^1.7.0",
5555
"@pubkey-ui/generators": "^1.7.0",
@@ -110,20 +110,20 @@
110110
"@graphql-codegen/typescript-operations": "^4.2.1",
111111
"@nestjs/schematics": "10.1.1",
112112
"@nestjs/testing": "10.3.9",
113-
"@nx/cypress": "19.3.0",
114-
"@nx/eslint": "19.3.0",
115-
"@nx/eslint-plugin": "19.3.0",
116-
"@nx/jest": "19.3.0",
117-
"@nx/js": "19.3.0",
118-
"@nx/nest": "19.3.0",
119-
"@nx/node": "19.3.0",
120-
"@nx/plugin": "19.3.0",
121-
"@nx/react": "19.3.0",
122-
"@nx/rollup": "19.3.0",
123-
"@nx/vite": "19.3.0",
124-
"@nx/web": "19.3.0",
125-
"@nx/webpack": "19.3.0",
126-
"@nx/workspace": "19.3.0",
113+
"@nx/cypress": "20.3.3",
114+
"@nx/eslint": "20.3.3",
115+
"@nx/eslint-plugin": "20.3.3",
116+
"@nx/jest": "20.3.3",
117+
"@nx/js": "20.3.3",
118+
"@nx/nest": "20.3.3",
119+
"@nx/node": "20.3.3",
120+
"@nx/plugin": "20.3.3",
121+
"@nx/react": "20.3.3",
122+
"@nx/rollup": "20.3.3",
123+
"@nx/vite": "20.3.3",
124+
"@nx/web": "20.3.3",
125+
"@nx/webpack": "20.3.3",
126+
"@nx/workspace": "20.3.3",
127127
"@parcel/watcher": "^2.4.1",
128128
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
129129
"@svgr/webpack": "8.1.0",
@@ -133,7 +133,7 @@
133133
"@swc/jest": "0.2.36",
134134
"@testing-library/react": "16.0.0",
135135
"@types/bcrypt": "^5.0.2",
136-
"@types/jest": "^29.5.12",
136+
"@types/jest": "29.5.14",
137137
"@types/node": "20.14.7",
138138
"@types/passport-discord": "^0.1.13",
139139
"@types/passport-github": "^1.1.12",
@@ -143,32 +143,32 @@
143143
"@types/pluralize": "^0.0.33",
144144
"@types/react": "18.3.3",
145145
"@types/react-dom": "18.3.0",
146-
"@typescript-eslint/eslint-plugin": "7.9.0",
147-
"@typescript-eslint/parser": "7.9.0",
146+
"@typescript-eslint/eslint-plugin": "7.18.0",
147+
"@typescript-eslint/parser": "7.18.0",
148148
"@vitest/coverage-v8": "^1.0.4",
149149
"@vitest/ui": "^1.3.1",
150-
"babel-jest": "^29.7.0",
150+
"babel-jest": "29.7.0",
151151
"commander": "^12.1.0",
152152
"core-js": "3.37.1",
153-
"cypress": "13.12.0",
153+
"cypress": "13.17.0",
154154
"dayjs": "^1.11.11",
155155
"en-inflectors": "^1.0.12",
156156
"eslint": "8.57.0",
157157
"eslint-config-prettier": "9.1.0",
158158
"eslint-plugin-cypress": "2.15.1",
159-
"eslint-plugin-import": "2.29.1",
160-
"eslint-plugin-jsx-a11y": "6.8.0",
159+
"eslint-plugin-import": "2.31.0",
160+
"eslint-plugin-jsx-a11y": "6.10.1",
161161
"eslint-plugin-react": "7.33.2",
162-
"eslint-plugin-react-hooks": "4.6.0",
162+
"eslint-plugin-react-hooks": "5.0.0",
163163
"graphql-request": "^6.1.0",
164164
"graphql-tag": "^2.12.6",
165165
"husky": "^9.0.11",
166-
"jest": "^29.7.0",
167-
"jest-environment-jsdom": "^29.7.0",
166+
"jest": "29.7.0",
167+
"jest-environment-jsdom": "29.7.0",
168168
"jest-environment-node": "^29.7.0",
169169
"json-schema-to-typescript": "^14.0.5",
170170
"lint-staged": "^15.2.7",
171-
"nx": "19.3.0",
171+
"nx": "20.3.3",
172172
"pg": "^8.12.0",
173173
"pluralize": "^8.0.0",
174174
"postcss": "8.4.38",
@@ -180,7 +180,7 @@
180180
"ts-jest": "^29.1.5",
181181
"ts-morph": "^22.0.0",
182182
"ts-node": "10.9.2",
183-
"typescript": "5.4.5",
183+
"typescript": "5.6.3",
184184
"url-loader": "^4.1.1",
185185
"verdaccio": "^5.0.4",
186186
"vite": "^5.0.0",

0 commit comments

Comments
 (0)