@umijs/bundler-utoopack 4.6.55 → 4.6.57

package/dist/config.d.ts

@@ -35,5 +35,5 @@ export declare type IDevOpts = {
     onBeforeMiddleware?: Function;
     disableCopy?: boolean;
     clean?: boolean;
-} & Pick<IConfigOpts, 'cache' | 'pkg'>;
+} & Pick<IConfigOpts, 'cache' | 'pkg' | 'staticPathPrefix'>;
 export declare function getDevUtooPackConfig(opts: IDevOpts): Promise<BundleOptions>;

package/dist/config.js

@@ -40,6 +40,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 +200,17 @@ function getExtraBabelModuleRules(opts) {
     }
   };
 }
+function normalizeUtoopackPath(path) {
+  return path.replace(/\\/g, "/");
+}
 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 +218,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,7 +235,7 @@ function getNormalizedAlias(alias, rootDir) {
     }
     newAlias[`${key}/*`] = `${value}/*`;
   }
-  newAlias[`${rootDir}/*`] = `${rootDir}/*`;
+  newAlias[`${normalizedRootDir}/*`] = `${normalizedRootDir}/*`;
   return newAlias;
 }
 function getNormalizedExternals(externals) {
@@ -374,6 +390,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 +427,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: {
@@ -503,6 +521,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 +564,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: {

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.55",
+  "version": "4.6.57",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.4.7",
+    "@utoo/pack": "1.4.8",
     "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.55",
-    "@umijs/bundler-webpack": "4.6.55"
+    "@umijs/bundler-webpack": "4.6.57",
+    "@umijs/bundler-utils": "4.6.57"
   },
   "devDependencies": {
     "father": "4.1.5"