@umijs/bundler-utoopack 4.6.42 → 4.6.43

package/dist/config.d.ts

@@ -1,6 +1,7 @@
 import type { IOpts as IConfigOpts } from '@umijs/bundler-webpack';
 import type { BundleOptions } from '@utoo/pack';
 import type { IOpts } from './types';
+export declare function mergeExtraPostcssPlugins(postcssConfig: any, extraPlugins?: any[]): any;
 export declare function getProdUtooPackConfig(opts: IOpts): Promise<BundleOptions>;
 export declare type IDevOpts = {
     afterMiddlewares?: any[];

package/dist/config.js

@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var config_exports = {};
 __export(config_exports, {
   getDevUtooPackConfig: () => getDevUtooPackConfig,
-  getProdUtooPackConfig: () => getProdUtooPackConfig
+  getProdUtooPackConfig: () => getProdUtooPackConfig,
+  mergeExtraPostcssPlugins: () => mergeExtraPostcssPlugins
 });
 module.exports = __toCommonJS(config_exports);
 var import_bundler_webpack = require("@umijs/bundler-webpack");
@@ -185,6 +186,61 @@ function getSvgModuleRules(opts) {
     }
   };
 }
+function appendPostcssPlugin(postcssConfig, plugin) {
+  const [pluginName, pluginOptions = {}] = plugin;
+  if (postcssConfig == null) {
+    return {
+      plugins: {
+        [pluginName]: pluginOptions
+      }
+    };
+  }
+  if (!import_utils.lodash.isPlainObject(postcssConfig)) {
+    throw new Error(
+      `Utoopack styles.postcss must be an object when extraPostCSSPlugins is used.`
+    );
+  }
+  const existingPlugins = postcssConfig.plugins;
+  if (existingPlugins != null && !import_utils.lodash.isPlainObject(existingPlugins)) {
+    throw new Error(
+      `Utoopack styles.postcss.plugins must be an object when extraPostCSSPlugins is used.`
+    );
+  }
+  return {
+    ...postcssConfig,
+    plugins: {
+      ...existingPlugins || {},
+      [pluginName]: pluginOptions
+    }
+  };
+}
+function normalizeExtraPostcssPlugin(plugin) {
+  if (typeof plugin === "string") {
+    return [[plugin, {}]];
+  }
+  if (Array.isArray(plugin) && typeof plugin[0] === "string" && plugin.length <= 2) {
+    return [[plugin[0], plugin[1] ?? {}]];
+  }
+  if (import_utils.lodash.isPlainObject(plugin)) {
+    return Object.entries(plugin);
+  }
+  throw new Error(
+    `Utoopack only supports JSON-serializable extraPostCSSPlugins entries. Please use plugin names or [pluginName, options] tuples instead.`
+  );
+}
+function mergeExtraPostcssPlugins(postcssConfig, extraPlugins = []) {
+  return extraPlugins.reduce((memo, plugin) => {
+    return normalizeExtraPostcssPlugin(plugin).reduce(
+      (ret, normalizedPlugin) => {
+        return appendPostcssPlugin(ret, normalizedPlugin);
+      },
+      memo
+    );
+  }, postcssConfig);
+}
+function getUserUtoopackConfig(utoopackConfig = {}) {
+  return import_utils.lodash.omit(utoopackConfig, ["root"]);
+}
 async function getProdUtooPackConfig(opts) {
   var _a;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
@@ -241,6 +297,7 @@ async function getProdUtooPackConfig(opts) {
     svgo = {},
     inlineLimit
   } = opts.config;
+  const userUtoopackConfig = getUserUtoopackConfig(opts.config.utoopack);
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -267,15 +324,16 @@ async function getProdUtooPackConfig(opts) {
             javascriptEnabled: true,
             ...opts.config.lessLoader
           },
+          // postcss: normalizedPostcssConfig,
           sass: opts.config.sassLoader ?? void 0,
-          emotion: emotion || void 0
+          emotion
         },
         define,
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals),
         ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
-      opts.config.utoopack || {}
+      userUtoopackConfig
     )
   };
   return utooBundlerOpts;
@@ -336,6 +394,7 @@ async function getDevUtooPackConfig(opts) {
     svgo = {},
     inlineLimit
   } = opts.config;
+  const userUtoopackConfig = getUserUtoopackConfig(opts.config.utoopack);
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -361,8 +420,9 @@ async function getDevUtooPackConfig(opts) {
             javascriptEnabled: true,
             ...opts.config.lessLoader
           },
+          // postcss: normalizedPostcssPlugin,
           sass: opts.config.sassLoader ?? void 0,
-          emotion: emotion || void 0
+          emotion
         },
         define,
         // dev enable persistent cache by default
@@ -371,7 +431,7 @@ async function getDevUtooPackConfig(opts) {
         externals: getNormalizedExternals(userExternals),
         ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
-      opts.config.utoopack || {}
+      userUtoopackConfig
     ),
     watch: {
       enable: true
@@ -383,5 +443,6 @@ async function getDevUtooPackConfig(opts) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDevUtooPackConfig,
-  getProdUtooPackConfig
+  getProdUtooPackConfig,
+  mergeExtraPostcssPlugins
 });

package/dist/index.js

@@ -43,13 +43,20 @@ var import_fs = __toESM(require("fs"));
 var import_http = __toESM(require("http"));
 var import_path = __toESM(require("path"));
 var import_config = require("./config");
+var import_util = require("./util");
 var import_pack = require("@utoo/pack");
 __reExport(src_exports, require("./config"), module.exports);
+function getUtoopackRootDir(cwd, utoopackConfig, findRootDir2) {
+  if (typeof (utoopackConfig == null ? void 0 : utoopackConfig.root) === "string") {
+    return import_path.default.resolve(cwd, utoopackConfig.root);
+  }
+  return findRootDir2(cwd);
+}
 async function build(opts) {
   var _a;
   const { cwd, onBuildComplete } = opts;
   const { build: utooPackBuild, findRootDir: findRootDir2 } = require("@utoo/pack");
-  const rootDir = findRootDir2(cwd);
+  const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
   const utooPackConfig = await (0, import_config.getProdUtooPackConfig)({
     ...opts,
     rootDir
@@ -89,7 +96,7 @@ async function dev(opts) {
     throw new Error("opts should be supplied");
   }
   const { findRootDir: findRootDir2, serve: utooPackServe } = require("@utoo/pack");
-  const rootDir = findRootDir2(cwd);
+  const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
   const utooPackConfig = await (0, import_config.getDevUtooPackConfig)({
     ...opts,
     rootDir
@@ -177,7 +184,7 @@ async function dev(opts) {
   }
   server.listen(port, () => {
     const protocol = opts.config.https ? "https:" : "http:";
-    const banner = getDevBanner(
+    const banner = (0, import_util.getDevBanner)(
       protocol,
       opts.host,
       port,
@@ -228,16 +235,6 @@ async function dev(opts) {
     console.error(e.message);
   }
 }
-function getDevBanner(protocol, host, port, ip) {
-  const hostStr = host === "0.0.0.0" ? "localhost" : host;
-  const messages = [];
-  messages.push("  App listening at:");
-  messages.push(
-    `  - Local:   ${import_utils.chalk.cyan(`${protocol}//${hostStr}:${port}`)}`
-  );
-  messages.push(`  - Network: ${import_utils.chalk.cyan(`${protocol}//${ip}:${port}`)}`);
-  return messages.join("\n");
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build,

package/dist/util.d.ts

@@ -0,0 +1 @@
+export declare function getDevBanner(protocol: string, host?: string, port?: number, ip?: string): string;

package/dist/util.js

@@ -0,0 +1,39 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/util.ts
+var util_exports = {};
+__export(util_exports, {
+  getDevBanner: () => getDevBanner
+});
+module.exports = __toCommonJS(util_exports);
+var import_utils = require("@umijs/utils");
+function getDevBanner(protocol, host, port, ip) {
+  const hostStr = host === "0.0.0.0" ? "localhost" : host;
+  const messages = [];
+  messages.push("  App listening at:");
+  messages.push(
+    `  - Local:   ${import_utils.chalk.cyan(`${protocol}//${hostStr}:${port}`)}`
+  );
+  messages.push(`  - Network: ${import_utils.chalk.cyan(`${protocol}//${ip}:${port}`)}`);
+  return messages.join("\n");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDevBanner
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.42",
+  "version": "4.6.43",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.3.9",
+    "@utoo/pack": "1.3.10",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -19,8 +19,8 @@
     "postcss": "^8.4.21",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.42",
-    "@umijs/bundler-webpack": "4.6.42"
+    "@umijs/bundler-utils": "4.6.43",
+    "@umijs/bundler-webpack": "4.6.43"
   },
   "devDependencies": {
     "father": "4.1.5"