ci: fix v4 branch (#10048)

lachlancollins · web-flow · commit a96402dd94c5 · 2026-01-17T09:31:12.000+11:00
* Initial work

* Fix Nx

* Fix prettier and CSB

* Disable TUI
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
+  "changelog": [
+    "@svitejs/changesets-changelog-github-compact",
+    { "repo": "TanStack/query" }
+  ],
+  "commit": false,
+  "access": "public",
+  "baseBranch": "v4",
+  "updateInternalDependencies": "patch",
+  "fixed": [],
+  "linked": [],
+  "ignore": [],
+  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
+    "onlyUpdatePeerDependentsWhenOutOfRange": true
+  }
+}
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -7,5 +7,5 @@
     "/examples/vue/basic"
   ],
   "packages": ["packages/**"],
-  "node": "16"
+  "node": "18"
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,6 +1,7 @@
 name: pr
 
-on: [pull_request]
+on:
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
@@ -17,39 +18,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
       - name: Start Nx Agents
         run: npx nx-cloud start-ci-run
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Get base and head commits for `nx affected`
-        uses: nrwl/nx-set-shas@v4.1.2
+        uses: nrwl/nx-set-shas@v4.4.0
+        with:
+          main-branch-name: v4
       - name: Run Tests
         run: pnpm run test:pr --parallel=3
       - name: Stop Agents
         run: npx nx-cloud stop-all-agents
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
   format:
     name: Format
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4.1.0
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
-          cache-dependency-path: pnpm-lock.yaml
-      - name: Install dependencies
-        run: pnpm --filter "./packages/**" --filter query --prefer-offline install
+      - name: Setup Tools
+        uses: tanstack/config/.github/setup@main
       - name: Run prettier
         run: pnpm run test:format
   test-react-version:
@@ -60,22 +53,15 @@ jobs:
         react-version: [17, 18]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v6.0.1
         with:
           fetch-depth: 0
-          ref: ${{ github.head_ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4.1.0
-      - uses: actions/setup-node@v3
+      - name: Setup Tools
+        uses: tanstack/config/.github/setup@main
+      - name: Get base and head commits for `nx affected`
+        uses: nrwl/nx-set-shas@v4.4.0
         with:
-          node-version-file: .nvmrc
-          cache: pnpm
-          cache-dependency-path: pnpm-lock.yaml
-      - name: Install dependencies
-        run: pnpm --filter "./packages/**" --filter query --prefer-offline install
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+          main-branch-name: v4
       - name: Run Tests for React ${{ matrix.react-version }}
         uses: nick-fields/retry@v2.8.3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,39 @@
+name: ci
+
+on:
+  push:
+    branches: [main, alpha, beta, rc, v4]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  NX_CLOUD_DISTRIBUTED_EXECUTION: false
+  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+  NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
+
+jobs:
+  release:
+    name: Release
+    if: github.repository_owner == 'TanStack'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6.0.1
+        with:
+          fetch-depth: 0
+      - name: Setup Tools
+        uses: tanstack/config/.github/setup@main
+      - name: Run Tests
+        run: pnpm run test:ci
+      - name: Run Changesets (version or publish)
+        id: changesets
+        uses: changesets/action@v1.5.3
+        with:
+          version: pnpm run changeset:version
+          publish: pnpm run changeset:publish
+          commit: 'ci: Version Packages (v4)'
+          title: 'ci: Version Packages (v4)'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -7,15 +7,10 @@ package-lock.json
 yarn.lock
 
 # builds
-types
-*/**/build
-*/**/dist
-*/**/lib
-*/**/es
-artifacts
-.rpt2_cache
+build
 coverage
-*.tgz
+dist
+dist-ts
 
 # misc
 .DS_Store
@@ -35,12 +30,22 @@ stats-hydration.json
 stats.json
 stats.html
 .vscode/settings.json
+.vscode/mcp.json
+.cursor/rules
+.github/instructions/nx.instructions.md
 
 *.log
 *.tsbuildinfo
-.DS_Store
+.angular
 .cache
 .idea
 .nx/cache
 .nx/workspace-data
-nx-cloud.env
+.pnpm-store
+.svelte-kit
+.tsup
+.vinxi
+temp
+
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
diff --git a/.prettierignore b/.prettierignore
@@ -3,4 +3,5 @@
 **/build
 **/coverage
 **/dist
+**/dist-ts
 **/codemods/**/__testfixtures__
diff --git a/nx.json b/nx.json
@@ -1,31 +1,11 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "affected": {
-    "defaultBase": "main"
-  },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx-cloud",
-      "options": {
-        "cacheableOperations": [
-          "test:lib",
-          "test:eslint",
-          "test:types",
-          "test:build",
-          "build:types",
-          "build",
-          "rollup"
-        ],
-        "parallel": 5,
-        "accessToken": "ZDdkNDA4MGEtYjNmYi00MWI4LWE1N2QtYTdlNmYxMGJlZWM2fHJlYWQ="
-      }
-    }
-  },
-  "defaultBase": "main",
-  "pluginsConfig": {
-    "@nrwl/js": {
-      "analyzeSourceFiles": false
-    }
+  "defaultBase": "v4",
+  "nxCloudId": "6412c827e6da5d7b4a0b1fe3",
+  "useInferencePlugins": false,
+  "parallel": 5,
+  "tui": {
+    "enabled": false
   },
   "namedInputs": {
     "globalBuildAffectingConfig": [
@@ -59,30 +39,41 @@
   "targetDefaults": {
     "test:lib": {
       "outputs": ["{projectRoot}/coverage"],
-      "inputs": ["default", "^public"]
+      "inputs": ["default", "^public"],
+      "cache": true
     },
     "test:eslint": {
-      "inputs": ["default", "^public"]
+      "inputs": ["default", "^public"],
+      "cache": true
     },
     "test:types": {
       "outputs": [
         "{projectRoot}/build/**/*.d.ts",
         "{projectRoot}/build/.tsbuildinfo"
       ],
       "inputs": ["default", "^public"],
-      "dependsOn": ["^test:types"]
+      "dependsOn": ["^test:types"],
+      "cache": true
     },
     "build:types": {
       "outputs": [
         "{projectRoot}/build/**/*.d.ts",
         "{projectRoot}/build/.tsbuildinfo"
       ],
       "inputs": ["default", "^public"],
-      "dependsOn": ["^build:types"]
+      "dependsOn": ["^build:types"],
+      "cache": true
     },
     "test:build": {
       "dependsOn": ["build"],
-      "inputs": ["^public"]
+      "inputs": ["^public"],
+      "cache": true
+    },
+    "build": {
+      "cache": true
+    },
+    "rollup": {
+      "cache": true
     }
   }
 }
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/TanStack/query.git"
   },
-  "packageManager": "pnpm@8.5.1",
+  "packageManager": "pnpm@9.5.0",
   "scripts": {
     "clean": "pnpm --filter \"./packages/**\" run clean",
     "preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
@@ -74,8 +74,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "expect-type": "^1.2.1",
     "jest": "^27.5.1",
-    "nx": "16.7.4",
-    "nx-cloud": "16.3.0",
+    "nx": "22.3.3",
     "prettier": "^2.6.2",
     "prettier-plugin-svelte": "^2.9.0",
     "react": "^19.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`"/examples/vue/basic"`
`8`	`8`	`],`
`9`	`9`	`"packages": ["packages/**"],`
`10`		`- "node": "16"`
	`10`	`+ "node": "18"`
`11`	`11`	`}`