Skip to content

Commit

Permalink
chore: nx migrate to v17.3
Browse files Browse the repository at this point in the history
  • Loading branch information
bsunderhus committed Jan 31, 2024
1 parent a5554e9 commit 46403ef
Show file tree
Hide file tree
Showing 30 changed files with 4,458 additions and 3,192 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/consistent-type-definitions": "off"
}
},
{
"files": ["*.js", "*.jsx"],
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ testem.log
# System Files
.DS_Store
Thumbs.db

# nx
.nx
28 changes: 28 additions & 0 deletions .verdaccio/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# path to a directory with all packages
storage: ../tmp/local-registry/storage

# a list of other known repositories we can talk to
uplinks:
npmjs:
url: https://registry.yarnpkg.com
maxage: 60m

packages:
'**':
# give all users (including non-authenticated users) full access
# because it is a local registry
access: $all
publish: $all
unpublish: $all

# if package is not available locally, proxy requests to npm registry
proxy: npmjs

# log settings
logs:
type: stdout
format: pretty
level: warn

publish:
allow_offline: true # set offline to true to allow publish offline
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-chat",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-data-grid-react-window",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-data-grid-react-window-grid",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-headless-provider",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-resize-handle",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: nx migrate to v17.3",
"packageName": "@fluentui-contrib/react-shadow",
"email": "[email protected]",
"dependentChangeType": "none"
}
205 changes: 205 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
{
"migrations": [
{
"cli": "nx",
"version": "16.2.0-beta.0",
"description": "Remove outputPath from run commands",
"implementation": "./src/migrations/update-16-2-0/remove-run-commands-output-path",
"package": "nx",
"name": "16.2.0-remove-output-path-from-run-commands"
},
{
"cli": "nx",
"version": "16.6.0-beta.6",
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
"package": "nx",
"name": "16.6.0-prefix-outputs"
},
{
"cli": "nx",
"version": "16.8.0-beta.3",
"description": "Escape $ in env variables",
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
"package": "nx",
"name": "16.8.0-escape-dollar-sign-env"
},
{
"cli": "nx",
"version": "17.0.0-beta.1",
"description": "Updates the default cache directory to .nx/cache",
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
"package": "nx",
"name": "17.0.0-move-cache-directory"
},
{
"cli": "nx",
"version": "17.0.0-beta.3",
"description": "Use minimal config for tasksRunnerOptions",
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
"package": "nx",
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
},
{
"version": "17.0.0-rc.1",
"description": "Migration for v17.0.0-rc.1",
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
"package": "nx",
"name": "rm-default-collection-npm-scope"
},
{
"cli": "nx",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "17.3.0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "17-2-6-beta.1",
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
"package": "@nx/eslint-plugin",
"name": "update-17-2-6-rename-workspace-rules"
},
{
"cli": "nx",
"version": "16.6.0-beta.0",
"description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
"factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps",
"package": "@nx/js",
"name": "explicitly-set-projects-to-update-buildable-deps"
},
{
"cli": "nx",
"version": "16.8.2-beta.0",
"description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
"factory": "./src/migrations/update-16-8-2/update-swcrc",
"package": "@nx/js",
"name": "16-8-2-update-swcrc"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nx/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"cli": "nx",
"version": "16.2.0-beta.0",
"description": "Replace @nx/plugin:e2e with @nx/jest",
"implementation": "./src/migrations/update-16-2-0/replace-e2e-executor",
"package": "@nx/plugin",
"name": "update-16-2-0-replace-e2e-executor"
},
{
"cli": "nx",
"version": "16.2.0-beta.0",
"description": "Remove react-test-renderer from package.json",
"implementation": "./src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package",
"package": "@nx/react",
"name": "update-16-2-0-remove-package"
},
{
"cli": "nx",
"version": "16.3.0-beta.2",
"description": "Remove @types/react-router-dom from package.json",
"implementation": "./src/migrations/update-16-3-0/remove-types-react-router-dom-package",
"package": "@nx/react",
"name": "remove-types-react-router-dom"
},
{
"cli": "nx",
"version": "16.7.0-beta.2",
"description": "Add @babel/core to package.json if @babel/preset-react is present",
"implementation": "./src/migrations/update-16-7-0/add-babel-core",
"package": "@nx/react",
"name": "add-babel-core"
},
{
"cli": "nx",
"version": "16.7.0-beta.2",
"description": "Add @nx/react types to tsconfig types array",
"implementation": "./src/migrations/update-16-7-0-add-typings/update-16-7-0-add-typings",
"package": "@nx/react",
"name": "update-16-7-0-add-typings"
},
{
"cli": "nx",
"version": "16.9.0-beta.1",
"description": "Replace imports of Module Federation utils frm @nx/devkit to @nx/webpack",
"implementation": "./src/migrations/update-16-9-0/migrate-mf-util-usage",
"package": "@nx/devkit",
"name": "update-16-9-0-migrate-mf-usage-to-webpack"
},
{
"cli": "nx",
"version": "17.2.1-beta.0",
"description": "Add webpack.config.js file when webpackConfig is not defined",
"implementation": "./src/migrations/update-17-2-1/webpack-config-setup",
"package": "@nx/webpack",
"name": "update-17-2-1-webpack-config-setup"
},
{
"cli": "nx",
"version": "16.5.0-beta.0",
"description": "Move .storybook/tsconfig.json to tsconfig.storybook.json for non-Angular projects.",
"factory": "./src/migrations/update-16-5-0/move-storybook-tsconfig",
"package": "@nx/storybook",
"name": "update-16-5-0"
},
{
"cli": "nx",
"version": "16.5.0-beta.2",
"description": "Add test-setup.ts to ignored files in production input",
"implementation": "./src/migrations/update-16-5-0/add-test-setup-to-inputs-ignore",
"package": "@nx/jest",
"name": "add-test-setup-to-inputs-ignore"
},
{
"version": "17.1.0-beta.2",
"description": "Move jest executor options to nx.json targetDefaults",
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
"package": "@nx/jest",
"name": "move-options-to-target-defaults"
},
{
"version": "16.8.0",
"description": "update-16-8-0-add-ignored-files",
"implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files",
"package": "@nx/linter",
"name": "update-16-8-0-add-ignored-files"
},
{
"version": "17.0.0-beta.7",
"description": "update-17-0-0-rename-to-eslint",
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
"package": "@nx/linter",
"name": "update-17-0-0-rename-to-eslint"
},
{
"version": "17.1.0-beta.1",
"description": "Updates for @typescript-utils/utils v6.9.1+",
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
"package": "@nx/linter",
"name": "update-typescript-eslint"
},
{
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/linter",
"name": "simplify-eslint-patterns"
},
{
"version": "17.2.9",
"description": "Move executor options to target defaults",
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
"package": "@nx/linter",
"name": "move-options-to-target-defaults"
}
]
}
54 changes: 29 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,42 +26,42 @@
"@babel/preset-typescript": "^7.21.5",
"@fluentui/react-components": "^9.46.3",
"@griffel/shadow-dom": "~0.1.0",
"@nx/devkit": "16.1.4",
"@nx/eslint-plugin": "16.1.4",
"@nx/jest": "16.1.4",
"@nx/js": "16.1.4",
"@nx/linter": "16.1.4",
"@nx/plugin": "16.1.4",
"@nx/react": "16.1.4",
"@nx/storybook": "16.1.4",
"@nx/webpack": "16.1.4",
"@nx/workspace": "16.1.4",
"@nx/devkit": "17.3.0",
"@nx/eslint-plugin": "17.3.0",
"@nx/jest": "17.3.0",
"@nx/js": "17.3.0",
"@nx/linter": "17.3.0",
"@nx/plugin": "17.3.0",
"@nx/react": "17.3.0",
"@nx/storybook": "17.3.0",
"@nx/webpack": "17.3.0",
"@nx/workspace": "17.3.0",
"@rnx-kit/eslint-plugin": "0.4.2",
"@storybook/addon-essentials": "7.0.12",
"@storybook/addon-storysource": "^7.0.26",
"@storybook/addon-essentials": "7.6.10",
"@storybook/addon-storysource": "7.6.10",
"@storybook/core-common": "^7.0.9",
"@storybook/core-server": "7.0.12",
"@storybook/react-webpack5": "7.0.12",
"@swc-node/register": "~1.4.2",
"@storybook/core-server": "7.6.10",
"@storybook/react-webpack5": "7.6.10",
"@swc-node/register": "1.6.8",
"@swc/cli": "~0.1.62",
"@swc/core": "~1.3.51",
"@swc/helpers": "~0.5.0",
"@swc/core": "1.3.107",
"@swc/helpers": "0.5.3",
"@swc/jest": "0.2.20",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.4.0",
"@types/node": "16.11.7",
"@types/node": "18.19.10",
"@types/react-virtualized-auto-sizer": "^1.0.1",
"@types/react-window": "^1.8.5",
"@typescript-eslint/eslint-plugin": "^5.58.0",
"@typescript-eslint/parser": "^5.58.0",
"@typescript-eslint/eslint-plugin": "6.20.0",
"@typescript-eslint/parser": "6.20.0",
"beachball": "^2.33.2",
"eslint": "~8.15.0",
"eslint-config-prettier": "8.1.0",
"eslint": "8.48.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "^2.27.5",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"jsonc-eslint-parser": "^2.1.0",
"nx": "16.1.4",
"nx": "17.3.0",
"parsel-js": "^1.1.2",
"patch-package": "^7.0.0",
"prettier": "^2.6.2",
Expand All @@ -77,7 +77,11 @@
"ts-jest": "^29.1.0",
"ts-node": "10.9.1",
"tslib": "^2.3.0",
"typescript": "~5.0.2"
"typescript": "5.3.3",
"verdaccio": "^5.0.4"
},
"dependencies": {}
"dependencies": {},
"nx": {
"includedScripts": []
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../babel.config.json"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default async function (

const { root: projectRoot } = project;
await configurationGenerator(tree, {
name,
project: name,
configureCypress: false,
uiFramework: '@storybook/react-webpack5',
tsConfiguration: true,
Expand Down
Loading

0 comments on commit 46403ef

Please sign in to comment.