Fix --format=es (#128)

jaredpalmer · May 31, 2019 · 47fb723 · 47fb723
1 parent e1c3c68
commit 47fb723
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,14 @@
 
 import sade from 'sade';
 import glob from 'tiny-glob/sync';
-import { rollup, watch, RollupOptions, OutputOptions } from 'rollup';
+import {
+  rollup,
+  watch,
+  RollupOptions,
+  OutputOptions,
+  RollupWatchOptions,
+  WatcherOptions,
+} from 'rollup';
 import asyncro from 'asyncro';
 import chalk from 'chalk';
 import util from 'util';
@@ -17,12 +24,7 @@ import { paths } from './constants';
 import * as Messages from './messages';
 import { createRollupConfig } from './createRollupConfig';
 import { createJestConfig } from './createJestConfig';
-import {
-  safeVariableName,
-  resolveApp,
-  safePackageName,
-  clearConsole,
-} from './utils';
+import { resolveApp, safePackageName, clearConsole } from './utils';
 import * as Output from './output';
 import { concatAllArray } from 'jpjs';
 import getInstallCmd from './getInstallCmd';
@@ -84,7 +86,9 @@ async function getInputs(entries: string[], source?: string) {
 
   return concatAllArray(inputs);
 }
-function createBuildConfigs(opts: any) {
+function createBuildConfigs(
+  opts: any
+): Array<RollupOptions & { output: OutputOptions }> {
   return concatAllArray(
     opts.input.map((input: string) => [
       opts.format.includes('cjs') &&
@@ -252,7 +256,7 @@ prog
   .action(async (opts: any) => {
     opts.name = opts.name || appPackageJson.name;
     opts.input = await getInputs(opts.entry, appPackageJson.source);
-    const [cjsDev, cjsProd, ...otherConfigs] = createBuildConfigs(opts);
+    const buildConfigs = createBuildConfigs(opts);
     if (opts.format.includes('cjs')) {
       await util.promisify(mkdirp)(resolveApp('dist'));
       await fs.writeFile(
@@ -273,12 +277,12 @@ prog
     }
     const spinner = ora().start();
     await watch(
-      [cjsDev, cjsProd, ...otherConfigs].map(inputOptions => ({
+      (buildConfigs as RollupWatchOptions[]).map(inputOptions => ({
         watch: {
           silent: true,
-          include: 'src/**',
-          exclude: 'node_modules/**',
-        },
+          include: ['src/**'],
+          exclude: ['node_modules/**'],
+        } as WatcherOptions,
         ...inputOptions,
       }))
     ).on('event', async event => {
@@ -322,7 +326,7 @@ prog
   .action(async (opts: any) => {
     opts.name = opts.name || appPackageJson.name;
     opts.input = await getInputs(opts.entry, appPackageJson.source);
-    const [cjsDev, cjsProd, ...otherConfigs] = createBuildConfigs(opts);
+    const buildConfigs = createBuildConfigs(opts);
     if (opts.format.includes('cjs')) {
       try {
         await util.promisify(mkdirp)(resolveApp('./dist'));
@@ -353,7 +357,7 @@ prog
     try {
       const promise = asyncro
         .map(
-          [cjsDev, cjsProd, ...otherConfigs],
+          buildConfigs,
           async (inputOptions: RollupOptions & { output: OutputOptions }) => {
             let bundle = await rollup(inputOptions);
             await bundle.write(inputOptions.output);