Merge branch 'main' into mdm-eslintplugintype

Author: lachlancollins

.github/workflows/release.yml

@@ -34,27 +34,24 @@ jobs:
       - name: Stop Nx Agents
         if: ${{ always() }}
         run: npx nx-cloud stop-all-agents
-      - name: Version Packages
-        run: pnpm run changeset:version
+      - name: Run Changesets (version or publish)
+        id: changesets
+        uses: changesets/[email protected]
+        with:
+          version: pnpm run changeset:version
+          publish: pnpm run changeset:publish
+          commit: 'ci: Version Packages'
+          title: 'ci: Version Packages'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Commit version files
-        run: |
-          if [[ -n "$(git status --porcelain)" ]]; then
-            git config --global user.name 'Tanner Linsley'
-            git config --global user.email '[email protected]'
-            git add -A
-            git commit -m "ci: Version Packages"
-            git push
-          fi
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Auto-merge Changesets PR
+        if: steps.changesets.outputs.hasChangesets == 'true'
+        run: gh pr --repo "$REPO" merge --squash "$PR_NUM"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish Packages
-        run: |
-          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-          pnpm run changeset:publish
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          PR_NUM: ${{ steps.changesets.outputs.pullRequestNumber }}
+          REPO: ${{ github.repository }}
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:

package.json

@@ -43,7 +43,7 @@
     "@arethetypeswrong/cli": "^0.15.3",
     "@changesets/cli": "^2.29.5",
     "@cspell/eslint-plugin": "^9.2.1",
-    "@eslint-react/eslint-plugin": "^1.53.1",
+    "@eslint-react/eslint-plugin": "^2.0.1",
     "@svitejs/changesets-changelog-github-compact": "^1.2.0",
     "@tanstack/config": "^0.20.2",
     "@testing-library/jest-dom": "^6.8.0",

packages/eslint-plugin-query/package.json

@@ -59,11 +59,11 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@typescript-eslint/utils": "^8.44.0"
+    "@typescript-eslint/utils": "^8.44.1"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "^8.44.0",
-    "@typescript-eslint/rule-tester": "^8.44.0",
+    "@typescript-eslint/parser": "^8.44.1",
+    "@typescript-eslint/rule-tester": "^8.44.1",
     "combinate": "^1.1.11",
     "eslint": "^9.36.0",
     "npm-run-all2": "^5.0.0"