@umijs/preset-umi 4.3.13 → 4.3.15

package/dist/features/mako/mako.js

@@ -33,6 +33,7 @@ __export(mako_exports, {
 });
 module.exports = __toCommonJS(mako_exports);
 var import_path = __toESM(require("path"));
+var import_extractEntryAssets = require("../../utils/extractEntryAssets");
 var import_platform = require("../../utils/platform");
 var mako_default = (api) => {
   api.describe({
@@ -66,17 +67,48 @@ var mako_default = (api) => {
     },
     enableBy: api.EnableBy.config
   });
+  const assets = {
+    // Will contain all js and mjs files
+    js: [],
+    // Will contain all css files
+    css: []
+  };
   api.modifyConfig((memo) => {
     var _a;
     if (import_platform.isWindows) {
       memo.mako = false;
       process.env.OKAM = "";
     }
+    const makoPlugins = ((_a = memo.mako) == null ? void 0 : _a.plugins) || [];
+    if (!api.config.mpa) {
+      makoPlugins.push({
+        name: "UmiHtmlGenerationMako",
+        generateEnd: ({ stats }) => {
+          const entryPointFiles = /* @__PURE__ */ new Set();
+          for (const chunk of stats.entrypoints["umi"].chunks) {
+            const files = stats.chunks.find((c) => c.id === chunk).files;
+            for (const file of files) {
+              entryPointFiles.add(file);
+            }
+          }
+          let entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(Array.from(entryPointFiles));
+          Object.entries(entryAssets).forEach(([ext, files]) => {
+            if (!Array.isArray(assets[ext])) {
+              assets[ext] = [];
+            }
+            assets[ext].push(...files);
+          });
+        }
+      });
+    }
     return {
       ...memo,
       mfsu: false,
       hmrGuardian: false,
-      makoPlugins: ((_a = memo.mako) == null ? void 0 : _a.plugins) || []
+      mako: {
+        ...memo.mako,
+        plugins: makoPlugins
+      }
     };
   });
   api.onStart(() => {
@@ -97,4 +129,18 @@ var mako_default = (api) => {
       console.error(e);
     }
   });
+  api.addHTMLStyles(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.css.map((css) => {
+      return `${displayPublicPath}${css}`;
+    });
+  });
+  api.addHTMLHeadScripts(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.js.map((js) => {
+      return `${displayPublicPath}${js}`;
+    });
+  });
 };

package/dist/features/webpack/webpack.js

@@ -22,6 +22,7 @@ __export(webpack_exports, {
   default: () => webpack_default
 });
 module.exports = __toCommonJS(webpack_exports);
+var import_extractEntryAssets = require("../../utils/extractEntryAssets");
 var webpack_default = (api) => {
   api.describe({
     key: "preset-umi:webpack",
@@ -39,29 +40,12 @@ var webpack_default = (api) => {
         "UmiHtmlGeneration",
         async (compilation) => {
           const entryPointFiles = compilation.entrypoints.get("umi").getFiles();
-          const entryPointPublicPathMap = {};
-          const extensionRegexp = /\.(css|js|mjs)(\?|$)/;
-          const UMI_ASSETS_REG = {
-            js: /^umi(\..+)?\.js$/,
-            css: /^umi(\..+)?\.css$/
-          };
-          entryPointFiles.forEach((entryPointPublicPath) => {
-            const extMatch = extensionRegexp.exec(entryPointPublicPath);
-            if (!extMatch) {
-              return;
+          let entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(entryPointFiles);
+          Object.entries(entryAssets).forEach(([ext, files]) => {
+            if (!Array.isArray(assets[ext])) {
+              assets[ext] = [];
             }
-            if (entryPointPublicPath.includes(".hot-update")) {
-              return;
-            }
-            if (entryPointPublicPathMap[entryPointPublicPath]) {
-              return;
-            }
-            if (UMI_ASSETS_REG.js.test(entryPointPublicPath) || UMI_ASSETS_REG.css.test(entryPointPublicPath)) {
-              return;
-            }
-            entryPointPublicPathMap[entryPointPublicPath] = true;
-            const ext = extMatch[1] === "mjs" ? "js" : extMatch[1];
-            assets[ext].push(entryPointPublicPath);
+            assets[ext].push(...files);
           });
         }
       );

package/dist/utils/extractEntryAssets.d.ts

@@ -0,0 +1,6 @@
+export declare type EntryAssets = {
+    js: string[];
+    css: string[];
+    [key: string]: string[];
+};
+export declare function extractEntryAssets(entryPointFiles: string[]): EntryAssets;

package/dist/utils/extractEntryAssets.js

@@ -0,0 +1,61 @@
+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/utils/extractEntryAssets.ts
+var extractEntryAssets_exports = {};
+__export(extractEntryAssets_exports, {
+  extractEntryAssets: () => extractEntryAssets
+});
+module.exports = __toCommonJS(extractEntryAssets_exports);
+function extractEntryAssets(entryPointFiles) {
+  const assets = {
+    // Will contain all js and mjs files
+    js: [],
+    // Will contain all css files
+    css: []
+  };
+  const entryPointPublicPathMap = {};
+  const extensionRegexp = /\.(css|js|mjs)(\?|$)/;
+  const UMI_ASSETS_REG = {
+    js: /^umi(\..+)?\.js$/,
+    css: /^umi(\..+)?\.css$/
+  };
+  entryPointFiles.forEach((entryPointPublicPath) => {
+    const extMatch = extensionRegexp.exec(entryPointPublicPath);
+    if (!extMatch) {
+      return;
+    }
+    if (entryPointPublicPath.includes(".hot-update")) {
+      return;
+    }
+    if (entryPointPublicPathMap[entryPointPublicPath]) {
+      return;
+    }
+    if (UMI_ASSETS_REG.js.test(entryPointPublicPath) || UMI_ASSETS_REG.css.test(entryPointPublicPath)) {
+      return;
+    }
+    entryPointPublicPathMap[entryPointPublicPath] = true;
+    const ext = extMatch[1] === "mjs" ? "js" : extMatch[1];
+    assets[ext].push(entryPointPublicPath);
+  });
+  return assets;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractEntryAssets
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.3.13",
+  "version": "4.3.15",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.8.1",
+    "@umijs/bundler-mako": "0.8.3",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
@@ -41,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.3.13",
-    "@umijs/babel-preset-umi": "4.3.13",
-    "@umijs/bundler-esbuild": "4.3.13",
-    "@umijs/bundler-utils": "4.3.13",
-    "@umijs/bundler-vite": "4.3.13",
-    "@umijs/bundler-webpack": "4.3.13",
-    "@umijs/core": "4.3.13",
+    "@umijs/ast": "4.3.15",
+    "@umijs/babel-preset-umi": "4.3.15",
+    "@umijs/bundler-esbuild": "4.3.15",
+    "@umijs/bundler-vite": "4.3.15",
+    "@umijs/bundler-webpack": "4.3.15",
+    "@umijs/core": "4.3.15",
+    "@umijs/bundler-utils": "4.3.15",
+    "@umijs/plugin-run": "4.3.15",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/mfsu": "4.3.13",
-    "@umijs/plugin-run": "4.3.13",
-    "@umijs/renderer-react": "4.3.13",
-    "@umijs/server": "4.3.13",
+    "@umijs/mfsu": "4.3.15",
+    "@umijs/renderer-react": "4.3.15",
+    "@umijs/server": "4.3.15",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.3.13",
-    "@umijs/zod2ts": "4.3.13"
+    "@umijs/utils": "4.3.15",
+    "@umijs/zod2ts": "4.3.15"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",