Skip to content

Commit

Permalink
feat: bump nx
Browse files Browse the repository at this point in the history
  • Loading branch information
Tirke committed Jul 3, 2024
1 parent 46a7059 commit 59b2910
Show file tree
Hide file tree
Showing 9 changed files with 1,625 additions and 1,209 deletions.
9 changes: 7 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,18 @@
},
"newlines-between": "always"
}
]
],
"@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,5 +39,6 @@ testem.log
Thumbs.db

.nx/cache
.nx/workspace-data

local-redis-cluster/**/data
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/dist
/coverage

/.nx/cache
/.nx/cache
/.nx/workspace-data
88 changes: 38 additions & 50 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,78 +2,66 @@
"migrations": [
{
"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",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "17.0.0-move-cache-directory"
"name": "17.3.0-update-nx-wrapper"
},
{
"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",
"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": "17.0.0-use-minimal-config-for-tasks-runner-options"
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
},
{
"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",
"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": "rm-default-collection-npm-scope"
"name": "move-default-base-to-nx-json-root"
},
{
"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"
"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": "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"
},
{
"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/eslint",
"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/eslint",
"name": "update-typescript-eslint"
"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": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/eslint",
"name": "simplify-eslint-patterns"
"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": "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",
"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-17-2-6-rename-workspace-rules"
"name": "update-19-1-0-rename-no-extra-semi"
},
{
"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",
"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"
}
]
}
}
15 changes: 7 additions & 8 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"affected": {
"defaultBase": "main"
},
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
"inputs": ["production", "^production"],
"cache": true
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
},
"@nx/jest:jest": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true,
Expand All @@ -25,6 +18,10 @@
"codeCoverage": true
}
}
},
"@nx/eslint:lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
}
},
"workspaceLayout": {
Expand All @@ -43,5 +40,7 @@
"!{projectRoot}/src/test-setup.[jt]s"
]
},
"nxCloudAccessToken": "ZjVhZDI4NDktYjgwOC00ZjI5LWI3ZmItNDRjY2M5YTlmNWQ3fHJlYWQtd3JpdGU="
"nxCloudAccessToken": "ZjVhZDI4NDktYjgwOC00ZjI5LWI3ZmItNDRjY2M5YTlmNWQ3fHJlYWQtd3JpdGU=",
"useInferencePlugins": false,
"defaultBase": "main"
}
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
},
"devDependencies": {
"@changesets/cli": "2.27.5",
"@nx/eslint": "17.2.8",
"@nx/eslint-plugin": "17.2.8",
"@nx/jest": "17.2.8",
"@nx/js": "17.2.8",
"@nx/workspace": "17.2.8",
"@nx/eslint": "19.4.0",
"@nx/eslint-plugin": "19.4.0",
"@nx/jest": "19.4.0",
"@nx/js": "19.4.0",
"@nx/workspace": "19.4.0",
"@svitejs/changesets-changelog-github-compact": "1.1.0",
"@swc/cli": "0.3.12",
"@swc/core": "1.5.28",
"@swc/cli": "0.3.14",
"@swc/core": "1.5.7",
"@swc/jest": "0.2.36",
"@types/jest": "29.5.12",
"@types/node": "20.14.2",
"@typescript-eslint/eslint-plugin": "7.13.0",
"@typescript-eslint/parser": "7.13.0",
"@types/node": "18.19.9",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"cache-manager": "5.6.1",
"eslint": "9.4.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"jest": "29.7.0",
"nx": "17.2.8",
"nx": "19.4.0",
"prettier": "3.3.2",
"ts-node": "10.9.2",
"tsup": "8.1.0",
Expand Down
7 changes: 3 additions & 4 deletions packages/node-cache-manager-ioredis/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/node-cache-manager-ioredis/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "nx:run-commands",
Expand All @@ -26,8 +27,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -36,6 +36,5 @@
"jestConfig": "packages/node-cache-manager-ioredis/jest.config.ts"
}
}
},
"tags": []
}
}
7 changes: 3 additions & 4 deletions packages/node-cache-manager-mongodb/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/node-cache-manager-mongodb/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "nx:run-commands",
Expand All @@ -26,8 +27,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand All @@ -36,6 +36,5 @@
"jestConfig": "packages/node-cache-manager-mongodb/jest.config.ts"
}
}
},
"tags": []
}
}
Loading

0 comments on commit 59b2910

Please sign in to comment.