@umijs/bundler-utoopack 4.6.18 → 4.6.20

package/dist/config.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/config.ts
@@ -106,12 +116,22 @@ function getNormalizedExternals(externals) {
     (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 ", "")
-        };
+        const containsScript = url.startsWith("script");
+        const script = url.replace("script ", "");
+        if (containsScript) {
+          ret[k] = {
+            // ['antd', 'Button'] => `antd.Button`
+            root: members.join("."),
+            type: "script",
+            // `script https://example.com/lib/script.js` => `https://example.com/lib/script.js`
+            script
+          };
+        } else {
+          ret[k] = {
+            root: members.join("."),
+            script
+          };
+        }
       } else if (typeof v === "string") {
         ret[k] = v.replace(/^window(\s+|\.)/, "");
       } else {
@@ -121,6 +141,47 @@ function getNormalizedExternals(externals) {
     {}
   );
 }
+function getSvgModuleRules(opts) {
+  const { svgr, svgo = {} } = opts;
+  if (!svgr) {
+    return {};
+  }
+  return {
+    module: {
+      rules: {
+        "*.svg": {
+          loaders: [
+            {
+              loader: require.resolve("@umijs/bundler-webpack/dist/loader/svgr"),
+              options: {
+                svgoConfig: {
+                  plugins: [
+                    {
+                      name: "preset-default",
+                      params: {
+                        overrides: {
+                          removeTitle: false
+                        }
+                      }
+                    },
+                    "prefixIds"
+                  ],
+                  ...typeof svgo === "object" ? svgo : {}
+                },
+                ...svgr,
+                svgo: !!svgo
+              }
+            },
+            {
+              loader: require.resolve("@umijs/bundler-webpack/compiled/url-loader")
+            }
+          ],
+          as: "*.js"
+        }
+      }
+    }
+  };
+}
 async function getProdUtooPackConfig(opts) {
   var _a;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
@@ -159,7 +220,10 @@ async function getProdUtooPackConfig(opts) {
     publicPath,
     runtimePublicPath,
     externals: userExternals,
-    copy = []
+    copy = [],
+    svgr,
+    svgo = {},
+    inlineLimit
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -194,7 +258,8 @@ async function getProdUtooPackConfig(opts) {
           "process.env": JSON.stringify(processEnvForUtoopack)
         },
         nodePolyfill: true,
-        externals: getNormalizedExternals(userExternals)
+        externals: getNormalizedExternals(userExternals),
+        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       opts.config.utoopack || {}
     )
@@ -239,8 +304,13 @@ async function getDevUtooPackConfig(opts) {
     publicPath,
     runtimePublicPath,
     externals: userExternals,
-    copy = []
+    copy = [],
+    svgr,
+    svgo = {},
+    inlineLimit
   } = opts.config;
+  const normalizedExternals = getNormalizedExternals(userExternals);
+  debugger;
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -274,7 +344,8 @@ async function getDevUtooPackConfig(opts) {
           "process.env": JSON.stringify(processEnvForUtoopack)
         },
         nodePolyfill: true,
-        externals: getNormalizedExternals(userExternals)
+        externals: normalizedExternals,
+        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       opts.config.utoopack || {}
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.18",
+  "version": "4.6.20",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,14 +8,14 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.1.15",
+    "@utoo/pack": "1.1.18",
     "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.6.18",
-    "@umijs/bundler-webpack": "4.6.18"
+    "@umijs/bundler-webpack": "4.6.20",
+    "@umijs/bundler-utils": "4.6.20"
   },
   "devDependencies": {
     "father": "4.1.5"