Skip to content

Commit 1bf0081

Browse files
committed
chore: migrate to nx 20.2
1 parent 5ac2812 commit 1bf0081

File tree

7 files changed

+1264
-1096
lines changed

7 files changed

+1264
-1096
lines changed

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

+30-32
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,50 @@
99
"name": "update-19-6-0-add-nx-packages"
1010
},
1111
{
12-
"cli": "nx",
13-
"version": "19.6.0-beta.0",
14-
"description": "Use serve-static or preview for webServerCommand.",
15-
"implementation": "./src/migrations/update-19-6-0/use-serve-static-preview-for-command",
16-
"package": "@nx/playwright",
17-
"name": "19-6-0-use-serve-static-preview-for-command"
12+
"version": "20.0.0-beta.7",
13+
"description": "Migration for v20.0.0-beta.7",
14+
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
15+
"package": "nx",
16+
"name": "move-use-daemon-process"
1817
},
1918
{
20-
"cli": "nx",
21-
"version": "19.6.0-beta.1",
22-
"description": "Add inferred ciTargetNames to targetDefaults with dependsOn to ensure dependent application builds are scheduled before atomized tasks.",
23-
"implementation": "./src/migrations/update-19-6-0/add-e2e-ci-target-defaults",
24-
"package": "@nx/playwright",
25-
"name": "update-19-6-0-add-e2e-ci-target-defaults"
19+
"version": "20.0.1",
20+
"description": "Set `useLegacyCache` to true for migrating workspaces",
21+
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
22+
"x-repair-skip": true,
23+
"package": "nx",
24+
"name": "use-legacy-cache"
2625
},
2726
{
2827
"cli": "nx",
29-
"version": "19.6.3-beta.0",
30-
"description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
31-
"implementation": "./src/migrations/update-19-6-3/proxy-config",
32-
"package": "@nx/webpack",
33-
"name": "update-19-6-3-proxy-config"
28+
"version": "20.2.0-beta.2",
29+
"description": "Update the ModuleFederationConfig import use @nx/module-federation.",
30+
"factory": "./src/migrations/update-20-2-0/migrate-mf-imports-to-new-package",
31+
"package": "@nx/react",
32+
"name": "update-20-2-0-update-module-federation-config-import"
3433
},
3534
{
3635
"cli": "nx",
37-
"version": "19.6.0-beta.4",
38-
"description": "Ensure Module Federation DTS is turned off by default.",
39-
"factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default",
36+
"version": "20.2.0-beta.2",
37+
"description": "Update the withModuleFederation import use @nx/module-federation/webpack.",
38+
"factory": "./src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package",
4039
"package": "@nx/react",
41-
"name": "update-19-6-0-turn-module-federation-dts-off"
40+
"name": "update-20-2-0-update-with-module-federation-import"
4241
},
4342
{
4443
"cli": "nx",
45-
"version": "19.6.0-beta.4",
46-
"description": "Update the server file for Module Federation SSR port value to be the same as the 'serve' target port value.",
47-
"factory": "./src/migrations/update-19-6-0/update-ssr-server-port",
48-
"package": "@nx/react",
49-
"name": "update-module-federation-ssr-server-file"
44+
"version": "20.0.0-beta.5",
45+
"description": "replace getJestProjects with getJestProjectsAsync",
46+
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
47+
"package": "@nx/jest",
48+
"name": "replace-getJestProjects-with-getJestProjectsAsync"
5049
},
5150
{
52-
"cli": "nx",
53-
"version": "19.6.1-beta.0",
54-
"description": "Ensure Target Defaults are set correctly for Module Federation.",
55-
"factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf",
56-
"package": "@nx/react",
57-
"name": "update-19-6-1-ensure-module-federation-target-defaults"
51+
"version": "20.2.0-beta.5",
52+
"description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
53+
"implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
54+
"package": "@nx/eslint",
55+
"name": "update-typescript-eslint-v8.13.0"
5856
}
5957
]
6058
}

nx.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,6 @@
8181
},
8282
"parallel": 3,
8383
"defaultBase": "main",
84-
"useInferencePlugins": false
84+
"useInferencePlugins": false,
85+
"useLegacyCache": true
8586
}

package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
"@fluentui/react-shared-contexts": "^9.7.2",
3636
"@fluentui/scheme-utilities": "^8.3.58",
3737
"@griffel/shadow-dom": "~0.2.0",
38-
"@nx/devkit": "19.8.14",
39-
"@nx/eslint-plugin": "19.8.14",
40-
"@nx/jest": "19.8.14",
41-
"@nx/js": "19.8.14",
42-
"@nx/eslint": "19.8.14",
43-
"@nx/playwright": "19.8.14",
44-
"@nx/plugin": "19.8.14",
45-
"@nx/react": "19.8.14",
46-
"@nx/storybook": "19.8.14",
47-
"@nx/web": "19.8.14",
48-
"@nx/webpack": "19.8.14",
49-
"@nx/workspace": "19.8.14",
38+
"@nx/devkit": "20.2.2",
39+
"@nx/eslint-plugin": "20.2.2",
40+
"@nx/jest": "20.2.2",
41+
"@nx/js": "20.2.2",
42+
"@nx/eslint": "20.2.2",
43+
"@nx/playwright": "20.2.2",
44+
"@nx/plugin": "20.2.2",
45+
"@nx/react": "20.2.2",
46+
"@nx/storybook": "20.2.2",
47+
"@nx/web": "20.2.2",
48+
"@nx/webpack": "20.2.2",
49+
"@nx/workspace": "20.2.2",
5050
"@playwright/experimental-ct-react": "^1.49.1",
5151
"@rnx-kit/eslint-plugin": "0.5.3",
5252
"@storybook/addon-docs": "7.6.17",
@@ -79,12 +79,12 @@
7979
"beachball": "^2.33.2",
8080
"eslint": "8.57.0",
8181
"eslint-config-prettier": "9.1.0",
82-
"eslint-plugin-import": "^2.27.5",
82+
"eslint-plugin-import": "2.31.0",
8383
"eslint-plugin-playwright": "^0.15.3",
8484
"jest": "29.7.0",
8585
"jest-environment-jsdom": "29.7.0",
8686
"jsonc-eslint-parser": "^2.1.0",
87-
"nx": "19.8.14",
87+
"nx": "20.2.2",
8888
"parsel-js": "^1.1.2",
8989
"patch-package": "^7.0.0",
9090
"prettier": "^2.6.2",
@@ -100,7 +100,7 @@
100100
"syncpack": "^9.8.6",
101101
"ts-node": "10.9.1",
102102
"tslib": "^2.3.0",
103-
"typescript": "5.5.4",
103+
"typescript": "5.6.3",
104104
"verdaccio": "^5.0.4"
105105
},
106106
"dependencies": {},

packages/nx-plugin/src/generators/configure-storybook/generator.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export default async function (
2424

2525
await configurationGenerator(tree, {
2626
project: name,
27-
configureCypress: false,
2827
uiFramework: '@storybook/react-webpack5',
2928
tsConfiguration: true,
3029
interactionTests: false,

packages/nx-plugin/src/generators/library/generator.ts

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ async function invokeNxGenerators(tree: Tree, options: LibraryGeneratorSchema) {
9494
await libraryGenerator(tree, {
9595
name,
9696
directory: `packages/${name}`,
97-
projectNameAndRootFormat: 'as-provided',
9897
publishable: true,
9998
compiler: 'swc',
10099
testEnvironment: options.testEnvironment,

0 commit comments

Comments
 (0)