build(next-drupal): switch from microbundle to tsup for builds

chapter-three · Nov 17, 2023 · 77de568 · 77de568
1 parent 1be6184
commit 77de568
Show file tree

Hide file tree

Showing 23 changed files with 416 additions and 1,669 deletions.
diff --git a/examples/example-auth/tsconfig.json b/examples/example-auth/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-blog/tsconfig.json b/examples/example-blog/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-client/tsconfig.json b/examples/example-client/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-custom-auth/tsconfig.json b/examples/example-custom-auth/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-custom-cache/tsconfig.json b/examples/example-custom-cache/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-custom-fetcher/tsconfig.json b/examples/example-custom-fetcher/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-custom-serializer/tsconfig.json b/examples/example-custom-serializer/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-graphql/tsconfig.json b/examples/example-graphql/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-marketing/tsconfig.json b/examples/example-marketing/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-query/tsconfig.json b/examples/example-query/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-search-api/tsconfig.json b/examples/example-search-api/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-umami/tsconfig.json b/examples/example-umami/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/examples/example-webform/tsconfig.json b/examples/example-webform/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/package.json b/package.json
@@ -63,13 +63,13 @@
     "jest": "^27.5.1",
     "lerna": "^4.0.0",
     "lint-staged": "^15.0.2",
-    "microbundle": "^0.15.1",
     "prettier": "^3.0.3",
     "start-server-and-test": "^1.15.5",
     "ts-jest": "^27.1.5",
     "ts-node": "^10.9.1",
+    "tsup": "^7.3.0",
     "turbo": "^1.10.15",
-    "typescript": "^4.9.5",
+    "typescript": "^5.2.2",
     "uuid": "^9.0.1",
     "yaml": "^2.3.3"
   }

diff --git a/packages/next-drupal-query/package.json b/packages/next-drupal-query/package.json
@@ -6,8 +6,20 @@
   "source": "src/index.ts",
   "type": "module",
   "main": "dist/index.cjs",
-  "module": "dist/index.modern.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,8 +29,8 @@
     "url": "https://twitter.com/shadcn"
   },
   "scripts": {
-    "prepare": "microbundle --no-compress --jsx React.createElement --format modern,cjs",
-    "dev": "microbundle watch --no-compress --jsx React.createElement --format modern,cjs",
+    "prepare": "tsup",
+    "dev": "tsup --watch",
     "test": "jest"
   },
   "keywords": [
@@ -37,13 +49,12 @@
     "directory": "packages/next-drupal-query"
   },
   "devDependencies": {
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "typescript": "^4.9.5"
+    "type-fest": "^4.8.1",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
     "deepmerge": "^4.3.1",
     "drupal-jsonapi-params": "^2.3.1",
-    "next": "^12.2.3 || ^13",
-    "type-fest": "^2.19.0"
+    "next": "^12.2.3 || ^13"
   }
 }
diff --git a/packages/next-drupal-query/tsup.config.ts b/packages/next-drupal-query/tsup.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from "tsup"
+
+export const tsup = defineConfig({
+  entry: ["src/index.ts"],
+  // Enable experimental code splitting support in CommonJS.
+  // splitting: true,
+  // Use Rollup for tree shaking.
+  // treeshake: true,
+  sourcemap: true,
+  clean: true,
+  format: ["esm", "cjs"],
+  dts: true,
+  cjsInterop: true,
+})
diff --git a/packages/next-drupal/package.json b/packages/next-drupal/package.json
@@ -6,8 +6,20 @@
   "source": "src/index.ts",
   "type": "module",
   "main": "dist/index.cjs",
-  "module": "dist/index.modern.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,8 +29,8 @@
     "url": "https://twitter.com/shadcn"
   },
   "scripts": {
-    "prepare": "microbundle --no-compress --jsx React.createElement --format modern,cjs",
-    "dev": "microbundle watch --no-compress --jsx React.createElement --format modern,cjs",
+    "prepare": "tsup",
+    "dev": "tsup --watch",
     "test": "jest"
   },
   "keywords": [
@@ -37,8 +49,7 @@
     "directory": "packages/next-drupal"
   },
   "devDependencies": {
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "typescript": "^4.9.5"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
     "jsona": "^1.12.1",

diff --git a/packages/next-drupal/tsup.config.ts b/packages/next-drupal/tsup.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from "tsup"
+
+export const tsup = defineConfig({
+  entry: ["src/index.ts"],
+  // Enable experimental code splitting support in CommonJS.
+  // splitting: true,
+  // Use Rollup for tree shaking.
+  // treeshake: true,
+  sourcemap: true,
+  clean: true,
+  format: ["esm", "cjs"],
+  dts: true,
+  cjsInterop: true,
+})
diff --git a/starters/basic-starter/tsconfig.json b/starters/basic-starter/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/starters/graphql-starter/tsconfig.json b/starters/graphql-starter/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "ES2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

diff --git a/www/tsconfig.json b/www/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,