Skip to content

Commit 5b1c33f

Browse files
authored
Merge pull request #117 from gcko/feature/upgrade-to-nx-20
Feature/upgrade to nx 20
2 parents 22f9963 + 7415607 commit 5b1c33f

16 files changed

+6117
-3876
lines changed

.eslintrc.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@
2424
{
2525
"files": ["*.ts", "*.tsx"],
2626
"extends": ["plugin:@nx/typescript"],
27-
"rules": {}
27+
"rules": {
28+
"no-extra-semi": "off",
29+
"@typescript-eslint/no-unused-vars": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
3134
"extends": ["plugin:@nx/javascript"],
32-
"rules": {}
35+
"rules": {
36+
"no-extra-semi": "off"
37+
}
3338
},
3439
{
3540
"files": "*.json",

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Thumbs.db
4141

4242
# nx
4343
/.nx/cache
44+
.nx/workspace-data
4445

4546
# Sonar
4647
.scannerwork

.prettierignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/dist
44
/coverage
55

6-
/.nx/cache
6+
/.nx/cache
7+
/.nx/workspace-data

apps/docs-site/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"build-docs": {
1717
"executor": "nx:run-commands",
1818
"options": {
19-
"command": "ts-node tools/scripts/build-tool-docs.ts"
19+
"command": "ts-node --project tools/tsconfig.tools.json tools/scripts/build-tool-docs.ts"
2020
},
2121
"cache": true,
2222
"inputs": [

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

migrations.json

+60-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,67 @@
11
{
22
"migrations": [
33
{
4-
"version": "18.1.0-beta.3",
5-
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
6-
"implementation": "./src/migrations/update-17-2-0/move-default-base",
4+
"cli": "nx",
5+
"version": "19.2.0-beta.2",
6+
"description": "Updates the default workspace data directory to .nx/workspace-data",
7+
"implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory",
78
"package": "nx",
8-
"name": "move-default-base-to-nx-json-root"
9+
"name": "19-2-0-move-graph-cache-directory"
10+
},
11+
{
12+
"cli": "nx",
13+
"version": "19.2.2-beta.0",
14+
"description": "Updates the nx wrapper.",
15+
"implementation": "./src/migrations/update-17-3-0/update-nxw",
16+
"package": "nx",
17+
"name": "19-2-2-update-nx-wrapper"
18+
},
19+
{
20+
"version": "19.2.4-beta.0",
21+
"description": "Set project name in nx.json explicitly",
22+
"implementation": "./src/migrations/update-19-2-4/set-project-name",
23+
"x-repair-skip": true,
24+
"package": "nx",
25+
"name": "19-2-4-set-project-name"
26+
},
27+
{
28+
"version": "20.0.0-beta.7",
29+
"description": "Migration for v20.0.0-beta.7",
30+
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
31+
"package": "nx",
32+
"name": "move-use-daemon-process"
33+
},
34+
{
35+
"version": "20.0.1",
36+
"description": "Set `useLegacyCache` to true for migrating workspaces",
37+
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
38+
"x-repair-skip": true,
39+
"package": "nx",
40+
"name": "use-legacy-cache"
41+
},
42+
{
43+
"cli": "nx",
44+
"version": "19.6.3-beta.0",
45+
"description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
46+
"implementation": "./src/migrations/update-19-6-3/proxy-config",
47+
"package": "@nx/webpack",
48+
"name": "update-19-6-3-proxy-config"
49+
},
50+
{
51+
"cli": "nx",
52+
"version": "20.0.0-beta.5",
53+
"description": "replace getJestProjects with getJestProjectsAsync",
54+
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
55+
"package": "@nx/jest",
56+
"name": "replace-getJestProjects-with-getJestProjectsAsync"
57+
},
58+
{
59+
"cli": "nx",
60+
"version": "19.1.0-beta.6",
61+
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
62+
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
63+
"package": "@nx/eslint-plugin",
64+
"name": "update-19-1-0-rename-no-extra-semi"
965
}
1066
]
1167
}

nx.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@
4747
"nxCloudAccessToken": "MWM4ZWZiNDgtOGYwMi00ZDI3LTllMDUtYTNkYTExMmU3MDY2fHJlYWQ=",
4848
"parallel": 3,
4949
"defaultBase": "origin/main",
50-
"useInferencePlugins": false
50+
"useInferencePlugins": false,
51+
"useLegacyCache": true
5152
}

0 commit comments

Comments
 (0)