Add react-server bundle for core and infinite

.github/workflows/trigger-release.yml

@@ -24,7 +24,7 @@ on:
 name: Trigger Release
 
 env:
-  PNPM_VERSION: 7.26.1
+  PNPM_VERSION: 8.4.0
   SEMVER_TYPE: ${{ github.event.inputs.semverType }}
   RELEASE_TYPE: ${{ github.event.inputs.releaseType }}
 

_internal/package.json

@@ -2,11 +2,17 @@
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
-  "exports": "./dist/index.mjs",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "react-server": "./dist/react-server.mjs",
+    "import": "./dist/index.mjs",
+    "module": "./dist/index.esm.js",
+    "require": "./dist/index.js"
+  },
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

_internal/src/react-server.ts

@@ -0,0 +1 @@
+export { serialize } from './utils/serialize'

_internal/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "outDir": "./dist"
   },
-  "include": ["./*.ts"]
+  "include": ["./src"]
 }

core/package.json

@@ -2,11 +2,17 @@
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
-  "exports": "./dist/index.mjs",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "react-server": "./dist/react-server.mjs",
+    "import": "./dist/index.mjs",
+    "module": "./dist/index.esm.js",
+    "require": "./dist/index.js"
+  },
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

core/src/react-server.ts

@@ -0,0 +1 @@
+export { unstable_serialize } from './serialize'

core/src/serialize.ts

@@ -0,0 +1,4 @@
+import type { Key } from 'swr'
+import { serialize } from 'swr/_internal'
+
+export const unstable_serialize = (key: Key) => serialize(key)[0]

core/use-swr.ts → core/src/use-swr.ts

@@ -744,7 +744,7 @@ export const SWRConfig = OBJECT.defineProperty(ConfigProvider, 'defaultValue', {
   defaultValue: FullConfiguration
 }
 
-export const unstable_serialize = (key: Key) => serialize(key)[0]
+export { unstable_serialize } from './serialize'
 
 /**
  * A hook to fetch data.

immutable/package.json

@@ -5,8 +5,8 @@
   "exports": "./dist/index.mjs",
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

immutable/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "outDir": "./dist"
   },
-  "include": ["./*.ts"]
+  "include": ["./src"]
 }

infinite/package.json

@@ -2,11 +2,17 @@
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/infinite/index.d.ts",
-  "exports": "./dist/index.mjs",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "react-server": "./dist/react-server.mjs",
+    "import": "./dist/index.mjs",
+    "module": "./dist/index.esm.js",
+    "require": "./dist/index.js"
+  },
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

infinite/index.ts → infinite/src/index.ts

@@ -30,17 +30,20 @@ import type {
   SWRInfiniteCompareFn
 } from './types'
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js'
+import { INFINITE_PREFIX, getFirstPageKey } from './serialize'
 
-const INFINITE_PREFIX = '$inf$'
+// const INFINITE_PREFIX = '$inf$'
 const EMPTY_PROMISE = Promise.resolve() as Promise<undefined>
 
-const getFirstPageKey = (getKey: SWRInfiniteKeyLoader) => {
-  return serialize(getKey ? getKey(0, null) : null)[0]
-}
+// const getFirstPageKey = (getKey: SWRInfiniteKeyLoader) => {
+//   return serialize(getKey ? getKey(0, null) : null)[0]
+// }
 
-export const unstable_serialize = (getKey: SWRInfiniteKeyLoader) => {
-  return INFINITE_PREFIX + getFirstPageKey(getKey)
-}
+export { unstable_serialize } from './serialize'
+
+// export const unstable_serialize = (getKey: SWRInfiniteKeyLoader) => {
+//   return INFINITE_PREFIX + getFirstPageKey(getKey)
+// }
 
 export const infinite = (<Data, Error>(useSWRNext: SWRHook) =>
   (

infinite/src/react-server.ts

@@ -0,0 +1 @@
+export { unstable_serialize } from './serialize'

infinite/src/serialize.ts

@@ -0,0 +1,12 @@
+import type { SWRInfiniteKeyLoader } from './types'
+import { serialize } from 'swr/_internal'
+
+export const INFINITE_PREFIX = '$inf$'
+
+export const getFirstPageKey = (getKey: SWRInfiniteKeyLoader) => {
+  return serialize(getKey ? getKey(0, null) : null)[0]
+}
+
+export const unstable_serialize = (getKey: SWRInfiniteKeyLoader) => {
+  return INFINITE_PREFIX + getFirstPageKey(getKey)
+}

infinite/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "outDir": "./dist"
   },
-  "include": ["./*.ts"]
+  "include": ["./src"]
 }

jest.config.js

@@ -5,12 +5,12 @@ module.exports = {
   modulePathIgnorePatterns: ['<rootDir>/examples/'],
   setupFilesAfterEnv: ['<rootDir>/test/jest-setup.ts'],
   moduleNameMapper: {
-    '^swr$': '<rootDir>/core/index.ts',
-    '^swr/infinite$': '<rootDir>/infinite/index.ts',
-    '^swr/immutable$': '<rootDir>/immutable/index.ts',
-    '^swr/subscription$': '<rootDir>/subscription/index.ts',
-    '^swr/mutation$': '<rootDir>/mutation/index.ts',
-    '^swr/_internal$': '<rootDir>/_internal/index.ts'
+    '^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'
   },
   transform: {
     '^.+\\.(t|j)sx?$': ['@swc/jest']

mutation/package.json

@@ -1,12 +1,17 @@
 {
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
-  "types": "./dist/mutation/index.d.ts",
-  "exports": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.mjs",
+    "module": "./dist/index.esm.js",
+    "require": "./dist/index.js"
+  },
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

mutation/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "outDir": "./dist"
   },
-  "include": ["./*.ts"]
+  "include": ["./src"]
 }

package.json

@@ -18,12 +18,14 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./core/dist/index.d.ts",
+      "react-server": "./core/dist/react-server.mjs",
       "import": "./core/dist/index.mjs",
       "module": "./core/dist/index.esm.js",
       "require": "./core/dist/index.js"
     },
     "./infinite": {
       "types": "./infinite/dist/infinite/index.d.ts",
+      "react-server": "./infinite/dist/react-server.mjs",
       "import": "./infinite/dist/index.mjs",
       "module": "./infinite/dist/index.esm.js",
       "require": "./infinite/dist/index.js"
@@ -41,7 +43,7 @@
       "require": "./subscription/dist/index.js"
     },
     "./mutation": {
-      "types": "./mutation/dist/mutation/index.d.ts",
+      "types": "./mutation/dist/index.d.ts",
       "import": "./mutation/dist/index.mjs",
       "module": "./mutation/dist/index.esm.js",
       "require": "./mutation/dist/index.js"
@@ -78,7 +80,7 @@
     "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:e2e": "pnpm next build e2e/site",
-    "build-package": "bunchee index.ts --cwd",
+    "build-package": "bunchee --cwd",
     "types:check": "pnpm -r run types:check",
     "prepublishOnly": "pnpm clean && pnpm build",
     "publish-beta": "pnpm publish --tag beta",
@@ -111,7 +113,7 @@
     "@types/use-sync-external-store": "^0.0.3",
     "@typescript-eslint/eslint-plugin": "5.59.8",
     "@typescript-eslint/parser": "5.59.8",
-    "bunchee": "3.2.0",
+    "bunchee": "3.3.4",
     "eslint": "8.42.0",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-jest-dom": "5.0.1",

subscription/package.json

@@ -2,11 +2,16 @@
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
-  "exports": "./dist/index.mjs",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.mjs",
+    "module": "./dist/index.esm.js",
+    "require": "./dist/index.js"
+  },
   "private": true,
   "scripts": {
-    "watch": "bunchee index.ts -w",
-    "build": "bunchee index.ts",
+    "watch": "bunchee -w",
+    "build": "bunchee",
     "types:check": "tsc --noEmit",
     "clean": "rimraf dist"
   },

subscription/tsconfig.json

@@ -4,6 +4,6 @@
     "outDir": "./dist",
     "rootDir": "..",
   },
-  "include": [".", "../src"],
+  "include": ["./src"],
   "exclude": ["./dist"]
 }

test/type/helper-types.tsx

@@ -1,4 +1,4 @@
-import type { BlockingData } from '../../_internal/types'
+import type { BlockingData } from 'swr/_internal'
 import { expectType } from './utils'
 
 export function testDataCached() {

tsconfig.json

@@ -19,12 +19,12 @@
     "noEmitOnError": true,
     "downlevelIteration": true,
     "paths": {
-      "swr": ["./core/index.ts"],
-      "swr/infinite": ["./infinite/index.ts"],
-      "swr/immutable": ["./immutable/index.ts"],
-      "swr/mutation": ["./mutation/index.ts"],
-      "swr/_internal": ["./_internal/index.ts"],
-      "swr/subscription": ["subscription/index.ts"],
+      "swr": ["./core/src/index.ts"],
+      "swr/infinite": ["./infinite/src/index.ts"],
+      "swr/immutable": ["./immutable/src/index.ts"],
+      "swr/mutation": ["./mutation/src/index.ts"],
+      "swr/_internal": ["./_internal/src/index.ts"],
+      "swr/subscription": ["subscription/src/index.ts"],
     },
     "incremental": true
   },