@umijs/bundler-utoopack 4.5.3 → 4.6.1

package/dist/config.js

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(config_exports);
 var import_bundler_webpack = require("@umijs/bundler-webpack");
 var import_utils = require("@umijs/utils");
 var import_pack = require("@utoo/pack");
+var import_path = require("path");
 function convertProcessEnvForUtoopack(webpackConfig) {
   var _a;
   let processEnvForUtoopack = {};
@@ -50,7 +51,14 @@ function convertProcessEnvForUtoopack(webpackConfig) {
 function getModularizeImports(extraBabelPlugins) {
   return extraBabelPlugins.filter((p) => /^import$|babel-plugin-import/.test(p[0])).reduce(
     (acc, [_, v]) => {
-      const { libraryName, libraryDirectory, style, ...rest } = v;
+      const {
+        libraryName,
+        libraryDirectory,
+        style,
+        camel2DashComponentName,
+        transformToDefaultImport,
+        ...rest
+      } = v;
       if (Object.keys(rest).length > 0) {
         throw new Error(
           `babel-plugin-import options ${Object.keys(
@@ -63,10 +71,15 @@ function getModularizeImports(extraBabelPlugins) {
           `babel-plugin-import style function is not supported in utoopack bundler`
         );
       }
+      let transformRule = "{{ kebabCase member }}";
+      if (camel2DashComponentName === false) {
+        transformRule = "{{ member }}";
+      }
+      const skipDefaultConversion = typeof transformToDefaultImport === "undefined" ? false : !Boolean(transformToDefaultImport);
       acc[libraryName] = {
-        transform: `${libraryName}/${libraryDirectory}/{{ kebabCase member }}`,
+        transform: `${libraryName}/${libraryDirectory}/${transformRule}`,
         preventFullImport: false,
-        skipDefaultConversion: false,
+        skipDefaultConversion,
         style: typeof style === "boolean" ? "style" : style
       };
       return acc;
@@ -76,12 +89,38 @@ function getModularizeImports(extraBabelPlugins) {
 }
 function getNormalizedAlias(alias, rootDir) {
   const newAlias = { ...alias };
-  if (newAlias.react) {
-    newAlias["react/*"] = `${newAlias.react}/*`;
+  for (const [key, value] of Object.entries(newAlias)) {
+    if (key.endsWith("/*") || value.endsWith("/*") || key.endsWith("/") || value.endsWith("/") || key.endsWith("$")) {
+      continue;
+    }
+    if ((0, import_path.extname)(value)) {
+      continue;
+    }
+    newAlias[`${key}/*`] = `${value}/*`;
   }
   newAlias[`${rootDir}/*`] = `${rootDir}/*`;
   return newAlias;
 }
+function getNormalizedExternals(externals) {
+  return Object.entries(externals || {}).reduce(
+    (ret, [k, v]) => {
+      if (Array.isArray(v)) {
+        const [url, ...members] = v;
+        ret[k] = {
+          // ['antd', 'Button'] => `antd.Button`
+          root: members.join("."),
+          // `script https://example.com/lib/script.js` => `https://example.com/lib/script.js`
+          script: url.replace("script ", "")
+        };
+      } else if (typeof v === "string") {
+        ret[k] = v.replace(/^window(\s+|\.)/, "");
+      } else {
+      }
+      return ret;
+    },
+    {}
+  );
+}
 async function getProdUtooPackConfig(opts) {
   var _a;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
@@ -107,7 +146,7 @@ async function getProdUtooPackConfig(opts) {
     disableCopy: opts.disableCopy
   });
   let utooBundlerOpts = (0, import_pack.compatOptionsFromWebpack)({
-    ...import_utils.lodash.omit(webpackConfig, ["target", "module"]),
+    ...import_utils.lodash.omit(webpackConfig, ["target", "module", "externals"]),
     compatMode: true
   });
   const extraBabelPlugins = [
@@ -116,7 +155,12 @@ async function getProdUtooPackConfig(opts) {
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
   const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
-  const { publicPath, runtimePublicPath } = opts.config;
+  const {
+    publicPath,
+    runtimePublicPath,
+    externals: userExternals,
+    copy = []
+  } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -124,13 +168,12 @@ async function getProdUtooPackConfig(opts) {
       {
         output: {
           clean: opts.clean,
-          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         optimization: {
           modularizeImports,
           concatenateModules: true
-          // minify: false,
-          // moduleIds: 'named',
         },
         resolve: {
           alias: getNormalizedAlias(
@@ -149,7 +192,9 @@ async function getProdUtooPackConfig(opts) {
         // Override process.env for utoopack format
         define: {
           "process.env": JSON.stringify(processEnvForUtoopack)
-        }
+        },
+        nodePolyfill: true,
+        externals: getNormalizedExternals(userExternals)
       },
       opts.config.utoopack || {}
     )
@@ -181,7 +226,7 @@ async function getDevUtooPackConfig(opts) {
     analyze: process.env.ANALYZE
   });
   let utooBundlerOpts = (0, import_pack.compatOptionsFromWebpack)({
-    ...import_utils.lodash.omit(webpackConfig, ["target", "module"]),
+    ...import_utils.lodash.omit(webpackConfig, ["target", "module", "externals"]),
     compatMode: true
   });
   const extraBabelPlugins = [
@@ -190,7 +235,12 @@ async function getDevUtooPackConfig(opts) {
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
   const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
-  const { publicPath, runtimePublicPath } = opts.config;
+  const {
+    publicPath,
+    runtimePublicPath,
+    externals: userExternals,
+    copy = []
+  } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -199,7 +249,8 @@ async function getDevUtooPackConfig(opts) {
         output: {
           // utoopack 的 dev 需要默认清空产物目录
           clean: opts.clean === void 0 ? true : opts.clean,
-          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         resolve: {
           alias: getNormalizedAlias(
@@ -221,7 +272,9 @@ async function getDevUtooPackConfig(opts) {
         // Override process.env for utoopack format
         define: {
           "process.env": JSON.stringify(processEnvForUtoopack)
-        }
+        },
+        nodePolyfill: true,
+        externals: getNormalizedExternals(userExternals)
       },
       opts.config.utoopack || {}
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.5.3",
+  "version": "4.6.1",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,21 +8,18 @@
     "dist"
   ],
   "dependencies": {
+    "@utoo/pack": "1.0.1",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-http-proxy": "^2.1.1",
-    "@umijs/bundler-utils": "4.5.3",
-    "@umijs/bundler-webpack": "4.5.3"
+    "@umijs/bundler-webpack": "4.6.1",
+    "@umijs/bundler-utils": "4.6.1"
   },
   "devDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.56",
     "father": "4.1.5"
   },
-  "peerDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.56"
-  },
   "publishConfig": {
     "access": "public"
   },