Revert "fix: avoid empty chunks (#566)"

This reverts commit f71c2c5.
posva · Jan 21, 2025 · 72abbd7 · 72abbd7
1 parent ef86a6a
commit 72abbd7
Showing 4 changed files with 85 additions and 56 deletions.
diff --git a/package.json b/package.json
@@ -32,65 +32,101 @@
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "types": {
+        "require": "./dist/index.d.cts",
+        "import": "./dist/index.d.ts"
+      },
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
     },
     "./vite": {
-      "import": "./dist/vite.js",
-      "require": "./dist/vite.cjs"
+      "types": {
+        "require": "./dist/vite.d.cts",
+        "import": "./dist/vite.d.ts"
+      },
+      "require": "./dist/vite.cjs",
+      "import": "./dist/vite.js"
     },
     "./webpack": {
-      "import": "./dist/webpack.js",
-      "require": "./dist/webpack.cjs"
+      "types": {
+        "require": "./dist/webpack.d.cts",
+        "import": "./dist/webpack.d.ts"
+      },
+      "require": "./dist/webpack.cjs",
+      "import": "./dist/webpack.js"
     },
     "./rollup": {
-      "import": "./dist/rollup.js",
-      "require": "./dist/rollup.cjs"
+      "types": {
+        "require": "./dist/rollup.d.cts",
+        "import": "./dist/rollup.d.ts"
+      },
+      "require": "./dist/rollup.cjs",
+      "import": "./dist/rollup.js"
     },
     "./esbuild": {
-      "import": "./dist/esbuild.js",
-      "require": "./dist/esbuild.cjs"
+      "types": {
+        "require": "./dist/esbuild.d.cts",
+        "import": "./dist/esbuild.d.ts"
+      },
+      "require": "./dist/esbuild.cjs",
+      "import": "./dist/esbuild.js"
     },
     "./options": {
-      "import": "./dist/options.js",
-      "require": "./dist/options.cjs"
+      "types": {
+        "require": "./dist/options.d.cts",
+        "import": "./dist/options.d.ts"
+      },
+      "require": "./dist/options.cjs",
+      "import": "./dist/options.js"
     },
     "./runtime": {
-      "import": "./dist/runtime.js",
-      "require": "./dist/runtime.cjs"
+      "types": {
+        "require": "./dist/runtime.d.cts",
+        "import": "./dist/runtime.d.ts"
+      },
+      "require": "./dist/runtime.cjs",
+      "import": "./dist/runtime.js"
     },
     "./types": {
       "types": {
-        "import": "./dist/types.d.ts",
-        "require": "./dist/types.d.cts"
-      }
+        "require": "./dist/types.d.cts",
+        "import": "./dist/types.d.ts"
+      },
+      "require": "./dist/types.cjs",
+      "import": "./dist/types.js"
     },
     "./data-loaders": {
-      "import": "./dist/data-loaders/index.js",
-      "require": "./dist/data-loaders/index.cjs"
+      "types": {
+        "require": "./dist/data-loaders/index.d.cts",
+        "import": "./dist/data-loaders/index.d.ts"
+      },
+      "require": "./dist/data-loaders/index.cjs",
+      "import": "./dist/data-loaders/index.js"
     },
     "./data-loaders/basic": {
-      "import": "./dist/data-loaders/basic.js",
-      "require": "./dist/data-loaders/basic.cjs"
+      "types": {
+        "require": "./dist/data-loaders/basic.d.cts",
+        "import": "./dist/data-loaders/basic.d.ts"
+      },
+      "require": "./dist/data-loaders/basic.cjs",
+      "import": "./dist/data-loaders/basic.js"
     },
     "./data-loaders/pinia-colada": {
-      "import": "./dist/data-loaders/pinia-colada.js",
-      "require": "./dist/data-loaders/pinia-colada.cjs"
+      "types": {
+        "require": "./dist/data-loaders/pinia-colada.d.cts",
+        "import": "./dist/data-loaders/pinia-colada.d.ts"
+      },
+      "require": "./dist/data-loaders/pinia-colada.cjs",
+      "import": "./dist/data-loaders/pinia-colada.js"
     },
     "./client": {
       "types": "./client.d.ts"
     }
   },
   "typesVersions": {
     "*": {
-      "data-loaders": [
-        "./dist/data-loaders/index.d.ts"
-      ],
-      "data-loaders/basic": [
-        "./dist/data-loaders/basic.d.ts"
-      ],
-      "data-loaders/pinia-colada": [
-        "./dist/data-loaders/pinia-colada.d.ts"
+      "./client": [
+        "./client.d.ts"
       ],
       "*": [
         "./dist/*",

diff --git a/src/index.ts b/src/index.ts
@@ -22,7 +22,7 @@ import { appendExtensionListToPattern } from './core/utils'
 import { MACRO_DEFINE_PAGE_QUERY } from './core/definePage'
 import { createAutoExportPlugin } from './data-loaders/auto-exports'
 
-export type * from './types'
+export * from './types'
 
 export { DEFAULT_OPTIONS }
 

diff --git a/tsup-runtime.config.ts b/tsup-runtime.config.ts
@@ -4,12 +4,14 @@ import { commonOptions } from './tsup.config'
 export default defineConfig([
   {
     ...commonOptions,
+    clean: false,
     entry: ['./src/runtime.ts'],
     external: [...commonOptions.external, 'unplugin-vue-router/types'],
   },
 
   {
     ...commonOptions,
+    clean: false,
     entry: ['./src/data-loaders/entries/*'],
     // to work with node10 moduleResolution mode
     outDir: 'dist/data-loaders',

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -1,8 +1,7 @@
-import { rm } from 'node:fs/promises'
 import { defineConfig, type Options } from 'tsup'
 
 export const commonOptions = {
-  clean: false,
+  clean: true,
   format: ['cjs', 'esm'],
   dts: true,
   external: [
@@ -17,25 +16,17 @@ export const commonOptions = {
   splitting: true,
 } satisfies Options
 
-export default defineConfig(async () => {
-  await rm('dist', { recursive: true, force: true })
-
-  return [
-    {
-      ...commonOptions,
-      entry: [
-        './src/index.ts',
-        './src/options.ts',
-        './src/esbuild.ts',
-        './src/rollup.ts',
-        './src/vite.ts',
-        './src/webpack.ts',
-      ],
-    },
-    {
-      ...commonOptions,
-      dts: { only: true },
-      entry: ['./src/types.ts'],
-    },
-  ]
-})
+export default defineConfig([
+  {
+    ...commonOptions,
+    entry: [
+      './src/index.ts',
+      './src/options.ts',
+      './src/esbuild.ts',
+      './src/rollup.ts',
+      './src/vite.ts',
+      './src/webpack.ts',
+      './src/types.ts',
+    ],
+  },
+])