Merge branch 'main' into air2-patch-1

.eslintrc.json

@@ -1,27 +1,45 @@
 {
   "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint"],
-  "env": {
-    "node": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "rules": {
-    "@typescript-eslint/consistent-type-imports": "error",
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-      {
-        "argsIgnorePattern": "_"
-      }
-    ],
-    "@typescript-eslint/array-type": "error",
-    "@typescript-eslint/no-explicit-any": "warn"
-  },
+  "ignorePatterns": ["**/*"],
+  "plugins": ["@nx"],
   "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "@nx/enforce-module-boundaries": [
+          "error",
+          {
+            "enforceBuildableLibDependency": true,
+            "allow": [],
+            "depConstraints": [
+              {
+                "sourceTag": "*",
+                "onlyDependOnLibsWithTags": ["*"]
+              }
+            ]
+          }
+        ],
+        "@typescript-eslint/consistent-type-imports": "error",
+        "@typescript-eslint/no-unused-vars": [
+          "error",
+          {
+            "argsIgnorePattern": "_"
+          }
+        ],
+        "@typescript-eslint/array-type": "error",
+        "@typescript-eslint/no-explicit-any": "warn"
+      }
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "extends": ["plugin:@nx/typescript"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "extends": ["plugin:@nx/javascript"],
+      "rules": {}
+    },
     {
       "files": "*.json",
       "parser": "jsonc-eslint-parser",

.github/workflows/ci.yml

@@ -59,8 +59,7 @@ jobs:
           # whereas the build only checks src files
           cmd1: npx nx run-many -t build,typecheck,check-rule-docs,lint,check-rule-lists
           cmd2: npx nx run-many -t test --codeCoverage
-          cmd3: npx nx-cloud record -- yarn lint
-          cmd4: npx nx-cloud record -- yarn format-check
+          cmd3: npx nx-cloud record -- yarn format-check
 
       # Run distributed e2e test suites with independent local registries (max 1 per agent via parallel=1)
       - name: Run e2e test suites

e2e/src/__snapshots__/new-workspace-create-application-false-ng-add-then-project.test.ts.snap

@@ -11,8 +11,8 @@ exports[`new-workspace-create-application-false-ng-add-then-project it should pa
   "@angular/cli": "^17.X.X",
   "@angular/compiler-cli": "^17.X.X",
   "@types/jasmine": "~5.1.0",
-  "@typescript-eslint/eslint-plugin": "7.6.0",
-  "@typescript-eslint/parser": "7.6.0",
+  "@typescript-eslint/eslint-plugin": "7.7.0",
+  "@typescript-eslint/parser": "7.7.0",
   "eslint": "^8.57.0",
   "jasmine-core": "~5.1.0",
   "karma": "~6.4.0",

e2e/src/__snapshots__/new-workspace-create-application-false-project-then-ng-add.test.ts.snap

@@ -11,8 +11,8 @@ exports[`new-workspace-create-application-false-project-then-ng-add it should pa
   "@angular/cli": "^17.X.X",
   "@angular/compiler-cli": "^17.X.X",
   "@types/jasmine": "~5.1.0",
-  "@typescript-eslint/eslint-plugin": "7.6.0",
-  "@typescript-eslint/parser": "7.6.0",
+  "@typescript-eslint/eslint-plugin": "7.7.0",
+  "@typescript-eslint/parser": "7.7.0",
   "eslint": "^8.57.0",
   "jasmine-core": "~5.1.0",
   "karma": "~6.4.0",

e2e/src/__snapshots__/new-workspace.test.ts.snap

@@ -11,8 +11,8 @@ exports[`new-workspace it should pass linting after creating a new workspace fro
   "@angular/cli": "^17.X.X",
   "@angular/compiler-cli": "^17.X.X",
   "@types/jasmine": "~5.1.0",
-  "@typescript-eslint/eslint-plugin": "7.6.0",
-  "@typescript-eslint/parser": "7.6.0",
+  "@typescript-eslint/eslint-plugin": "7.7.0",
+  "@typescript-eslint/parser": "7.7.0",
   "eslint": "^8.57.0",
   "jasmine-core": "~5.1.0",
   "karma": "~6.4.0",

e2e/utils/fixtures.ts

@@ -54,7 +54,7 @@ export class Fixture {
     return parseJson<T>(content);
   }
 
-  createFile(f: string, content: string = ''): void {
+  createFile(f: string, content = ''): void {
     writeFileSync(joinPathFragments(this.root, f), content);
   }
 }

nx.json

@@ -4,16 +4,9 @@
   "release": {
     "projects": ["*", "!e2e*", "!nx-plugin"],
     "version": {
-      "generatorOptions": {
-        "currentVersionResolver": "git-tag",
-        "specifierSource": "conventional-commits"
-      }
+      "conventionalCommits": true
     },
     "changelog": {
-      "git": {
-        "commit": true,
-        "tag": true
-      },
       "workspaceChangelog": {
         "createRelease": "github"
       },
@@ -44,6 +37,14 @@
       "cache": true
     },
     "lint": {
+      "inputs": [
+        "default",
+        "{workspaceRoot}/.eslintrc.json",
+        "{workspaceRoot}/.eslintignore"
+      ],
+      "options": {
+        "ignore-path": "../../.eslintignore"
+      },
       "cache": true
     },
     "e2e": {
@@ -100,5 +101,6 @@
       "!{projectRoot}/src/test-setup.[jt]s"
     ],
     "projectSpecificFiles": []
-  }
+  },
+  "plugins": ["@nx/eslint/plugin"]
 }

package.json

@@ -28,7 +28,7 @@
     "pre-push": "yarn format-check",
     "format": "node node_modules/prettier/bin/prettier.cjs --write \"./**/*.{ts,js,json,md}\"",
     "format-check": "node node_modules/prettier/bin/prettier.cjs --check \"./**/*.{ts,js,json,md}\"",
-    "lint": "eslint . --ext .js,.ts",
+    "lint": "nx run-many -t lint",
     "typecheck": "nx run-many -t typecheck",
     "release": "ts-node --transpile-only tools/scripts/release.ts",
     "exec-tool": "ts-node --transpile-only --project tsconfig.tools.json tools/scripts/exec-tool.ts",
@@ -56,12 +56,12 @@
     "@angular/compiler": "17.3.4",
     "@commitlint/cli": "19.2.2",
     "@commitlint/config-conventional": "19.2.2",
-    "@nx/devkit": "18.1.1",
-    "@nx/eslint-plugin": "18.1.1",
-    "@nx/jest": "18.1.1",
-    "@nx/js": "18.1.1",
-    "@nx/plugin": "18.1.1",
-    "@nx/workspace": "18.1.1",
+    "@nx/devkit": "18.3.1",
+    "@nx/eslint-plugin": "18.3.1",
+    "@nx/jest": "18.3.1",
+    "@nx/js": "18.3.1",
+    "@nx/plugin": "18.3.1",
+    "@nx/workspace": "18.3.1",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-typescript": "^11.1.0",
@@ -75,8 +75,8 @@
     "@types/jest": "29.4.4",
     "@types/node": "20.12.7",
     "@types/prettier": "2.7.3",
-    "@typescript-eslint/eslint-plugin": "7.6.0",
-    "@typescript-eslint/parser": "7.6.0",
+    "@typescript-eslint/eslint-plugin": "7.7.0",
+    "@typescript-eslint/parser": "7.7.0",
     "commitizen": "4.3.0",
     "cz-conventional-changelog": "3.3.0",
     "env-cmd": "10.1.0",
@@ -90,7 +90,7 @@
     "jsonc-eslint-parser": "^2.1.0",
     "lint-staged": "15.2.2",
     "ncp": "2.0.0",
-    "nx": "18.1.1",
+    "nx": "18.3.1",
     "prettier": "3.1.1",
     "prettier-v2-for-jest-inline-snapshots": "npm:prettier@^2",
     "rimraf": "5.0.5",

packages/builder/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/builder",
-  "version": "0.0.0-e2e",
+  "version": "17.3.0",
   "description": "Angular CLI builder for ESLint",
   "license": "MIT",
   "main": "dist/index.js",

packages/bundled-angular-compiler/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

packages/bundled-angular-compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/bundled-angular-compiler",
-  "version": "0.0.0-e2e",
+  "version": "17.3.0",
   "description": "A CJS bundled version of @angular/compiler",
   "license": "MIT",
   "main": "dist/index.js",

packages/eslint-plugin-template/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

packages/eslint-plugin-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin-template",
-  "version": "0.0.0-e2e",
+  "version": "17.3.0",
   "description": "ESLint plugin for Angular Templates",
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,10 +17,10 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@angular-eslint/bundled-angular-compiler": "0.0.0-e2e",
-    "@angular-eslint/utils": "0.0.0-e2e",
-    "@typescript-eslint/type-utils": "7.6.0",
-    "@typescript-eslint/utils": "7.6.0",
+    "@angular-eslint/bundled-angular-compiler": "17.3.0",
+    "@angular-eslint/utils": "17.3.0",
+    "@typescript-eslint/type-utils": "7.7.0",
+    "@typescript-eslint/utils": "7.7.0",
     "aria-query": "5.3.0",
     "axobject-query": "4.0.0"
   },

packages/eslint-plugin/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

packages/eslint-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/eslint-plugin",
-  "version": "0.0.0-e2e",
+  "version": "17.3.0",
   "description": "ESLint plugin for Angular applications, following angular.io/styleguide",
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,8 +17,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@angular-eslint/utils": "0.0.0-e2e",
-    "@typescript-eslint/utils": "7.6.0"
+    "@angular-eslint/utils": "17.3.0",
+    "@typescript-eslint/utils": "7.7.0"
   },
   "peerDependencies": {
     "eslint": "^7.20.0 || ^8.0.0",

packages/nx-plugin/project.json

@@ -36,18 +36,6 @@
         ]
       }
     },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/nx-plugin/**/*.ts",
-          "packages/nx-plugin/generators.json",
-          "packages/nx-plugin/executors.json",
-          "packages/nx-plugin/package.json"
-        ]
-      }
-    },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],

packages/schematics/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}