Skip to content

Commit

Permalink
build: upgrade nx to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
lwhiteley committed Jul 4, 2024
1 parent 40e778e commit db78d8e
Show file tree
Hide file tree
Showing 10 changed files with 1,092 additions and 825 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ testem.log
Thumbs.db

.nx/cache
.nx/workspace-data
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
/coverage
/.nx/cache
pnpm-*.yaml

/.nx/workspace-data
7 changes: 3 additions & 4 deletions examples/typescript-001/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "examples/typescript-001/src",
"projectType": "application",
"tags": [],
"targets": {
"build": {
"executor": "@nx/vite:build",
Expand Down Expand Up @@ -60,9 +61,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
}
},
"tags": []
}
}
90 changes: 90 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"migrations": [
{
"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": "18.0.0-beta.2",
"description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
"x-repair-skip": true,
"package": "nx",
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
},
{
"version": "18.1.0-beta.3",
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
"implementation": "./src/migrations/update-17-2-0/move-default-base",
"package": "nx",
"name": "move-default-base-to-nx-json-root"
},
{
"cli": "nx",
"version": "19.2.0-beta.2",
"description": "Updates the default workspace data directory to .nx/workspace-data",
"implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory",
"package": "nx",
"name": "19-2-0-move-graph-cache-directory"
},
{
"cli": "nx",
"version": "19.2.2-beta.0",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "19-2-2-update-nx-wrapper"
},
{
"version": "19.2.4-beta.0",
"description": "Set project name in nx.json explicitly",
"implementation": "./src/migrations/update-19-2-4/set-project-name",
"x-repair-skip": true,
"package": "nx",
"name": "19-2-4-set-project-name"
},
{
"version": "17.3.0-beta.0",
"description": "Move the vitest coverage thresholds in their own object if exists and add reporters.",
"implementation": "./src/migrations/update-17-3-0/vitest-coverage-and-reporters",
"package": "@nx/vite",
"name": "vitest-coverage-and-reporters"
},
{
"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/eslint",
"name": "move-options-to-target-defaults"
},
{
"cli": "nx",
"version": "19.1.0-beta.6",
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
"package": "@nx/eslint-plugin",
"name": "update-19-1-0-rename-no-extra-semi"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/webpack:webpack' is used for Module Federation.",
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
"package": "@nx/react",
"name": "add-module-federation-env-var-to-target-defaults"
},
{
"cli": "nx",
"version": "18.1.1-beta.0",
"description": "Ensure targetDefaults inputs for task hashing when '@nx/webpack:webpack' is used are correct for Module Federation.",
"factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs",
"package": "@nx/react",
"name": "fix-target-defaults-for-webpack"
}
]
}
20 changes: 13 additions & 7 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@
"targetDefaults": {
"build": {
"cache": true,
"dependsOn": ["^build"]
"dependsOn": [
"^build"
]
},
"lint": {
"@nx/vite:test": {
"cache": true,
"inputs": [
"default",
"^default"
]
},
"@nx/eslint:lint": {
"cache": true,
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintignore",
"{workspaceRoot}/eslint.config.js"
]
},
"@nx/vite:test": {
"cache": true,
"inputs": ["default", "^default"]
}
},
"workspaceLayout": {
Expand All @@ -45,5 +50,6 @@
"linter": "eslint"
}
}
}
},
"useInferencePlugins": false
}
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,53 @@
},
"private": true,
"dependencies": {
"@swc/helpers": "~0.5.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"tslib": "^2.3.0"
"@swc/helpers": "0.5.11",
"react": "18.3.1",
"react-dom": "18.3.1",
"tslib": "^2.6.3"
},
"devDependencies": {
"@babel/core": "^7.14.5",
"@babel/preset-react": "^7.14.5",
"@nx/devkit": "^17.2.8",
"@nx/eslint": "17.2.8",
"@nx/eslint-plugin": "17.2.8",
"@nx/js": "17.2.8",
"@nx/react": "^17.2.8",
"@nx/vite": "17.2.8",
"@nx/devkit": "19.4.0",
"@nx/eslint": "19.4.0",
"@nx/eslint-plugin": "19.4.0",
"@nx/js": "19.4.0",
"@nx/react": "19.4.0",
"@nx/vite": "19.4.0",
"@release-it/bumper": "^6.0.1",
"@swc-node/register": "~1.6.7",
"@swc/cli": "~0.1.62",
"@swc/core": "~1.3.85",
"@testing-library/react": "14.0.0",
"@types/node": "18.16.9",
"@types/react": "18.2.33",
"@types/react-dom": "18.2.14",
"@swc-node/register": "1.9.2",
"@swc/cli": "0.3.14",
"@swc/core": "1.5.7",
"@testing-library/react": "15.0.6",
"@types/node": "18.19.9",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"@vitejs/plugin-react": "^4.2.0",
"@vitest/coverage-v8": "~0.34.6",
"@vitest/ui": "~0.34.6",
"eslint": "~8.48.0",
"@vitest/coverage-v8": "1.6.0",
"@vitest/ui": "1.6.0",
"eslint": "8.57.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"jsdom": "~22.1.0",
"nx": "17.2.8",
"nx": "19.4.0",
"prettier": "^2.6.2",
"release-it": "^17.0.1",
"ts-node": "10.9.1",
"typedoc": "^0.25.6",
"typedoc-plugin-markdown": "^3.17.1",
"typescript": "~5.2.2",
"typescript": "5.4.5",
"url-loader": "^4.1.1",
"valtio": "^1.12.1",
"valtio": "^1.13.2",
"verdaccio": "^5.0.4",
"vite": "^5.0.0",
"vitest": "~0.34.6",
"vitest": "1.6.0",
"yargs": "^17.7.2"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion packages/history-utility/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"valtio-utility"
],
"dependencies": {
"tslib": "^2.3.0"
"tslib": "^2.6.3"
},
"peerDependencies": {
"valtio": ">=1.0.0"
Expand Down
7 changes: 3 additions & 4 deletions packages/history-utility/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/history-utility/src",
"projectType": "library",
"tags": ["publish"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -22,8 +23,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/vite:test",
Expand All @@ -41,6 +41,5 @@
]
}
}
},
"tags": ["publish"]
}
}
Loading

0 comments on commit db78d8e

Please sign in to comment.