Merge remote-tracking branch 'upstream/main' into feature/angular-query-devtools-sub-path-imports

arnoud-dv · arnoud-dv · commit 5523975d0257 · 2025-06-17T20:28:27.000+02:00
diff --git a/examples/angular/auto-refetching/package.json b/examples/angular/auto-refetching/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/basic-persister/package.json b/examples/angular/basic-persister/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "@tanstack/angular-query-persist-client": "^5.62.7",
     "@tanstack/query-sync-storage-persister": "^5.80.7",
     "rxjs": "^7.8.2",
diff --git a/examples/angular/basic/package.json b/examples/angular/basic/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/devtools-panel/package.json b/examples/angular/devtools-panel/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
     "@angular/router": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/infinite-query-with-max-pages/package.json b/examples/angular/infinite-query-with-max-pages/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/optimistic-updates/package.json b/examples/angular/optimistic-updates/package.json
@@ -15,7 +15,7 @@
     "@angular/forms": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/pagination/package.json b/examples/angular/pagination/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/query-options-from-a-service/package.json b/examples/angular/query-options-from-a-service/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
     "@angular/router": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/router/package.json b/examples/angular/router/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
     "@angular/router": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/rxjs/package.json b/examples/angular/rxjs/package.json
@@ -15,7 +15,7 @@
     "@angular/forms": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/examples/angular/simple/package.json b/examples/angular/simple/package.json
@@ -14,7 +14,7 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-browser-dynamic": "^20.0.0",
-    "@tanstack/angular-query-experimental": "^5.80.7",
+    "@tanstack/angular-query-experimental": "^5.80.8",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "zone.js": "0.15.0"
diff --git a/packages/angular-query-experimental/.attw.json b/packages/angular-query-experimental/.attw.json
@@ -1,3 +1,3 @@
 {
-  "ignoreRules": ["cjs-resolves-to-esm", "no-resolution"]
+  "ignoreRules": ["cjs-resolves-to-esm"]
 }
diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-query-experimental",
-  "version": "5.80.7",
+  "version": "5.80.8",
   "description": "Signals for managing, caching and syncing asynchronous and remote data in Angular",
   "author": "Arnoud de Vries",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "tanstack"
   ],
   "scripts": {
-    "clean": "premove ./build ./coverage ./dist-ts",
+    "clean": "premove ./build ./coverage ./dist-ts ./**.d.ts",
     "compile": "tsc --build",
     "test:eslint": "eslint ./src",
     "test:types": "npm-run-all --serial test:types:*",
@@ -42,16 +42,19 @@
     "test:types:tscurrent": "tsc --build",
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
-    "test:build": "publint --strict --pack=false ./build && attw --pack ./build",
-    "build": "pnpm build:tsup",
-    "build:tsup": "tsup --tsconfig tsconfig.prod.json"
+    "test:build": "pnpm pack && publint *.tgz --strict && attw *.tgz; premove *.tgz",
+    "build": "vite build",
+    "prepack": "node scripts/prepack.js",
+    "postpack": "node scripts/postpack.js"
   },
   "type": "module",
+  "types": "dist/types/index.d.ts",
+  "module": "dist/index.mjs",
   "exports": {
     ".": {
-      "types": "./build/index.d.ts",
+      "types": "./dist/types/index.d.ts",
       "@tanstack/custom-condition": "./src/index.ts",
-      "default": "./build/index.mjs"
+      "default": "./dist/index.mjs"
     },
     "./devtools": {
       "types": "./build/devtools/index.d.ts",
@@ -77,10 +80,9 @@
   },
   "sideEffects": false,
   "files": [
-    "devtools",
-    "devtools-panel",
-    "index.*",
-    "*.d.ts"
+    "**/*.d.ts",
+    "dist",
+    "!dist/types/**"
   ],
   "dependencies": {
     "@tanstack/query-core": "workspace:*",
@@ -94,39 +96,46 @@
     "@angular/platform-browser-dynamic": "^20.0.0",
     "@tanstack/query-test-utils": "workspace:*",
     "eslint-plugin-jsdoc": "^50.5.0",
-    "npm-run-all2": "^5.0.0"
+    "npm-run-all2": "^5.0.0",
+    "vite-plugin-dts": "4.2.3",
+    "vite-plugin-externalize-deps": "^0.9.0",
+    "vite-tsconfig-paths": "^5.1.4"
   },
   "peerDependencies": {
     "@angular/common": ">=16.0.0",
     "@angular/core": ">=16.0.0"
   },
   "publishConfig": {
+    "types": "index.d.ts",
     "exports": {
       ".": {
         "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "./devtools": {
-        "types": "./devtools/index.d.ts",
-        "development": "./devtools/index.mjs",
-        "default": "./devtools/stub.mjs"
-      },
-      "./devtools/production": {
-        "types": "./devtools/production/index.d.ts",
-        "default": "./devtools/index.mjs"
-      },
-      "./devtools-panel": {
-        "types": "./devtools-panel/index.d.ts",
-        "development": "./devtools-panel/index.mjs",
-        "default": "./devtools-panel/stub.mjs"
-      },
-      "./devtools-panel/production": {
-        "types": "./devtools-panel/production/index.d.ts",
-        "default": "./devtools-panel/index.mjs"
+        "default": "./dist/index.mjs"
       },
       "./package.json": {
         "default": "./package.json"
       }
+    },
+    "./devtools": {
+      "types": "./devtools/index.d.ts",
+      "development": "./devtools/index.mjs",
+      "default": "./devtools/stub.mjs"
+    },
+    "./devtools/production": {
+      "types": "./devtools/production/index.d.ts",
+      "default": "./devtools/index.mjs"
+    },
+    "./devtools-panel": {
+      "types": "./devtools-panel/index.d.ts",
+      "development": "./devtools-panel/index.mjs",
+      "default": "./devtools-panel/stub.mjs"
+    },
+    "./devtools-panel/production": {
+      "types": "./devtools-panel/production/index.d.ts",
+      "default": "./devtools-panel/index.mjs"
+    },
+    "./package.json": {
+      "default": "./package.json"
     }
   }
 }
diff --git a/packages/angular-query-experimental/scripts/postpack.js b/packages/angular-query-experimental/scripts/postpack.js
@@ -0,0 +1,54 @@
+import { unlink, rmdir } from 'fs/promises'
+import fg from 'fast-glob'
+
+const constants = {
+  IGNORE_FILES_PATTERNS: [
+    'dist/**',
+    'node_modules/**',
+    '.git/**',
+    'scripts/**',
+  ],
+  CLEANUP_FILES_GLOB: ['**/*.d.ts'],
+  IGNORE_REMOVE_DIRECTORIES: [
+    'dist/**',
+    'node_modules/**',
+    '.git/**',
+    'scripts/**',
+    'src/**',
+  ],
+}
+
+async function postpack() {
+  console.log(
+    'Running postpack script to cleanup type declaration linked files used for publishing',
+  )
+
+  const typeFiles = await fg(constants.CLEANUP_FILES_GLOB, {
+    ignore: constants.IGNORE_FILES_PATTERNS,
+  })
+
+  if (typeFiles.length === 0) {
+    return
+  }
+
+  await Promise.all(typeFiles.map((file) => unlink(file)))
+
+  const dirs = await fg(['**/'], {
+    onlyDirectories: true,
+    ignore: constants.IGNORE_REMOVE_DIRECTORIES,
+  })
+
+  // Remove empty directories (deepest first)
+  const sortedDirs = dirs.sort(
+    (a, b) => b.split('/').length - a.split('/').length,
+  )
+  await Promise.all(
+    sortedDirs.map(
+      (dir) => rmdir(dir).catch(() => {}), // Ignore errors (dir not empty)
+    ),
+  )
+}
+
+postpack().catch((error) => {
+  console.error('Postpack failed:', error)
+})
diff --git a/packages/angular-query-experimental/scripts/prepack.js b/packages/angular-query-experimental/scripts/prepack.js
@@ -0,0 +1,68 @@
+import { link, mkdir } from 'fs/promises'
+import { dirname, relative } from 'path'
+import fg from 'fast-glob'
+
+const constants = {
+  DIST_TYPES_DIRECTORY: 'dist/types',
+  OUTPUT_DIRECTORY: '.',
+  DIST_TYPE_FILES_GLOB: 'dist/types/**/*.d.ts',
+}
+
+/*
+`prepack` lifecycle script which links type declaration files from the dist folder to the package root.
+allows using types in package exports as such:
+
+`"types": "./index.d.ts"`
+
+and subpath exports
+
+```json
+    "./some-subpath": {
+      "types": "./some-subpath/index.d.ts", // ✅ works with `"modeResolution": "node"`
+      "default": "./build/some-subpath/index.mjs"
+    },
+```
+
+When TypeScript is configured with `moduleResolution: node`, type declaration file directory structures are expected
+to exactly match the subpath export as in the example above.
+
+```json
+    "./some-subpath": {
+      "types": "./build/dist/some-subpath/index.d.ts", // ❌ does not work with `"moduleResolution": "node"`
+      "default": "./build/some-subpath/index.mjs"
+    },
+```
+
+It's important to support `"moduleResolution": "node"` as many Angular applications are still configured this way.
+
+In the `postpack` lifecycle script these links are removed to keep a clean development environment
+ */
+async function prepack() {
+  console.log('Running prepack script to prepare types for publishing')
+
+  const typeFiles = await fg([constants.DIST_TYPE_FILES_GLOB])
+  if (typeFiles.length === 0) return
+
+  const destDirs = [
+    ...new Set(
+      typeFiles
+        .map((file) => {
+          const dest = relative(constants.DIST_TYPES_DIRECTORY, file)
+          return dirname(dest)
+        })
+        .filter((dir) => dir !== constants.OUTPUT_DIRECTORY),
+    ),
+  ]
+
+  await Promise.all(destDirs.map((dir) => mkdir(dir, { recursive: true })))
+  await Promise.all(
+    typeFiles.map((file) => {
+      const dest = relative(constants.DIST_TYPES_DIRECTORY, file)
+      return link(file, dest)
+    }),
+  )
+
+  console.log(`Linked ${typeFiles.length} type files`)
+}
+
+prepack().catch(console.error)
diff --git a/packages/angular-query-experimental/tsconfig.json b/packages/angular-query-experimental/tsconfig.json
@@ -3,8 +3,6 @@
   "compilerOptions": {
     "outDir": "./dist-ts",
     "rootDir": ".",
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
     "noFallthroughCasesInSwitch": true,
     "useDefineForClassFields": false,
     "target": "ES2022"
diff --git a/packages/angular-query-experimental/tsconfig.prod.json b/packages/angular-query-experimental/tsconfig.prod.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "incremental": false,
     "composite": false,
-    "rootDir": "../../"
+    "rootDir": "../../",
+    "customConditions": null
   }
 }
diff --git a/packages/angular-query-experimental/tsup.config.js b/packages/angular-query-experimental/tsup.config.js
diff --git a/packages/angular-query-experimental/vite.config.ts b/packages/angular-query-experimental/vite.config.ts
diff --git a/packages/angular-query-persist-client/.attw.json b/packages/angular-query-persist-client/.attw.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
