Skip to content

Commit 32bd111

Browse files
committed
nx20
Signed-off-by: Todd Baert <[email protected]>
1 parent 584c4dc commit 32bd111

File tree

7 files changed

+1276
-1082
lines changed

7 files changed

+1276
-1082
lines changed

.eslintrc.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"root": true,
33
"ignorePatterns": ["**/*"],
44
"plugins": ["@nx"],
5-
"extends": [
6-
"eslint:recommended",
7-
"plugin:prettier/recommended"
8-
],
5+
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
96
"overrides": [
107
{
118
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -28,12 +25,18 @@
2825
{
2926
"files": ["*.ts", "*.tsx"],
3027
"extends": ["plugin:@nx/typescript"],
31-
"rules": {}
28+
"rules": {
29+
"@typescript-eslint/no-extra-semi": "error",
30+
"no-extra-semi": "off"
31+
}
3232
},
3333
{
3434
"files": ["*.js", "*.jsx"],
3535
"extends": ["plugin:@nx/javascript"],
36-
"rules": {}
36+
"rules": {
37+
"@typescript-eslint/no-extra-semi": "error",
38+
"no-extra-semi": "off"
39+
}
3740
},
3841
{
3942
"files": "*.json",

.prettierignore

Lines changed: 2 additions & 1 deletion
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

jest.config.ts

Lines changed: 4 additions & 4 deletions
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

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,88 @@
22
"migrations": [
33
{
44
"cli": "nx",
5-
"version": "17.0.0-beta.1",
6-
"description": "Updates the default cache directory to .nx/cache",
7-
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
5+
"version": "18.0.0-beta.2",
6+
"description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
7+
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
8+
"x-repair-skip": true,
89
"package": "nx",
9-
"name": "17.0.0-move-cache-directory"
10+
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
1011
},
1112
{
12-
"cli": "nx",
13-
"version": "17.0.0-beta.3",
14-
"description": "Use minimal config for tasksRunnerOptions",
15-
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
13+
"version": "18.1.0-beta.3",
14+
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
15+
"implementation": "./src/migrations/update-17-2-0/move-default-base",
1616
"package": "nx",
17-
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
17+
"name": "move-default-base-to-nx-json-root"
1818
},
1919
{
20-
"version": "17.0.0-rc.1",
21-
"description": "Migration for v17.0.0-rc.1",
22-
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
20+
"cli": "nx",
21+
"version": "19.2.0-beta.2",
22+
"description": "Updates the default workspace data directory to .nx/workspace-data",
23+
"implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory",
2324
"package": "nx",
24-
"name": "rm-default-collection-npm-scope"
25+
"name": "19-2-0-move-graph-cache-directory"
2526
},
2627
{
2728
"cli": "nx",
28-
"version": "17.3.0-beta.6",
29+
"version": "19.2.2-beta.0",
2930
"description": "Updates the nx wrapper.",
3031
"implementation": "./src/migrations/update-17-3-0/update-nxw",
3132
"package": "nx",
32-
"name": "17.3.0-update-nx-wrapper"
33+
"name": "19-2-2-update-nx-wrapper"
3334
},
3435
{
35-
"cli": "nx",
36-
"version": "17-2-6-beta.1",
37-
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
38-
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
39-
"package": "@nx/eslint-plugin",
40-
"name": "update-17-2-6-rename-workspace-rules"
36+
"version": "19.2.4-beta.0",
37+
"description": "Set project name in nx.json explicitly",
38+
"implementation": "./src/migrations/update-19-2-4/set-project-name",
39+
"x-repair-skip": true,
40+
"package": "nx",
41+
"name": "19-2-4-set-project-name"
4142
},
4243
{
43-
"version": "17.1.0-beta.2",
44-
"description": "Move jest executor options to nx.json targetDefaults",
45-
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
46-
"package": "@nx/jest",
47-
"name": "move-options-to-target-defaults"
44+
"version": "20.0.0-beta.7",
45+
"description": "Migration for v20.0.0-beta.7",
46+
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
47+
"package": "nx",
48+
"name": "move-use-daemon-process"
4849
},
4950
{
50-
"cli": "nx",
51-
"version": "17.0.2",
52-
"description": "Remove deprecated build options",
53-
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
54-
"package": "@nx/js",
55-
"name": "update-17-0-0-remove-deprecated-build-options"
51+
"version": "20.0.1",
52+
"description": "Set `useLegacyCache` to true for migrating workspaces",
53+
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
54+
"x-repair-skip": true,
55+
"package": "nx",
56+
"name": "use-legacy-cache"
5657
},
5758
{
58-
"version": "17.0.0-beta.7",
59-
"description": "update-17-0-0-rename-to-eslint",
60-
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
59+
"version": "20.2.0-beta.5",
60+
"description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
61+
"implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
6162
"package": "@nx/eslint",
62-
"name": "update-17-0-0-rename-to-eslint"
63+
"name": "update-typescript-eslint-v8.13.0"
6364
},
6465
{
65-
"version": "17.1.0-beta.1",
66-
"description": "Updates for @typescript-utils/utils v6.9.1+",
67-
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
66+
"version": "20.3.0-beta.1",
67+
"description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
68+
"implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides",
6869
"package": "@nx/eslint",
69-
"name": "update-typescript-eslint"
70+
"name": "add-file-extensions-to-overrides"
7071
},
7172
{
72-
"version": "17.2.0-beta.0",
73-
"description": "Simplify eslintFilePatterns",
74-
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
75-
"package": "@nx/eslint",
76-
"name": "simplify-eslint-patterns"
73+
"cli": "nx",
74+
"version": "19.1.0-beta.6",
75+
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
76+
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
77+
"package": "@nx/eslint-plugin",
78+
"name": "update-19-1-0-rename-no-extra-semi"
7779
},
7880
{
79-
"version": "17.2.9",
80-
"description": "Move executor options to target defaults",
81-
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
82-
"package": "@nx/eslint",
83-
"name": "move-options-to-target-defaults"
81+
"cli": "nx",
82+
"version": "20.0.0-beta.5",
83+
"description": "replace getJestProjects with getJestProjectsAsync",
84+
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
85+
"package": "@nx/jest",
86+
"name": "replace-getJestProjects-with-getJestProjectsAsync"
8487
}
8588
]
8689
}

nx.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"affected": {
4-
"defaultBase": "main"
5-
},
63
"pluginsConfig": {
74
"@nx/js": {
85
"analyzeSourceFiles": true
@@ -39,5 +36,8 @@
3936
"default": ["{projectRoot}/**/*", "sharedGlobals"],
4037
"sharedGlobals": [],
4138
"production": ["default"]
42-
}
39+
},
40+
"useInferencePlugins": false,
41+
"defaultBase": "main",
42+
"useLegacyCache": true
4343
}

0 commit comments

Comments
 (0)