vercel · Nov 13, 2023 · Dec 19, 2023 · Jan 14, 2024 · Jan 14, 2024 · Jan 14, 2024
diff --git a/.github/workflows/test-canary.yml b/.github/workflows/test-canary.yml
@@ -1,7 +1,7 @@
 name: Test React Canary
 
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
 
@@ -20,7 +20,8 @@ jobs:
 
       - name: Lint and test
         run: |
-          pnpm run-all-checks
           pnpm clean
           pnpm build
+          pnpm run-all-checks
+          pnpm test
           pnpm test:build
diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
@@ -20,10 +20,11 @@ jobs:
 
       - name: Lint and test
         run: |
-          pnpm run-all-checks
           pnpm clean
           pnpm build
+          pnpm run-all-checks
           pnpm attw
+          pnpm test
           pnpm test:build
   e2e:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -65,9 +65,9 @@ jobs:
       - run: pnpm install
 
       - run: |
-          pnpm run-all-checks
           pnpm clean
           pnpm build
+          pnpm run-all-checks
           pnpm test:build
 
       - name: Configure git

diff --git a/_internal/package.json b/_internal/package.json
@@ -1,21 +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": {
-    "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