build: use new bundle convention (#2865)

* build: use new bundle convention * fix test alias * chore: fix lint error * update bundler and pkg exports * import from core * react-server alias * Update alias * simplify script * change internal import path * rm duplicated script * fix imports * rm unused * upgrade bunchee and fix export * fix alias --------- Co-authored-by: Yixuan Xu <yixuanxu94@outlook.com>
vercel · Jan 14, 2024 · bf5363e · bf5363e
1 parent 387a3ab
commit bf5363e
Show file tree

Hide file tree

Showing 61 changed files with 480 additions and 489 deletions.
diff --git a/_internal/package.json b/_internal/package.json
@@ -1,22 +1,6 @@
 {
-  "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "react-server": "./dist/react-server.mjs",
-    "import": "./dist/index.mjs",
-    "module": "./dist/index.esm.js",
-    "require": "./dist/index.js"
-  },
-  "private": true,
-  "scripts": {
-    "watch": "bunchee -w",
-    "build": "bunchee",
-    "types:check": "tsc --noEmit",
-    "clean": "rimraf dist"
-  },
-  "peerDependencies": {
-    "swr": "*",
-    "react": "*"
-  }
+  "main": "../dist/_internal/index.js",
+  "module": "../dist/_internal/index.esm.js",
+  "types": "../dist/_internal/index.d.ts",
+  "private": true
 }
diff --git a/_internal/tsconfig.json b/_internal/tsconfig.json
diff --git a/core/package.json b/core/package.json
diff --git a/core/src/serialize.ts b/core/src/serialize.ts
diff --git a/core/tsconfig.json b/core/tsconfig.json
diff --git a/e2e/test/tsconfig.json b/e2e/test/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    ".",
+  ],
+}
diff --git a/core/src/env.d.ts → env.d.ts b/core/src/env.d.ts → env.d.ts
diff --git a/immutable/package.json b/immutable/package.json
@@ -1,21 +1,6 @@
 {
-  "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "import": "./dist/index.mjs",
-    "module": "./dist/index.esm.js",
-    "require": "./dist/index.js"
-  },
-  "private": true,
-  "scripts": {
-    "watch": "bunchee -w",
-    "build": "bunchee",
-    "types:check": "tsc --noEmit",
-    "clean": "rimraf dist"
-  },
-  "peerDependencies": {
-    "swr": "*",
-    "react": "*"
-  }
+  "main": "../dist/immutable/index.js",
+  "module": "../dist/immutable/index.esm.js",
+  "types": "../dist/immutable/index.d.ts",
+  "private": true
 }
diff --git a/immutable/tsconfig.json b/immutable/tsconfig.json
diff --git a/infinite/package.json b/infinite/package.json
@@ -1,23 +1,6 @@
 {
-  "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "react-server": "./dist/react-server.mjs",
-    "import": "./dist/index.mjs",
-    "module": "./dist/index.esm.js",
-    "require": "./dist/index.js"
-  },
-  "private": true,
-  "scripts": {
-    "watch": "bunchee -w",
-    "build": "bunchee",
-    "types:check": "tsc --noEmit",
-    "clean": "rimraf dist"
-  },
-  "peerDependencies": {
-    "swr": "*",
-    "react": "*",
-    "use-sync-external-store": "*"
-  }
+  "main": "../dist/infinite/index.js",
+  "module": "../dist/infinite/index.esm.js",
+  "types": "../dist/infinite/index.d.ts",
+  "private": true
 }
diff --git a/infinite/src/index.react-server.ts b/infinite/src/index.react-server.ts
diff --git a/infinite/tsconfig.json b/infinite/tsconfig.json
diff --git a/jest.config.js b/jest.config.js
@@ -5,12 +5,12 @@ module.exports = {
   modulePathIgnorePatterns: ['<rootDir>/examples/'],
   setupFilesAfterEnv: ['<rootDir>/test/jest-setup.ts'],
   moduleNameMapper: {
-    '^swr$': '<rootDir>/core/src/index.ts',
-    '^swr/infinite$': '<rootDir>/infinite/src/index.ts',
-    '^swr/immutable$': '<rootDir>/immutable/src/index.ts',
-    '^swr/subscription$': '<rootDir>/subscription/src/index.ts',
-    '^swr/mutation$': '<rootDir>/mutation/src/index.ts',
-    '^swr/_internal$': '<rootDir>/_internal/src/index.ts'
+    '^swr$': '<rootDir>/src/index/index.ts',
+    '^swr/infinite$': '<rootDir>/src/infinite/index.ts',
+    '^swr/immutable$': '<rootDir>/src/immutable/index.ts',
+    '^swr/subscription$': '<rootDir>/src/subscription/index.ts',
+    '^swr/mutation$': '<rootDir>/src/mutation/index.ts',
+    '^swr/_internal$': '<rootDir>/src/_internal/index.ts'
   },
   transform: {
     '^.+\\.(t|j)sx?$': ['@swc/jest']

diff --git a/mutation/package.json b/mutation/package.json
@@ -1,21 +1,6 @@
 {
-  "main": "./dist/index.js",
-  "module": "./dist/index.esm.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "import": "./dist/index.mjs",
-    "module": "./dist/index.esm.js",
-    "require": "./dist/index.js"
-  },
-  "private": true,
-  "scripts": {
-    "watch": "bunchee -w",
-    "build": "bunchee",
-    "types:check": "tsc --noEmit",
-    "clean": "rimraf dist"
-  },
-  "peerDependencies": {
-    "swr": "*",
-    "react": "*"
-  }
+  "main": "../dist/mutation/index.js",
+  "module": "../dist/mutation/index.esm.js",
+  "types": "../dist/mutation/index.d.ts",
+  "private": true
 }
diff --git a/mutation/tsconfig.json b/mutation/tsconfig.json
diff --git a/package.json b/package.json
@@ -11,74 +11,88 @@
     "fetch"
   ],
   "packageManager": "pnpm@8.4.0",
-  "main": "./core/dist/index.js",
-  "module": "./core/dist/index.esm.js",
-  "types": "./core/dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "infinite": [
-        "./infinite/dist/index.d.ts"
-      ],
-      "immutable": [
-        "./immutable/dist/index.d.ts"
-      ],
-      "mutation": [
-        "./mutation/dist/index.d.ts"
-      ],
-      "subscription": [
-        "./subscription/dist/index.d.ts"
-      ]
-    }
-  },
+  "main": "./dist/core/index.js",
+  "module": "./dist/core/index.esm.js",
+  "types": "./dist/core/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "react-server": "./core/dist/react-server.mjs",
-      "import": "./core/dist/index.mjs",
-      "module": "./core/dist/index.esm.js",
-      "require": "./core/dist/index.js"
+      "react-server": "./dist/core/react-server.mjs",
+      "import": {
+        "types": "./dist/core/index.d.mts",
+        "default": "./dist/core/index.mjs"
+      },
+      "module": "./dist/core/index.esm.js",
+      "require": {
+        "types": "./dist/core/index.d.ts",
+        "default": "./dist/core/index.js"
+      }
     },
     "./infinite": {
-      "react-server": "./infinite/dist/react-server.mjs",
-      "import": "./infinite/dist/index.mjs",
-      "module": "./infinite/dist/index.esm.js",
-      "require": "./infinite/dist/index.js"
+      "react-server": "./dist/infinite/react-server.mjs",
+      "import": {
+        "types": "./dist/infinite/index.d.mts",
+        "default": "./dist/infinite/index.mjs"
+      },
+      "module": "./dist/infinite/index.esm.js",
+      "require": {
+        "types": "./dist/infinite/index.d.ts",
+        "default": "./dist/infinite/index.js"
+      }
     },
     "./immutable": {
-      "import": "./immutable/dist/index.mjs",
-      "module": "./immutable/dist/index.esm.js",
-      "require": "./immutable/dist/index.js"
+      "import": {
+        "types": "./dist/immutable/index.d.mts",
+        "default": "./dist/immutable/index.mjs"
+      },
+      "module": "./dist/immutable/index.esm.js",
+      "require": {
+        "types": "./dist/immutable/index.d.ts",
+        "default": "./dist/immutable/index.js"
+      }
     },
     "./subscription": {
-      "import": "./subscription/dist/index.mjs",
-      "module": "./subscription/dist/index.esm.js",
-      "require": "./subscription/dist/index.js"
+      "import": {
+        "types": "./dist/subscription/index.d.mts",
+        "default": "./dist/subscription/index.mjs"
+      },
+      "module": "./dist/subscription/index.esm.js",
+      "require": {
+        "types": "./dist/subscription/index.d.ts",
+        "default": "./dist/subscription/index.js"
+      }
     },
     "./mutation": {
-      "import": "./mutation/dist/index.mjs",
-      "module": "./mutation/dist/index.esm.js",
-      "require": "./mutation/dist/index.js"
+      "import": {
+        "types": "./dist/mutation/index.d.mts",
+        "default": "./dist/mutation/index.mjs"
+      },
+      "module": "./dist/mutation/index.esm.js",
+      "require": {
+        "types": "./dist/mutation/index.d.ts",
+        "default": "./dist/mutation/index.js"
+      }
     },
     "./_internal": {
-      "react-server": "./_internal/dist/react-server.mjs",
-      "import": "./_internal/dist/index.mjs",
-      "module": "./_internal/dist/index.esm.js",
-      "require": "./_internal/dist/index.js"
+      "react-server": "./dist/_internal/react-server.mjs",
+      "import": {
+        "types": "./dist/_internal/index.d.mts",
+        "default": "./dist/_internal/index.mjs"
+      },
+      "module": "./dist/_internal/index.esm.js",
+      "require": {
+        "types": "./dist/_internal/index.d.ts",
+        "default": "./dist/_internal/index.js"
+      }
     }
   },
   "files": [
-    "core/dist/**/*.{js,d.ts,mjs,d.mts}",
-    "infinite/dist/**/*.{js,d.ts,mjs,d.mts}",
-    "immutable/dist/**/*.{js,d.ts,mjs,d.mts}",
-    "mutation/dist/**/*.{js,d.ts,mjs,d.mts}",
-    "_internal/dist/**/*.{js,d.ts,mjs,d.mts}",
-    "subscription/dist/*.{js,d.ts,mjs,d.mts}",
-    "core/package.json",
-    "infinite/package.json",
-    "immutable/package.json",
-    "mutation/package.json",
-    "_internal/package.json",
-    "subscription/package.json"
+    "dist",
+    "infinite",
+    "immutable",
+    "subscription",
+    "mutation",
+    "_internal"
   ],
   "repository": "github:vercel/swr",
   "homepage": "https://swr.vercel.app",
@@ -87,11 +101,10 @@
     "prepare": "husky install",
     "csb:install": "corepack enable && corepack pnpm i",
     "csb:build": "pnpm build",
-    "clean": "pnpm -r run clean && rimraf playwright-report test-result",
+    "clean": "rimraf ./dist && rimraf playwright-report test-result",
     "watch": "pnpm -r run watch",
-    "build": "pnpm build-package _internal && pnpm build-package core && pnpm build-package infinite && pnpm build-package immutable && pnpm build-package mutation && pnpm build-package subscription",
+    "build": "bunchee",
     "build:e2e": "pnpm next build e2e/site",
-    "build-package": "bunchee --cwd",
     "attw": "attw --pack",
     "types:check": "pnpm -r run types:check",
     "prepublishOnly": "pnpm clean && pnpm build",
@@ -126,7 +139,7 @@
     "@types/use-sync-external-store": "^0.0.3",
     "@typescript-eslint/eslint-plugin": "5.59.8",
     "@typescript-eslint/parser": "5.59.8",
-    "bunchee": "3.9.2",
+    "bunchee": "^4.3.4",
     "eslint": "8.42.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-jest-dom": "5.0.1",