fix: don't bundle dts by default

egoist · May 18, 2020 · edcce14 · edcce14
1 parent c398839
commit edcce14
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -18,35 +18,28 @@ cli
   })
   .option('--bundle', 'Bundle node_modules')
   .option('--dts', 'Generate declaration file')
+  .option('--dts-bundle', 'Bundle types from node_modules')
   .option('--watch', 'Watch mode')
   .option('--define.* <value>', 'Define compile-time constants')
-  .option('--external <name>', 'Mark specific packages as external (use with --bundle)')
+  .option(
+    '--external <name>',
+    'Mark specific packages as external (use with --bundle)'
+  )
   .option('--module-name <name>', 'Module name (with with --format umd)')
   .option('--jsxFactory <jsxFactory>', 'Name of JSX factory function', {
     default: 'React.createElement',
   })
   .option('--jsxFragment <jsxFragment>', 'Name of JSX fragment function', {
     default: 'React.Fragment',
   })
-  .option('--inlineDynamicImports', 'Create a single bundle that inlines dynamic imports')
+  .option(
+    '--inlineDynamicImports',
+    'Create a single bundle that inlines dynamic imports'
+  )
   .action(async (files: string[], options) => {
     const { rollup, watch } = await import('rollup')
     const { createRollupConfigs, printSizes } = await import('./')
-    const rollupConfigs = await createRollupConfigs(files, {
-      watch: options.watch,
-      minify: options.minify,
-      jsxFragment: options.jsxFragment,
-      jsxFactory: options.jsxFactory,
-      format: options.format,
-      target: options.target,
-      dts: options.dts,
-      bundle: options.bundle,
-      outDir: options.outDir,
-      define: options.define,
-      external: options.external,
-      moduleName: options.moduleName,
-      inlineDynamicImports: options.inlineDynamicImports
-    })
+    const rollupConfigs = await createRollupConfigs(files, options)
     if (options.watch) {
       const watcher = watch(
         rollupConfigs.map((config) => ({
@@ -90,7 +83,7 @@ cli
       define: options.define,
       outDir: 'dist',
       format: 'cjs',
-      target: 'es2017'
+      target: 'es2017',
     })
     const bundle = await rollup(rollupConfig.inputConfig)
     const { output } = await bundle.write(rollupConfig.outputConfig)

diff --git a/src/index.ts b/src/index.ts
@@ -11,8 +11,12 @@ import { resolvePlugin } from './resolve-plugin'
 import { isExternal } from './utils'
 
 type Options = {
+  // Bundle packages in node_modules
   bundle?: boolean
+  // Generate .d.ts file
   dts?: boolean
+  // Bundle .d.ts files in node_modules
+  dtsBundle?: boolean
   target?: EsbuildTarget
   watch?: boolean
   minify?: boolean
@@ -69,7 +73,7 @@ export async function createRollupConfigs(files: string[], options: Options) {
           resolvePlugin({
             bundle: options.bundle,
             external: options.external,
-            dts,
+            dtsBundle: options.dtsBundle,
           }),
           !dts &&
             commonjsPlugin({

diff --git a/src/resolve-plugin.ts b/src/resolve-plugin.ts
@@ -12,17 +12,17 @@ const joycon = new JoyCon()
 export const resolvePlugin = ({
   bundle,
   external,
-  dts,
+  dtsBundle,
 }: {
   bundle?: boolean
   external?: string[]
-  dts?: boolean
+  dtsBundle?: boolean
 }): Plugin => {
   const nodeResolve = nodeResolvePlugin({
-    mainFields: dts ? ['types', 'typings'] : ['module', 'main'],
-    extensions: dts ? ['.d.ts'] : ['.mjs', '.js', '.json', '.node'],
+    mainFields: dtsBundle ? ['types', 'typings'] : ['module', 'main'],
+    extensions: dtsBundle ? ['.d.ts'] : ['.mjs', '.js', '.json', '.node'],
     customResolveOptions: {
-      moduleDirectory: dts
+      moduleDirectory: dtsBundle
         ? ['node_modules/@types', 'node_modules']
         : 'node_modules',
     },