@umijs/bundler-utoopack 4.6.56 → 4.6.58

package/dist/config.d.ts

@@ -1,9 +1,10 @@
 import type { IOpts as IConfigOpts } from '@umijs/bundler-webpack';
 import type { BundleOptions } from '@utoo/pack';
 import type { IOpts } from './types';
+export declare function normalizeUtoopackPath(path: string): string;
 export declare function mergeExtraPostcssPlugins(postcssConfig: any, extraPlugins?: any[]): any;
-export declare function getProdUtooPackConfig(opts: IOpts): Promise<BundleOptions>;
-export declare function getSSRUtooPackConfig(opts: IOpts & {
+export declare function getProdUtooPackConfig(rawOpts: IOpts): Promise<BundleOptions>;
+export declare function getSSRUtooPackConfig(rawOpts: IOpts & {
     serverBuildPath: string;
     useHash?: boolean;
     isDev?: boolean;
@@ -35,5 +36,5 @@ export declare type IDevOpts = {
     onBeforeMiddleware?: Function;
     disableCopy?: boolean;
     clean?: boolean;
-} & Pick<IConfigOpts, 'cache' | 'pkg'>;
-export declare function getDevUtooPackConfig(opts: IDevOpts): Promise<BundleOptions>;
+} & Pick<IConfigOpts, 'cache' | 'pkg' | 'staticPathPrefix'>;
+export declare function getDevUtooPackConfig(rawOpts: IDevOpts): Promise<BundleOptions>;

package/dist/config.js

@@ -32,7 +32,8 @@ __export(config_exports, {
   getDevUtooPackConfig: () => getDevUtooPackConfig,
   getProdUtooPackConfig: () => getProdUtooPackConfig,
   getSSRUtooPackConfig: () => getSSRUtooPackConfig,
-  mergeExtraPostcssPlugins: () => mergeExtraPostcssPlugins
+  mergeExtraPostcssPlugins: () => mergeExtraPostcssPlugins,
+  normalizeUtoopackPath: () => normalizeUtoopackPath
 });
 module.exports = __toCommonJS(config_exports);
 var import_bundler_webpack = require("@umijs/bundler-webpack");
@@ -40,6 +41,11 @@ var import_utils = require("@umijs/utils");
 var import_pack = require("@utoo/pack");
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
+var DEFAULT_STATIC_PATH_PREFIX = "static/";
+function getAssetModuleFilename(staticPathPrefix) {
+  const prefix = staticPathPrefix !== void 0 ? staticPathPrefix : DEFAULT_STATIC_PATH_PREFIX;
+  return `${prefix}[name].[contenthash:8]`;
+}
 function getUtoopackDefine(opts) {
   const define = Object.fromEntries(
     Object.entries(opts.config.define || {}).map(([key, value]) => {
@@ -195,8 +201,42 @@ function getExtraBabelModuleRules(opts) {
     }
   };
 }
+function normalizeUtoopackPath(path) {
+  return path.replace(/\\/g, "/");
+}
+function normalizeUtoopackEntry(entry) {
+  if (typeof entry === "string") {
+    return normalizeUtoopackPath(entry);
+  }
+  if (Array.isArray(entry)) {
+    return entry.map(normalizeUtoopackEntry);
+  }
+  if (entry && typeof entry === "object") {
+    return Object.fromEntries(
+      Object.entries(entry).map(([key, value]) => [
+        key,
+        normalizeUtoopackEntry(value)
+      ])
+    );
+  }
+  return entry;
+}
+function normalizeUtoopackOpts(opts) {
+  return {
+    ...opts,
+    cwd: normalizeUtoopackPath(opts.cwd),
+    rootDir: normalizeUtoopackPath(opts.rootDir),
+    entry: normalizeUtoopackEntry(opts.entry)
+  };
+}
 function getNormalizedAlias(alias, rootDir) {
-  const newAlias = { ...alias };
+  const newAlias = Object.fromEntries(
+    Object.entries(alias || {}).map(([key, value]) => [
+      normalizeUtoopackPath(key),
+      normalizeUtoopackPath(value)
+    ])
+  );
+  const normalizedRootDir = normalizeUtoopackPath(rootDir);
   for (const [key, value] of Object.entries(newAlias)) {
     if (key.endsWith("/*") || value.endsWith("/*") || key.endsWith("/") || value.endsWith("/") || key.endsWith("$")) {
       continue;
@@ -204,7 +244,9 @@ function getNormalizedAlias(alias, rootDir) {
     const ext = (0, import_path.extname)(value);
     if (ext) {
       let isDirectory = false;
-      const candidates = [.../* @__PURE__ */ new Set([value, (0, import_path.resolve)(rootDir, value)])];
+      const candidates = [
+        .../* @__PURE__ */ new Set([value, (0, import_path.resolve)(normalizedRootDir, value)])
+      ];
       for (const candidate of candidates) {
         try {
           const stat = import_fs.default.statSync(candidate);
@@ -219,40 +261,116 @@ function getNormalizedAlias(alias, rootDir) {
     }
     newAlias[`${key}/*`] = `${value}/*`;
   }
-  newAlias[`${rootDir}/*`] = `${rootDir}/*`;
+  newAlias[`${normalizedRootDir}/*`] = `${normalizedRootDir}/*`;
   return newAlias;
 }
+function normalizeExternalValue(v) {
+  if (Array.isArray(v)) {
+    const [url, ...members] = v;
+    const scriptPrefix = /^script\s+/.exec(url);
+    const script = scriptPrefix ? url.slice(scriptPrefix[0].length) : url;
+    if (scriptPrefix) {
+      return {
+        // ['antd', 'Button'] => `antd.Button`
+        root: members.join("."),
+        type: "script",
+        // `script https://example.com/lib/script.js` => `https://example.com/lib/script.js`
+        script
+      };
+    } else if (url === "promise" && typeof members[0] === "string") {
+      return `promise ${members[0]}`;
+    } else {
+      return {
+        root: members.join("."),
+        script
+      };
+    }
+  } else if (typeof v === "string") {
+    return v.replace(/^window(\s+|\.)/, "");
+  }
+}
+function toWildcardExternalConfig(value) {
+  const normalized = normalizeExternalValue(value);
+  if (typeof normalized === "string") {
+    const externalType = /^(commonjs|esm|promise)\s+/.exec(normalized);
+    if (externalType) {
+      return {
+        root: normalized.slice(externalType[0].length),
+        type: externalType[1]
+      };
+    }
+    return {
+      root: normalized
+    };
+  }
+}
+function getExternalSubPathGlob(externalKey) {
+  if (!externalKey.includes("*")) return;
+  const parts = externalKey.split("/");
+  const packageName = externalKey.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
+  const subPathGlob = externalKey.slice(packageName.length);
+  if (!packageName || !subPathGlob.startsWith("/")) return;
+  return {
+    packageName,
+    subPathGlob
+  };
+}
+function escapeRegexChar(char) {
+  return /[|\\{}()[\]^$+?.]/.test(char) ? `\\${char}` : char;
+}
+function globToSubPathRegex(glob) {
+  let regex = "^";
+  for (const char of glob) {
+    if (char === "*") {
+      regex += ".+";
+    } else if (char === "/") {
+      regex += "\\/";
+    } else {
+      regex += escapeRegexChar(char);
+    }
+  }
+  return `/${regex}$/`;
+}
+function addWildcardSubPath(config, subPathGlob) {
+  var _a;
+  return {
+    ...config,
+    subPath: {
+      ...config.subPath || {},
+      rules: [
+        ...((_a = config.subPath) == null ? void 0 : _a.rules) || [],
+        {
+          regex: globToSubPathRegex(subPathGlob),
+          target: ""
+        }
+      ]
+    }
+  };
+}
 function getNormalizedExternals(externals) {
-  return Object.entries(externals || {}).reduce(
-    (ret, [k, v]) => {
-      if (Array.isArray(v)) {
-        const [url, ...members] = v;
-        const scriptPrefix = /^script\s+/.exec(url);
-        const script = scriptPrefix ? url.slice(scriptPrefix[0].length) : url;
-        if (scriptPrefix) {
-          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 if (url === "promise" && typeof members[0] === "string") {
-          ret[k] = `promise ${members[0]}`;
-        } else {
-          ret[k] = {
-            root: members.join("."),
-            script
-          };
+  const ret = Object.entries(externals || {}).reduce(
+    (memo, [k, v]) => {
+      if (!getExternalSubPathGlob(k)) {
+        const normalized = normalizeExternalValue(v);
+        if (normalized !== void 0) {
+          memo[k] = normalized;
         }
-      } else if (typeof v === "string") {
-        ret[k] = v.replace(/^window(\s+|\.)/, "");
-      } else {
       }
-      return ret;
+      return memo;
     },
     {}
   );
+  Object.entries(externals || {}).forEach(([k, v]) => {
+    const externalSubPathGlob = getExternalSubPathGlob(k);
+    if (!externalSubPathGlob) return;
+    const normalized = toWildcardExternalConfig(v);
+    if (!normalized) return;
+    ret[externalSubPathGlob.packageName] = addWildcardSubPath(
+      ret[externalSubPathGlob.packageName] && typeof ret[externalSubPathGlob.packageName] === "object" ? ret[externalSubPathGlob.packageName] : normalized,
+      externalSubPathGlob.subPathGlob
+    );
+  });
+  return ret;
 }
 function getSvgModuleRules(opts) {
   const { svgr, svgo = {} } = opts;
@@ -353,8 +471,9 @@ function getUserUtoopackConfig(utoopackConfig = {}) {
 function getDefaultPersistentCaching() {
   return process.platform !== "win32";
 }
-async function getProdUtooPackConfig(opts) {
+async function getProdUtooPackConfig(rawOpts) {
   var _a;
+  const opts = normalizeUtoopackOpts(rawOpts);
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -374,6 +493,7 @@ async function getProdUtooPackConfig(opts) {
     extraBabelIncludes: opts.config.extraBabelIncludes,
     chainWebpack: opts.chainWebpack,
     modifyWebpackConfig: opts.modifyWebpackConfig,
+    staticPathPrefix: opts.staticPathPrefix,
     pkg: opts.pkg,
     disableCopy: opts.disableCopy
   });
@@ -410,6 +530,7 @@ async function getProdUtooPackConfig(opts) {
         output: {
           clean: opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          assetModuleFilename: getAssetModuleFilename(opts.staticPathPrefix),
           ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         optimization: {
@@ -444,7 +565,8 @@ async function getProdUtooPackConfig(opts) {
   };
   return utooBundlerOpts;
 }
-async function getSSRUtooPackConfig(opts) {
+async function getSSRUtooPackConfig(rawOpts) {
+  const opts = normalizeUtoopackOpts(rawOpts);
   const utooBundlerOpts = await getProdUtooPackConfig({
     ...opts,
     clean: false,
@@ -483,8 +605,9 @@ async function getSSRUtooPackConfig(opts) {
   };
   return utooBundlerOpts;
 }
-async function getDevUtooPackConfig(opts) {
+async function getDevUtooPackConfig(rawOpts) {
   var _a;
+  const opts = normalizeUtoopackOpts(rawOpts);
   let webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -503,6 +626,7 @@ async function getDevUtooPackConfig(opts) {
     extraBabelIncludes: opts.config.extraBabelIncludes,
     chainWebpack: opts.chainWebpack,
     modifyWebpackConfig: opts.modifyWebpackConfig,
+    staticPathPrefix: opts.staticPathPrefix,
     // TO avoild bundler webpack add extra entry.
     hmr: false,
     analyze: process.env.ANALYZE
@@ -545,6 +669,7 @@ async function getDevUtooPackConfig(opts) {
         output: {
           clean: opts.clean === void 0 ? true : opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          assetModuleFilename: getAssetModuleFilename(opts.staticPathPrefix),
           ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         resolve: {
@@ -601,5 +726,6 @@ async function getDevUtooPackConfig(opts) {
   getDevUtooPackConfig,
   getProdUtooPackConfig,
   getSSRUtooPackConfig,
-  mergeExtraPostcssPlugins
+  mergeExtraPostcssPlugins,
+  normalizeUtoopackPath
 });

package/dist/index.js

@@ -48,23 +48,32 @@ var import_util = require("./util");
 var import_pack = require("@utoo/pack");
 __reExport(src_exports, require("./config"), module.exports);
 function getUtoopackRootDir(cwd, utoopackConfig, findRootDir2) {
+  const normalizedCwd = (0, import_config.normalizeUtoopackPath)(cwd);
   if (typeof (utoopackConfig == null ? void 0 : utoopackConfig.root) === "string") {
-    return import_path.default.resolve(cwd, utoopackConfig.root);
+    return (0, import_config.normalizeUtoopackPath)(
+      import_path.default.resolve(normalizedCwd, utoopackConfig.root)
+    );
   }
-  return findRootDir2(cwd);
+  return (0, import_config.normalizeUtoopackPath)(findRootDir2(normalizedCwd));
 }
 async function build(opts) {
   var _a, _b, _c;
   const { cwd, onBuildComplete } = opts;
+  const normalizedCwd = (0, import_config.normalizeUtoopackPath)(cwd);
   const buildStartTime = Date.now();
   const { build: utooPackBuild, findRootDir: findRootDir2 } = require("@utoo/pack");
-  const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
+  const rootDir = getUtoopackRootDir(
+    normalizedCwd,
+    opts.config.utoopack,
+    findRootDir2
+  );
   const utooPackConfig = await (0, import_config.getProdUtooPackConfig)({
     ...opts,
+    cwd: normalizedCwd,
     rootDir
   });
   try {
-    await utooPackBuild(utooPackConfig, cwd, rootDir);
+    await utooPackBuild(utooPackConfig, normalizedCwd, rootDir);
   } catch (e) {
     console.error(e.message);
     const err = new Error("Build with utoopack failed.");
@@ -94,14 +103,14 @@ async function build(opts) {
     isFirstCompile: true
   }));
   const absOutputPath = import_path.default.resolve(
-    cwd,
+    normalizedCwd,
     ((_b = utooPackConfig.config.output) == null ? void 0 : _b.path) || "dist"
   );
   console.log(
     (0, import_util.getBuildBanner)({
       packVersion: process.env.UTOOPACK_VERSION,
       duration: time,
-      outputPath: import_path.default.relative(cwd, absOutputPath) || ".",
+      outputPath: import_path.default.relative(normalizedCwd, absOutputPath) || ".",
       assetCount: (_c = stats.assets) == null ? void 0 : _c.length
     })
   );
@@ -110,15 +119,21 @@ async function build(opts) {
 async function buildSSR(opts) {
   var _a;
   const { cwd } = opts;
+  const normalizedCwd = (0, import_config.normalizeUtoopackPath)(cwd);
   const buildStartTime = Date.now();
   const { build: utooPackBuild, findRootDir: findRootDir2 } = require("@utoo/pack");
-  const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
+  const rootDir = getUtoopackRootDir(
+    normalizedCwd,
+    opts.config.utoopack,
+    findRootDir2
+  );
   const utooPackConfig = await (0, import_config.getSSRUtooPackConfig)({
     ...opts,
+    cwd: normalizedCwd,
     rootDir
   });
   try {
-    await utooPackBuild(utooPackConfig, cwd, rootDir);
+    await utooPackBuild(utooPackConfig, normalizedCwd, rootDir);
   } catch (e) {
     console.error(e.message);
     const err = new Error("Build SSR with utoopack failed.");
@@ -147,15 +162,21 @@ async function buildSSR(opts) {
 }
 async function dev(opts) {
   const { cwd, onDevCompileDone } = opts;
+  const normalizedCwd = (0, import_config.normalizeUtoopackPath)(cwd);
   if (!opts) {
     throw new Error("opts should be supplied");
   }
   const devStartTime = Date.now();
   const protocol = opts.config.https ? "https:" : "http:";
   const { findRootDir: findRootDir2, serve: utooPackServe } = require("@utoo/pack");
-  const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
+  const rootDir = getUtoopackRootDir(
+    normalizedCwd,
+    opts.config.utoopack,
+    findRootDir2
+  );
   const utooPackConfig = await (0, import_config.getDevUtooPackConfig)({
     ...opts,
+    cwd: normalizedCwd,
     rootDir
   });
   const app = (0, import_express.default)();
@@ -279,7 +300,7 @@ async function dev(opts) {
   try {
     await Promise.all([
       serverReady,
-      utooPackServe(utooPackConfig, cwd, rootDir, {
+      utooPackServe(utooPackConfig, normalizedCwd, rootDir, {
         port: utooServePort,
         hostname: "127.0.0.1",
         logServerInfo: false

package/dist/types.d.ts

@@ -20,4 +20,4 @@ export declare type IOpts = {
     clean?: boolean;
     watch?: boolean;
     disableCopy?: boolean;
-} & Pick<IConfigOpts, 'cache' | 'pkg'>;
+} & Pick<IConfigOpts, 'cache' | 'pkg' | 'staticPathPrefix'>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.56",
+  "version": "4.6.58",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.4.8",
+    "@utoo/pack": "1.4.11",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -20,8 +20,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.56",
-    "@umijs/bundler-webpack": "4.6.56"
+    "@umijs/bundler-utils": "4.6.58",
+    "@umijs/bundler-webpack": "4.6.58"
   },
   "devDependencies": {
     "father": "4.1.5"