Skip to content

Commit

Permalink
chore: update Nx
Browse files Browse the repository at this point in the history
  • Loading branch information
beeman committed Jun 16, 2024
1 parent bec86a9 commit 592acaa
Show file tree
Hide file tree
Showing 8 changed files with 9,248 additions and 7,213 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"
}
},
{
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
# - run: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"


- uses: pnpm/action-setup@v2
with:
version: 8
Expand All @@ -31,7 +31,7 @@ jobs:
with:
node-version: 20
cache: 'pnpm'
- run: pnpm install --frozen-lockfile
- run: pnpm install --no-frozen-lockfile
- uses: nrwl/nx-set-shas@v4

- run: pnpm exec nx-cloud record -- nx format:check
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ testem.log
.DS_Store
Thumbs.db

.nx/cache
.nx/cache
.nx/workspace-data
nx-cloud.env
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ tmp
pnpm-lock.yaml
.angular/cache


/.nx/workspace-data
44 changes: 44 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"migrations": [
{
"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"
},
{
"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.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"
}
]
}
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"sharedGlobals": []
},
"useInferencePlugins": false,
"nxCloudAccessToken": "NDc2MzhmYWMtMjgxNC00NzJiLWI3ZjQtZjliYmQwMDIzZGNifHJlYWQtd3JpdGU=",
"nxCloudAccessToken": "ZDEwM2JhYmEtZGJjMS00OWRmLWE4OWUtODdlYjIxMzM2OGQ4fHJlYWQ=",
"generators": {
"@nx/react": {
"application": {
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@
"devDependencies": {
"@babel/core": "^7.14.5",
"@babel/preset-react": "^7.14.5",
"@nx/esbuild": "18.1.0-beta.5",
"@nx/eslint": "18.1.0-beta.5",
"@nx/eslint-plugin": "18.1.0-beta.5",
"@nx/jest": "18.1.0-beta.5",
"@nx/js": "18.1.0-beta.5",
"@nx/node": "18.1.0-beta.5",
"@nx/react": "18.1.0-beta.5",
"@nx/web": "18.1.0-beta.5",
"@nx/webpack": "18.1.0-beta.5",
"@nx/workspace": "18.1.0-beta.5",
"@nx/esbuild": "19.3.0",
"@nx/eslint": "19.3.0",
"@nx/eslint-plugin": "19.3.0",
"@nx/jest": "19.3.0",
"@nx/js": "19.3.0",
"@nx/node": "19.3.0",
"@nx/react": "19.3.0",
"@nx/web": "19.3.0",
"@nx/webpack": "19.3.0",
"@nx/workspace": "19.3.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@svgr/webpack": "^8.0.1",
"@swc-node/register": "~1.8.0",
"@swc/cli": "~0.1.62",
"@swc/core": "~1.3.85",
"@swc/helpers": "~0.5.2",
"@testing-library/react": "14.0.0",
"@swc-node/register": "1.9.2",
"@swc/cli": "0.3.12",
"@swc/core": "1.5.7",
"@swc/helpers": "0.5.11",
"@testing-library/react": "15.0.6",
"@types/express": "~4.17.13",
"@types/jest": "^29.4.0",
"@types/node": "18.16.9",
"@types/react": "18.2.33",
"@types/react-dom": "18.2.14",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"babel-jest": "^29.4.1",
"esbuild": "^0.19.2",
"eslint": "~8.48.0",
"eslint": "8.57.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
Expand All @@ -49,15 +49,15 @@
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.4.1",
"jest-environment-node": "^29.4.1",
"nx": "18.1.0-beta.5",
"postcss": "^8.4.35",
"nx": "19.3.0",
"postcss": "8.4.38",
"postcss-preset-mantine": "^1.13.0",
"postcss-simple-vars": "^7.0.1",
"prettier": "^2.6.2",
"react-refresh": "^0.10.0",
"ts-jest": "^29.1.0",
"ts-node": "10.9.1",
"typescript": "~5.3.2",
"typescript": "5.4.5",
"url-loader": "^4.1.1",
"webpack-cli": "^5.1.4"
},
Expand All @@ -82,8 +82,8 @@
"dotenv": "^16.4.5",
"express": "~4.18.1",
"jotai": "^2.7.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.11.2",
"serve-favicon": "^2.5.0",
"timeago-react": "^3.0.6",
Expand Down
Loading

0 comments on commit 592acaa

Please sign in to comment.