Skip to content

Commit 09a1cc5

Browse files
build: update to Nx 20.0.x (#1433)
Closes #1393
1 parent bb780b5 commit 09a1cc5

File tree

8 files changed

+1001
-1138
lines changed

8 files changed

+1001
-1138
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ tmpanalogapp*
6565
~/.nvm/nvm.sh
6666

6767
.nx/cache
68-
.nx/workspace-data
68+
.nx/workspace-data
69+
vite.config.*.timestamp*

apps/blog-app/src/vite-env.d.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/// <reference types="vite/client" />
2+
3+
interface ImportMetaEnv {
4+
readonly VITE_ANALOG_PUBLIC_BASE_URL: string;
5+
}
6+
7+
interface ImportMeta {
8+
readonly env: ImportMetaEnv;
9+
}

apps/blog-app/vite.config.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/// <reference types="vitest" />
22

33
import analog, { type PrerenderContentFile } from '@analogjs/platform';
4+
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
45
import { defineConfig } from 'vite';
56

67
// Only run in Netlify CI
@@ -75,6 +76,7 @@ export default defineConfig(() => {
7576
},
7677
},
7778
}),
79+
nxViteTsPaths(),
7880
],
7981
};
8082
});

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+
});

nx.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@
6868
"projectSpecificFiles": []
6969
},
7070
"nxCloudAccessToken": "NDRkYzdkYmMtNDI3NS00MDI0LWFkMGQtMmI0Zjc2MTY2YzU0fHJlYWQtb25seQ==",
71-
"defaultBase": "main"
71+
"defaultBase": "main",
72+
"useLegacyCache": true
7273
}

package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
"@astrojs/react": "^3.0.0",
5757
"@babel/core": "^7.21.8",
5858
"@mdx-js/react": "3.0.1",
59-
"@nx/angular": "19.5.3",
60-
"@nx/devkit": "19.5.3",
59+
"@nx/angular": "20.0.8",
60+
"@nx/devkit": "20.0.8",
6161
"@trpc/client": "^10.25.0",
6262
"@trpc/server": "^10.25.0",
6363
"ajv-formats": "^2.1.1",
@@ -95,14 +95,14 @@
9595
"@commitlint/cli": "^17.4.2",
9696
"@commitlint/config-conventional": "^17.4.2",
9797
"@netlify/functions": "^2.3.0",
98-
"@nx/cypress": "19.5.3",
99-
"@nx/eslint": "19.5.3",
100-
"@nx/eslint-plugin": "19.5.3",
101-
"@nx/jest": "19.5.3",
102-
"@nx/js": "19.5.3",
103-
"@nx/plugin": "19.5.3",
104-
"@nx/vite": "19.5.3",
105-
"@nx/web": "19.5.3",
98+
"@nx/cypress": "20.0.8",
99+
"@nx/eslint": "20.0.8",
100+
"@nx/eslint-plugin": "20.0.8",
101+
"@nx/jest": "20.0.8",
102+
"@nx/js": "20.0.8",
103+
"@nx/plugin": "20.0.8",
104+
"@nx/vite": "20.0.8",
105+
"@nx/web": "20.0.8",
106106
"@schematics/angular": "^19.0.0-rc.0",
107107
"@semantic-release/changelog": "^6.0.3",
108108
"@semantic-release/exec": "^6.0.3",
@@ -113,7 +113,7 @@
113113
"@swc/helpers": "0.5.11",
114114
"@types/babel__core": "^7.20.0",
115115
"@types/hast": "^3.0.3",
116-
"@types/jest": "29.4.4",
116+
"@types/jest": "29.5.14",
117117
"@types/marked": "^5.0.0",
118118
"@types/node": "18.19.15",
119119
"@types/prismjs": "^1.26.0",
@@ -138,8 +138,8 @@
138138
"fs-extra": "^11.1.1",
139139
"h3": "^1.8.2",
140140
"happy-dom": "^12.10.3",
141-
"jest": "^29.5.0",
142-
"jest-environment-jsdom": "^29.5.0",
141+
"jest": "29.7.0",
142+
"jest-environment-jsdom": "29.7.0",
143143
"jsdom": "22.1.0",
144144
"jsonc-eslint-parser": "^2.1.0",
145145
"kolorist": "^1.6.0",
@@ -149,7 +149,7 @@
149149
"minimist": "^1.2.7",
150150
"ng-packagr": "^19.0.0-rc.0",
151151
"nitropack": "^2.9.7",
152-
"nx": "19.5.3",
152+
"nx": "20.0.8",
153153
"playwright": "^1.30.0",
154154
"postcss": "^8.4.21",
155155
"postcss-import": "~15.1.0",

pnpm-lock.yaml

+952-1,114
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.base.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
"baseUrl": ".",
1818
"paths": {
1919
"@analogjs/astro-angular": ["packages/astro-angular/src/index.ts"],
20-
"@analogjs/content": ["packages/content/src/index.ts"],
20+
"@analogjs/content": [
21+
"./node_modules/@analogjs/content",
22+
"packages/content/src/index.ts"
23+
],
2124
"@analogjs/content-plugin": ["packages/content-plugin/src/index.ts"],
2225
"@analogjs/content/prism-highlighter": [
2326
"packages/content/prism-highlighter/src/index.ts"
@@ -30,9 +33,18 @@
3033
"./node_modules/@analogjs/platform",
3134
"packages/platform/src/index.ts"
3235
],
33-
"@analogjs/router": ["packages/router/src/index.ts"],
34-
"@analogjs/router/server": ["packages/router/server/src/index.ts"],
35-
"@analogjs/router/tokens": ["packages/router/tokens/src/index.ts"],
36+
"@analogjs/router": [
37+
"./node_modules/@analogjs/router",
38+
"packages/router/src/index.ts"
39+
],
40+
"@analogjs/router/server": [
41+
"./node_modules/@analogjs/router/server",
42+
"packages/router/server/src/index.ts"
43+
],
44+
"@analogjs/router/tokens": [
45+
"./node_modules/@analogjs/router/tokens",
46+
"packages/router/tokens/src/index.ts"
47+
],
3648
"@analogjs/top-bar": ["libs/top-bar/src/index.ts"],
3749
"@analogjs/trpc": ["packages/trpc/src/index.ts"],
3850
"@analogjs/vite-plugin-angular": [

0 commit comments

Comments
 (0)