diff --git a/did-you-know/src/plugin.ts b/did-you-know/src/plugin.ts index e05f955f965d..c21f2faba6d6 100644 --- a/did-you-know/src/plugin.ts +++ b/did-you-know/src/plugin.ts @@ -69,7 +69,7 @@ export default (api: any) => { const cacheDir = path.join(api.paths.absNodeModulesPath, '.cache'); if (!fs.existsSync(cacheDir)) { - fs.mkdirSync(cacheDir); + fs.mkdirSync(cacheDir, { recursive: true }); } fs.writeFileSync(recordJSONPath, JSON.stringify(records), 'utf-8'); }); diff --git a/examples/ssr-demo/.umirc.ts b/examples/ssr-demo/.umirc.ts index bdb1c6618ff3..115a8381b07d 100644 --- a/examples/ssr-demo/.umirc.ts +++ b/examples/ssr-demo/.umirc.ts @@ -5,15 +5,15 @@ export default { routePrefetch: {}, manifest: {}, clientLoader: {}, - mako: { - plugins: [ - { - load: () => {}, - }, - ], - }, + // mako: { + // plugins: [ + // { + // load: () => {}, + // }, + // ], + // }, ssr: { - builder: 'mako', + // builder: 'mako', }, exportStatic: {}, styles: [`body { color: red; }`], diff --git a/lerna.json b/lerna.json index 6a58085846a0..6e9426b34a46 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.3.11", + "version": "4.3.18", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index 3482d346974b..8026794faca6 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/ast", "homepage": "https://github.com/umijs/umi/tree/master/packages/ast#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/babel-preset-umi/package.json b/packages/babel-preset-umi/package.json index 38b196e06f54..230b5ab39732 100644 --- a/packages/babel-preset-umi/package.json +++ b/packages/babel-preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/babel-preset-umi", - "version": "4.3.11", + "version": "4.3.18", "description": "Official babel preset for umi.", "homepage": "https://github.com/umijs/umi/tree/master/packages/babel-preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/bundler-esbuild/package.json b/packages/bundler-esbuild/package.json index 681bd14efd24..577134992b5a 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/bundler-esbuild", "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/bundler-utils/package.json b/packages/bundler-utils/package.json index 610dd6aa3e65..b5bb3fc5f20a 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.3.11", + "version": "4.3.18", "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-utils#readme", "bugs": "https://github.com/umijs/umi/issues", "repository": { diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json index 170f8a8d6165..6d8a5d03d6ce 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/bundler-vite", "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-vite#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/bundler-vite/src/config/transformer/target.ts b/packages/bundler-vite/src/config/transformer/target.ts index 47a446027b8f..b57947d5b51d 100644 --- a/packages/bundler-vite/src/config/transformer/target.ts +++ b/packages/bundler-vite/src/config/transformer/target.ts @@ -25,7 +25,7 @@ export default (function target(userConfig) { return false; } - const isLegacy = isLegacyBrowser(userConfig.targets); + const isLegacy = isLegacyBrowser(userConfig.targets || {}); // convert { ie: 11 } to ['ie11'] // 低版本浏览器需要使用 legacy 插件 同时设置会有 warning diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json index e162347df1c8..2bbcc9d009b1 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/bundler-webpack", "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/core/package.json b/packages/core/package.json index 0c4695abc1de..78cfd7c40324 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.3.11", + "version": "4.3.18", "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme", "bugs": "https://github.com/umijs/umi/issues", "repository": { diff --git a/packages/create-umi/package.json b/packages/create-umi/package.json index 63e8ffb1bd65..af45829634d6 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.3.11", + "version": "4.3.18", "description": "create-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/lint/package.json b/packages/lint/package.json index cb0c60b6299d..deca179a7fa3 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/lint", "homepage": "https://github.com/umijs/umi/tree/master/packages/lint#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/max/package.json b/packages/max/package.json index 7e88e31b9dae..295c955519df 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/max", "homepage": "https://github.com/umijs/umi/tree/master/packages/max#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/mfsu/package.json b/packages/mfsu/package.json index aa3501f9dea3..73fb5d8b52b0 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/mfsu", "homepage": "https://github.com/umijs/umi/tree/master/packages/mfsu#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/plugin-docs/package.json b/packages/plugin-docs/package.json index be34737f493e..0751c030e735 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/plugin-docs", "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-docs#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/plugin-run/package.json b/packages/plugin-run/package.json index 3019eb3bb57b..557d6ca99fda 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/plugin-run", "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-run#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 8210e7c74d21..9dfebd5c1163 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/plugins", "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-umi/package.json b/packages/preset-umi/package.json index a37068879431..965a43d54c82 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", @@ -30,7 +30,7 @@ "@umijs/ast": "workspace:*", "@umijs/babel-preset-umi": "workspace:*", "@umijs/bundler-esbuild": "workspace:*", - "@umijs/bundler-mako": "0.7.9", + "@umijs/bundler-mako": "0.8.7", "@umijs/bundler-utils": "workspace:*", "@umijs/bundler-vite": "workspace:*", "@umijs/bundler-webpack": "workspace:*", diff --git a/packages/preset-umi/src/features/mako/mako.ts b/packages/preset-umi/src/features/mako/mako.ts index d006b33874ae..f4c59ac9a17d 100644 --- a/packages/preset-umi/src/features/mako/mako.ts +++ b/packages/preset-umi/src/features/mako/mako.ts @@ -1,5 +1,9 @@ import path from 'path'; import { IApi } from '../../types'; +import { + EntryAssets, + extractEntryAssets, +} from '../../utils/extractEntryAssets'; import { isWindows } from '../../utils/platform'; export default (api: IApi) => { @@ -45,17 +49,52 @@ export default (api: IApi) => { enableBy: api.EnableBy.config, }); + // html 处理逻辑 + const assets: EntryAssets = { + // Will contain all js and mjs files + js: [], + // Will contain all css files + css: [], + }; + api.modifyConfig((memo) => { // @TODO remove this when mako support windows if (isWindows) { memo.mako = false; process.env.OKAM = ''; } + const makoPlugins = memo.mako?.plugins || []; + if (!api.config.mpa) { + makoPlugins.push({ + name: 'UmiHtmlGenerationMako', + generateEnd: ({ stats }: any) => { + const entryPointFiles = new Set(); + + for (const chunk of stats.entrypoints['umi']?.chunks || []) { + const files = stats.chunks.find((c: any) => c.id === chunk).files; + for (const file of files) { + entryPointFiles.add(file); + } + } + + let entryAssets = 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: memo.mako?.plugins || [], + mako: { + ...memo.mako, + plugins: makoPlugins, + }, }; }); @@ -78,4 +117,21 @@ export default (api: IApi) => { 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}`; + }); + }); }; diff --git a/packages/preset-umi/src/features/webpack/webpack.ts b/packages/preset-umi/src/features/webpack/webpack.ts index 44f18c601dcd..6c727ff2f543 100644 --- a/packages/preset-umi/src/features/webpack/webpack.ts +++ b/packages/preset-umi/src/features/webpack/webpack.ts @@ -3,6 +3,10 @@ import type { Compiler, } from '@umijs/bundler-webpack/compiled/webpack'; import { IApi } from '../../types'; +import { + EntryAssets, + extractEntryAssets, +} from '../../utils/extractEntryAssets'; export default (api: IApi) => { api.describe({ @@ -11,7 +15,7 @@ export default (api: IApi) => { }); // html 处理逻辑 - const assets: { js: string[]; css: string[]; [key: string]: string[] } = { + const assets: EntryAssets = { // Will contain all js and mjs files js: [], // Will contain all css files @@ -26,45 +30,12 @@ export default (api: IApi) => { const entryPointFiles = compilation.entrypoints .get('umi')! .getFiles(); - - // Extract paths to .js, .mjs and .css files from the current compilation - const entryPointPublicPathMap: Record = {}; - const extensionRegexp = /\.(css|js|mjs)(\?|$)/; - - const UMI_ASSETS_REG = { - js: /^umi(\..+)?\.js$/, - css: /^umi(\..+)?\.css$/, - }; - - entryPointFiles.forEach((entryPointPublicPath) => { - const extMatch = extensionRegexp.exec(entryPointPublicPath); - // Skip if the public path is not a .css, .mjs or .js file - if (!extMatch) { - return; - } - - if (entryPointPublicPath.includes('.hot-update')) { - return; + let entryAssets = extractEntryAssets(entryPointFiles); + Object.entries(entryAssets).forEach(([ext, files]) => { + if (!Array.isArray(assets[ext])) { + assets[ext] = []; } - - // Skip if this file is already known - // (e.g. because of common chunk optimizations) - if (entryPointPublicPathMap[entryPointPublicPath]) { - return; - } - - // umi html 默认会注入 不做处理 - if ( - UMI_ASSETS_REG.js.test(entryPointPublicPath) || - UMI_ASSETS_REG.css.test(entryPointPublicPath) - ) { - return; - } - - entryPointPublicPathMap[entryPointPublicPath] = true; - // ext will contain .js or .css, because .mjs recognizes as .js - const ext = extMatch[1] === 'mjs' ? 'js' : extMatch[1]; - assets[ext].push(entryPointPublicPath); + assets[ext].push(...files); }); }, ); diff --git a/packages/preset-umi/src/utils/extractEntryAssets.ts b/packages/preset-umi/src/utils/extractEntryAssets.ts new file mode 100644 index 000000000000..e28f12c86a88 --- /dev/null +++ b/packages/preset-umi/src/utils/extractEntryAssets.ts @@ -0,0 +1,60 @@ +export type EntryAssets = { + js: string[]; + css: string[]; + [key: string]: string[]; +}; + +export function extractEntryAssets(entryPointFiles: string[]): EntryAssets { + const assets: { + js: string[]; + css: string[]; + [key: string]: string[]; + } = { + // Will contain all js and mjs files + js: [], + // Will contain all css files + css: [], + }; + + // Extract paths to .js, .mjs and .css files from the current compilation + const entryPointPublicPathMap: Record = {}; + const extensionRegexp = /\.(css|js|mjs)(\?|$)/; + + const UMI_ASSETS_REG = { + js: /^umi(\..+)?\.js$/, + css: /^umi(\..+)?\.css$/, + }; + + entryPointFiles.forEach((entryPointPublicPath) => { + const extMatch = extensionRegexp.exec(entryPointPublicPath); + // Skip if the public path is not a .css, .mjs or .js file + if (!extMatch) { + return; + } + + if (entryPointPublicPath.includes('.hot-update')) { + return; + } + + // Skip if this file is already known + // (e.g. because of common chunk optimizations) + if (entryPointPublicPathMap[entryPointPublicPath]) { + return; + } + + // umi html 默认会注入 不做处理 + if ( + UMI_ASSETS_REG.js.test(entryPointPublicPath) || + UMI_ASSETS_REG.css.test(entryPointPublicPath) + ) { + return; + } + + entryPointPublicPathMap[entryPointPublicPath] = true; + // ext will contain .js or .css, because .mjs recognizes as .js + const ext = extMatch[1] === 'mjs' ? 'js' : extMatch[1]; + assets[ext].push(entryPointPublicPath); + }); + + return assets; +} diff --git a/packages/preset-umi/src/utils/transformIEAR.ts b/packages/preset-umi/src/utils/transformIEAR.ts index 6fe57637eb9a..6874fad31820 100644 --- a/packages/preset-umi/src/utils/transformIEAR.ts +++ b/packages/preset-umi/src/utils/transformIEAR.ts @@ -70,7 +70,7 @@ export const IEAR_REG_EXP = new RegExp( // match quotes ($2) `('|")`, // match absolute file path ($3) - `(\\/.*[^\\\\])\\2`, + `((?:[a-zA-Z]:|\\/).*[^\\\\])\\2`, ')', ].join(''), // match full-content diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index 40bcfa1e75d2..6320661693b7 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/preset-vue", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-vue#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/src/features/config/config.ts b/packages/preset-vue/src/features/config/config.ts index 0a8952f288bf..243ee516d453 100644 --- a/packages/preset-vue/src/features/config/config.ts +++ b/packages/preset-vue/src/features/config/config.ts @@ -1,6 +1,5 @@ import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain'; import { IApi } from 'umi'; -import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js'; import { addAssetRules } from './assetRules'; export function getConfig(config: Config, api: IApi) { @@ -23,7 +22,9 @@ export function getConfig(config: Config, api: IApi) { babelParserPlugins: ['jsx', 'classProperties', 'decorators-legacy'], }); - config.plugin('vue-loader-plugin').use(VueLoaderPlugin); + const VueLoaderPlugin = require('vue-loader/dist/pluginWebpack5'); + + config.plugin('vue-loader-plugin').use(VueLoaderPlugin.default); // https://github.com/vuejs/vue-loader/issues/1435#issuecomment-869074949 config.module diff --git a/packages/renderer-react/package.json b/packages/renderer-react/package.json index 8976262a51b8..1b3c29a9db9b 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/renderer-react", "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/renderer-vue/package.json b/packages/renderer-vue/package.json index 8569dcd6f0ef..fbf1f69734cf 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/renderer-vue", "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-vue#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/server/package.json b/packages/server/package.json index faaf1f41e537..e5804b29d1f6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/server", "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/testing/package.json b/packages/testing/package.json index 374e679c0adb..f5880b32cb06 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/test", "homepage": "https://github.com/umijs/umi/tree/master/packages/testing#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/umi/package.json b/packages/umi/package.json index 57fab6783e9a..ccff739d1b99 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.3.11", + "version": "4.3.18", "description": "umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/utils/package.json b/packages/utils/package.json index 2dc8f0972944..4ccf16df2a75 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.3.11", + "version": "4.3.18", "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme", "bugs": "https://github.com/umijs/umi/issues", "repository": { diff --git a/packages/zod2ts/package.json b/packages/zod2ts/package.json index 82c05d178521..5d54c2ccb971 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.3.11", + "version": "4.3.18", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f2207d4ee19..e30125c9b3c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2435,8 +2435,8 @@ importers: specifier: workspace:* version: link:../bundler-esbuild '@umijs/bundler-mako': - specifier: 0.7.9 - version: 0.7.9 + specifier: 0.8.7 + version: 0.8.7 '@umijs/bundler-utils': specifier: workspace:* version: link:../bundler-utils @@ -18488,11 +18488,11 @@ packages: - supports-color dev: true - /@umijs/bundler-mako@0.7.9: - resolution: {integrity: sha512-TkrzB+CPlKiLIb+nBNUibW35Bu5ZqdvPo5fqwkx2dhH6qzMM5KOoYVm9FYXTwLp556oB34Mc03SfpxtU/8VIrQ==} + /@umijs/bundler-mako@0.8.7: + resolution: {integrity: sha512-nN9Cv1oj85TwqrDI9HcWOGAu/Q2QZ8FCVFlINopFeYnVVWXD50Io4EGXaO4c3Y7hkZtKuRQxONziwoWhEGV20g==} dependencies: '@umijs/bundler-utils': 4.1.2 - '@umijs/mako': 0.7.9 + '@umijs/mako': 0.8.7 chalk: 4.1.2 compression: 1.7.4 connect-history-api-fallback: 2.0.0 @@ -18837,8 +18837,8 @@ packages: - typescript dev: true - /@umijs/mako-darwin-arm64@0.7.9: - resolution: {integrity: sha512-PjxNpZ164cNgpYnY0Zzxk+JkeN7k2oiXTFojojkmA4laJin0VlXkVCqhDbMGcHVX7AbUpmJTIs/50uXRtz7UTA==} + /@umijs/mako-darwin-arm64@0.8.7: + resolution: {integrity: sha512-eLNcEIb/ar2ytdJjJVWzh3IKwEvO94H6IO9OaJ0D2akWckR0lMGodfXfpBrLKYKVm1q5klXGUG8D2NKEN5jBmA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -18846,8 +18846,8 @@ packages: dev: false optional: true - /@umijs/mako-darwin-x64@0.7.9: - resolution: {integrity: sha512-ZJlMyJudSVKT5GSUS9BMk10GOO5HQN1KnsoeOvhloWkfNGwFiTxKii0K9csl1FRNhYHUQYA2NrFQkc+j69yEww==} + /@umijs/mako-darwin-x64@0.8.7: + resolution: {integrity: sha512-jyT3EkrfiwTLnRZLDrgedj40IMTQpIsV391RL1xuUzcF2P2avQkJEx2y+lG/H0BZMtoFhkK4xTCR4f4MdQWcnA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -18855,8 +18855,17 @@ packages: dev: false optional: true - /@umijs/mako-linux-x64-gnu@0.7.9: - resolution: {integrity: sha512-RNfAMmsRK796M/W270GzVcdJtiuNQEHTZEDUetFWQVMXfKyeJXgyJ+e9/uLIP1emMxcvjRh7SwwOVscCbqNkCA==} + /@umijs/mako-linux-arm64-musl@0.8.7: + resolution: {integrity: sha512-Gv0u6B22bMRxMjoah80hWoq4G058cOJN69qRp1miCtp7vCrYLuNEKRVO05/X4GGDiYAEnQP/qUNnJb+XUG4w4Q==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@umijs/mako-linux-x64-gnu@0.8.7: + resolution: {integrity: sha512-GjMLMfiOeY7Vh1+iXqyamQhy6R+6O6j2+pHO2/OxKsmb0EJMEmcAtjsPwE8OaktULFoQJzgVJCkgmTz94TKd2Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -18864,8 +18873,8 @@ packages: dev: false optional: true - /@umijs/mako-linux-x64-musl@0.7.9: - resolution: {integrity: sha512-99kmQ7P5KkEd5KSo/X0Sj5UiBJOtGTjtDJ5eA/Crlq61oj5IKlDE7Chwh6MK+gls9yii4OFD09QnrL2BKmyxhg==} + /@umijs/mako-linux-x64-musl@0.8.7: + resolution: {integrity: sha512-RfaxScHbp2oW/4F6cSdAxmhCoL+yM4AmNv2Y0yf7bpxWXrR/x84vCvP4V7RFmxtIOeV89oG4wiHDBekLDmEJDA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -18873,8 +18882,8 @@ packages: dev: false optional: true - /@umijs/mako@0.7.9: - resolution: {integrity: sha512-wwNtO3jt9rviFo7zab5ufLmcShzP9w171q279rjpRZ6BGTly8uGMVGvTIQxiDGZeHUMnNz44FpRcgqEEuBloFw==} + /@umijs/mako@0.8.7: + resolution: {integrity: sha512-9v9iYMwJuHioIZdF81hk6bCHXxRJnYrD4wnCiSsVZVVrE5gdy7VzWGpWW6Wji6m8dY65QjPIO1pkvqXAvUQ45w==} engines: {node: '>= 16'} hasBin: true dependencies: @@ -18892,10 +18901,11 @@ packages: semver: 7.6.2 yargs-parser: 21.1.1 optionalDependencies: - '@umijs/mako-darwin-arm64': 0.7.9 - '@umijs/mako-darwin-x64': 0.7.9 - '@umijs/mako-linux-x64-gnu': 0.7.9 - '@umijs/mako-linux-x64-musl': 0.7.9 + '@umijs/mako-darwin-arm64': 0.8.7 + '@umijs/mako-darwin-x64': 0.8.7 + '@umijs/mako-linux-arm64-musl': 0.8.7 + '@umijs/mako-linux-x64-gnu': 0.8.7 + '@umijs/mako-linux-x64-musl': 0.8.7 dev: false /@umijs/max-plugin-openapi@2.0.3: