feat: support output bundler unminified

boilerplate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-father",
-  "version": "4.5.0",
+  "version": "4.5.1-beta.3",
   "description": "Creator for father boilerplate",
   "homepage": "https://github.com/umijs/father/tree/master/boilerplate#readme",
   "bugs": "https://github.com/umijs/father/issues",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "father",
-  "version": "4.5.0",
+  "version": "4.5.1-beta.3",
   "description": "A bundless/bundle build tool",
   "homepage": "https://github.com/umijs/father#readme",
   "bugs": "https://github.com/umijs/father/issues",
@@ -43,12 +43,12 @@
   },
   "dependencies": {
     "@microsoft/api-extractor": "7.39.1",
-    "@umijs/babel-preset-umi": "^4.3.12",
-    "@umijs/bundler-utils": "^4.3.12",
-    "@umijs/bundler-webpack": "^4.3.12",
+    "@umijs/babel-preset-umi": "^4.3.14",
+    "@umijs/bundler-utils": "^4.3.14",
+    "@umijs/bundler-webpack": "^4.3.14",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/core": "^4.3.12",
-    "@umijs/utils": "^4.3.12",
+    "@umijs/core": "^4.3.14",
+    "@umijs/utils": "^4.3.14",
     "@vercel/ncc": "0.33.3",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "babel-plugin-module-resolver": "4.1.0",

src/builder/bundle/index.ts

@@ -31,7 +31,9 @@ interface IBundleOpts {
   incremental?: boolean;
 }
 
-function bundle(opts: Omit<IBundleOpts, 'watch' | 'incremental'>): Promise<void>;
+function bundle(
+  opts: Omit<IBundleOpts, 'watch' | 'incremental'>,
+): Promise<void>;
 function bundle(opts: IBundleOpts): Promise<IBundleWatcher>;
 async function bundle(opts: IBundleOpts): Promise<void | IBundleWatcher> {
   const enableCache = process.env.FATHER_CACHE !== 'none';
@@ -68,7 +70,6 @@ async function bundle(opts: IBundleOpts): Promise<void | IBundleWatcher> {
           devtool: config.sourcemap && 'source-map',
           externals: config.externals,
           outputPath: config.output.path,
-
           // postcss config
           extraPostCSSPlugins,
           postcssLoader,
@@ -80,7 +81,7 @@ async function bundle(opts: IBundleOpts): Promise<void | IBundleWatcher> {
 
           // compatible with IE11 by default
           targets: getBundleTargets(config),
-          jsMinifier: JSMinifier.terser,
+          jsMinifier: config.jsMinifier,
           cssMinifier: CSSMinifier.cssnano,
           extraBabelIncludes: [/node_modules/],
 
@@ -165,21 +166,21 @@ async function bundle(opts: IBundleOpts): Promise<void | IBundleWatcher> {
         // enable webpack persistent cache
         ...(enableCache
           ? {
-            cache: {
-              buildDependencies: opts.buildDependencies,
-            },
-          }
+              cache: {
+                buildDependencies: opts.buildDependencies,
+              },
+            }
           : {}),
 
         // collect close handlers for watch mode
         ...(opts.watch
           ? {
-            onBuildComplete({ isFirstCompile, close }: any) {
-              if (isFirstCompile) closeHandlers.push(close);
-              // log for watch mode
-              else logStatus();
-            },
-          }
+              onBuildComplete({ isFirstCompile, close }: any) {
+                if (isFirstCompile) closeHandlers.push(close);
+                // log for watch mode
+                else logStatus();
+              },
+            }
           : {}),
         disableCopy: true,
       });

src/builder/config.ts

@@ -1,4 +1,6 @@
+import { JSMinifier } from '@umijs/bundler-webpack/dist/types';
 import { winPath } from '@umijs/utils';
+import assert from 'assert';
 import { Minimatch } from 'minimatch';
 import path from 'path';
 import { loadConfig } from 'tsconfig-paths';
@@ -24,6 +26,7 @@ export interface IBundleConfig
     Omit<IFatherBundleConfig, 'entry' | 'output'> {
   type: IFatherBuildTypes.BUNDLE;
   bundler: 'webpack';
+  jsMinifier: JSMinifier;
   entry: string;
   output: {
     filename: string;
@@ -111,55 +114,97 @@ export function normalizeUserConfig(
     const entryConfig = umd.entry;
     const output =
       typeof umd.output === 'object' ? umd.output : { path: umd.output };
-    const bundleConfig: Omit<IBundleConfig, 'entry'> = {
-      type: IFatherBuildTypes.BUNDLE,
-      bundler: 'webpack',
-      ...baseConfig,
+    const bundleConfig: Omit<IBundleConfig, 'entry' | 'output' | 'jsMinifier'> =
+      {
+        type: IFatherBuildTypes.BUNDLE,
+        bundler: 'webpack',
+        ...baseConfig,
 
-      // override base configs from umd config
-      ...umd,
-
-      // generate default output
-      output: {
-        // default to generate filename from package name
-        filename:
-          output.filename || `${getAutoBundleFilename(pkg.name)}.min.js`,
-        // default to output dist
-        path: output.path || 'dist/umd',
-      },
-    };
+        // override base configs from umd config
+        ...umd,
+      };
 
     if (typeof entryConfig === 'object') {
-      // extract multiple entries to single configs
-      Object.keys(entryConfig).forEach((entry) => {
-        const outputConfig = entryConfig[entry].output;
+      Object.entries(entryConfig).forEach(([entry, singleConfig]) => {
+        const outputConfig = singleConfig.output;
+
         const entryOutput =
           typeof outputConfig === 'object'
             ? outputConfig
             : { path: outputConfig };
+        if (singleConfig.generateUnminified) {
+          assert(
+            !entryOutput.filename?.includes('.min'),
+            'if set generateUnminified enabled, you need to delete ".min" in the output filename config',
+          );
+        }
 
-        configs.push({
+        const minifiedConfig = {
           ...bundleConfig,
-
-          // override all configs from entry config
-          ...entryConfig[entry],
+          ...singleConfig,
           entry,
-
-          // override output
+          jsMinifier: JSMinifier.terser,
           output: {
-            filename:
-              entryOutput.filename || `${path.parse(entry).name}.min.js`,
-            path: entryOutput.path || bundleConfig.output.path,
+            filename: entryOutput.filename
+              ? `${entryOutput.filename}${
+                  singleConfig.generateUnminified ? '.min' : ''
+                }`
+              : `${path.parse(entry).name}.min.js`,
+            path: entryOutput.path || output.path || 'dist/umd',
           },
-        });
+        };
+
+        if (singleConfig.generateUnminified) {
+          const unminifiedConfig = {
+            ...bundleConfig,
+            ...singleConfig,
+            entry,
+            jsMinifier: JSMinifier.none,
+            sourcemap: false,
+            output: {
+              filename: entryOutput.filename || `${path.parse(entry).name}.js`,
+              path: entryOutput.path || output.path || 'dist/umd',
+            },
+          };
+          configs.push(unminifiedConfig, minifiedConfig);
+        } else {
+          configs.push(minifiedConfig);
+        }
       });
     } else {
-      // generate single entry to single config
+      const defaultEntry = entryConfig || 'src/index';
+      const defaultFileName = getAutoBundleFilename(pkg.name);
+      if (umd.generateUnminified) {
+        if (umd.generateUnminified) {
+          assert(
+            !output.filename?.includes('.min'),
+            'if set generateUnminified enabled, you need to delete ".min" in the output filename config',
+          );
+        }
+        configs.push({
+          ...bundleConfig,
+          entry: defaultEntry,
+          jsMinifier: JSMinifier.none,
+          sourcemap: false,
+          output: {
+            filename: output.filename
+              ? `${output.filename}.js`
+              : `${defaultFileName}.js`,
+            path: output.path || 'dist/umd',
+          },
+        });
+      }
+
       configs.push({
         ...bundleConfig,
-
-        // default to bundle src/index
-        entry: entryConfig || 'src/index',
+        entry: defaultEntry,
+        jsMinifier: JSMinifier.terser,
+        output: {
+          filename: output.filename
+            ? `${output.filename}${umd.generateUnminified ? '.min' : ''}`
+            : `${defaultFileName}.min.js`,
+          path: output.path || 'dist/umd',
+        },
       });
     }
   }

src/features/configPlugins/schema.ts

@@ -64,6 +64,7 @@ export function getSchemas(): Record<string, (Joi: Root) => any> {
           Joi.string(),
           Joi.array(),
         ),
+        generateUnminified: Joi.boolean().optional(),
         chainWebpack: Joi.function().optional(),
         extractCSS: Joi.boolean().optional(),
         name: Joi.string().optional(),