feat: Replace rollup with tsup/esbuild (#5597)

Co-authored-by: Dominik Dorfmeister <office@dorfmeister.cc> Co-authored-by: Aryan Deora <adeora@iu.edu>
TanStack · Jul 19, 2023 · b3d7d55 · b3d7d55
1 parent b879836
commit b3d7d55
Show file tree

Hide file tree

Showing 59 changed files with 786 additions and 1,111 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/docs/react/installation.md b/docs/react/installation.md
@@ -42,12 +42,12 @@ If you're not using a module bundler or package manager, you can also use this l
 React Query is optimized for modern browsers. It is compatible with the following browsers config
 
 ```
-Chrome >= 84
+Chrome >= 91
 Firefox >= 90
-Edge >= 84
+Edge >= 91
 Safari >= 15
 iOS >= 15
-opera >= 70
+opera >= 77
 ```
 
 > Depending on your environment, you might need to add polyfills. If you want to support older browsers, you need to transpile the library from `node_modules` yourselves.

diff --git a/nx.json b/nx.json
@@ -27,11 +27,9 @@
   },
   "namedInputs": {
     "sharedGlobals": [
-      "{workspaceRoot}/.browserslistrc",
       "{workspaceRoot}/.eslintrc.cjs",
-      "{workspaceRoot}/babel.config.cjs",
       "{workspaceRoot}/package.json",
-      "{workspaceRoot}/scripts/getRollupConfig.js",
+      "{workspaceRoot}/scripts/getTsupConfig.js",
       "{workspaceRoot}/tsconfig.json"
     ],
     "default": [

diff --git a/package.json b/package.json
@@ -31,15 +31,7 @@
   "namespace": "@tanstack",
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.6.0",
-    "@babel/core": "^7.21.8",
-    "@babel/preset-env": "^7.21.5",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.21.5",
     "@commitlint/parse": "^17.6.5",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^25.0.2",
-    "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-replace": "^5.0.2",
     "@solidjs/testing-library": "^0.5.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -59,7 +51,6 @@
     "@typescript-eslint/parser": "^5.54.0",
     "@vitest/coverage-istanbul": "^0.33.0",
     "axios": "^1.4.0",
-    "babel-preset-solid": "^1.6.10",
     "chalk": "^5.2.0",
     "concurrently": "^8.0.1",
     "cpy-cli": "^4.2.0",
@@ -84,9 +75,6 @@
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.1",
     "rollup": "^3.26.0",
-    "rollup-plugin-node-externals": "^6.1.1",
-    "rollup-plugin-preserve-directives": "^0.2.0",
-    "rollup-plugin-visualizer": "^5.9.2",
     "rollup-preset-solid": "^2.0.1",
     "semver": "^7.5.1",
     "solid-js": "^1.6.13",

diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json
@@ -11,18 +11,18 @@
     "url": "https://github.com/sponsors/tannerlinsley"
   },
   "type": "module",
-  "types": "build/lib/index.d.ts",
-  "main": "build/lib/index.cjs",
-  "module": "build/lib/index.js",
+  "types": "build/legacy/index.d.ts",
+  "main": "build/legacy/index.cjs",
+  "module": "build/legacy/index.js",
   "exports": {
     ".": {
       "import": {
-        "types": "./build/lib/index.d.ts",
-        "default": "./build/lib/index.js"
+        "types": "./build/legacy/index.d.ts",
+        "default": "./build/legacy/index.js"
       },
       "require": {
-        "types": "./build/lib/index.d.cts",
-        "default": "./build/lib/index.cjs"
+        "types": "./build/legacy/index.d.cts",
+        "default": "./build/legacy/index.cjs"
       }
     },
     "./package.json": "./package.json"

diff --git a/packages/eslint-plugin-query/tsup.config.js b/packages/eslint-plugin-query/tsup.config.js
@@ -1,13 +1,8 @@
 // @ts-check
 
 import { defineConfig } from 'tsup'
+import { legacyConfig } from '../../scripts/getTsupConfig.js'
 
-export default defineConfig({
-  entry: ['src/index.ts'],
-  format: ['cjs', 'esm'],
-  target: ['es2020', 'node16'],
-  outDir: 'build/lib',
-  dts: true,
-  sourcemap: true,
-  clean: true,
-})
+export default defineConfig([
+  legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'], bundle: true }),
+])
diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json
@@ -11,21 +11,25 @@
     "url": "https://github.com/sponsors/tannerlinsley"
   },
   "type": "module",
-  "types": "build/lib/index.d.ts",
-  "main": "build/lib/index.legacy.cjs",
-  "module": "build/lib/index.legacy.js",
+  "types": "build/legacy/index.d.ts",
+  "main": "build/legacy/index.cjs",
+  "module": "build/legacy/index.js",
   "exports": {
     ".": {
-      "types": "./build/lib/index.d.ts",
-      "import": "./build/lib/index.js",
-      "require": "./build/lib/index.cjs",
-      "default": "./build/lib/index.cjs"
+      "import": {
+        "types": "./build/modern/index.d.ts",
+        "default": "./build/modern/index.js"
+      },
+      "require": {
+        "types": "./build/modern/index.d.cts",
+        "default": "./build/modern/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
   "files": [
-    "build/lib/*",
+    "build",
     "src"
   ],
   "scripts": {
@@ -34,10 +38,8 @@
     "test:types": "tsc --noEmit",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
-    "test:build": "publint --strict",
-    "build": "pnpm build:rollup && pnpm build:types",
-    "build:rollup": "rollup --config rollup.config.js",
-    "build:types": "tsc --emitDeclarationOnly"
+    "test:build": "publint --strict && attw --pack",
+    "build": "tsup"
   },
   "dependencies": {
     "@tanstack/query-persist-client-core": "workspace:*"

diff --git a/packages/query-async-storage-persister/rollup.config.js b/packages/query-async-storage-persister/rollup.config.js
diff --git a/packages/query-async-storage-persister/tsconfig.eslint.json b/packages/query-async-storage-persister/tsconfig.eslint.json
@@ -3,5 +3,5 @@
   "compilerOptions": {
     "noEmit": true
   },
-  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"]
+  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
 }
diff --git a/packages/query-async-storage-persister/tsup.config.js b/packages/query-async-storage-persister/tsup.config.js
@@ -0,0 +1,9 @@
+// @ts-check
+
+import { defineConfig } from 'tsup'
+import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js'
+
+export default defineConfig([
+  modernConfig({ entry: ['src/*.ts'] }),
+  legacyConfig({ entry: ['src/*.ts'] }),
+])
diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json
@@ -11,31 +11,33 @@
     "url": "https://github.com/sponsors/tannerlinsley"
   },
   "type": "module",
-  "types": "build/lib/index.d.ts",
-  "main": "build/lib/index.legacy.cjs",
-  "module": "build/lib/index.legacy.js",
+  "types": "build/legacy/index.d.ts",
+  "main": "build/legacy/index.cjs",
+  "module": "build/legacy/index.js",
   "exports": {
     ".": {
-      "types": "./build/lib/index.d.ts",
-      "import": "./build/lib/index.js",
-      "require": "./build/lib/index.cjs",
-      "default": "./build/lib/index.cjs"
+      "import": {
+        "types": "./build/modern/index.d.ts",
+        "default": "./build/modern/index.js"
+      },
+      "require": {
+        "types": "./build/modern/index.d.cts",
+        "default": "./build/modern/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
   "files": [
-    "build/lib/*",
+    "build",
     "src"
   ],
   "scripts": {
     "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
     "test:types": "tsc --noEmit",
-    "test:build": "publint --strict",
-    "build": "pnpm build:rollup && pnpm build:types",
-    "build:rollup": "rollup --config rollup.config.js",
-    "build:types": "tsc --emitDeclarationOnly"
+    "test:build": "publint --strict && attw --pack",
+    "build": "tsup"
   },
   "dependencies": {
     "@tanstack/query-core": "workspace:*",

diff --git a/packages/query-broadcast-client-experimental/rollup.config.js b/packages/query-broadcast-client-experimental/rollup.config.js
diff --git a/packages/query-broadcast-client-experimental/tsconfig.eslint.json b/packages/query-broadcast-client-experimental/tsconfig.eslint.json
@@ -3,5 +3,5 @@
   "compilerOptions": {
     "noEmit": true
   },
-  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"]
+  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
 }
diff --git a/packages/query-broadcast-client-experimental/tsup.config.js b/packages/query-broadcast-client-experimental/tsup.config.js
@@ -0,0 +1,9 @@
+// @ts-check
+
+import { defineConfig } from 'tsup'
+import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js'
+
+export default defineConfig([
+  modernConfig({ entry: ['src/*.ts'] }),
+  legacyConfig({ entry: ['src/*.ts'] }),
+])
diff --git a/packages/query-core/package.json b/packages/query-core/package.json
@@ -11,21 +11,25 @@
     "url": "https://github.com/sponsors/tannerlinsley"
   },
   "type": "module",
-  "types": "build/lib/index.d.ts",
-  "main": "build/lib/index.legacy.cjs",
-  "module": "build/lib/index.legacy.js",
+  "types": "build/legacy/index.d.ts",
+  "main": "build/legacy/index.cjs",
+  "module": "build/legacy/index.js",
   "exports": {
     ".": {
-      "types": "./build/lib/index.d.ts",
-      "import": "./build/lib/index.js",
-      "require": "./build/lib/index.cjs",
-      "default": "./build/lib/index.cjs"
+      "import": {
+        "types": "./build/modern/index.d.ts",
+        "default": "./build/modern/index.js"
+      },
+      "require": {
+        "types": "./build/modern/index.d.cts",
+        "default": "./build/modern/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
   "files": [
-    "build/lib/*",
+    "build",
     "src"
   ],
   "scripts": {
@@ -34,9 +38,7 @@
     "test:types": "tsc --noEmit",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
-    "test:build": "publint --strict",
-    "build": "pnpm build:rollup && pnpm build:types",
-    "build:rollup": "rollup --config rollup.config.js",
-    "build:types": "tsc --emitDeclarationOnly"
+    "test:build": "publint --strict && attw --pack",
+    "build": "tsup"
   }
 }
diff --git a/packages/query-core/rollup.config.js b/packages/query-core/rollup.config.js
diff --git a/packages/query-core/tsconfig.eslint.json b/packages/query-core/tsconfig.eslint.json
@@ -3,5 +3,5 @@
   "compilerOptions": {
     "noEmit": true
   },
-  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"]
+  "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"]
 }
diff --git a/packages/query-core/tsup.config.js b/packages/query-core/tsup.config.js
@@ -0,0 +1,9 @@
+// @ts-check
+
+import { defineConfig } from 'tsup'
+import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js'
+
+export default defineConfig([
+  modernConfig({ entry: ['src/*.ts'] }),
+  legacyConfig({ entry: ['src/*.ts'] }),
+])