Skip to content

Commit

Permalink
Merge pull request #372 from amplication/deps/update-to-nx19
Browse files Browse the repository at this point in the history
chore(deps): update nx to v19
  • Loading branch information
mulygottlieb authored May 20, 2024
2 parents b356f34 + b341ac4 commit b6d0ce8
Show file tree
Hide file tree
Showing 8 changed files with 801 additions and 646 deletions.
54 changes: 43 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"ignorePatterns": [
"**/*"
],
"plugins": [
"@nx"
],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"files": [
"*.ts",
"*.tsx",
"*.js",
"*.jsx"
],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
Expand All @@ -14,29 +23,49 @@
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
"onlyDependOnLibsWithTags": [
"*"
]
}
],
"checkDynamicDependenciesExceptions": [
"@amplication/auth-core"
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"plugin:@nx/typescript"
],
"rules": {
"no-prototype-builtins": "warn",
"@typescript-eslint/no-unused-vars": "warn",
"no-case-declarations": "warn"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"files": [
"*.js",
"*.jsx"
],
"extends": [
"plugin:@nx/javascript"
],
"rules": {}
},
{
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
"files": [
"*.spec.ts",
"*.spec.tsx",
"*.spec.js",
"*.spec.jsx"
],
"env": {
"jest": true
},
Expand All @@ -47,7 +76,10 @@
}
},
{
"files": ["*.spec.template.ts", "*.spec.template.tsx"],
"files": [
"*.spec.template.ts",
"*.spec.template.tsx"
],
"env": {
"jest": true
},
Expand All @@ -56,4 +88,4 @@
}
}
]
}
}
6 changes: 5 additions & 1 deletion .github/workflows/nx.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ jobs:
id: files
uses: tj-actions/changed-files@v42
with:
files_ignore: package-lock.json
files_ignore: |
package.json
package-lock.json
.eslintrc*
nx.json
base_sha: ${{ env.NX_BASE }}
separator: ","

Expand Down
40 changes: 4 additions & 36 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,11 @@
{
"migrations": [
{
"cli": "nx",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"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": "17.3.0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "18.0.0-beta.2",
"description": "Updates .env 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": "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": "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": "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"
"name": "move-default-base-to-nx-json-root"
}
]
}
6 changes: 2 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"affected": {
"defaultBase": "master"
},
"targetDefaults": {
"build": {
"cache": true,
Expand Down Expand Up @@ -54,5 +51,6 @@
"appsDir": "plugins",
"libsDir": "libs"
},
"nxCloudAccessToken": "NTVlMDE1YmItM2FmZC00MTA5LTg0YzItMDA4M2NjZWI1ODVjfHJlYWQ="
"nxCloudAccessToken": "NTVlMDE1YmItM2FmZC00MTA5LTg0YzItMDA4M2NjZWI1ODVjfHJlYWQ=",
"defaultBase": "master"
}
Loading

0 comments on commit b6d0ce8

Please sign in to comment.