Skip to content

Commit ef442a7

Browse files
brandonrobertsbrandonroberts
authored
fix(platform): add support for Nx 21 release (#1727)
1 parent 050117c commit ef442a7

File tree

9 files changed

+1207
-1261
lines changed

9 files changed

+1207
-1261
lines changed

‎package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"@astrojs/react": "^3.0.0",
5959
"@babel/core": "^7.21.8",
6060
"@mdx-js/react": "3.0.1",
61-
"@nx/angular": "20.6.4",
62-
"@nx/devkit": "20.6.4",
61+
"@nx/angular": "21.0.3",
62+
"@nx/devkit": "21.0.3",
6363
"@trpc/client": "^10.25.0",
6464
"@trpc/server": "^10.25.0",
6565
"ajv-formats": "^2.1.1",
@@ -99,23 +99,23 @@
9999
"@commitlint/cli": "^17.4.2",
100100
"@commitlint/config-conventional": "^17.4.2",
101101
"@netlify/functions": "^2.3.0",
102-
"@nx/cypress": "20.6.4",
103-
"@nx/eslint": "20.6.4",
104-
"@nx/eslint-plugin": "20.6.4",
105-
"@nx/jest": "20.6.4",
106-
"@nx/js": "20.6.4",
107-
"@nx/plugin": "20.6.4",
108-
"@nx/storybook": "20.6.4",
109-
"@nx/vite": "20.6.4",
110-
"@nx/web": "20.6.4",
102+
"@nx/cypress": "21.0.3",
103+
"@nx/eslint": "21.0.3",
104+
"@nx/eslint-plugin": "21.0.3",
105+
"@nx/jest": "21.0.3",
106+
"@nx/js": "21.0.3",
107+
"@nx/plugin": "21.0.3",
108+
"@nx/storybook": "21.0.3",
109+
"@nx/vite": "21.0.3",
110+
"@nx/web": "21.0.3",
111111
"@schematics/angular": "19.2.5",
112112
"@semantic-release/changelog": "^6.0.3",
113113
"@semantic-release/exec": "^6.0.3",
114114
"@semantic-release/git": "^10.0.1",
115-
"@storybook/angular": "^8.6.12",
115+
"@storybook/angular": "8.6.12",
116116
"@storybook/builder-vite": "^8.6.12",
117117
"@swc-node/register": "1.9.2",
118-
"@swc/cli": "0.3.12",
118+
"@swc/cli": "0.6.0",
119119
"@swc/core": "1.5.7",
120120
"@swc/helpers": "0.5.11",
121121
"@types/babel__core": "^7.20.0",
@@ -135,10 +135,10 @@
135135
"conventional-changelog": "^3.1.25",
136136
"conventional-changelog-cli": "^2.2.2",
137137
"cpy-cli": "^4.2.0",
138-
"cypress": "13.14.2",
138+
"cypress": "14.3.3",
139139
"esbuild": "0.25.0",
140140
"eslint": "8.57.0",
141-
"eslint-config-prettier": "9.0.0",
141+
"eslint-config-prettier": "10.1.5",
142142
"eslint-plugin-cypress": "3.5.0",
143143
"execa": "^7.1.1",
144144
"fast-glob": "^3.2.12",
@@ -159,7 +159,7 @@
159159
"minimist": "^1.2.7",
160160
"ng-packagr": "19.2.0",
161161
"nitropack": "^2.11.0",
162-
"nx": "20.6.4",
162+
"nx": "21.0.3",
163163
"playwright": "^1.49.1",
164164
"postcss": "^8.4.21",
165165
"postcss-import": "~15.1.0",

‎packages/content/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
2828
"@angular/platform-browser": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
2929
"@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
30-
"@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
30+
"@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0",
3131
"front-matter": "^4.0.2",
3232
"marked": "^15.0.7",
3333
"marked-gfm-heading-id": "^4.1.1",

‎packages/nx-plugin/src/generators/app/generator.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ describe('nx-plugin generator', () => {
139139
expect(dependencies['mermaid']).toBe('^10.2.4');
140140
expect(dependencies['prismjs']).toBe('^1.29.0');
141141

142-
expect(devDependencies['@nx/devkit']).toBe('^20.0.0');
143-
expect(devDependencies['@nx/angular']).toBe('^20.0.0');
142+
expect(devDependencies['@nx/devkit']).toBe('^21.0.0');
143+
expect(devDependencies['@nx/angular']).toBe('^21.0.0');
144144
// we just check for truthy because @nx/eslint generator
145145
// will install the correct version based on Nx version
146146
expect(devDependencies['@nx/eslint']).toBeTruthy();
147147
expect(devDependencies['@analogjs/platform']).toBeDefined();
148148
expect(devDependencies['@analogjs/vite-plugin-angular']).toBeDefined();
149149
expect(devDependencies['@analogjs/vitest-angular']).toBeDefined();
150-
expect(devDependencies['@nx/vite']).toBe('^20.0.0');
150+
expect(devDependencies['@nx/vite']).toBe('^21.0.0');
151151
expect(devDependencies['jsdom']).toBe('^22.1.0');
152152
expect(devDependencies['vite']).toBeDefined();
153153
expect(devDependencies['vite-tsconfig-paths']).toBe('^4.2.0');

‎packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const initWithNxNamespace = async (
7878
'@nx/angular': versions['@nx/angular'],
7979
'@nx/devkit': versions['@nx/devkit'],
8080
'@nx/eslint': versions['@nx/eslint'],
81-
typescript: '~5.5.0',
81+
typescript: '~5.7.0',
8282
},
8383
);
8484

‎packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// V18_X
22
// dependencies
3-
export const V18_X_NX_DEVKIT = '^20.0.0';
4-
export const V18_X_NX_ANGULAR = '^20.0.0';
3+
export const V18_X_NX_DEVKIT = '^21.0.0';
4+
export const V18_X_NX_ANGULAR = '^21.0.0';
55
export const V18_X_ANALOG_JS_CONTENT = '^1.16.1-beta.7';
66
export const V18_X_ANALOG_JS_ROUTER = '^1.16.1-beta.7';
77
export const V18_X_ANALOG_JS_TRPC = '~0.3.0';
@@ -26,8 +26,8 @@ export const V18_X_AUTOPREFIXER = '^10.4.0';
2626
// devDependencies
2727
export const V18_X_ANALOG_JS_PLATFORM = '^1.16.1-beta.7';
2828
export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
29-
export const V18_X_NX_VITE = '^20.0.0';
30-
export const V18_X_NX_LINTER = '^20.0.0';
29+
export const V18_X_NX_VITE = '^21.0.0';
30+
export const V18_X_NX_LINTER = '^21.0.0';
3131
export const V18_X_JSDOM = '^22.1.0';
3232
export const V18_X_VITE = '^6.0.0';
3333
export const V18_X_VITE_TSCONFIG_PATHS = '^4.2.0';

‎packages/nx-plugin/src/utils/versions/ng_18_X/versions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// V18_X
22
export const V18_X_ANALOG_JS_ROUTER = '^1.7.0';
33
export const V18_X_ANALOG_JS_CONTENT = '^1.7.0';
4-
export const V18_X_MARKED = '^5.0.2';
5-
export const V18_X_MARKED_GFM_HEADING_ID = '^3.0.4';
6-
export const V18_X_MARKED_HIGHLIGHT = '^2.0.1';
7-
export const V18_X_MARKED_MANGLE = '^1.1.7';
4+
export const V18_X_MARKED = '^15.0.7';
5+
export const V18_X_MARKED_GFM_HEADING_ID = '^4.1.1';
6+
export const V18_X_MARKED_HIGHLIGHT = '^2.2.1';
7+
export const V18_X_MARKED_MANGLE = '^1.1.10';
88
export const V18_X_PRISMJS = '^1.29.0';
99

1010
// devDependencies

‎packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export const V19_X_PRISMJS = '^1.29.0';
1111
export const V19_X_ANALOG_JS_PLATFORM = '^1.16.1-beta.7';
1212
export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.16.1-beta.7';
1313
export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^1.16.1-beta.7';
14-
export const V19_X_NX_ANGULAR = '^20.0.0';
15-
export const V19_X_NX_VITE = '^20.0.0';
14+
export const V19_X_NX_ANGULAR = '^21.0.0';
15+
export const V19_X_NX_VITE = '^21.0.0';
1616
export const V19_X_JSDOM = '^22.0.0';
1717
export const V19_X_VITE_TSCONFIG_PATHS = '^4.2.0';
1818
export const V19_X_VITEST = '^2.0.0';

‎packages/platform/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"vitefu": "^1.0.0"
3535
},
3636
"peerDependencies": {
37-
"@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
38-
"@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
39-
"@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
37+
"@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
38+
"@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
39+
"@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
4040
"marked": "^15.0.7",
4141
"marked-gfm-heading-id": "^4.1.1",
4242
"marked-highlight": "^2.2.1",

0 commit comments

Comments
 (0)