chore: update tsup to v8 & make changes to type imports

pmndrs · Oct 12, 2024 · 8294462 · 8294462
1 parent bfaba44
commit 8294462
Show file tree

Hide file tree

Showing 15 changed files with 736 additions and 123 deletions.
diff --git a/package.json b/package.json
@@ -102,7 +102,7 @@
     "spec.ts": "1.1.3",
     "start-server-and-test": "2.0.3",
     "three": "0.150.1",
-    "tsup": "6.7.0",
+    "tsup": "8.3.0",
     "turbo": "1.13.3",
     "typescript": "5.3.3",
     "vite": "5.2.11",

diff --git a/packages/animated/package.json b/packages/animated/package.json
@@ -4,13 +4,18 @@
   "description": "Animated component props for React",
   "module": "./dist/react-spring_animated.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_animated.modern.d.ts",
+  "types": "./dist/react-spring_animated.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_animated.modern.d.ts",
-      "import": "./dist/react-spring_animated.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_animated.modern.d.mts",
+        "default": "./dist/react-spring_animated.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_animated.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_core.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_core.modern.d.ts",
+  "types": "./dist/react-spring_core.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_core.modern.d.ts",
-      "import": "./dist/react-spring_core.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_core.modern.d.mts",
+        "default": "./dist/react-spring_core.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_core.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/parallax/package.json b/packages/parallax/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_parallax.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_parallax.modern.d.ts",
+  "types": "./dist/react-spring_parallax.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_parallax.modern.d.ts",
-      "import": "./dist/react-spring_parallax.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_parallax.modern.d.mts",
+        "default": "./dist/react-spring_parallax.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_parallax.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/rafz/package.json b/packages/rafz/package.json
@@ -4,13 +4,18 @@
   "description": "react-spring's fork of rafz one frameloop to rule them all",
   "module": "./dist/react-spring_rafz.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_rafz.modern.d.ts",
+  "types": "./dist/react-spring_rafz.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_rafz.modern.d.ts",
-      "import": "./dist/react-spring_rafz.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_rafz.modern.d.mts",
+        "default": "./dist/react-spring_rafz.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_rafz.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/react-spring/package.json b/packages/react-spring/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.4",
   "module": "./dist/react-spring.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring.modern.d.ts",
+  "types": "./dist/react-spring.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring.modern.d.ts",
-      "import": "./dist/react-spring.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring.modern.d.mts",
+        "default": "./dist/react-spring.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -4,13 +4,18 @@
   "description": "Globals and shared modules",
   "module": "./dist/react-spring_shared.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_shared.modern.d.ts",
+  "types": "./dist/react-spring_shared.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_shared.modern.d.ts",
-      "import": "./dist/react-spring_shared.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_shared.modern.d.mts",
+        "default": "./dist/react-spring_shared.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_shared.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -4,13 +4,18 @@
   "description": "Internal package with TypeScript stuff",
   "module": "./dist/react-spring_types.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_types.modern.d.ts",
+  "types": "./dist/react-spring_types.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_types.modern.d.ts",
-      "import": "./dist/react-spring_types.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_types.modern.d.mts",
+        "default": "./dist/react-spring_types.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_types.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/targets/konva/package.json b/targets/konva/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_konva.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_konva.modern.d.ts",
+  "types": "./dist/react-spring_konva.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_konva.modern.d.ts",
-      "import": "./dist/react-spring_konva.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_konva.modern.d.mts",
+        "default": "./dist/react-spring_konva.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_konva.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/targets/native/package.json b/targets/native/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_native.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_native.modern.d.ts",
+  "types": "./dist/react-spring_native.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_native.modern.d.ts",
-      "import": "./dist/react-spring_native.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_native.modern.d.mts",
+        "default": "./dist/react-spring_native.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_native.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/targets/three/package.json b/targets/three/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_three.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_three.modern.d.ts",
+  "types": "./dist/react-spring_three.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_three.modern.d.ts",
-      "import": "./dist/react-spring_three.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_three.modern.d.mts",
+        "default": "./dist/react-spring_three.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_three.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/targets/web/package.json b/targets/web/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_web.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_web.modern.d.ts",
+  "types": "./dist/react-spring_web.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_web.modern.d.ts",
-      "import": "./dist/react-spring_web.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_web.modern.d.mts",
+        "default": "./dist/react-spring_web.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_web.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/targets/zdog/package.json b/targets/zdog/package.json
@@ -3,13 +3,18 @@
   "version": "9.7.5",
   "module": "./dist/react-spring_zdog.legacy-esm.js",
   "main": "./dist/cjs/index.js",
-  "types": "./dist/react-spring_zdog.modern.d.ts",
+  "types": "./dist/react-spring_zdog.modern.d.mts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/react-spring_zdog.modern.d.ts",
-      "import": "./dist/react-spring_zdog.modern.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/react-spring_zdog.modern.d.mts",
+        "default": "./dist/react-spring_zdog.modern.mjs"
+      },
+      "require": {
+        "types": "./dist/cjs/react-spring_zdog.development.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "files": [

diff --git a/tsup.config.base.ts b/tsup.config.base.ts
@@ -3,16 +3,14 @@ import fs from 'fs'
 import path from 'path'
 
 interface BuildOptions {
-  format: 'cjs' | 'umd' | 'esm'
+  format: 'cjs' | 'esm'
   name:
     | 'development'
     | 'production.min'
     | 'legacy-esm'
     | 'modern'
     | 'modern.development'
     | 'modern.production.min'
-    | 'umd'
-    | 'umd.min'
   minify: boolean
   env: 'development' | 'production' | ''
   target?:
@@ -33,6 +31,7 @@ const buildTargets: BuildOptions[] = [
     target: 'es2020',
     minify: false,
     env: 'development',
+    dts: true,
   },
   {
     format: 'cjs',