Skip to content

Commit f419248

Browse files
feat: nx 21 support (#251)
* chore(repo): bump deps * chore(repo): [nx migration] remove-legacy-cache * chore(qwik-nx): bump in-project deps * feat(qwik-nx): deprecate qwikNxVite * chore(repo): update readme
1 parent 404475a commit f419248

17 files changed

+189
-972
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ This plugin supports Nx migrations and provides necessary version and code updat
9393

9494
| qwik-nx version | Nx version |
9595
| --------------- | ------------------------- |
96+
| ^3.2.0 | ^21.0.0 |
9697
| ^3.1.0 | ^20.7.0 |
9798
| ^3.0.0 | ^20.0.0 |
9899
| ^2.0.0 | ^17.0.0, ^18.0.0, ^19.0.0 |

e2e/qwik-nx-e2e/tests/chore.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ describe('misc checks', () => {
2323
expect(packageJson.dependencies).toBeUndefined();
2424
expect(packageJson.devDependencies).toBeUndefined();
2525
expect(packageJson.peerDependencies).toEqual({
26-
'@nx/devkit': '^20.7.0',
27-
'@nx/js': '^20.7.0',
28-
'@nx/eslint': '^20.7.0',
29-
'@nx/vite': '^20.7.0',
26+
'@nx/devkit': '^21.0.0',
27+
'@nx/js': '^21.0.0',
28+
'@nx/eslint': '^21.0.0',
29+
'@nx/vite': '^21.0.0',
3030
});
3131
},
3232
DEFAULT_E2E_TIMEOUT

nx.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,5 @@
4444
"libsDir": "packages"
4545
},
4646
"nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU=",
47-
"useInferencePlugins": false,
48-
"useLegacyCache": true
47+
"useInferencePlugins": false
4948
}

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"@commitlint/config-angular": "^17.8.1",
2525
"@commitlint/config-conventional": "^17.8.1",
2626
"@jscutlery/semver": "^4.2.0",
27-
"@nx/cypress": "20.7.1",
28-
"@nx/devkit": "20.7.1",
29-
"@nx/eslint": "20.7.1",
30-
"@nx/eslint-plugin": "20.7.1",
31-
"@nx/jest": "20.7.1",
32-
"@nx/js": "20.7.1",
33-
"@nx/playwright": "20.7.1",
34-
"@nx/plugin": "20.7.1",
35-
"@nx/storybook": "20.7.1",
36-
"@nx/vite": "20.7.1",
37-
"@nx/workspace": "20.7.1",
27+
"@nx/cypress": "21.0.3",
28+
"@nx/devkit": "21.0.3",
29+
"@nx/eslint": "21.0.3",
30+
"@nx/eslint-plugin": "21.0.3",
31+
"@nx/jest": "21.0.3",
32+
"@nx/js": "21.0.3",
33+
"@nx/playwright": "21.0.3",
34+
"@nx/plugin": "21.0.3",
35+
"@nx/storybook": "21.0.3",
36+
"@nx/vite": "21.0.3",
37+
"@nx/workspace": "21.0.3",
3838
"@swc-node/register": "1.9.2",
3939
"@swc/cli": "0.3.12",
4040
"@swc/core": "1.5.7",
@@ -66,7 +66,7 @@
6666
"jsonc-eslint-parser": "^2.4.0",
6767
"kill-port": "2.0.1",
6868
"ngx-deploy-npm": "8.0.1",
69-
"nx": "20.7.1",
69+
"nx": "21.0.3",
7070
"prettier": "^2.8.8",
7171
"pretty-quick": "^3.3.1",
7272
"semver": "7.6.0",
@@ -81,7 +81,7 @@
8181
"yargs": "17.7.1"
8282
},
8383
"dependencies": {
84-
"@storybook/addon-interactions": "8.4.7",
84+
"@storybook/addon-interactions": "8.6.14",
8585
"@swc/helpers": "0.5.13",
8686
"storybook": "^8.2.8",
8787
"tslib": "^2.6.2"

packages/qwik-nx/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"generators": "./generators.json",
2323
"executors": "./executors.json",
2424
"peerDependencies": {
25-
"@nx/devkit": "^20.7.0",
26-
"@nx/js": "^20.7.0",
27-
"@nx/vite": "^20.7.0",
28-
"@nx/eslint": "^20.7.0"
25+
"@nx/devkit": "^21.0.0",
26+
"@nx/js": "^21.0.0",
27+
"@nx/vite": "^21.0.0",
28+
"@nx/eslint": "^21.0.0"
2929
},
3030
"nx-migrations": {
3131
"migrations": "./migrations.json"

packages/qwik-nx/src/migrations/__snapshots__/add-root-property-to-vite-config.spec.ts.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ exports[`add-root-property-to-vite-config migration should add/update the "root"
44
"import { qwikVite } from \\"@builder.io/qwik/optimizer\\";
55
import { defineConfig } from \\"vite\\";
66
import tsconfigPaths from \\"vite-tsconfig-paths\\";
7-
import { qwikNxVite } from \\"qwik-nx/plugins\\";
87
export default defineConfig({
98
root: apps / myapp,
109
plugins: [
11-
qwikNxVite(),
1210
qwikVite({
1311
client: {
1412
outDir: \\"../../dist/apps/myapp/client\\",

packages/qwik-nx/src/migrations/add-root-property-to-vite-config.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ const getViteConfigSample = (
2828
) => `import { qwikVite } from '@builder.io/qwik/optimizer';
2929
import { defineConfig } from 'vite';
3030
import tsconfigPaths from 'vite-tsconfig-paths';
31-
import { qwikNxVite } from 'qwik-nx/plugins';
3231
3332
export default defineConfig({
3433
${includeRootProp ? '\nroot: "apps/myapp"' : ''}
3534
plugins: [
36-
qwikNxVite(),
3735
qwikVite({
3836
client: {
3937
outDir: '../../dist/apps/myapp/client',

packages/qwik-nx/src/plugins/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
export * from './qwik-nx-vite.plugin';
2-
export type {
3-
ProjectFilter,
4-
ExcludeProjectFilter,
5-
QwikNxVitePluginOptions,
6-
} from './models/qwik-nx-vite';

packages/qwik-nx/src/plugins/models/qwik-nx-vite.ts

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)