Skip to content

Commit 6130ec6

Browse files
committed
build(repo): upgrade to nx 21.5.3 and fix test issue
1 parent 0d14bcf commit 6130ec6

13 files changed

Lines changed: 2774 additions & 1518 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ testem.log
4545
Thumbs.db
4646

4747
# Nx
48+
.cursor/rules/nx-rules.mdc
49+
.github/instructions/nx.instructions.md
4850
.nx/cache
4951
.nx/workspace-data
5052
migrations.json
@@ -61,4 +63,4 @@ apps/**/pnpm-lock.yaml
6163

6264
# Next.js
6365
.next
64-
out
66+
out

e2e/nx-payload-e2e/project.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@
1313
"runInBand": true
1414
},
1515
"configurations": {
16-
"docker": { "testPathPattern": ["docker", "ui"] },
16+
"docker": {
17+
"testPathPatterns": ["docker", "ui"]
18+
},
1719
"skip-docker": {
1820
"testPathIgnorePatterns": ["docker", "ui"]
1921
},
20-
"quick": { "testPathPattern": ["quick"] }
22+
"quick": {
23+
"testPathPatterns": ["quick"]
24+
}
2125
}
2226
}
2327
}

e2e/nx-payload-e2e/src/nx-payload.legacy.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ describe('Test plugin by creating workspace with preset (legacy test suite)', ()
9696
});
9797

9898
it('should test application', async () => {
99-
await runNxCommandAsync(`test ${project.appName}`);
99+
// https://github.com/nrwl/nx/issues/32880
100+
await runNxCommandAsync(`test ${project.appName} --force-exit`);
100101
});
101102

102103
it('should lint application', async () => {

e2e/nx-payload-e2e/src/nx-payload.main.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ describe('Test plugin by creating workspace with preset (extended test suite)',
116116
});
117117

118118
it('should test application', () => {
119-
const result = runNxCommand(`test ${project.appName}`);
119+
// https://github.com/nrwl/nx/issues/32880
120+
const result = runNxCommand(`test ${project.appName} --force-exit`);
120121
expect(result).toContain('Successfully ran target test');
121122
});
122123

e2e/nx-payload-e2e/src/nx-payload.quick.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ describe('Test plugin by starting with an empty workspace (limited test suite)',
107107
});
108108

109109
it('should test application', async () => {
110-
await runNxCommandAsync(`test ${appName}`);
110+
// https://github.com/nrwl/nx/issues/32880
111+
await runNxCommandAsync(`test ${appName} --force-exit`);
111112
});
112113

113114
it('should lint application', async () => {

nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
"preVersionCommand": "pnpm nx run-many -t build",
137137
"conventionalCommits": true,
138138
"generatorOptions": {
139-
"fallbackCurrentVersionResolver": "disk"
139+
"fallbackCurrentVersionResolver": "disk",
140+
"preserveLocalDependencyProtocols": false
140141
}
141142
},
142143
"conventionalCommits": {

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@
9292
"@eslint/js": "^9.8.0",
9393
"@evilmartians/lefthook": "^1.8.0",
9494
"@homebridge/node-pty-prebuilt-multiarch": "^0.13.0",
95-
"@nx/cypress": "20.8.2",
96-
"@nx/devkit": "20.8.2",
97-
"@nx/esbuild": "20.8.2",
98-
"@nx/eslint": "20.8.2",
99-
"@nx/eslint-plugin": "20.8.2",
100-
"@nx/jest": "20.8.2",
101-
"@nx/js": "20.8.2",
102-
"@nx/next": "20.8.2",
103-
"@nx/node": "20.8.2",
104-
"@nx/playwright": "20.8.2",
105-
"@nx/plugin": "20.8.2",
106-
"@nx/react": "20.8.2",
107-
"@nx/remix": "20.8.2",
108-
"@nx/vite": "20.8.2",
109-
"@nx/web": "20.8.2",
110-
"@nx/webpack": "20.8.2",
111-
"@nx/workspace": "20.8.2",
95+
"@nx/cypress": "21.5.3",
96+
"@nx/devkit": "21.5.3",
97+
"@nx/esbuild": "21.5.3",
98+
"@nx/eslint": "21.5.3",
99+
"@nx/eslint-plugin": "21.5.3",
100+
"@nx/jest": "21.5.3",
101+
"@nx/js": "21.5.3",
102+
"@nx/next": "21.5.3",
103+
"@nx/node": "21.5.3",
104+
"@nx/playwright": "21.5.3",
105+
"@nx/plugin": "21.5.3",
106+
"@nx/react": "21.5.3",
107+
"@nx/remix": "21.5.3",
108+
"@nx/vite": "21.5.3",
109+
"@nx/web": "21.5.3",
110+
"@nx/webpack": "21.5.3",
111+
"@nx/workspace": "21.5.3",
112112
"@octokit/core": "6.1.6",
113113
"@octokit/graphql-schema": "^15.25.0",
114114
"@octokit/plugin-rest-endpoint-methods": "^13.2.6",
@@ -124,14 +124,14 @@
124124
"@swc/cli": "0.6.0",
125125
"@swc/core": "~1.13.0",
126126
"@swc/helpers": "~0.5.11",
127-
"@swc/jest": "~0.2.36",
127+
"@swc/jest": "0.2.39",
128128
"@tailwindcss/postcss": "~4.1.0",
129129
"@tailwindcss/typography": "^0.5.16",
130130
"@testing-library/dom": "^10.0.0",
131131
"@testing-library/jest-dom": "6.7.0",
132132
"@testing-library/react": "16.1.0",
133133
"@testing-library/user-event": "^14.5.2",
134-
"@types/jest": "^29.5.12",
134+
"@types/jest": "30.0.0",
135135
"@types/kill-port": "^2.0.3",
136136
"@types/node": "22.17.1",
137137
"@types/nodemailer": "^6.4.17",
@@ -146,10 +146,10 @@
146146
"@vitejs/plugin-react-swc": "^3.5.0",
147147
"@vitest/coverage-v8": "^1.0.4",
148148
"@vitest/ui": "^1.3.1",
149-
"babel-jest": "^29.7.0",
149+
"babel-jest": "30.0.5",
150150
"chalk": "^4.1.0",
151151
"concurrently": "^9.1.2",
152-
"create-nx-workspace": "20.8.2",
152+
"create-nx-workspace": "21.5.3",
153153
"cz-git": "^1.8.0",
154154
"czg": "^1.8.0",
155155
"docker-cli-js": "^2.10.0",
@@ -164,17 +164,18 @@
164164
"eslint-plugin-react": "7.37.5",
165165
"eslint-plugin-react-hooks": "5.2.0",
166166
"graphql-config": "^5.1.3",
167-
"jest": "^29.7.0",
167+
"jest": "30.0.5",
168168
"jest-diff": "^29.7.0",
169-
"jest-environment-jsdom": "29.7.0",
170-
"jest-environment-node": "^29.7.0",
169+
"jest-environment-jsdom": "30.0.5",
170+
"jest-environment-node": "^30.1.2",
171+
"jest-util": "~30.0.0",
171172
"jiti": "2.4.2",
172173
"jsdom": "~26.1.0",
173174
"kill-port": "^2.0.1",
174175
"memfs": "^4.14.0",
175176
"nodemon": "^3.1.9",
176177
"npm-whoami": "^1.1.4",
177-
"nx": "20.8.2",
178+
"nx": "21.5.3",
178179
"nx-cloud": "19.1.0",
179180
"postcss": "~8.5.2",
180181
"prettier": "^3.0.0",
@@ -186,12 +187,12 @@
186187
"tcp-port-used": "^1.0.2",
187188
"tiny-invariant": "^1.3.3",
188189
"tree-kill": "^1.2.2",
189-
"ts-jest": "^29.1.0",
190+
"ts-jest": "29.4.4",
190191
"ts-node": "10.9.2",
191192
"tslib": "^2.4.1",
192193
"tsx": "^4.19.2",
193194
"type-fest": "^4.26.1",
194-
"typescript": "~5.7.0",
195+
"typescript": "5.9.2",
195196
"typescript-eslint": "^8.0.0",
196197
"verdaccio": "6.1.6",
197198
"vite": "6.3.6",

packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
"@actions/github": "^6.0.0",
3535
"@clack/prompts": "^0.11.0",
3636
"@homebridge/node-pty-prebuilt-multiarch": "^0.13.0",
37-
"@nx/devkit": "^20.0.0",
38-
"@nx/plugin": "^20.0.0",
37+
"@nx/devkit": "^21.0.0",
38+
"@nx/plugin": "^21.0.0",
3939
"@octokit/request-error": "^5.0.1",
4040
"chalk": "^4.1.0",
4141
"docker-cli-js": "^2.10.0",
4242
"fast-glob": "^3.3.2",
4343
"http-status-codes": "^2.3.0",
4444
"kill-port": "^2.0.1",
4545
"npm-whoami": "^1.1.4",
46-
"nx": "^20.0.0",
46+
"nx": "^21.0.0",
4747
"simple-git": "^3.27.0",
4848
"tcp-port-used": "^1.0.2",
4949
"tiny-invariant": "^1.3.3",

packages/create-nx-payload/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dependencies": {
2323
"chalk": "^4.1.0",
24-
"create-nx-workspace": "20.4.5",
24+
"create-nx-workspace": "21.5.3",
2525
"enquirer": "^2.4.1",
2626
"tslib": "^2.4.1",
2727
"yargs": "^17.7.2"

packages/nx-fly-deployment-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@actions/core": "^1.11.1",
2828
"@actions/exec": "^1.1.1",
2929
"@actions/github": "^6.0.0",
30-
"@nx/devkit": "^20.0.0",
30+
"@nx/devkit": "^20.0.0 || ^21.0.0",
3131
"@octokit/webhooks-types": "^7.6.1",
3232
"zod": "^3.23.8"
3333
},

0 commit comments

Comments
 (0)