Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
62 changes: 30 additions & 32 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,50 @@
"name": "update-19-6-0-add-nx-packages"
},
{
"cli": "nx",
"version": "19.6.0-beta.0",
"description": "Use serve-static or preview for webServerCommand.",
"implementation": "./src/migrations/update-19-6-0/use-serve-static-preview-for-command",
"package": "@nx/playwright",
"name": "19-6-0-use-serve-static-preview-for-command"
"version": "20.0.0-beta.7",
"description": "Migration for v20.0.0-beta.7",
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
"package": "nx",
"name": "move-use-daemon-process"
},
{
"cli": "nx",
"version": "19.6.0-beta.1",
"description": "Add inferred ciTargetNames to targetDefaults with dependsOn to ensure dependent application builds are scheduled before atomized tasks.",
"implementation": "./src/migrations/update-19-6-0/add-e2e-ci-target-defaults",
"package": "@nx/playwright",
"name": "update-19-6-0-add-e2e-ci-target-defaults"
"version": "20.0.1",
"description": "Set `useLegacyCache` to true for migrating workspaces",
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
"x-repair-skip": true,
"package": "nx",
"name": "use-legacy-cache"
},
{
"cli": "nx",
"version": "19.6.3-beta.0",
"description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
"implementation": "./src/migrations/update-19-6-3/proxy-config",
"package": "@nx/webpack",
"name": "update-19-6-3-proxy-config"
"version": "20.2.0-beta.2",
"description": "Update the ModuleFederationConfig import use @nx/module-federation.",
"factory": "./src/migrations/update-20-2-0/migrate-mf-imports-to-new-package",
"package": "@nx/react",
"name": "update-20-2-0-update-module-federation-config-import"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Ensure Module Federation DTS is turned off by default.",
"factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default",
"version": "20.2.0-beta.2",
"description": "Update the withModuleFederation import use @nx/module-federation/webpack.",
"factory": "./src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package",
"package": "@nx/react",
"name": "update-19-6-0-turn-module-federation-dts-off"
"name": "update-20-2-0-update-with-module-federation-import"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Update the server file for Module Federation SSR port value to be the same as the 'serve' target port value.",
"factory": "./src/migrations/update-19-6-0/update-ssr-server-port",
"package": "@nx/react",
"name": "update-module-federation-ssr-server-file"
"version": "20.2.0-beta.5",
"description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
"implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
"package": "@nx/eslint",
"name": "update-typescript-eslint-v8.13.0"
},
{
"cli": "nx",
"version": "19.6.1-beta.0",
"description": "Ensure Target Defaults are set correctly for Module Federation.",
"factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf",
"package": "@nx/react",
"name": "update-19-6-1-ensure-module-federation-target-defaults"
"version": "20.0.0-beta.5",
"description": "replace getJestProjects with getJestProjectsAsync",
"implementation": "./src/migrations/update-20-0-0/replace-getJestProjects-with-getJestProjectsAsync",
"package": "@nx/jest",
"name": "replace-getJestProjects-with-getJestProjectsAsync"
}
]
}
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,6 @@
},
"parallel": 3,
"defaultBase": "main",
"useInferencePlugins": false
"useInferencePlugins": false,
"useLegacyCache": true
}
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@
"@fluentui/react-shared-contexts": "^9.7.2",
"@fluentui/scheme-utilities": "^8.3.58",
"@griffel/shadow-dom": "~0.2.0",
"@nx/devkit": "19.8.14",
"@nx/eslint-plugin": "19.8.14",
"@nx/jest": "19.8.14",
"@nx/js": "19.8.14",
"@nx/eslint": "19.8.14",
"@nx/playwright": "19.8.14",
"@nx/plugin": "19.8.14",
"@nx/react": "19.8.14",
"@nx/storybook": "19.8.14",
"@nx/web": "19.8.14",
"@nx/webpack": "19.8.14",
"@nx/workspace": "19.8.14",
"@nx/devkit": "20.2.2",
"@nx/eslint-plugin": "20.2.2",
"@nx/jest": "20.2.2",
"@nx/js": "20.2.2",
"@nx/eslint": "20.2.2",
"@nx/playwright": "20.2.2",
"@nx/plugin": "20.2.2",
"@nx/react": "20.2.2",
"@nx/storybook": "20.2.2",
"@nx/web": "20.2.2",
"@nx/webpack": "20.2.2",
"@nx/workspace": "20.2.2",
"@playwright/experimental-ct-react": "^1.49.1",
"@rnx-kit/eslint-plugin": "0.5.3",
"@storybook/addon-docs": "7.6.17",
Expand Down Expand Up @@ -79,12 +79,12 @@
"beachball": "^2.33.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-playwright": "^0.15.3",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jsonc-eslint-parser": "^2.1.0",
"nx": "19.8.14",
"nx": "20.2.2",
"parsel-js": "^1.1.2",
"patch-package": "^7.0.0",
"prettier": "^2.6.2",
Expand All @@ -100,7 +100,7 @@
"syncpack": "^9.8.6",
"ts-node": "10.9.1",
"tslib": "^2.3.0",
"typescript": "5.5.4",
"typescript": "5.6.3",
"verdaccio": "^5.0.4"
},
"dependencies": {},
Expand Down
10 changes: 5 additions & 5 deletions packages/nx-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"generators": "./generators.json",
"executors": "./executors.json",
"dependencies": {
"@nx/devkit": "^19.3.2",
"@nx/devkit": "^20.2.2",
"semver": "^7.5.2",
"@nx/storybook": "^19.3.2",
"@nx/js": "^19.3.2",
"@nx/playwright": "^19.3.2",
"@nx/storybook": "^20.2.2",
"@nx/js": "^20.2.2",
"@nx/playwright": "^20.2.2",
"tslib": "^2.3.0"
},
"peerDependencies": {
"@playwright/experimental-ct-react": "^1.49.1",
"nx": ">= 19 <= 21"
"nx": ">= 20 <= 21"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export default async function (

await configurationGenerator(tree, {
project: name,
configureCypress: false,
uiFramework: '@storybook/react-webpack5',
tsConfiguration: true,
interactionTests: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ describe('create-package generator', () => {

expect(tree.children(config.root)).toMatchInlineSnapshot(`
[
"tsconfig.lib.json",
"tsconfig.json",
"src",
"tsconfig.lib.json",
"README.md",
".swcrc",
"package.json",
Expand Down
1 change: 0 additions & 1 deletion packages/nx-plugin/src/generators/library/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ async function invokeNxGenerators(tree: Tree, options: LibraryGeneratorSchema) {
await libraryGenerator(tree, {
name,
directory: `packages/${name}`,
projectNameAndRootFormat: 'as-provided',
publishable: true,
compiler: 'swc',
testEnvironment: options.testEnvironment,
Expand Down
Loading