From 2e4cd209a2f3fc0a8dad844ebcd62edfb03111eb Mon Sep 17 00:00:00 2001 From: 60late <37356900+60late@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:07:46 +0800 Subject: [PATCH 01/26] docs: add stylelint version tip (#12084) * docs: add stylelint version tip * docs: ... --------- Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- docs/docs/docs/guides/lint.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/docs/docs/guides/lint.md b/docs/docs/docs/guides/lint.md index 8618e58eb3a2..2bc1543379f0 100644 --- a/docs/docs/docs/guides/lint.md +++ b/docs/docs/docs/guides/lint.md @@ -31,10 +31,12 @@ $ pnpm add @umijs/lint -D 然后安装 ESLint 及 Stylelint： +> 目前 `@umijs/lint` 使用的 `stylelint` 版本是 v14 + ```bash -$ npm i eslint stylelint -D +$ npm i -D eslint "stylelint@^14" # or -$ pnpm add eslint stylelint -D +$ pnpm add -D eslint "stylelint@^14" ``` ### 启用配置 From af1536585d8c1cdd3bad67bbecf3c0daeadd8788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:17:46 +0800 Subject: [PATCH 02/26] fix: overrides `:root` pseudo class (#12092) --- packages/preset-umi/src/features/overrides/transform.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/preset-umi/src/features/overrides/transform.ts b/packages/preset-umi/src/features/overrides/transform.ts index a352e9ebf4c5..be97d3dc2313 100644 --- a/packages/preset-umi/src/features/overrides/transform.ts +++ b/packages/preset-umi/src/features/overrides/transform.ts @@ -47,6 +47,9 @@ export async function transform(cssContent: string, filePath: string) { } else if (/^body([\s+~>[:]|$)/.test(selector)) { // use html parent to promote body selector priority return `html ${selector}`; + } else if (selector === ':root') { + // https://github.com/umijs/umi/issues/12089 + return 'html:root'; } return prefixedSelector; }, From 501e841f24f185c93fd40d83706b33865fa6b3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:37:57 +0800 Subject: [PATCH 03/26] fix: `modifyHtml#path` when `exportStatic` is enabled (#12115) --- .../preset-umi/src/features/exportStatic/exportStatic.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/preset-umi/src/features/exportStatic/exportStatic.ts b/packages/preset-umi/src/features/exportStatic/exportStatic.ts index 411a2b44e35d..c08af14a71b9 100644 --- a/packages/preset-umi/src/features/exportStatic/exportStatic.ts +++ b/packages/preset-umi/src/features/exportStatic/exportStatic.ts @@ -220,7 +220,11 @@ export default (api: IApi) => { } // append html file - const htmlContent = await getMarkup(markupArgs); + const htmlContent = await getMarkup({ + ...markupArgs, + // https://github.com/umijs/umi/issues/12108 + path: route.path, + }); htmlFiles.push({ path: file, From 0a666fc535d89d95bb6d71200b1b969081c9c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Mon, 19 Feb 2024 10:39:54 +0800 Subject: [PATCH 04/26] =?UTF-8?q?docs:=20=E4=BC=98=E5=8C=96=E6=96=87?= =?UTF-8?q?=E6=A1=A3,=E6=96=B9=E4=BE=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/docs/api/runtime-config.md | 50 ++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/docs/docs/docs/api/runtime-config.md b/docs/docs/docs/api/runtime-config.md index a2b176b2e61c..92da1930bf02 100644 --- a/docs/docs/docs/api/runtime-config.md +++ b/docs/docs/docs/api/runtime-config.md @@ -88,14 +88,50 @@ export default { }; ``` +### getInitialState + +`getInitialState()` 的返回值将成为全局初始状态。例如： + +```ts +// src/app.ts +import { fetchInitialData } from "@/services/initial"; + +export async function () { + const initialData = await fetchInitialData(); + return initialData; +} +``` + +现在，各种插件和您定义的组件都可以通过 `useModel('@@initialState')` 直接获取到这份全局的初始状态，如下所示： + +```tsx +import { useModel } from "umi"; + +export default function Page() { + const { initialState, loading, error, refresh, setInitialState } = + useModel("@@initialState"); + return <>{initialState}; +} +``` + +| 对象属性 | 类型 | 介绍 | +| --- | --- | --- | +| `initialState` | `any` | 导出的 `getInitialState()` 方法的返回值 | +| `loading` | `boolean` | `getInitialState()` 或 `refresh()` 方法是否正在进行中。在首次获取到初始状态前，页面其他部分的渲染都会**被阻止** | +| `error` | `Error` | 如果导出的 `getInitialState()` 方法运行时报错，报错的错误信息 | +| `refresh` | `() => void` | 重新执行 `getInitialState` 方法，并获取新的全局初始状态 | +| `setInitialState` | `(state: any) => void` | 手动设置 `initialState` 的值，手动设置完毕会将 `loading` 置为 `false` | + ### layout 修改[内置布局](../max/layout-menu)的配置，比如配置退出登陆、自定义导航暴露的渲染区域等。 > 注意：需要开启 [layout](../api/config#layout) 插件，才能使用它的运行时配置。 -```js -export const layout = { +```tsx +import { RuntimeConfig } from 'umi'; + +export const layout:RuntimeConfig = { logout: () => {}, // do something }; ``` @@ -134,7 +170,7 @@ export function onRouteChange({ clientRoutes, location }) { } ``` -### patchRoutes(\{ routes \}) +### patchRoutes ```ts export function patchRoutes({ routes, routeComponents }) { @@ -148,7 +184,7 @@ export function patchRoutes({ routes, routeComponents }) { 注：如需动态更新路由，建议使用 `patchClientRoutes()` ，否则你可能需要同时修改 `routes` 和 `routeComponents`。 -### patchClientRoutes(\{ routes \}) +### patchClientRoutes 修改被 react-router 渲染前的树状路由表，接收内容同 [useRoutes](https://reactrouter.com/en/main/hooks/use-routes)。 @@ -222,7 +258,7 @@ export function render(oldRender) { Umi 内置了 `qiankun` 插件来提供微前端的能力，具体参考[插件配置](../max/micro-frontend)。 -### render(oldRender: `Function`) +### render 覆写 render。 @@ -244,14 +280,14 @@ export function render(oldRender) { 如果你使用了 `import { request } from 'umi';` 来请求数据，那么你可以通过该配置来自定义中间件、拦截器、错误处理适配等。具体参考 [request](../max/request) 插件配置。 -### rootContainer(lastRootContainer, args) +### rootContainer 修改交给 react-dom 渲染时的根组件。 比如用于在外面包一个 Provider， ```js -export function rootContainer(container) { +export function rootContainer(container, args) { return React.createElement(ThemeProvider, null, container); } ``` From 5d64b5c81048647c5804e90de3305d8f87d535a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Mon, 19 Feb 2024 10:50:42 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/docs/api/runtime-config.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/docs/docs/api/runtime-config.md b/docs/docs/docs/api/runtime-config.md index 92da1930bf02..c2359b7b79fc 100644 --- a/docs/docs/docs/api/runtime-config.md +++ b/docs/docs/docs/api/runtime-config.md @@ -90,6 +90,8 @@ export default { ### getInitialState +- Type: `getInitialState: () => Promise | any` + `getInitialState()` 的返回值将成为全局初始状态。例如： ```ts @@ -124,6 +126,8 @@ export default function Page() { ### layout +- Type: `RuntimeConfig | ProLayoutProps` + 修改[内置布局](../max/layout-menu)的配置，比如配置退出登陆、自定义导航暴露的渲染区域等。 > 注意：需要开启 [layout](../api/config#layout) 插件，才能使用它的运行时配置。 @@ -131,14 +135,16 @@ export default function Page() { ```tsx import { RuntimeConfig } from 'umi'; -export const layout:RuntimeConfig = { +export const layout: RuntimeConfig = { logout: () => {}, // do something }; ``` 更多具体配置参考[插件文档](../max/layout-menu#运行时配置)。 -### onRouteChange(\{ routes, clientRoutes, location, action, basename, isFirst \}) +### onRouteChange + +- type: `(args: { routes: Routes; clientRoutes: Routes; location: Location; action: Action; basename: string; isFirst: boolean }) => void` 在初始加载和路由切换时做一些事情。 @@ -172,6 +178,8 @@ export function onRouteChange({ clientRoutes, location }) { ### patchRoutes +- type: `(args: { routes: Routes; routeComponents }) => void` + ```ts export function patchRoutes({ routes, routeComponents }) { console.log('patchRoutes', routes, routeComponents); @@ -186,6 +194,8 @@ export function patchRoutes({ routes, routeComponents }) { ### patchClientRoutes +- type: `(args: { routes: Routes; }) => void` + 修改被 react-router 渲染前的树状路由表，接收内容同 [useRoutes](https://reactrouter.com/en/main/hooks/use-routes)。 比如在最前面添加一个 `/foo` 路由， @@ -260,6 +270,8 @@ Umi 内置了 `qiankun` 插件来提供微前端的能力，具体参考[插件 ### render +- Type: `(oldRender: Function)=>void` + 覆写 render。 比如用于渲染之前做权限校验， @@ -282,6 +294,8 @@ export function render(oldRender) { ### rootContainer +- Type: `(container: JSX.Element,args: { routes: Routes; plugin; history: History }) => JSX.Element;` + 修改交给 react-dom 渲染时的根组件。 比如用于在外面包一个 Provider， From 46eb12a726aff894392c6ee4396ad1467360d2eb Mon Sep 17 00:00:00 2001 From: ChuckRay <63182083+Chuck-Ray@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:18:28 +0800 Subject: [PATCH 06/26] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=9A=84=E7=97=85=E5=8F=A5=20(#12132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs/docs/guides/mfsu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/docs/guides/mfsu.md b/docs/docs/docs/guides/mfsu.md index 7c39d8079cb8..f62bb3908599 100644 --- a/docs/docs/docs/guides/mfsu.md +++ b/docs/docs/docs/guides/mfsu.md @@ -40,7 +40,7 @@ mfsu: { } ``` -和编译时分析的方式不同，扫描分析的方式会先读取项目中的所有源代码文件，然后通过静态分析的方式获取项目的依赖。这个过程非常的快，在一个有 17 万行代码，1400 多个文件项目中，分析一次只需要 700ms 左右。如此快速的分析的代价时，收集到的依赖会缺失后面项目代码编译插入的依赖；这部分的依赖最终和项目代码一起编译打包。 +和编译时分析的方式不同，扫描分析的方式会先读取项目中的所有源代码文件，然后通过静态分析的方式获取项目的依赖。这个过程非常的快，在一个有 17 万行代码，1400 多个文件项目中，分析一次只需要 700ms 左右。如此快速的分析的代价是：收集到的依赖会缺失后面项目代码编译插入的依赖；这部分的依赖最终和项目代码一起编译打包。 分析完项目依赖之后，Umi 会拿着这份依赖信息，并行的去进行项目代码的编译和依赖的编译。 From 2d3fa22d76887097372a8e370f19074df9cc6b4d Mon Sep 17 00:00:00 2001 From: zhuxian <18270244870@163.com> Date: Wed, 21 Feb 2024 13:48:50 +0800 Subject: [PATCH 07/26] =?UTF-8?q?fix(plugin-icons):=20=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=20solar=20=E9=A2=84=E8=AE=BE=E5=89=8D=E7=BC=80=20(#12130)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/preset-umi/src/features/icons/icons.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/preset-umi/src/features/icons/icons.ts b/packages/preset-umi/src/features/icons/icons.ts index 10510109a1b1..fc4e87668a96 100644 --- a/packages/preset-umi/src/features/icons/icons.ts +++ b/packages/preset-umi/src/features/icons/icons.ts @@ -287,6 +287,7 @@ type IconCollections = 'academicons' | 'subway' | 'svg-spinners' | 'system-uicons' | + 'solar' | 'tabler' | 'teenyicons' | 'topcoat' | From 98ee5b158477d9b0dc2e5cdc896eec133d076989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:27:07 +0800 Subject: [PATCH 08/26] chore: disable tsx node warning (#12093) --- packages/plugin-run/package.json | 2 +- packages/plugin-run/src/index.ts | 10 +- pnpm-lock.yaml | 243 +------------------------------ scripts/bin/umi-scripts.js | 7 +- 4 files changed, 18 insertions(+), 244 deletions(-) diff --git a/packages/plugin-run/package.json b/packages/plugin-run/package.json index 8b34f65f921b..66b045314fdf 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -20,7 +20,7 @@ "dev": "umi-scripts father dev" }, "dependencies": { - "tsx": "^3.12.2" + "tsx": "3.12.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-run/src/index.ts b/packages/plugin-run/src/index.ts index 9a51414b4641..9457a71dbb4d 100644 --- a/packages/plugin-run/src/index.ts +++ b/packages/plugin-run/src/index.ts @@ -46,7 +46,15 @@ export default (api: IApi) => { 'utf-8', ); const tsxPath = getBinPath(); - fork(tsxPath, [absTmpFilePath, ...restArgs], { stdio: 'inherit' }); + fork(tsxPath, [absTmpFilePath, ...restArgs], { + stdio: 'inherit', + env: { + ...process.env, + // disable `(node:92349) ExperimentalWarning: `--experimental-loader` may be removed in the future;` warning + // more context: https://github.com/umijs/umi/pull/11981 + NODE_NO_WARNINGS: '1', + }, + }); }, }); }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0977496c5413..f6181225ce7d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2256,7 +2256,7 @@ importers: packages/plugin-run: dependencies: tsx: - specifier: ^3.12.2 + specifier: 3.12.2 version: 3.12.2 packages/plugins: @@ -12479,15 +12479,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm64@0.18.20: - resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.15.18: resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} engines: {node: '>=12'} @@ -12513,15 +12504,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm@0.18.20: - resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.16.17: resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==} engines: {node: '>=12'} @@ -12539,15 +12521,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-x64@0.18.20: - resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.16.17: resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==} engines: {node: '>=12'} @@ -12565,15 +12538,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-arm64@0.18.20: - resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.16.17: resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==} engines: {node: '>=12'} @@ -12591,15 +12555,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-x64@0.18.20: - resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.16.17: resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==} engines: {node: '>=12'} @@ -12617,15 +12572,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-arm64@0.18.20: - resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.16.17: resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==} engines: {node: '>=12'} @@ -12643,15 +12589,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-x64@0.18.20: - resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.16.17: resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==} engines: {node: '>=12'} @@ -12669,15 +12606,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm64@0.18.20: - resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.16.17: resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==} engines: {node: '>=12'} @@ -12695,15 +12623,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm@0.18.20: - resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.16.17: resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==} engines: {node: '>=12'} @@ -12721,15 +12640,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ia32@0.18.20: - resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.15.18: resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} engines: {node: '>=12'} @@ -12755,15 +12665,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-loong64@0.18.20: - resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.16.17: resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==} engines: {node: '>=12'} @@ -12781,15 +12682,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-mips64el@0.18.20: - resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.16.17: resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==} engines: {node: '>=12'} @@ -12807,15 +12699,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ppc64@0.18.20: - resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.16.17: resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==} engines: {node: '>=12'} @@ -12833,15 +12716,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-riscv64@0.18.20: - resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.16.17: resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==} engines: {node: '>=12'} @@ -12859,15 +12733,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-s390x@0.18.20: - resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.16.17: resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==} engines: {node: '>=12'} @@ -12885,15 +12750,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-x64@0.18.20: - resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.16.17: resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==} engines: {node: '>=12'} @@ -12911,15 +12767,6 @@ packages: requiresBuild: true optional: true - /@esbuild/netbsd-x64@0.18.20: - resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.16.17: resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==} engines: {node: '>=12'} @@ -12937,15 +12784,6 @@ packages: requiresBuild: true optional: true - /@esbuild/openbsd-x64@0.18.20: - resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.16.17: resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==} engines: {node: '>=12'} @@ -12963,15 +12801,6 @@ packages: requiresBuild: true optional: true - /@esbuild/sunos-x64@0.18.20: - resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.16.17: resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==} engines: {node: '>=12'} @@ -12989,15 +12818,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-arm64@0.18.20: - resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.16.17: resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==} engines: {node: '>=12'} @@ -13015,15 +12835,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-ia32@0.18.20: - resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.16.17: resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==} engines: {node: '>=12'} @@ -13041,15 +12852,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-x64@0.18.20: - resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@7.32.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -18440,7 +18242,7 @@ packages: /@umijs/plugin-run@4.0.90: resolution: {integrity: sha512-/OoJkZkdfuHvVxXoxa/MMyHa7lVLuy6txFccY32V9wKPqPjnPiSkYZrnhZTykMyEmKXbXTX2yqqhyY91gSTgRA==} dependencies: - tsx: 3.14.0 + tsx: 3.12.2 dev: true /@umijs/plugin-umi-request-compat@1.0.0(react@18.1.0)(umi@packages+umi): @@ -26480,36 +26282,6 @@ packages: '@esbuild/win32-ia32': 0.17.19 '@esbuild/win32-x64': 0.17.19 - /esbuild@0.18.20: - resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.18.20 - '@esbuild/android-arm64': 0.18.20 - '@esbuild/android-x64': 0.18.20 - '@esbuild/darwin-arm64': 0.18.20 - '@esbuild/darwin-x64': 0.18.20 - '@esbuild/freebsd-arm64': 0.18.20 - '@esbuild/freebsd-x64': 0.18.20 - '@esbuild/linux-arm': 0.18.20 - '@esbuild/linux-arm64': 0.18.20 - '@esbuild/linux-ia32': 0.18.20 - '@esbuild/linux-loong64': 0.18.20 - '@esbuild/linux-mips64el': 0.18.20 - '@esbuild/linux-ppc64': 0.18.20 - '@esbuild/linux-riscv64': 0.18.20 - '@esbuild/linux-s390x': 0.18.20 - '@esbuild/linux-x64': 0.18.20 - '@esbuild/netbsd-x64': 0.18.20 - '@esbuild/openbsd-x64': 0.18.20 - '@esbuild/sunos-x64': 0.18.20 - '@esbuild/win32-arm64': 0.18.20 - '@esbuild/win32-ia32': 0.18.20 - '@esbuild/win32-x64': 0.18.20 - dev: true - /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -46882,17 +46654,6 @@ packages: optionalDependencies: fsevents: 2.3.3 - /tsx@3.14.0: - resolution: {integrity: sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==} - hasBin: true - dependencies: - esbuild: 0.18.20 - get-tsconfig: 4.7.2 - source-map-support: 0.5.21 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /tty-browserify@0.0.0: resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==} diff --git a/scripts/bin/umi-scripts.js b/scripts/bin/umi-scripts.js index 7afc1f06a432..f1785de08401 100755 --- a/scripts/bin/umi-scripts.js +++ b/scripts/bin/umi-scripts.js @@ -24,7 +24,12 @@ const spawn = sync( 'tsx', [scriptPathAsStr, ...throughArgs], { - env: process.env, + env: { + ...process.env, + // disable `(node:92349) ExperimentalWarning: `--experimental-loader` may be removed in the future;` warning + // more context: https://github.com/umijs/umi/pull/11981 + NODE_NO_WARNINGS: '1' + }, cwd: process.cwd(), stdio: 'inherit', shell: true From 0c561eab4f623cf38366889c8fdb2468fe7a17fa Mon Sep 17 00:00:00 2001 From: sorrycc Date: Thu, 22 Feb 2024 15:28:11 +0800 Subject: [PATCH 09/26] release: 4.1.2 --- lerna.json | 2 +- packages/ast/package.json | 2 +- packages/babel-preset-umi/package.json | 2 +- packages/bundler-esbuild/package.json | 2 +- packages/bundler-utils/package.json | 2 +- packages/bundler-vite/package.json | 2 +- packages/bundler-webpack/client/client/client.js | 4 ++-- packages/bundler-webpack/package.json | 2 +- packages/core/package.json | 2 +- packages/create-umi/package.json | 2 +- packages/lint/package.json | 2 +- packages/max/package.json | 2 +- packages/mfsu/package.json | 2 +- packages/plugin-docs/package.json | 2 +- packages/plugin-run/package.json | 2 +- packages/plugins/package.json | 2 +- packages/preset-umi/package.json | 2 +- packages/preset-vue/package.json | 2 +- packages/renderer-react/package.json | 2 +- packages/renderer-vue/package.json | 2 +- packages/server/package.json | 2 +- packages/testing/package.json | 2 +- packages/umi/package.json | 2 +- packages/utils/package.json | 2 +- packages/zod2ts/package.json | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lerna.json b/lerna.json index 2713771c784d..2e59ded2e0c1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.1.1", + "version": "4.1.2", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index 460ea3598bcd..343b0f7a722b 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.1.1", + "version": "4.1.2", "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 342a09ef6c2d..1fc584b5bee3 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.1.1", + "version": "4.1.2", "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 105eb1b4c0a1..3b8741f96ce0 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.1.1", + "version": "4.1.2", "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 87d1922b9f8a..77ba3d01fe15 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.1.1", + "version": "4.1.2", "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 f914af8c2488..ab13a86af52f 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.1.1", + "version": "4.1.2", "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-webpack/client/client/client.js b/packages/bundler-webpack/client/client/client.js index 98163038350d..e2924136021f 100644 --- a/packages/bundler-webpack/client/client/client.js +++ b/packages/bundler-webpack/client/client/client.js @@ -1,5 +1,5 @@ -function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); } -function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; } +function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); } +function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; } function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } import stripAnsi from '@umijs/utils/compiled/strip-ansi'; diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json index 0acbd1a17488..1ad8cbd8682d 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.1.1", + "version": "4.1.2", "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 ff21926eda9a..21d43ea08b7f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.1.1", + "version": "4.1.2", "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 6c9b463193b5..28b704e2dd80 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.1.1", + "version": "4.1.2", "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 12199cd5cbc9..083414dca3e7 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.1.1", + "version": "4.1.2", "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 8a0eb437fb5c..8daf873b2f77 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.1.1", + "version": "4.1.2", "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 2cc07d1fb778..1d63fb1d56fd 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.1.1", + "version": "4.1.2", "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 d9c29d828e7f..f7abfb568eb6 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.1.1", + "version": "4.1.2", "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 66b045314fdf..5427ae8f059a 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.1.1", + "version": "4.1.2", "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 df3bcf6078da..92f6c5ad5e84 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.1.1", + "version": "4.1.2", "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 86dbd9bea424..e638a5129c51 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.1.1", + "version": "4.1.2", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index 572cc555637d..3d609a537e50 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.1.1", + "version": "4.1.2", "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/renderer-react/package.json b/packages/renderer-react/package.json index ab60036cc8b7..35737bab0913 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.1.1", + "version": "4.1.2", "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 3b5b32b6cd33..22f7736e264e 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.1.1", + "version": "4.1.2", "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 e8cadcc7b3ab..9a6077b7135a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.1.1", + "version": "4.1.2", "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 674eb19166da..ddad41fa82f6 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.1.1", + "version": "4.1.2", "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 a237964de96d..8ffec360b055 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.1.1", + "version": "4.1.2", "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 42fb4f8909ff..56766eadfe16 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.1.1", + "version": "4.1.2", "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 2765a5857a01..bfd7e4864d60 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.1.1", + "version": "4.1.2", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", From 7f5f6c7c1a67dfc4fee0a912860e1b6cf3247ee0 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 26 Feb 2024 20:04:14 +0800 Subject: [PATCH 10/26] docs: add `layout` param for `routes.md` (#12143) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: add `layout` param for `routes.md` * docs: update * docs: update --------- Co-authored-by: 咲奈Sakina <59400654+fz6m@users.noreply.github.com> --- docs/docs/docs/guides/routes.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/docs/docs/guides/routes.md b/docs/docs/docs/guides/routes.md index ed064d37330d..18c1bb82fdb9 100644 --- a/docs/docs/docs/guides/routes.md +++ b/docs/docs/docs/guides/routes.md @@ -191,6 +191,29 @@ const TheOldPage = ()=>{ export default withAuth(TheOldPage) ``` +### layout + +* Type: `boolean` + +通过配置 `layout: false` 可以单独关闭某一个路由的全局布局： + +```js +// .umirc.ts + +export default { + routes: [ + // 取消 login 页面的全局布局，从而自行实现整个页面 + { path: '/login', component: '@/pages/Login', layout: false }, + ], +} +``` + +注： + +1. 全局布局可能来自于 `layouts/index.tsx` 约定，或插件添加的 layout（如 `@umijs/max` 自带的 layout 插件将自动添加菜单布局），当配置 `layout: false` 时，将取消所有 layout ，此时组件内容占据整个页面，多用于登录页等场景。 + +2. `layout: false` 仅对一级路由生效，更多例子详见 [全局 layout](#全局-layout) 。 + ## 约定式路由 除配置式路由外，Umi 也支持约定式路由。约定式路由也叫文件路由，就是不需要手写配置，文件系统即路由，通过目录和文件及其命名分析出路由配置。 From 69329bd120ed502f22fa2ff16b56643471c5c6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Tue, 27 Feb 2024 00:41:14 +0800 Subject: [PATCH 11/26] docs: remove unstable website (#12150) --- docs/docs/blog/legacy-browser.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/blog/legacy-browser.md b/docs/docs/blog/legacy-browser.md index d3b3d7e09c74..94b8a35e7dbb 100644 --- a/docs/docs/blog/legacy-browser.md +++ b/docs/docs/blog/legacy-browser.md @@ -82,7 +82,7 @@ export default { export default { headScripts: [ - 'http://polyfill.alicdn.com/v3/polyfill.min.js', // or https://polyfill.io/v3/polyfill.min.js + 'http://polyfill.alicdn.com/v3/polyfill.min.js', ], legacy: {}, }; @@ -94,7 +94,7 @@ export default { | :----------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | CDN 引入 | 以 cdn 形式引入 **script 形式且前置的** 、目标浏览器环境缺少的 polyfill js 文件，如 [es6-shim](https://github.com/paulmillr/es6-shim) 。 | | 人工 core-js | 利用 [core-js](https://github.com/zloirock/core-js) 系工具，如通过 [core-js-builder](https://github.com/zloirock/core-js/tree/master/packages/core-js-builder) 构建自己需要的 polyfill 产物，再以 **前置 script 脚本** 形式引入项目。 | -| 动态 polyfill 服务 | 使用根据当前浏览器请求 UA 动态下发所需 polyfill 的服务，比如 [polyfill.io](https://polyfill.io/v3/polyfill.min.js) ，考虑到速度，可使用国内的 [alicdn polyfill.io](http://polyfill.alicdn.com/v3/polyfill.min.js) 服务。另外，你还可以使用 [polyfill-service](https://github.com/Financial-Times/polyfill-service) 自建相同的动态 polyfill 下发服务。 | +| 动态 polyfill 服务 | 使用根据当前浏览器请求 UA 动态下发所需 polyfill 的服务，比如 [polyfill.io (alicdn)](http://polyfill.alicdn.com/v3/polyfill.min.js) 服务。另外，你还可以使用 [polyfill-service](https://github.com/Financial-Times/polyfill-service) 自建相同的动态 polyfill 下发服务。 | 注： From e23b8e0ec7f054d892e7e56ea0c50db9c0e0d46b Mon Sep 17 00:00:00 2001 From: Peach Date: Thu, 29 Feb 2024 09:45:19 +0800 Subject: [PATCH 12/26] feat(preset-umi): support to preload route chunk files (#12095) * feat: add bundler info when enable okam * feat: support to preload route chunk files * refactor: output scp to templates * refactor: prefetch to preload and extract as utils * refactor: preloadMode to preload.mode * refactor: correct visit logic * refactor: update enableBy for okam * refactor: compatible with mako bundler * refactor: enable by default * feat: support runtime public path * refactor: correct logic * refactor: handle no file route * refactor: improvements * refactor: improvements * refactor: sort files data --- packages/preset-umi/.fatherrc.ts | 14 + .../src/client/preloadRouteFilesScp.ts | 49 ++++ packages/preset-umi/src/features/okam/okam.ts | 14 +- .../routePreloadOnLoad/routePreloadOnLoad.ts | 271 ++++++++++++++++++ .../src/features/routePreloadOnLoad/utils.ts | 46 +++ packages/preset-umi/src/index.ts | 1 + .../preloadRouteFilesScp.js | 1 + 7 files changed, 393 insertions(+), 3 deletions(-) create mode 100644 packages/preset-umi/src/client/preloadRouteFilesScp.ts create mode 100644 packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts create mode 100644 packages/preset-umi/src/features/routePreloadOnLoad/utils.ts create mode 100644 packages/preset-umi/templates/routePreloadOnLoad/preloadRouteFilesScp.js diff --git a/packages/preset-umi/.fatherrc.ts b/packages/preset-umi/.fatherrc.ts index 3305dd5a74a7..b976741a0db4 100644 --- a/packages/preset-umi/.fatherrc.ts +++ b/packages/preset-umi/.fatherrc.ts @@ -2,4 +2,18 @@ import { defineConfig } from 'father'; export default defineConfig({ extends: '../../.fatherrc.base.ts', + cjs: { + ignores: ['src/client/*'], + }, + umd: { + entry: 'src/client/preloadRouteFilesScp.ts', + output: 'templates/routePreloadOnLoad', + chainWebpack(memo) { + memo.output.filename('preloadRouteFilesScp.js'); + memo.output.delete('libraryTarget'); + memo.output.iife(true); + + return memo; + }, + }, }); diff --git a/packages/preset-umi/src/client/preloadRouteFilesScp.ts b/packages/preset-umi/src/client/preloadRouteFilesScp.ts new file mode 100644 index 000000000000..7232620e8c63 --- /dev/null +++ b/packages/preset-umi/src/client/preloadRouteFilesScp.ts @@ -0,0 +1,49 @@ +/** + * NOTE: DO NOT USE ADVANCED SYNTAX IN THIS FILE, TO AVOID INSERT HELPERS TO REDUCE SCRIPT SIZE. + */ + +import { getPreloadRouteFiles } from '../features/routePreloadOnLoad/utils'; + +// always add trailing slash for base +const basename = '{{basename}}'.replace(/([^/])$/, '$1/'); +const publicPath = '{{publicPath}}'; +const pathname = location.pathname; +const routePath = + pathname.startsWith(basename) && + decodeURI(`/${pathname.slice(basename.length)}`); + +// skip preload if basename not match +if (routePath) { + const map = '{{routeChunkFilesMap}}' as any; + const doc = document; + const head = doc.head; + const createElement = doc.createElement.bind(doc); + const files = getPreloadRouteFiles(routePath, map, { + publicPath, + }); + + files?.forEach((file) => { + const type = file.type; + const url = file.url; + let tag: HTMLLinkElement | HTMLScriptElement; + + if (type === 'js') { + tag = createElement('script'); + tag.src = url; + tag.async = true; + } else if (type === 'css') { + tag = createElement('link'); + tag.href = url; + tag.rel = 'preload'; + tag.as = 'style'; + } else { + return; + } + + file.attrs.forEach((attr) => { + tag.setAttribute(attr[0], attr[1] || ''); + }); + + head.appendChild(tag); + }); +} diff --git a/packages/preset-umi/src/features/okam/okam.ts b/packages/preset-umi/src/features/okam/okam.ts index 33b843f90763..f908338d06fa 100644 --- a/packages/preset-umi/src/features/okam/okam.ts +++ b/packages/preset-umi/src/features/okam/okam.ts @@ -2,11 +2,19 @@ import { checkVersion } from '@umijs/utils'; import { IApi } from '../../types'; export default (api: IApi) => { + api.describe({ + enableBy: () => Boolean(process.env.OKAM), + }); + api.onCheck(() => { // mako 仅支持 node 16+ // ref: https://github.com/umijs/mako/issues/300 - if (api.userConfig.mako) { - checkVersion(16, `Node 16 is required when using mako.`); - } + checkVersion(16, `Node 16 is required when using mako.`); + }); + + api.modifyAppData((memo) => { + memo.bundler = 'mako'; + + return memo; }); }; diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts new file mode 100644 index 000000000000..d74d69a5c71e --- /dev/null +++ b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts @@ -0,0 +1,271 @@ +import type { StatsCompilation } from '@umijs/bundler-webpack/compiled/webpack'; +import { lodash, logger, winPath } from '@umijs/utils'; +import { readFileSync } from 'fs'; +import { dirname, isAbsolute, join, relative } from 'path'; +import { TEMPLATES_DIR } from '../../constants'; +import { createResolver } from '../../libs/scan'; +import type { IApi, IRoute } from '../../types'; +import { PRELOAD_ROUTE_MAP_SCP_TYPE } from './utils'; + +export interface IRouteChunkFilesMap { + /** + * script attr prefix (package.json name) + */ + p: string; + /** + * bundler type + */ + b: string; + /** + * all chunk files + */ + f: [string, string | number][]; + /** + * route files index map + */ + r: Record; +} + +/** + * forked from: https://github.com/remix-run/react-router/blob/fb0f1f94778f4762989930db209e6a111504aa63/packages/router/utils.ts#L688C1-L719 + */ +const routeScoreCache = new Map(); + +function computeRouteScore(path: string): number { + if (!routeScoreCache.get(path)) { + const paramRe = /^:[\w-]+$/; + const dynamicSegmentValue = 3; + const emptySegmentValue = 1; + const staticSegmentValue = 10; + const splatPenalty = -2; + const isSplat = (s: string) => s === '*'; + let segments = path.split('/'); + let initialScore = segments.length; + if (segments.some(isSplat)) { + initialScore += splatPenalty; + } + + routeScoreCache.set( + path, + segments + .filter((s) => !isSplat(s)) + .reduce( + (score, segment) => + score + + (paramRe.test(segment) + ? dynamicSegmentValue + : segment === '' + ? emptySegmentValue + : staticSegmentValue), + initialScore, + ), + ); + } + + return routeScoreCache.get(path)!; +} + +export default (api: IApi) => { + let routeChunkFilesMap: IRouteChunkFilesMap; + + // enable when package name available + // because preload script use package name as attribute prefix value + api.describe({ + enableBy: () => Boolean(api.pkg.name), + }); + + api.addHTMLHeadScripts(() => { + if (api.name === 'build') { + // internal tern app use map mode + return api.config.tern + ? // map mode + [ + { + type: PRELOAD_ROUTE_MAP_SCP_TYPE, + content: JSON.stringify(routeChunkFilesMap), + }, + ] + : // script mode + [ + { + content: readFileSync( + join( + TEMPLATES_DIR, + 'routePreloadOnLoad/preloadRouteFilesScp.js', + ), + 'utf-8', + ) + .replace( + '"{{routeChunkFilesMap}}"', + JSON.stringify(routeChunkFilesMap), + ) + .replace('{{basename}}', api.config.base) + .replace( + '"{{publicPath}}"', + `${ + // handle runtimePublicPath + api.config.runtimePublicPath ? 'window.publicPath||' : '' + }"${api.config.publicPath}"`, + ), + }, + ]; + } + + return []; + }); + + api.onBuildComplete(async ({ err, stats }) => { + if (!err && !stats.hasErrors()) { + const routeModulePath = join(api.paths.absTmpPath, 'core/route.tsx'); + const routeModuleName = winPath(relative(api.cwd, routeModulePath)); + const resolver = createResolver({ alias: api.config.alias }); + const { chunks = [] } = stats.toJson + ? // webpack + stats.toJson() + : // mako + (stats.compilation as unknown as StatsCompilation); + + // collect all chunk files and file chunks indexes + const chunkFiles: Record = + {}; + const fileChunksMap: Record< + string, + { files: string[]; indexes?: number[] } + > = {}; + const pickPreloadFiles = (files: string[]) => + files.filter((f) => f.endsWith('.js') || f.endsWith('.css')); + + for (const chunk of chunks) { + const routeOrigins = chunk.origins!.filter((origin) => + origin.moduleName?.endsWith(routeModuleName), + ); + + for (const origin of routeOrigins) { + const queue = [chunk.id!].concat(chunk.siblings!); + const visited: typeof queue = []; + const files: string[] = []; + let fileAbsPath: string; + + // resolve route file path + try { + fileAbsPath = await resolver.resolve( + dirname(routeModulePath), + origin.request!, + ); + } catch (err) { + logger.error( + `[routePreloadOnLoad]: route file resolve error, cannot preload for ${origin.request!}`, + ); + continue; + } + + // collect all related chunk files for route file + while (queue.length) { + const currentId = queue.shift()!; + + if (!visited.includes(currentId)) { + const currentChunk = chunks.find((c) => c.id === currentId)!; + + // skip sibling entry chunk + if (currentChunk.entry) continue; + + // merge files + pickPreloadFiles(chunk.files!).forEach((file) => { + chunkFiles[file] ??= { + index: Object.keys(chunkFiles).length, + id: currentId, + }; + }); + + // merge files + files.push(...pickPreloadFiles(currentChunk.files!)); + + // continue to search sibling chunks + queue.push(...currentChunk.siblings!); + + // mark as visited + visited.push(currentId); + } + } + + fileChunksMap[fileAbsPath] = { files }; + } + } + + // generate indexes for file chunks + Object.values(fileChunksMap).forEach((item) => { + item.indexes = item.files.map((f) => chunkFiles[f].index); + }); + + // generate map for path -> files (include parent route files) + const routeFilesMap: Record = {}; + + for (const route of Object.values(api.appData.routes)) { + // skip redirect route + if (!route.file) continue; + + let current = route; + const files: string[] = []; + + do { + // skip inline function route file + if (current.file && !current.file.startsWith('(')) { + try { + const fileReqPath = + isAbsolute(current.file) || current.file.startsWith('@/') + ? current.file + : // a => ./a + // .a => ./.a + current.file.replace(/^([^.]|\.[^./])/, './$1'); + const fileAbsPath = await resolver.resolve( + api.paths.absPagesPath, + fileReqPath, + ); + + files.push(fileAbsPath); + } catch { + logger.error( + `[routePreloadOnLoad]: route file resolve error, cannot preload for ${current.file}`, + ); + } + } + current = current.parentId && api.appData.routes[current.parentId]; + } while (current); + + const indexes = files.reduce((indexes, file) => { + // why fileChunksMap[file] may not existing? + // because Mako will merge minimal async chunk into entry chunk + // so the merged route chunk does not has to preload + return indexes.concat(fileChunksMap[file]?.indexes || []); + }, []); + const { absPath } = route; + + routeFilesMap[absPath] = + // why different route may has same absPath? + // because umi implement route.wrappers via nested routes way, the wrapper route will has same absPath with the nested route + // so we always select the longest file indexes for the nested route + !routeFilesMap[absPath] || + routeFilesMap[absPath].length < indexes.length + ? indexes + : routeFilesMap[absPath]; + } + + routeChunkFilesMap = { + p: api.pkg.name!, + b: api.appData.bundler!, + f: Object.entries(chunkFiles) + .sort((a, b) => a[1].index - b[1].index) + .map(([k, { id }]) => [k, id]), + // sort similar to react-router@6 + r: lodash(routeFilesMap) + .toPairs() + .sort( + ([a]: [string, number[]], [b]: [string, number[]]) => + computeRouteScore(a) - computeRouteScore(b), + ) + .fromPairs() + .value() as any, + }; + } + }); +}; diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts b/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts new file mode 100644 index 000000000000..90076221f307 --- /dev/null +++ b/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts @@ -0,0 +1,46 @@ +/** + * NOTE: DO NOT USE ADVANCED SYNTAX IN THIS FILE, TO AVOID INSERT HELPERS TO REDUCE SCRIPT SIZE. + */ + +import type { IRouteChunkFilesMap } from './routePreloadOnLoad'; + +interface IPreloadRouteFile { + type: 'js' | 'css' | (string & {}); + url: string; + attrs: ([string, string] | [string])[]; +} + +export const PRELOAD_ROUTE_MAP_SCP_TYPE = 'umi-route-chunk-files-map'; + +export function getPreloadRouteFiles( + path: string, + map: IRouteChunkFilesMap, + opts: { publicPath: string }, +): IPreloadRouteFile[] | undefined { + const matched: IRouteChunkFilesMap['r'][string] | undefined = + // search for static route + map.r[path] || + // search for dynamic route + Object.entries(map.r).find((p) => { + const route = p[0]; + const reg = new RegExp( + // replace /:id to /[^/]+ + // replace /* to /.+ + `^${route.replace(/\/:[^/]+/g, '/[^/]+').replace('/*', '/.+')}$`, + ); + + return reg.test(path); + })?.[1]; + + return matched?.map((i) => { + const id = map.f[i][1]; + const file = map.f[i][0]; + const ext = file.split('.').pop() as IPreloadRouteFile['type']; + + return { + type: ext, + url: `${opts.publicPath}${file}`, + attrs: [[`data-${map.b}`, `${map.p}:${id}`]], + }; + }); +} diff --git a/packages/preset-umi/src/index.ts b/packages/preset-umi/src/index.ts index a559625881d5..8787f6065108 100644 --- a/packages/preset-umi/src/index.ts +++ b/packages/preset-umi/src/index.ts @@ -58,6 +58,7 @@ export default () => { require.resolve('./features/swc/swc'), require.resolve('./features/ui/ui'), require.resolve('./features/hmrGuardian/hmrGuardian'), + require.resolve('./features/routePreloadOnLoad/routePreloadOnLoad'), // commands require.resolve('./commands/build'), diff --git a/packages/preset-umi/templates/routePreloadOnLoad/preloadRouteFilesScp.js b/packages/preset-umi/templates/routePreloadOnLoad/preloadRouteFilesScp.js new file mode 100644 index 000000000000..5b0001c71c9d --- /dev/null +++ b/packages/preset-umi/templates/routePreloadOnLoad/preloadRouteFilesScp.js @@ -0,0 +1 @@ +!function(){"use strict";var t="{{basename}}".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,"{{routeChunkFilesMap}}",{publicPath:"{{publicPath}}"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}(); \ No newline at end of file From 0694d3af2647724be969d9dd1f6f6a5f56096461 Mon Sep 17 00:00:00 2001 From: PeachScript Date: Thu, 29 Feb 2024 10:24:19 +0800 Subject: [PATCH 13/26] release: 4.0.0-canary.20240229.1 --- lerna.json | 2 +- packages/ast/package.json | 2 +- packages/babel-preset-umi/package.json | 2 +- packages/bundler-esbuild/package.json | 2 +- packages/bundler-utils/package.json | 2 +- packages/bundler-vite/package.json | 2 +- packages/bundler-webpack/package.json | 2 +- packages/core/package.json | 2 +- packages/create-umi/package.json | 2 +- packages/lint/package.json | 2 +- packages/max/package.json | 2 +- packages/mfsu/package.json | 2 +- packages/plugin-docs/package.json | 2 +- packages/plugin-run/package.json | 2 +- packages/plugins/package.json | 2 +- packages/preset-umi/package.json | 2 +- packages/preset-vue/package.json | 2 +- packages/renderer-react/package.json | 2 +- packages/renderer-vue/package.json | 2 +- packages/server/package.json | 2 +- packages/testing/package.json | 2 +- packages/umi/package.json | 2 +- packages/utils/package.json | 2 +- packages/zod2ts/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 2e59ded2e0c1..527cb6cbac1a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index 343b0f7a722b..4b1f88cf30af 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 1fc584b5bee3..6433c18ceed3 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.1.2", + "version": "4.0.0-canary.20240229.1", "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 3b8741f96ce0..a027ff0e9be4 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 77ba3d01fe15..d69600939098 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 ab13a86af52f..a9c303469962 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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-webpack/package.json b/packages/bundler-webpack/package.json index 1ad8cbd8682d..fbcda2bf1969 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 21d43ea08b7f..0adc22b08bb1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 28b704e2dd80..75590ef0a144 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 083414dca3e7..277ac3b3f6a9 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 8daf873b2f77..338ef1a551db 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 1d63fb1d56fd..5733b66e954e 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 f7abfb568eb6..69214fb16db1 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 5427ae8f059a..22fbeebf81b1 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 92f6c5ad5e84..d0411f4a2c1b 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 e638a5129c51..33c28d58a9a5 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index 3d609a537e50..f9272886fde2 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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/renderer-react/package.json b/packages/renderer-react/package.json index 35737bab0913..b683710acb3c 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 22f7736e264e..8513e25ca8d6 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 9a6077b7135a..5d1b8a70b3d1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 ddad41fa82f6..c4d035d167e9 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 8ffec360b055..a131a73751b7 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 56766eadfe16..87f95b4f5b48 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "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 bfd7e4864d60..af377458827d 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.1.2", + "version": "4.0.0-canary.20240229.1", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", From 67f8f27d155e2c5e9219955df4ebfddd6036a472 Mon Sep 17 00:00:00 2001 From: Peach Date: Thu, 29 Feb 2024 17:58:21 +0800 Subject: [PATCH 14/26] fix(preset-umi): chunk files not found error in route preload feature (#12159) * fix(preset-umi): chunk files not found error in route preload feature * fix: unnecessary route preload files * refactor: make logic clear --- .../routePreloadOnLoad/routePreloadOnLoad.ts | 280 ++++++++++-------- 1 file changed, 154 insertions(+), 126 deletions(-) diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts index d74d69a5c71e..1d3594e22bf8 100644 --- a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts +++ b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts @@ -1,4 +1,7 @@ -import type { StatsCompilation } from '@umijs/bundler-webpack/compiled/webpack'; +import type { + StatsChunk, + StatsCompilation, +} from '@umijs/bundler-webpack/compiled/webpack'; import { lodash, logger, winPath } from '@umijs/utils'; import { readFileSync } from 'fs'; import { dirname, isAbsolute, join, relative } from 'path'; @@ -65,6 +68,141 @@ function computeRouteScore(path: string): number { return routeScoreCache.get(path)!; } +async function getRouteChunkFilesMap( + chunks: StatsChunk[], + opts: { + resolver: ReturnType; + routeModuleName: string; + routeModulePath: string; + }, +) { + const { resolver, routeModuleName, routeModulePath } = opts; + const routeChunkFiles: Record< + string, + { index: number; id: string | number } + > = {}; + const routeFileChunksMap: Record< + string, + { files: string[]; indexes?: number[] } + > = {}; + const pickPreloadFiles = (files: string[]) => + files.filter((f) => f.endsWith('.js') || f.endsWith('.css')); + const routeFileResolveCache: Record = {}; + + for (const chunk of chunks) { + // skip entry chunk + if (chunk.entry) continue; + + // pick js and css files + const pickedFiles = pickPreloadFiles(chunk.files!); + const routeOrigins = chunk.origins!.filter((origin) => + origin.moduleName?.endsWith(routeModuleName), + ); + + for (const origin of routeOrigins) { + let fileAbsPath: string; + + // resolve route file path + try { + fileAbsPath = routeFileResolveCache[origin.request!] ??= + await resolver.resolve(dirname(routeModulePath), origin.request!); + } catch (err) { + logger.error( + `[routePreloadOnLoad]: route file resolve error, cannot preload for ${origin.request!}`, + ); + continue; + } + + // save visit index and chunk id for each chunk file + pickedFiles.forEach((file) => { + routeChunkFiles[file] ??= { + index: Object.keys(routeChunkFiles).length, + id: chunk.id!, + }; + }); + + // merge all related chunk files for each route files + (routeFileChunksMap[fileAbsPath] ??= { + files: pickedFiles.slice(), + }).files.push(...pickedFiles); + } + } + + // generate indexes for file chunks + Object.values(routeFileChunksMap).forEach((item) => { + item.indexes = item.files.map((f) => routeChunkFiles[f].index); + }); + + return { + routeChunkFiles, + routeFileChunksMap, + }; +} + +async function getRoutePathFilesMap( + routes: Record, + fileChunksMap: Awaited< + ReturnType + >['routeFileChunksMap'], + opts: { resolver: ReturnType; absPagesPath: string }, +) { + const { resolver, absPagesPath } = opts; + const routeFilesMap: Record = {}; + + for (const route of Object.values(routes)) { + // skip redirect route + if (!route.file) continue; + + let current: IRoute | undefined = route; + const files: string[] = []; + + do { + // skip inline function route file + if (current.file && !current.file.startsWith('(')) { + try { + const fileReqPath = + isAbsolute(current.file) || current.file.startsWith('@/') + ? current.file + : // a => ./a + // .a => ./.a + current.file.replace(/^([^.]|\.[^./])/, './$1'); + const fileAbsPath = await resolver.resolve(absPagesPath, fileReqPath); + + files.push(fileAbsPath); + } catch { + logger.error( + `[routePreloadOnLoad]: route file resolve error, cannot preload for ${current.file}`, + ); + } + } + current = current.parentId ? routes[current.parentId] : undefined; + } while (current); + + const indexes = Array.from( + // use set to avoid duplicated indexes + files.reduce>((indexSet, file) => { + // why fileChunksMap[file] may not existing? + // because Mako will merge minimal async chunk into entry chunk + // so the merged route chunk does not has to preload + fileChunksMap[file]?.indexes!.forEach((i) => indexSet.add(i)); + + return indexSet; + }, new Set()), + ); + const { absPath } = route; + + routeFilesMap[absPath] = + // why different route may has same absPath? + // because umi implement route.wrappers via nested routes way, the wrapper route will has same absPath with the nested route + // so we always select the longest file indexes for the nested route + !routeFilesMap[absPath] || routeFilesMap[absPath].length < indexes.length + ? indexes + : routeFilesMap[absPath]; + } + + return routeFilesMap; +} + export default (api: IApi) => { let routeChunkFilesMap: IRouteChunkFilesMap; @@ -117,7 +255,6 @@ export default (api: IApi) => { api.onBuildComplete(async ({ err, stats }) => { if (!err && !stats.hasErrors()) { const routeModulePath = join(api.paths.absTmpPath, 'core/route.tsx'); - const routeModuleName = winPath(relative(api.cwd, routeModulePath)); const resolver = createResolver({ alias: api.config.alias }); const { chunks = [] } = stats.toJson ? // webpack @@ -125,135 +262,26 @@ export default (api: IApi) => { : // mako (stats.compilation as unknown as StatsCompilation); - // collect all chunk files and file chunks indexes - const chunkFiles: Record = - {}; - const fileChunksMap: Record< - string, - { files: string[]; indexes?: number[] } - > = {}; - const pickPreloadFiles = (files: string[]) => - files.filter((f) => f.endsWith('.js') || f.endsWith('.css')); - - for (const chunk of chunks) { - const routeOrigins = chunk.origins!.filter((origin) => - origin.moduleName?.endsWith(routeModuleName), - ); - - for (const origin of routeOrigins) { - const queue = [chunk.id!].concat(chunk.siblings!); - const visited: typeof queue = []; - const files: string[] = []; - let fileAbsPath: string; - - // resolve route file path - try { - fileAbsPath = await resolver.resolve( - dirname(routeModulePath), - origin.request!, - ); - } catch (err) { - logger.error( - `[routePreloadOnLoad]: route file resolve error, cannot preload for ${origin.request!}`, - ); - continue; - } - - // collect all related chunk files for route file - while (queue.length) { - const currentId = queue.shift()!; - - if (!visited.includes(currentId)) { - const currentChunk = chunks.find((c) => c.id === currentId)!; - - // skip sibling entry chunk - if (currentChunk.entry) continue; - - // merge files - pickPreloadFiles(chunk.files!).forEach((file) => { - chunkFiles[file] ??= { - index: Object.keys(chunkFiles).length, - id: currentId, - }; - }); - - // merge files - files.push(...pickPreloadFiles(currentChunk.files!)); - - // continue to search sibling chunks - queue.push(...currentChunk.siblings!); + // 1. collect all route chunk files and file chunks indexes from stats + const { routeChunkFiles, routeFileChunksMap } = + await getRouteChunkFilesMap(chunks, { + resolver, + routeModulePath, + routeModuleName: winPath(relative(api.cwd, routeModulePath)), + }); - // mark as visited - visited.push(currentId); - } - } - - fileChunksMap[fileAbsPath] = { files }; - } - } - - // generate indexes for file chunks - Object.values(fileChunksMap).forEach((item) => { - item.indexes = item.files.map((f) => chunkFiles[f].index); - }); - - // generate map for path -> files (include parent route files) - const routeFilesMap: Record = {}; - - for (const route of Object.values(api.appData.routes)) { - // skip redirect route - if (!route.file) continue; - - let current = route; - const files: string[] = []; - - do { - // skip inline function route file - if (current.file && !current.file.startsWith('(')) { - try { - const fileReqPath = - isAbsolute(current.file) || current.file.startsWith('@/') - ? current.file - : // a => ./a - // .a => ./.a - current.file.replace(/^([^.]|\.[^./])/, './$1'); - const fileAbsPath = await resolver.resolve( - api.paths.absPagesPath, - fileReqPath, - ); - - files.push(fileAbsPath); - } catch { - logger.error( - `[routePreloadOnLoad]: route file resolve error, cannot preload for ${current.file}`, - ); - } - } - current = current.parentId && api.appData.routes[current.parentId]; - } while (current); - - const indexes = files.reduce((indexes, file) => { - // why fileChunksMap[file] may not existing? - // because Mako will merge minimal async chunk into entry chunk - // so the merged route chunk does not has to preload - return indexes.concat(fileChunksMap[file]?.indexes || []); - }, []); - const { absPath } = route; - - routeFilesMap[absPath] = - // why different route may has same absPath? - // because umi implement route.wrappers via nested routes way, the wrapper route will has same absPath with the nested route - // so we always select the longest file indexes for the nested route - !routeFilesMap[absPath] || - routeFilesMap[absPath].length < indexes.length - ? indexes - : routeFilesMap[absPath]; - } + // 2. generate map for path -> files (include parent route files) + const routeFilesMap = await getRoutePathFilesMap( + api.appData.routes, + routeFileChunksMap, + { resolver, absPagesPath: api.paths.absPagesPath }, + ); + // 3. generate final route chunk files map routeChunkFilesMap = { p: api.pkg.name!, b: api.appData.bundler!, - f: Object.entries(chunkFiles) + f: Object.entries(routeChunkFiles) .sort((a, b) => a[1].index - b[1].index) .map(([k, { id }]) => [k, id]), // sort similar to react-router@6 From c93b5ad47173fb49ca8299844c9c2c1a4939da31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Sat, 2 Mar 2024 23:36:26 +0800 Subject: [PATCH 15/26] docs: add CF polyfill.io url (#12161) --- docs/docs/blog/legacy-browser.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/blog/legacy-browser.md b/docs/docs/blog/legacy-browser.md index 94b8a35e7dbb..61e5f5578a1d 100644 --- a/docs/docs/blog/legacy-browser.md +++ b/docs/docs/blog/legacy-browser.md @@ -94,7 +94,7 @@ export default { | :----------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | CDN 引入 | 以 cdn 形式引入 **script 形式且前置的** 、目标浏览器环境缺少的 polyfill js 文件，如 [es6-shim](https://github.com/paulmillr/es6-shim) 。 | | 人工 core-js | 利用 [core-js](https://github.com/zloirock/core-js) 系工具，如通过 [core-js-builder](https://github.com/zloirock/core-js/tree/master/packages/core-js-builder) 构建自己需要的 polyfill 产物，再以 **前置 script 脚本** 形式引入项目。 | -| 动态 polyfill 服务 | 使用根据当前浏览器请求 UA 动态下发所需 polyfill 的服务，比如 [polyfill.io (alicdn)](http://polyfill.alicdn.com/v3/polyfill.min.js) 服务。另外，你还可以使用 [polyfill-service](https://github.com/Financial-Times/polyfill-service) 自建相同的动态 polyfill 下发服务。 | +| 动态 polyfill 服务 | 使用根据当前浏览器请求 UA 动态下发所需 polyfill 的服务，比如 [polyfill.io (alicdn)](http://polyfill.alicdn.com/v3/polyfill.min.js) 或 [polyfill.io (CloudFlare)](https://cdnjs.cloudflare.com/polyfill/) 服务。另外，你还可以使用 [polyfill-service](https://github.com/polyfillpolyfill/polyfill-service) 自建相同的动态 polyfill 下发服务。 | 注： From e3038c9214661940741408f6f4b4ff94919e6279 Mon Sep 17 00:00:00 2001 From: max Date: Sun, 3 Mar 2024 00:36:32 +0800 Subject: [PATCH 16/26] docs: update env-variables.md (#12165) * docs: update env-variables.md * docs: update * docs: br * Update docs/docs/docs/guides/env-variables.md --------- Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- docs/docs/docs/guides/env-variables.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/docs/docs/guides/env-variables.md b/docs/docs/docs/guides/env-variables.md index 821142a2d486..8f18c40e7db8 100644 --- a/docs/docs/docs/guides/env-variables.md +++ b/docs/docs/docs/guides/env-variables.md @@ -64,10 +64,31 @@ BAR=bar CONCAT=$FOO$BAR # CONCAT=foobar ``` +通过 `.env.development` / `.env.production` 来为开发和构建分别配置不同的环境变量。 + 注意： * 不建议将 `.env.local` 加入版本管理中。 +### 在浏览器中使用环境变量 + +所有通过 `.env` 环境变量文件 或 命令行注入 的环境变量均默认只在 Umi 配置文件 (Node.js 环境) 内生效，在浏览器中无法直接通过 `process.env.VAR_NAME` 方式使用，通过进一步配置 [`define`](../api/config.md#define) 来注入到浏览器环境中： + +```bash +# .env +MY_TOKEN="xxxxx" +``` + +
+ +```ts +// .umirc.ts + + define: { 'process.env.MY_TOKEN': process.env.MY_TOKEN } +``` + +注：我们约定所有以 `UMI_APP_` 开头的环境变量会默认注入到浏览器中，无需配置 `define` 手动注入。 + ## 环境变量列表 按字母顺序排列。 From 9594ec28a5d2f0bed6861331ffeeef97fb7677ef Mon Sep 17 00:00:00 2001 From: PeachScript Date: Tue, 5 Mar 2024 13:47:35 +0800 Subject: [PATCH 17/26] release: 4.0.0-canary.20240305.1 --- lerna.json | 2 +- packages/ast/package.json | 2 +- packages/babel-preset-umi/package.json | 2 +- packages/bundler-esbuild/package.json | 2 +- packages/bundler-utils/package.json | 2 +- packages/bundler-vite/package.json | 2 +- packages/bundler-webpack/package.json | 2 +- packages/core/package.json | 2 +- packages/create-umi/package.json | 2 +- packages/lint/package.json | 2 +- packages/max/package.json | 2 +- packages/mfsu/package.json | 2 +- packages/plugin-docs/package.json | 2 +- packages/plugin-run/package.json | 2 +- packages/plugins/package.json | 2 +- packages/preset-umi/package.json | 2 +- packages/preset-vue/package.json | 2 +- packages/renderer-react/package.json | 2 +- packages/renderer-vue/package.json | 2 +- packages/server/package.json | 2 +- packages/testing/package.json | 2 +- packages/umi/package.json | 2 +- packages/utils/package.json | 2 +- packages/zod2ts/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 527cb6cbac1a..76c72580ccac 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index 4b1f88cf30af..35d8704e24eb 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 6433c18ceed3..93a3ac412e4e 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.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 a027ff0e9be4..5f06098c322c 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 d69600939098..107f97bfefa9 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 a9c303469962..ee234e1d4d28 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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-webpack/package.json b/packages/bundler-webpack/package.json index fbcda2bf1969..b421dd835907 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 0adc22b08bb1..23cae541546b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 75590ef0a144..4427e9245550 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 277ac3b3f6a9..b6f069b5a27a 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 338ef1a551db..17b7ae3379bc 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 5733b66e954e..1e1885971a83 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 69214fb16db1..0b87f761f987 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 22fbeebf81b1..b4364a94110a 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 d0411f4a2c1b..a349e9317115 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 33c28d58a9a5..178a7e563281 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index f9272886fde2..e1b8fef42cd0 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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/renderer-react/package.json b/packages/renderer-react/package.json index b683710acb3c..c0fd1b3c7e75 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 8513e25ca8d6..51189a3db666 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 5d1b8a70b3d1..410a79c87645 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 c4d035d167e9..f70ca4cb39be 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 a131a73751b7..e4e28fc56fcf 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 87f95b4f5b48..7b59e716f454 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "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 af377458827d..e96ada673a49 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.0.0-canary.20240229.1", + "version": "4.0.0-canary.20240305.1", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", From b8d7bd39892172c569fdc6012ec8018f25c2dde8 Mon Sep 17 00:00:00 2001 From: Peach Date: Fri, 8 Mar 2024 11:18:06 +0800 Subject: [PATCH 18/26] refactor(preset-umi): export route preload types for prebundle (#12183) --- packages/preset-umi/src/features/routePreloadOnLoad/utils.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts b/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts index 90076221f307..56bb90750736 100644 --- a/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts +++ b/packages/preset-umi/src/features/routePreloadOnLoad/utils.ts @@ -4,7 +4,9 @@ import type { IRouteChunkFilesMap } from './routePreloadOnLoad'; -interface IPreloadRouteFile { +export type { IRouteChunkFilesMap }; + +export interface IPreloadRouteFile { type: 'js' | 'css' | (string & {}); url: string; attrs: ([string, string] | [string])[]; From 1f24af33541b67774d6c1df4b0fb434924fd8eff Mon Sep 17 00:00:00 2001 From: PeachScript Date: Fri, 8 Mar 2024 12:14:20 +0800 Subject: [PATCH 19/26] release: 4.1.3 --- lerna.json | 2 +- packages/ast/package.json | 2 +- packages/babel-preset-umi/package.json | 2 +- packages/bundler-esbuild/package.json | 2 +- packages/bundler-utils/package.json | 2 +- packages/bundler-vite/package.json | 2 +- packages/bundler-webpack/package.json | 2 +- packages/core/package.json | 2 +- packages/create-umi/package.json | 2 +- packages/lint/package.json | 2 +- packages/max/package.json | 2 +- packages/mfsu/package.json | 2 +- packages/plugin-docs/package.json | 2 +- packages/plugin-run/package.json | 2 +- packages/plugins/package.json | 2 +- packages/preset-umi/package.json | 2 +- packages/preset-vue/package.json | 2 +- packages/renderer-react/package.json | 2 +- packages/renderer-vue/package.json | 2 +- packages/server/package.json | 2 +- packages/testing/package.json | 2 +- packages/umi/package.json | 2 +- packages/utils/package.json | 2 +- packages/zod2ts/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 76c72580ccac..0aabc43cd0cf 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index 35d8704e24eb..d9edfcec0a4b 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 93a3ac412e4e..5cd17c54238f 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.0.0-canary.20240305.1", + "version": "4.1.3", "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 5f06098c322c..7a90925153fd 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 107f97bfefa9..94ca47112c41 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 ee234e1d4d28..455ab77c2b81 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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-webpack/package.json b/packages/bundler-webpack/package.json index b421dd835907..7d8e14a3063f 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 23cae541546b..d5d15627a6c3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 4427e9245550..ff5a08856c85 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 b6f069b5a27a..829b58f86fdc 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 17b7ae3379bc..831f9d82f449 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 1e1885971a83..ca9bf7a85c81 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 0b87f761f987..b129cc384dbc 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 b4364a94110a..f1af4022ce1c 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 a349e9317115..bcce73a881ac 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 178a7e563281..9ef52d3cc2db 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index e1b8fef42cd0..bd30a9ac53ce 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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/renderer-react/package.json b/packages/renderer-react/package.json index c0fd1b3c7e75..3e2aeddeb3f3 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 51189a3db666..938c857b842f 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 410a79c87645..eeac2c8dfb91 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 f70ca4cb39be..9733111b01a3 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 e4e28fc56fcf..c83045391493 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 7b59e716f454..4720741827c5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "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 e96ada673a49..9a52a418c7fc 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.0.0-canary.20240305.1", + "version": "4.1.3", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", From a46726c69f57313f312737311ea49f7a6a88cb64 Mon Sep 17 00:00:00 2001 From: Peach Date: Mon, 11 Mar 2024 09:33:54 +0800 Subject: [PATCH 20/26] fix(preset-umi): disable route preload feature if unnecessary (#12186) * fix(preset-umi): route preload feature error in vite mode * refactor: skip unnecessary route preload logic --- .../routePreloadOnLoad/routePreloadOnLoad.ts | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts index 1d3594e22bf8..22525e4f137f 100644 --- a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts +++ b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts @@ -206,14 +206,21 @@ async function getRoutePathFilesMap( export default (api: IApi) => { let routeChunkFilesMap: IRouteChunkFilesMap; - // enable when package name available - // because preload script use package name as attribute prefix value api.describe({ - enableBy: () => Boolean(api.pkg.name), + enableBy: () => + // enable when package name available + // because preload script use package name as attribute prefix value + Boolean(api.pkg.name) && + // vite mode is not supported currently + !api.config.vite && + // mpa mode is unnecessary + !api.config.mpa && + // only esm router needs this feature + api.config.routeLoader?.moduleType === 'esm', }); api.addHTMLHeadScripts(() => { - if (api.name === 'build') { + if (api.name === 'build' && routeChunkFilesMap) { // internal tern app use map mode return api.config.tern ? // map mode @@ -278,22 +285,24 @@ export default (api: IApi) => { ); // 3. generate final route chunk files map - routeChunkFilesMap = { - p: api.pkg.name!, - b: api.appData.bundler!, - f: Object.entries(routeChunkFiles) - .sort((a, b) => a[1].index - b[1].index) - .map(([k, { id }]) => [k, id]), - // sort similar to react-router@6 - r: lodash(routeFilesMap) - .toPairs() - .sort( - ([a]: [string, number[]], [b]: [string, number[]]) => - computeRouteScore(a) - computeRouteScore(b), - ) - .fromPairs() - .value() as any, - }; + if (!lodash.isEmpty(routeChunkFiles) && !lodash.isEmpty(routeFilesMap)) { + routeChunkFilesMap = { + p: api.pkg.name!, + b: api.appData.bundler!, + f: Object.entries(routeChunkFiles) + .sort((a, b) => a[1].index - b[1].index) + .map(([k, { id }]) => [k, id]), + // sort similar to react-router@6 + r: lodash(routeFilesMap) + .toPairs() + .sort( + ([a]: [string, number[]], [b]: [string, number[]]) => + computeRouteScore(a) - computeRouteScore(b), + ) + .fromPairs() + .value() as any, + }; + } } }); }; From b90b8b56cdac4f1425b455358fd3d05a7f144ca4 Mon Sep 17 00:00:00 2001 From: PeachScript Date: Mon, 11 Mar 2024 09:37:05 +0800 Subject: [PATCH 21/26] release: 4.1.4 --- lerna.json | 2 +- packages/ast/package.json | 2 +- packages/babel-preset-umi/package.json | 2 +- packages/bundler-esbuild/package.json | 2 +- packages/bundler-utils/package.json | 2 +- packages/bundler-vite/package.json | 2 +- packages/bundler-webpack/package.json | 2 +- packages/core/package.json | 2 +- packages/create-umi/package.json | 2 +- packages/lint/package.json | 2 +- packages/max/package.json | 2 +- packages/mfsu/package.json | 2 +- packages/plugin-docs/package.json | 2 +- packages/plugin-run/package.json | 2 +- packages/plugins/package.json | 2 +- packages/preset-umi/package.json | 2 +- packages/preset-vue/package.json | 2 +- packages/renderer-react/package.json | 2 +- packages/renderer-vue/package.json | 2 +- packages/server/package.json | 2 +- packages/testing/package.json | 2 +- packages/umi/package.json | 2 +- packages/utils/package.json | 2 +- packages/zod2ts/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 0aabc43cd0cf..0b037ae949f3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { - "version": "4.1.3", + "version": "4.1.4", "workspaces": ["packages/*"] } diff --git a/packages/ast/package.json b/packages/ast/package.json index d9edfcec0a4b..2192f1c6ca9f 100644 --- a/packages/ast/package.json +++ b/packages/ast/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/ast", - "version": "4.1.3", + "version": "4.1.4", "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 5cd17c54238f..340ab8473be0 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.1.3", + "version": "4.1.4", "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 7a90925153fd..aa12b8f244e2 100644 --- a/packages/bundler-esbuild/package.json +++ b/packages/bundler-esbuild/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-esbuild", - "version": "4.1.3", + "version": "4.1.4", "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 94ca47112c41..833ac4f3f792 100644 --- a/packages/bundler-utils/package.json +++ b/packages/bundler-utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-utils", - "version": "4.1.3", + "version": "4.1.4", "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 455ab77c2b81..c8bbea5263d3 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-vite", - "version": "4.1.3", + "version": "4.1.4", "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-webpack/package.json b/packages/bundler-webpack/package.json index 7d8e14a3063f..c2080bac7080 100644 --- a/packages/bundler-webpack/package.json +++ b/packages/bundler-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/bundler-webpack", - "version": "4.1.3", + "version": "4.1.4", "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 d5d15627a6c3..9450bc25ca78 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/core", - "version": "4.1.3", + "version": "4.1.4", "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 ff5a08856c85..8bef238c013f 100644 --- a/packages/create-umi/package.json +++ b/packages/create-umi/package.json @@ -1,6 +1,6 @@ { "name": "create-umi", - "version": "4.1.3", + "version": "4.1.4", "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 829b58f86fdc..fa7919168a4f 100644 --- a/packages/lint/package.json +++ b/packages/lint/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/lint", - "version": "4.1.3", + "version": "4.1.4", "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 831f9d82f449..45866e639cd8 100644 --- a/packages/max/package.json +++ b/packages/max/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/max", - "version": "4.1.3", + "version": "4.1.4", "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 ca9bf7a85c81..d18c7613d63a 100644 --- a/packages/mfsu/package.json +++ b/packages/mfsu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mfsu", - "version": "4.1.3", + "version": "4.1.4", "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 b129cc384dbc..ca1ccb65dcea 100644 --- a/packages/plugin-docs/package.json +++ b/packages/plugin-docs/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-docs", - "version": "4.1.3", + "version": "4.1.4", "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 f1af4022ce1c..8dd18907ab8b 100644 --- a/packages/plugin-run/package.json +++ b/packages/plugin-run/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugin-run", - "version": "4.1.3", + "version": "4.1.4", "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 bcce73a881ac..0d5db9efab5d 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/plugins", - "version": "4.1.3", + "version": "4.1.4", "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 9ef52d3cc2db..45ecdd1f9628 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-umi", - "version": "4.1.3", + "version": "4.1.4", "description": "@umijs/preset-umi", "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme", "bugs": "https://github.com/umijs/umi/issues", diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json index bd30a9ac53ce..df8121cff079 100644 --- a/packages/preset-vue/package.json +++ b/packages/preset-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/preset-vue", - "version": "4.1.3", + "version": "4.1.4", "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/renderer-react/package.json b/packages/renderer-react/package.json index 3e2aeddeb3f3..8f93db0e9371 100644 --- a/packages/renderer-react/package.json +++ b/packages/renderer-react/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-react", - "version": "4.1.3", + "version": "4.1.4", "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 938c857b842f..1cf7e196a610 100644 --- a/packages/renderer-vue/package.json +++ b/packages/renderer-vue/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/renderer-vue", - "version": "4.1.3", + "version": "4.1.4", "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 eeac2c8dfb91..4ed3b58cb139 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/server", - "version": "4.1.3", + "version": "4.1.4", "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 9733111b01a3..575277e76837 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/test", - "version": "4.1.3", + "version": "4.1.4", "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 c83045391493..a14d2eef1db6 100644 --- a/packages/umi/package.json +++ b/packages/umi/package.json @@ -1,6 +1,6 @@ { "name": "umi", - "version": "4.1.3", + "version": "4.1.4", "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 4720741827c5..4895914a44a0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/utils", - "version": "4.1.3", + "version": "4.1.4", "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 9a52a418c7fc..9bd51f6c09bf 100644 --- a/packages/zod2ts/package.json +++ b/packages/zod2ts/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/zod2ts", - "version": "4.1.3", + "version": "4.1.4", "description": "@umijs/zod2ts", "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme", "bugs": "https://github.com/umijs/umi/issues", From 2e0ae4dcb2d4bd058730529818e99b2136495994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=B2=E5=A5=88Sakina?= <59400654+fz6m@users.noreply.github.com> Date: Mon, 11 Mar 2024 21:33:39 +0800 Subject: [PATCH 22/26] feat: react query plugin compat. with v5 (#12162) * feat: react query plugin compat. with v5 * chore: distinguish version --- packages/plugins/src/react-query.ts | 89 ++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 14 deletions(-) diff --git a/packages/plugins/src/react-query.ts b/packages/plugins/src/react-query.ts index 2b6b9afda7f0..d76698b1925d 100644 --- a/packages/plugins/src/react-query.ts +++ b/packages/plugins/src/react-query.ts @@ -1,5 +1,5 @@ import { winPath } from '@umijs/utils'; -import { dirname } from 'path'; +import { dirname, join } from 'path'; import { IApi } from 'umi'; import { resolveProjectDep } from './utils/resolveProjectDep'; import { withTmpPath } from './utils/withTmpPath'; @@ -21,26 +21,59 @@ export default (api: IApi) => { }); let pkgPath: string; + let devtoolsPkgPath: string; + const REACT_QUERY_DEP_NAME = '@tanstack/react-query'; + const REACT_QUERY_DEVTOOLS_DEP_NAME = '@tanstack/react-query-devtools'; const defaultPkgPath = winPath( - dirname(require.resolve('@tanstack/react-query/package.json')), + dirname(require.resolve(`${REACT_QUERY_DEP_NAME}/package.json`)), ); - const devtoolPkgPath = winPath( - dirname(require.resolve('@tanstack/react-query-devtools/package.json')), + const defaultDevtoolPkgPath = winPath( + dirname(require.resolve(`${REACT_QUERY_DEVTOOLS_DEP_NAME}/package.json`)), ); + // resolve RQ try { const localQueryPath = resolveProjectDep({ pkg: api.pkg, cwd: api.cwd, - dep: '@tanstack/react-query', + dep: REACT_QUERY_DEP_NAME, }); pkgPath = localQueryPath ? winPath(localQueryPath) : defaultPkgPath; } catch (e: any) { - throw new Error(`[reactQuery] package resolve failed, ${e.message}`); + throw new Error( + `[reactQuery] package '${REACT_QUERY_DEP_NAME}' resolve failed, ${e.message}`, + ); } + // resolve RQ devtools + try { + const localDevtoolsPkgPath = resolveProjectDep({ + pkg: api.pkg, + cwd: api.cwd, + dep: REACT_QUERY_DEVTOOLS_DEP_NAME, + }); + devtoolsPkgPath = localDevtoolsPkgPath + ? winPath(localDevtoolsPkgPath) + : defaultDevtoolPkgPath; + } catch (e: any) { + throw new Error( + `[reactQuery] package '${REACT_QUERY_DEVTOOLS_DEP_NAME}' resolve failed, ${e.message}`, + ); + } + // package.json + const pkg = require(join(pkgPath, 'package.json')); + const devtoolsPkg = require(join(devtoolsPkgPath, 'package.json')); + // version + const pkgVersion = pkg.version; + const devtoolsVersion = devtoolsPkg.version; + // check version + const useV4 = pkgVersion.startsWith('4'); + const useV4Devtools = devtoolsVersion.startsWith('4'); + const useV5 = pkgVersion.startsWith('5'); + const useV5Devtools = devtoolsVersion.startsWith('5'); + const canUseDevtools = (useV4 && useV4Devtools) || (useV5 && useV5Devtools); api.onStart(() => { - if (pkgPath !== defaultPkgPath) { - api.logger.info(`[reactQuery] use local package ${pkgPath}`); + if (pkgPath !== defaultPkgPath && !process.env.IS_UMI_BUILD_WORKER) { + api.logger.info(`[reactQuery] use local package, version: ${pkgVersion}`); } }); @@ -52,8 +85,18 @@ export default (api: IApi) => { return ['reactQuery']; }); + // alias + api.modifyConfig((memo) => { + memo.alias[REACT_QUERY_DEP_NAME] = pkgPath; + if (canUseDevtools) { + memo.alias[REACT_QUERY_DEVTOOLS_DEP_NAME] = devtoolsPkgPath; + } + return memo; + }); + api.onGenerateFiles(() => { - const enableDevTools = api.config.reactQuery.devtool !== false; + const enableDevTools = + api.config.reactQuery.devtool !== false && canUseDevtools; const enableQueryClient = api.config.reactQuery.queryClient !== false; const reactQueryRuntimeCode = api.appData.appJS?.exports.includes( 'reactQuery', @@ -65,17 +108,32 @@ export default (api: IApi) => { content: enableQueryClient ? ` import React from 'react'; -import { defaultContext, QueryClient, QueryClientProvider } from '${pkgPath}'; -import { ReactQueryDevtools } from '${devtoolPkgPath}'; +import { + ${useV4 ? 'defaultContext,' : ''} + QueryClient, + QueryClientProvider +} from '${pkgPath}'; +${ + enableDevTools + ? `import { ReactQueryDevtools } from '${devtoolsPkgPath}';` + : '' +} ${reactQueryRuntimeCode} const client = new QueryClient(reactQueryConfig.queryClient || {}); export function rootContainer(container) { return ( - + {container} ${ enableDevTools - ? '' + ? `` : '' } @@ -84,6 +142,7 @@ export function rootContainer(container) { ` : '', }); + api.writeTmpFile({ path: 'index.tsx', content: ` @@ -109,9 +168,11 @@ export { useQueryClient, QueryErrorResetBoundary, useQueryErrorResetBoundary, + ${useV5 ? 'queryOptions,' : ''} } from '${pkgPath}'; `, }); + api.writeTmpFile({ path: 'types.d.ts', content: ` @@ -123,7 +184,7 @@ export type { QueriesOptions, QueryErrorResetBoundaryProps, QueryClientProviderProps, - ContextOptions as QueryContextOptions, + ${useV4 ? 'ContextOptions as QueryContextOptions,' : ''} UseQueryOptions, UseBaseQueryOptions, UseQueryResult, From 32025eeaa983efd29ec83ca6ca7777c32c3a650c Mon Sep 17 00:00:00 2001 From: liu <31910599+BBBigCat@users.noreply.github.com> Date: Fri, 15 Mar 2024 00:37:12 +0800 Subject: [PATCH 23/26] feat: vite upgrade to 4.5.2 and improve `esbuildHelperChecker` (#12193) * feat: vite deps upgrade to 4.5.2 * chore: improve esbuildMinifyIIFE check log * chore: disable `esbuildHelperChecker` with vite mode --------- Co-authored-by: bin.liu Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- packages/bundler-vite/package.json | 2 +- packages/preset-umi/package.json | 2 +- .../esbuildHelperChecker.ts | 13 +- pnpm-lock.yaml | 1359 ++++++++++++++--- 4 files changed, 1149 insertions(+), 227 deletions(-) diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json index c8bbea5263d3..23c3bdb788dc 100644 --- a/packages/bundler-vite/package.json +++ b/packages/bundler-vite/package.json @@ -34,7 +34,7 @@ "postcss-preset-env": "7.5.0", "rollup-plugin-visualizer": "5.9.0", "systemjs": "^6.14.1", - "vite": "4.3.1" + "vite": "4.5.2" }, "devDependencies": { "@types/caniuse-lite": "1.0.5", diff --git a/packages/preset-umi/package.json b/packages/preset-umi/package.json index 45ecdd1f9628..ac5e6f092bb9 100644 --- a/packages/preset-umi/package.json +++ b/packages/preset-umi/package.json @@ -73,7 +73,7 @@ "multer": "1.4.4", "os-locale": "^6.0.2", "sirv": "2.0.2", - "vite": "4.3.1" + "vite": "4.5.2" }, "publishConfig": { "access": "public" diff --git a/packages/preset-umi/src/features/esbuildHelperChecker/esbuildHelperChecker.ts b/packages/preset-umi/src/features/esbuildHelperChecker/esbuildHelperChecker.ts index c024a3f2e34f..21f4673e86ab 100644 --- a/packages/preset-umi/src/features/esbuildHelperChecker/esbuildHelperChecker.ts +++ b/packages/preset-umi/src/features/esbuildHelperChecker/esbuildHelperChecker.ts @@ -27,11 +27,15 @@ async function checkDir(opts: { dir: string }) { .filter((v) => varMap[v].length > 1) .map((v) => `${v} (${varMap[v].join(', ')})`); if (conflicts.length) { - throw new Error( - `Found conflicts in esbuild helpers: ${conflicts.join( - ', ', - )}, please set esbuildMinifyIIFE: true in your config file.`, + logger.fatal( + chalk.yellow( + `Found conflicts in esbuild helpers: ${conflicts.join(', ')}`, + ), ); + logger.info( + `please set ${chalk.blue('esbuildMinifyIIFE: true')} in your config file`, + ); + throw new Error(`Found conflicts in esbuild helpers.`); } logger.info(`[esbuildHelperChecker] No conflicts found.`); } @@ -72,6 +76,7 @@ export default (api: IApi) => { }); api.onBuildComplete(async ({ err }) => { + if (api.config.vite) return; if (process.env.OKAM) return; if (err) return; const jsMinifier = api.config.jsMinifier || 'esbuild'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6181225ce7d..f6403eff4970 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1861,7 +1861,7 @@ importers: version: link:../utils '@vitejs/plugin-react': specifier: 4.0.0 - version: 4.0.0(vite@4.3.1) + version: 4.0.0(vite@4.5.2) core-js: specifier: 3.34.0 version: 3.34.0 @@ -1878,15 +1878,15 @@ importers: specifier: ^6.14.1 version: 6.14.2 vite: - specifier: 4.3.1 - version: 4.3.1(@types/node@18.11.18)(less@4.1.3)(sass@1.65.1) + specifier: 4.5.2 + version: 4.5.2(@types/node@18.11.18)(less@4.1.3) devDependencies: '@types/caniuse-lite': specifier: 1.0.5 version: 1.0.5 '@vitejs/plugin-legacy': specifier: 4.1.1 - version: 4.1.1(vite@4.3.1) + version: 4.1.1(vite@4.5.2) caniuse-lite: specifier: 1.0.30001571 version: 1.0.30001571 @@ -2104,7 +2104,7 @@ importers: version: 7.23.6 '@babel/eslint-parser': specifier: 7.23.3 - version: 7.23.3(@babel/core@7.23.6)(eslint@7.32.0) + version: 7.23.3(@babel/core@7.23.6)(eslint@8.35.0) '@stylelint/postcss-css-in-js': specifier: ^0.38.0 version: 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.21) @@ -2501,8 +2501,8 @@ importers: specifier: 2.0.2 version: 2.0.2 vite: - specifier: 4.3.1 - version: 4.3.1(@types/node@18.11.18)(less@4.1.3)(sass@1.65.1) + specifier: 4.5.2 + version: 4.5.2(@types/node@18.11.18)(less@4.1.3) packages/preset-vue: dependencies: @@ -5245,13 +5245,14 @@ packages: slash: 2.0.0 optionalDependencies: '@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3 - chokidar: 3.5.3 + chokidar: 3.6.0 dev: false /@babel/code-frame@7.12.11: resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==} dependencies: '@babel/highlight': 7.22.20 + dev: true /@babel/code-frame@7.22.13: resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} @@ -5428,29 +5429,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/core@7.23.2: - resolution: {integrity: sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@ampproject/remapping': 2.2.0 - '@babel/code-frame': 7.23.5 - '@babel/generator': 7.23.6 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.2) - '@babel/helpers': 7.23.6 - '@babel/parser': 7.23.6 - '@babel/template': 7.22.15 - '@babel/traverse': 7.23.6 - '@babel/types': 7.23.6 - convert-source-map: 2.0.0 - debug: 4.3.4(supports-color@8.1.1) - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/core@7.23.6: resolution: {integrity: sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==} engines: {node: '>=6.9.0'} @@ -5493,6 +5471,7 @@ packages: source-map: 0.5.7 transitivePeerDependencies: - supports-color + dev: true /@babel/eslint-parser@7.17.0(@babel/core@7.17.9)(eslint@8.35.0): resolution: {integrity: sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==} @@ -5528,8 +5507,8 @@ packages: semver: 6.3.1 dev: true - /@babel/eslint-parser@7.22.15(@babel/core@7.23.2)(eslint@8.35.0): - resolution: {integrity: sha512-yc8OOBIQk1EcRrpizuARSQS0TWAcOMpEJ1aafhNznaeYkeL+OhqnDObGFylB8ka8VFF/sZc+S4RzHyO+3LjQxg==} + /@babel/eslint-parser@7.23.3(@babel/core@7.22.5)(eslint@7.32.0): + resolution: {integrity: sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: '@babel/core': ^7.11.0 @@ -5538,14 +5517,14 @@ packages: eslint: optional: true dependencies: - '@babel/core': 7.23.2 + '@babel/core': 7.22.5 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 - eslint: 8.35.0 + eslint: 7.32.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 dev: true - /@babel/eslint-parser@7.23.3(@babel/core@7.22.5)(eslint@7.32.0): + /@babel/eslint-parser@7.23.3(@babel/core@7.23.6)(eslint@7.32.0): resolution: {integrity: sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: @@ -5555,14 +5534,14 @@ packages: eslint: optional: true dependencies: - '@babel/core': 7.22.5 + '@babel/core': 7.23.6 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 eslint: 7.32.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 dev: true - /@babel/eslint-parser@7.23.3(@babel/core@7.23.6)(eslint@7.32.0): + /@babel/eslint-parser@7.23.3(@babel/core@7.23.6)(eslint@8.35.0): resolution: {integrity: sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: @@ -5574,7 +5553,7 @@ packages: dependencies: '@babel/core': 7.23.6 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 - eslint: 7.32.0 + eslint: 8.35.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 @@ -6159,20 +6138,6 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 - /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.2): - resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-module-imports': 7.22.15 - '@babel/helper-simple-access': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - '@babel/helper-validator-identifier': 7.22.20 - dev: true - /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} @@ -7670,7 +7635,6 @@ packages: dependencies: '@babel/core': 7.20.12 '@babel/helper-plugin-utils': 7.22.5 - dev: true /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.22.5): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} @@ -7698,6 +7662,7 @@ packages: dependencies: '@babel/core': 7.4.5 '@babel/helper-plugin-utils': 7.22.5 + dev: true /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.20.12): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} @@ -9213,17 +9178,6 @@ packages: '@babel/helper-simple-access': 7.22.5 dev: false - /@babel/plugin-transform-modules-commonjs@7.23.0: - resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.0) - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-simple-access': 7.22.5 - dev: true - /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.20.12): resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} engines: {node: '>=6.9.0'} @@ -11940,6 +11894,20 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-color-function@1.1.0(postcss@8.4.35): + resolution: {integrity: sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-font-format-keywords@1.0.0(postcss@8.4.21): resolution: {integrity: sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==} engines: {node: ^12 || ^14 || >=16} @@ -11965,6 +11933,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-font-format-keywords@1.0.0(postcss@8.4.35): + resolution: {integrity: sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-hwb-function@1.0.1(postcss@8.4.21): resolution: {integrity: sha512-AMZwWyHbbNLBsDADWmoXT9A5yl5dsGEBeJSJRUJt8Y9n8Ziu7Wstt4MC8jtPW7xjcLecyfJwtnUTNSmOzcnWeg==} engines: {node: ^12 || ^14 || >=16} @@ -11990,6 +11971,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-hwb-function@1.0.1(postcss@8.4.35): + resolution: {integrity: sha512-AMZwWyHbbNLBsDADWmoXT9A5yl5dsGEBeJSJRUJt8Y9n8Ziu7Wstt4MC8jtPW7xjcLecyfJwtnUTNSmOzcnWeg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-ic-unit@1.0.0(postcss@8.4.21): resolution: {integrity: sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==} engines: {node: ^12 || ^14 || >=16} @@ -12017,6 +12011,20 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-ic-unit@1.0.0(postcss@8.4.35): + resolution: {integrity: sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-is-pseudo-class@2.0.5(postcss@8.4.21): resolution: {integrity: sha512-Ek+UFI4UP2hB9u0N1cJd6KgSF1rL0J3PT4is0oSStuus8+WzbGGPyJNMOKQ0w/tyPjxiCnOI4RdSMZt3nks64g==} engines: {node: ^12 || ^14 || >=16} @@ -12044,6 +12052,20 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /@csstools/postcss-is-pseudo-class@2.0.5(postcss@8.4.35): + resolution: {integrity: sha512-Ek+UFI4UP2hB9u0N1cJd6KgSF1rL0J3PT4is0oSStuus8+WzbGGPyJNMOKQ0w/tyPjxiCnOI4RdSMZt3nks64g==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/selector-specificity': 2.0.1(postcss-selector-parser@6.0.10)(postcss@8.4.35) + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /@csstools/postcss-normalize-display-values@1.0.0(postcss@8.4.21): resolution: {integrity: sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==} engines: {node: ^12 || ^14 || >=16} @@ -12069,6 +12091,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-normalize-display-values@1.0.0(postcss@8.4.35): + resolution: {integrity: sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-oklab-function@1.1.0(postcss@8.4.21): resolution: {integrity: sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==} engines: {node: ^12 || ^14 || >=16} @@ -12096,6 +12131,20 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-oklab-function@1.1.0(postcss@8.4.35): + resolution: {integrity: sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.21): resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==} engines: {node: ^12 || ^14 || >=16} @@ -12121,6 +12170,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.35): + resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-stepped-value-functions@1.0.0(postcss@8.4.21): resolution: {integrity: sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==} engines: {node: ^12 || ^14 || >=16} @@ -12146,6 +12208,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /@csstools/postcss-stepped-value-functions@1.0.0(postcss@8.4.35): + resolution: {integrity: sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /@csstools/postcss-unset-value@1.0.1(postcss@8.4.21): resolution: {integrity: sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==} engines: {node: ^12 || ^14 || >=16} @@ -12169,6 +12244,18 @@ packages: postcss: 8.4.32 dev: true + /@csstools/postcss-unset-value@1.0.1(postcss@8.4.35): + resolution: {integrity: sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /@csstools/selector-specificity@2.0.1(postcss-selector-parser@6.0.10)(postcss@8.4.21): resolution: {integrity: sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==} engines: {node: ^12 || ^14 || >=16} @@ -12196,6 +12283,20 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /@csstools/selector-specificity@2.0.1(postcss-selector-parser@6.0.10)(postcss@8.4.35): + resolution: {integrity: sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + postcss-selector-parser: ^6.0.10 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /@ctrl/tinycolor@3.4.1: resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==} engines: {node: '>=10'} @@ -12479,6 +12580,14 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm64@0.18.20: + resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + /@esbuild/android-arm@0.15.18: resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} engines: {node: '>=12'} @@ -12504,6 +12613,14 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm@0.18.20: + resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + /@esbuild/android-x64@0.16.17: resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==} engines: {node: '>=12'} @@ -12521,6 +12638,14 @@ packages: requiresBuild: true optional: true + /@esbuild/android-x64@0.18.20: + resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + optional: true + /@esbuild/darwin-arm64@0.16.17: resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==} engines: {node: '>=12'} @@ -12538,6 +12663,14 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-arm64@0.18.20: + resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + /@esbuild/darwin-x64@0.16.17: resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==} engines: {node: '>=12'} @@ -12555,6 +12688,14 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-x64@0.18.20: + resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + /@esbuild/freebsd-arm64@0.16.17: resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==} engines: {node: '>=12'} @@ -12572,6 +12713,14 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-arm64@0.18.20: + resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + optional: true + /@esbuild/freebsd-x64@0.16.17: resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==} engines: {node: '>=12'} @@ -12589,6 +12738,14 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-x64@0.18.20: + resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + optional: true + /@esbuild/linux-arm64@0.16.17: resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==} engines: {node: '>=12'} @@ -12606,6 +12763,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm64@0.18.20: + resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-arm@0.16.17: resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==} engines: {node: '>=12'} @@ -12623,6 +12788,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm@0.18.20: + resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-ia32@0.16.17: resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==} engines: {node: '>=12'} @@ -12640,6 +12813,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ia32@0.18.20: + resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-loong64@0.15.18: resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} engines: {node: '>=12'} @@ -12665,6 +12846,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64@0.18.20: + resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-mips64el@0.16.17: resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==} engines: {node: '>=12'} @@ -12682,6 +12871,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-mips64el@0.18.20: + resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-ppc64@0.16.17: resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==} engines: {node: '>=12'} @@ -12699,6 +12896,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ppc64@0.18.20: + resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-riscv64@0.16.17: resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==} engines: {node: '>=12'} @@ -12716,6 +12921,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-riscv64@0.18.20: + resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-s390x@0.16.17: resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==} engines: {node: '>=12'} @@ -12733,6 +12946,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-s390x@0.18.20: + resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-x64@0.16.17: resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==} engines: {node: '>=12'} @@ -12750,6 +12971,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-x64@0.18.20: + resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/netbsd-x64@0.16.17: resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==} engines: {node: '>=12'} @@ -12767,6 +12996,14 @@ packages: requiresBuild: true optional: true + /@esbuild/netbsd-x64@0.18.20: + resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + optional: true + /@esbuild/openbsd-x64@0.16.17: resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==} engines: {node: '>=12'} @@ -12784,6 +13021,14 @@ packages: requiresBuild: true optional: true + /@esbuild/openbsd-x64@0.18.20: + resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + optional: true + /@esbuild/sunos-x64@0.16.17: resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==} engines: {node: '>=12'} @@ -12801,6 +13046,14 @@ packages: requiresBuild: true optional: true + /@esbuild/sunos-x64@0.18.20: + resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + optional: true + /@esbuild/win32-arm64@0.16.17: resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==} engines: {node: '>=12'} @@ -12818,6 +13071,14 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-arm64@0.18.20: + resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + /@esbuild/win32-ia32@0.16.17: resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==} engines: {node: '>=12'} @@ -12835,6 +13096,14 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-ia32@0.18.20: + resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + /@esbuild/win32-x64@0.16.17: resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==} engines: {node: '>=12'} @@ -12852,6 +13121,14 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-x64@0.18.20: + resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /@eslint-community/eslint-utils@4.4.0(eslint@7.32.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -12896,6 +13173,7 @@ packages: strip-json-comments: 3.1.1 transitivePeerDependencies: - supports-color + dev: true /@eslint/eslintrc@2.0.0: resolution: {integrity: sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==} @@ -13152,6 +13430,7 @@ packages: minimatch: 3.1.2 transitivePeerDependencies: - supports-color + dev: true /@humanwhocodes/module-importer@1.0.1: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} @@ -15612,6 +15891,23 @@ packages: - supports-color dev: true + /@stylelint/postcss-css-in-js@0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35): + resolution: {integrity: sha512-XOz5CAe49kS95p5yRd+DAIWDojTjfmyAQ4bbDlXMdbZTQ5t0ThjSLvWI6JI2uiS7MFurVBkZ6zUqcimzcLTBoQ==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + peerDependencies: + postcss: '>=7.0.0' + postcss-syntax: '>=0.36.2' + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@babel/core': 7.23.6 + postcss: 8.4.35 + postcss-syntax: 0.36.2(postcss@8.4.35) + transitivePeerDependencies: + - supports-color + dev: true + /@stylelint/postcss-markdown@0.36.2(postcss-syntax@0.36.2)(postcss@7.0.39): resolution: {integrity: sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==} peerDependencies: @@ -17619,10 +17915,10 @@ packages: - supports-color dev: true - /@umijs/ast@4.0.90: - resolution: {integrity: sha512-l9RQZj77A/Kywru2ZR1QfRsCdw9b1JRFZpi9caJ47xkM+cJklWC4c6tBcT5SsPsQEAOUaRAcJKCxmwj5X15ZJA==} + /@umijs/ast@4.1.2: + resolution: {integrity: sha512-ejgp07sn4IEMf8Urxt+su9KrUWIWp0rhtnljB3XVR2A4mcVdz1jtSQbqYwQFtgn6Mp6tCMG+H1fkweRWj7+vfQ==} dependencies: - '@umijs/bundler-utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 transitivePeerDependencies: - supports-color dev: true @@ -17639,14 +17935,14 @@ packages: - supports-color dev: true - /@umijs/babel-preset-umi@4.0.90: - resolution: {integrity: sha512-EIpuJdDutSlHTW5AbR2L8rRx+tC1QrLbvxrQek69lM+0Jijnn2n1gznIKKH8ol8yfhNm1o4q54ATWU+SjIDMlg==} + /@umijs/babel-preset-umi@4.1.2: + resolution: {integrity: sha512-SdizYktVzp5ODwOQEeHzAwt+/WGUaIO/py9z1lGQdzxGfiTkEMU5hB70bh0fFKn3jOKCKTdBLw8BfIi2E/GwDQ==} dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.23.6 '@bloomberg/record-tuple-polyfill': 0.0.4 - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 - core-js: 3.28.0 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 + core-js: 3.34.0 transitivePeerDependencies: - supports-color dev: true @@ -17665,16 +17961,16 @@ packages: - supports-color dev: true - /@umijs/bundler-esbuild@4.0.90: - resolution: {integrity: sha512-qTC1jkvlFyAyBYvWVVtpHl/RY6jwAeVYppR3eg8lD5HDB5+JK4fsR+waPDjXz56KJfFr+T9+jT4I9LcbbQjKiw==} + /@umijs/bundler-esbuild@4.1.2: + resolution: {integrity: sha512-LcAlqoQKDUeEYmkLw2mB2T9FBOjZQsFSzCw6ZYItTV2zIdFNlH4U5slfhRqlwQbzxDgBrbPLEGl0M85CqEFE4w==} hasBin: true dependencies: - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 enhanced-resolve: 5.9.3 - postcss: 8.4.32 - postcss-flexbugs-fixes: 5.0.2(postcss@8.4.32) - postcss-preset-env: 7.5.0(postcss@8.4.32) + postcss: 8.4.35 + postcss-flexbugs-fixes: 5.0.2(postcss@8.4.35) + postcss-preset-env: 7.5.0(postcss@8.4.35) transitivePeerDependencies: - supports-color dev: true @@ -17702,10 +17998,10 @@ packages: - supports-color dev: true - /@umijs/bundler-utils@4.0.90: - resolution: {integrity: sha512-BMdKGrBLF1ReQYxgJ4egJppVr8ZiP3yoolsKLZg5KmttcuFmOJLGJ/2FXzMM9KbtKfKDDnCINi25STWtWJyF9A==} + /@umijs/bundler-utils@4.1.2: + resolution: {integrity: sha512-bcN3VSgCPZjyLmQrRWPfPkuhVP0GCFyBLTxzr4vPHQTYx7FjHJcvpEbOsXoVNiBHowRA8J6PGCB/jxqRSO1yxw==} dependencies: - '@umijs/utils': 4.0.90 + '@umijs/utils': 4.1.2 esbuild: 0.17.19 regenerate: 1.4.2 regenerate-unicode-properties: 10.1.1 @@ -17731,19 +18027,19 @@ packages: - supports-color dev: true - /@umijs/bundler-vite@4.0.90(@types/node@18.11.18)(postcss@8.4.32)(sass@1.65.1): - resolution: {integrity: sha512-Z4O+BhsmHmFKBgSJcQGy+6wyVDYMDtpBD37l5wI2xjEHkHwSiwLf9VCt1oUEwT+yv1mTaBfq8bUjconTFL/ydA==} + /@umijs/bundler-vite@4.1.2(@types/node@18.11.18)(postcss@8.4.35)(sass@1.65.1): + resolution: {integrity: sha512-znqi0rb8zsh90jT8duCkGj/gcli8xEkjQDi1y6BA/dshIO9Ra4KT9riijJsaumiD+OJrABpV2DWjX7JrszzByg==} hasBin: true dependencies: '@svgr/core': 6.5.1 - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 '@vitejs/plugin-react': 4.0.0(vite@4.3.1) - core-js: 3.28.0 + core-js: 3.34.0 less: 4.1.3 - postcss-preset-env: 7.5.0(postcss@8.4.32) + postcss-preset-env: 7.5.0(postcss@8.4.35) rollup-plugin-visualizer: 5.9.0(rollup@3.7.0) - systemjs: 6.14.2 + systemjs: 6.14.3 vite: 4.3.1(@types/node@18.11.18)(less@4.1.3)(sass@1.65.1) transitivePeerDependencies: - '@types/node' @@ -17790,29 +18086,29 @@ packages: - webpack-plugin-serve dev: true - /@umijs/bundler-webpack@4.0.90(typescript@4.8.4): - resolution: {integrity: sha512-8m8SD7hduEPQXsMmhU/QtvcAJQBhAmhhMjyCVCd6OSTryd2/kz9EeVjVUSQdKuuHdGzCBKfbB23lnMvu2loTyg==} + /@umijs/bundler-webpack@4.1.2(typescript@4.8.4): + resolution: {integrity: sha512-rCf+H/k1Ru/twlCvAlqjjRIZRZJNZmaXpROaQ6VviPDj1F5YLDWMCunvdGf8KOeBVTLy4syhdxn95ZIyKcPpPA==} hasBin: true dependencies: '@svgr/core': 6.5.1 '@svgr/plugin-jsx': 6.5.1(@svgr/core@6.5.1) '@svgr/plugin-svgo': 6.5.1(@svgr/core@6.5.1) '@types/hapi__joi': 17.1.9 - '@umijs/babel-preset-umi': 4.0.90 - '@umijs/bundler-utils': 4.0.90 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-utils': 4.1.2 '@umijs/case-sensitive-paths-webpack-plugin': 1.0.1 - '@umijs/mfsu': 4.0.90 + '@umijs/mfsu': 4.1.2 '@umijs/react-refresh-webpack-plugin': 0.5.11(react-refresh@0.14.0)(webpack@5.88.2) - '@umijs/utils': 4.0.90 + '@umijs/utils': 4.1.2 cors: 2.8.5 css-loader: 6.7.1(webpack@5.88.2) - es5-imcompatible-versions: 0.1.88 + es5-imcompatible-versions: 0.1.89 fork-ts-checker-webpack-plugin: 8.0.0(typescript@4.8.4) jest-worker: 29.4.3 lightningcss: 1.22.1 node-libs-browser: 2.2.1 - postcss: 8.4.32 - postcss-preset-env: 7.5.0(postcss@8.4.32) + postcss: 8.4.35 + postcss-preset-env: 7.5.0(postcss@8.4.35) react-error-overlay: 6.0.9 react-refresh: 0.14.0 transitivePeerDependencies: @@ -17827,29 +18123,29 @@ packages: - webpack-plugin-serve dev: true - /@umijs/bundler-webpack@4.0.90(typescript@4.9.5): - resolution: {integrity: sha512-8m8SD7hduEPQXsMmhU/QtvcAJQBhAmhhMjyCVCd6OSTryd2/kz9EeVjVUSQdKuuHdGzCBKfbB23lnMvu2loTyg==} + /@umijs/bundler-webpack@4.1.2(typescript@4.9.5): + resolution: {integrity: sha512-rCf+H/k1Ru/twlCvAlqjjRIZRZJNZmaXpROaQ6VviPDj1F5YLDWMCunvdGf8KOeBVTLy4syhdxn95ZIyKcPpPA==} hasBin: true dependencies: '@svgr/core': 6.5.1 '@svgr/plugin-jsx': 6.5.1(@svgr/core@6.5.1) '@svgr/plugin-svgo': 6.5.1(@svgr/core@6.5.1) '@types/hapi__joi': 17.1.9 - '@umijs/babel-preset-umi': 4.0.90 - '@umijs/bundler-utils': 4.0.90 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-utils': 4.1.2 '@umijs/case-sensitive-paths-webpack-plugin': 1.0.1 - '@umijs/mfsu': 4.0.90 + '@umijs/mfsu': 4.1.2 '@umijs/react-refresh-webpack-plugin': 0.5.11(react-refresh@0.14.0)(webpack@5.88.2) - '@umijs/utils': 4.0.90 + '@umijs/utils': 4.1.2 cors: 2.8.5 css-loader: 6.7.1(webpack@5.88.2) - es5-imcompatible-versions: 0.1.88 + es5-imcompatible-versions: 0.1.89 fork-ts-checker-webpack-plugin: 8.0.0(typescript@4.9.5)(webpack@5.88.2) jest-worker: 29.4.3 lightningcss: 1.22.1 node-libs-browser: 2.2.1 - postcss: 8.4.32 - postcss-preset-env: 7.5.0(postcss@8.4.32) + postcss: 8.4.35 + postcss-preset-env: 7.5.0(postcss@8.4.35) react-error-overlay: 6.0.9 react-refresh: 0.14.0 transitivePeerDependencies: @@ -17876,11 +18172,11 @@ packages: - supports-color dev: true - /@umijs/core@4.0.90: - resolution: {integrity: sha512-wAv32YX6drhSdC7f6TlSp/I0J0evD2Ajs80akqiBraBtjdW6ACoB3zvM5Z06bRigpsICS6UWbuCu1bfZNb8PbQ==} + /@umijs/core@4.1.2: + resolution: {integrity: sha512-OZlZKG+26coItwPJBtPmqB2zGSnVJqi/BVFm4MYB3fDtY5+/KmPCSXur/FJvpmRInoVAJkahbsycmMh+dUT0wQ==} dependencies: - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 transitivePeerDependencies: - supports-color dev: true @@ -18094,20 +18390,20 @@ packages: - typescript dev: true - /@umijs/lint@4.0.90(eslint@8.35.0)(jest@29.4.3)(typescript@4.9.5): - resolution: {integrity: sha512-vGcyqLYhKrWgaTffLAGhdZRfFfow8C69NJJ5klOtz6KApa6LjrJoF2+nkz0JMpAovMfd5cCmV8HRMgs4aSOBZA==} + /@umijs/lint@4.1.2(eslint@8.35.0)(jest@29.4.3)(typescript@4.9.5): + resolution: {integrity: sha512-sdau5ICWOtyEsQrRHuS5wx4iPZhu56DGrxZkASAXGtQxntoJeWzx/e+qAhdsiFiWZrNXbbOOdlafpGyLy6BoKA==} dependencies: - '@babel/core': 7.23.2 - '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.35.0) - '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.32) + '@babel/core': 7.23.6 + '@babel/eslint-parser': 7.23.3(@babel/core@7.23.6)(eslint@8.35.0) + '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35) '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.35.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.35.0)(typescript@4.9.5) - '@umijs/babel-preset-umi': 4.0.90 + '@umijs/babel-preset-umi': 4.1.2 eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.35.0)(jest@29.4.3)(typescript@4.9.5) eslint-plugin-react: 7.33.2(eslint@8.35.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.35.0) - postcss: 8.4.32 - postcss-syntax: 0.36.2(postcss@8.4.32) + postcss: 8.4.35 + postcss-syntax: 0.36.2(postcss@8.4.35) stylelint-config-standard: 25.0.0 transitivePeerDependencies: - eslint @@ -18122,20 +18418,20 @@ packages: - typescript dev: true - /@umijs/lint@4.0.90(jest@29.4.3)(typescript@4.9.5): - resolution: {integrity: sha512-vGcyqLYhKrWgaTffLAGhdZRfFfow8C69NJJ5klOtz6KApa6LjrJoF2+nkz0JMpAovMfd5cCmV8HRMgs4aSOBZA==} + /@umijs/lint@4.1.2(jest@29.4.3)(typescript@4.9.5): + resolution: {integrity: sha512-sdau5ICWOtyEsQrRHuS5wx4iPZhu56DGrxZkASAXGtQxntoJeWzx/e+qAhdsiFiWZrNXbbOOdlafpGyLy6BoKA==} dependencies: - '@babel/core': 7.23.2 - '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.35.0) - '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.32) + '@babel/core': 7.23.6 + '@babel/eslint-parser': 7.23.3(@babel/core@7.23.6)(eslint@8.35.0) + '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35) '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.35.0)(typescript@4.9.5) - '@umijs/babel-preset-umi': 4.0.90 + '@umijs/babel-preset-umi': 4.1.2 eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(jest@29.4.3)(typescript@4.9.5) eslint-plugin-react: 7.33.2(eslint@8.35.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.35.0) - postcss: 8.4.32 - postcss-syntax: 0.36.2(postcss@8.4.32) + postcss: 8.4.35 + postcss-syntax: 0.36.2(postcss@8.4.35) stylelint-config-standard: 25.0.0 transitivePeerDependencies: - eslint @@ -18200,12 +18496,12 @@ packages: - supports-color dev: true - /@umijs/mfsu@4.0.90: - resolution: {integrity: sha512-zAlDMAR4PzCRBD5VxpMkZ+BJ4Z3Ce4gmtVCEJBX7p4uREZ7lHUimi/31VF+oNOL28IoodpPuit9abJ2+6i2tOA==} + /@umijs/mfsu@4.1.2: + resolution: {integrity: sha512-PxkSdQWR0323B1PKLjn2F3ZLfxByg3MmwgRipUbwX3dC8ae9kqIR5wEB2bfL1uXSg9x63o2JMsv5/ObfhrsmYw==} dependencies: - '@umijs/bundler-esbuild': 4.0.90 - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-esbuild': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 enhanced-resolve: 5.9.3 is-equal: 1.7.0 transitivePeerDependencies: @@ -18239,8 +18535,8 @@ packages: - supports-color dev: true - /@umijs/plugin-run@4.0.90: - resolution: {integrity: sha512-/OoJkZkdfuHvVxXoxa/MMyHa7lVLuy6txFccY32V9wKPqPjnPiSkYZrnhZTykMyEmKXbXTX2yqqhyY91gSTgRA==} + /@umijs/plugin-run@4.1.2: + resolution: {integrity: sha512-SkCOd1ZMe5zJp0avxC0UWr4/MK4QU3iqMzNOk6kBYPMIZgsNSn+6+iol+Sb3aqn3RzU3TQWHeKtO2ckZyrD+vw==} dependencies: tsx: 3.12.2 dev: true @@ -18293,8 +18589,8 @@ packages: - supports-color dev: true - /@umijs/plugins@4.0.90(@types/react-dom@18.0.10)(@types/react@18.0.26)(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-9PGsd2ocRFf7DIy6dZn/k5IGAodzVPe1wi1t9lMN1RmT+5JoRHCV77eMCDAiBuF1uDU4yxEKXCnEkUNfkQovgw==} + /@umijs/plugins@4.1.2(@types/react-dom@18.0.10)(@types/react@18.0.26)(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-BcM+8WW8L8qByiVYHzzxzbXGUpbrCg2F1R1yjsD+uev8YQ0epI6X+Kzn0Np7/e7aPEJA737272Gvv088GCaBqQ==} dependencies: '@ahooksjs/use-request': 2.8.15(react@17.0.2) '@ant-design/antd-theme-variable': 1.0.0 @@ -18304,7 +18600,7 @@ packages: '@ant-design/pro-components': 2.3.20(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2) '@tanstack/react-query': 4.24.10(react-dom@17.0.2)(react@17.0.2) '@tanstack/react-query-devtools': 4.24.10(@tanstack/react-query@4.24.10)(react-dom@17.0.2)(react@17.0.2) - '@umijs/bundler-utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 '@umijs/valtio': 1.0.4(@types/react@18.0.26)(react@17.0.2) antd-dayjs-webpack-plugin: 1.0.6(dayjs@1.11.7) axios: 0.27.2(debug@4.3.4) @@ -18378,39 +18674,39 @@ packages: - webpack-plugin-serve dev: true - /@umijs/preset-umi@4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5): - resolution: {integrity: sha512-Q7JX0tpE6jVuYMQuWGRRMtTr8avjcvCsN6ENwIAZrzVlYgDKXLgo5T8BO+DAzY8acwgx9o9Y1iCXN1m9IIjk2w==} + /@umijs/preset-umi@4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5): + resolution: {integrity: sha512-tZe7mWS2vCoULXcY5Zx10nVWxMHPXl1+Pj3X0hiPE2oPYJYw5eYtE0+IivNAOUH2M2d5c8j257MgG+XND8Gpbw==} dependencies: '@iconify/utils': 2.1.1 '@svgr/core': 6.5.1 - '@umijs/ast': 4.0.90 - '@umijs/babel-preset-umi': 4.0.90 - '@umijs/bundler-esbuild': 4.0.90 - '@umijs/bundler-utils': 4.0.90 - '@umijs/bundler-vite': 4.0.90(@types/node@18.11.18)(postcss@8.4.32)(sass@1.65.1) - '@umijs/bundler-webpack': 4.0.90(typescript@4.9.5) - '@umijs/core': 4.0.90 + '@umijs/ast': 4.1.2 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-esbuild': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-vite': 4.1.2(@types/node@18.11.18)(postcss@8.4.35)(sass@1.65.1) + '@umijs/bundler-webpack': 4.1.2(typescript@4.9.5) + '@umijs/core': 4.1.2 '@umijs/did-you-know': 1.0.3 '@umijs/es-module-parser': 0.0.7 '@umijs/history': 5.3.1 - '@umijs/mfsu': 4.0.90 - '@umijs/plugin-run': 4.0.90 - '@umijs/renderer-react': 4.0.90(react-dom@18.1.0)(react@18.1.0) - '@umijs/server': 4.0.90 + '@umijs/mfsu': 4.1.2 + '@umijs/plugin-run': 4.1.2 + '@umijs/renderer-react': 4.1.2(react-dom@18.1.0)(react@18.1.0) + '@umijs/server': 4.1.2 '@umijs/ui': 3.0.1 - '@umijs/utils': 4.0.90 - '@umijs/zod2ts': 4.0.90 + '@umijs/utils': 4.1.2 + '@umijs/zod2ts': 4.1.2 babel-plugin-dynamic-import-node: 2.3.3 click-to-react-component: 1.1.0(@types/react@18.0.26)(react-dom@18.1.0)(react@18.1.0) - core-js: 3.28.0 + core-js: 3.34.0 current-script-polyfill: 1.0.0 enhanced-resolve: 5.9.3 fast-glob: 3.2.12 html-webpack-plugin: 5.5.0(webpack@5.75.0) less-plugin-resolve: 1.0.2 path-to-regexp: 1.7.0 - postcss: 8.4.32 - postcss-prefix-selector: 1.16.0(postcss@8.4.32) + postcss: 8.4.35 + postcss-prefix-selector: 1.16.0(postcss@8.4.35) react: 18.1.0 react-dom: 18.1.0(react@18.1.0) react-router: 6.3.0(react@18.1.0) @@ -18511,8 +18807,8 @@ packages: react-router-dom: 6.3.0(react-dom@18.1.0)(react@18.1.0) dev: true - /@umijs/renderer-react@4.0.90(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-3EvhbFIf8L8D8yJEW8HcmiMttetXR22x4yvLJpJkspnYeQajnpGSGhYuq5W6lOaq9gVHxU08D1CGaXdhbzoPqA==} + /@umijs/renderer-react@4.1.2(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-zAZ1yU/PTkit/Nl0JsArS8ZwWyhmFpMEMRKpFZqw1rYieXTlNGvZTm2twJj+rNzsxwoNmW7E24glJGjpm1CunA==} peerDependencies: react: '>=16.8' react-dom: '>=16.8' @@ -18522,7 +18818,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.23.6 '@loadable/component': 5.15.2(react@17.0.2) history: 5.3.0 react: 17.0.2 @@ -18531,8 +18827,8 @@ packages: react-router-dom: 6.3.0(react-dom@17.0.2)(react@17.0.2) dev: true - /@umijs/renderer-react@4.0.90(react-dom@18.1.0)(react@18.1.0): - resolution: {integrity: sha512-3EvhbFIf8L8D8yJEW8HcmiMttetXR22x4yvLJpJkspnYeQajnpGSGhYuq5W6lOaq9gVHxU08D1CGaXdhbzoPqA==} + /@umijs/renderer-react@4.1.2(react-dom@18.1.0)(react@18.1.0): + resolution: {integrity: sha512-zAZ1yU/PTkit/Nl0JsArS8ZwWyhmFpMEMRKpFZqw1rYieXTlNGvZTm2twJj+rNzsxwoNmW7E24glJGjpm1CunA==} peerDependencies: react: '>=16.8' react-dom: '>=16.8' @@ -18542,7 +18838,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.23.6 '@loadable/component': 5.15.2(react@18.1.0) history: 5.3.0 react: 18.1.0 @@ -18580,10 +18876,10 @@ packages: - supports-color dev: true - /@umijs/server@4.0.90: - resolution: {integrity: sha512-lwcV6mq+jLNZS/XSAxJFrBW9d/hhiIFIxc6OIj+K8WfeJDrc1H/G/BGM8dtqv56Vnl/HUqoAW7sND+BAdaa1fg==} + /@umijs/server@4.1.2: + resolution: {integrity: sha512-1oUWhF4qW2T4BqYKRTtZm+REJpDzPdQ3oeXubAIpFqek5Z0ABKcp7/mkH68AVRztsag0t9cXuBN/AL5GkvjXww==} dependencies: - '@umijs/bundler-utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 history: 5.3.0 react: 18.1.0 react-dom: 18.1.0(react@18.1.0) @@ -18608,13 +18904,13 @@ packages: - supports-color dev: true - /@umijs/test@4.0.90: - resolution: {integrity: sha512-3/l/qaO/9NzB6zTCTklgLpDgNqm75KXzV4+2wtGf6evH2rubNY5SDokTlfC8v5Pb/PLvRdVmERnyrelFbVjBrA==} + /@umijs/test@4.1.2: + resolution: {integrity: sha512-mmP0bmvYx/gHIgq8mxbMJSgLxBKh5Tp2ZiuK68aoqlBWSBXU2xB9LM4KGno3Or9vihSFAUzK1wWEcVj7CQCY4w==} dependencies: - '@babel/plugin-transform-modules-commonjs': 7.23.0 + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.0) '@jest/types': 27.5.1 - '@umijs/bundler-utils': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 + '@umijs/utils': 4.1.2 babel-jest: 29.7.0 esbuild: 0.17.19 identity-obj-proxy: 3.0.0 @@ -18664,8 +18960,8 @@ packages: pino: 7.11.0 dev: true - /@umijs/utils@4.0.90: - resolution: {integrity: sha512-H+/pgp6SjYiehBbSLLaFOdVvLgGpi4mGLKU08j9u1E8uj5Y1DfKISPfzr+PS4YGminQ4RpUvFOw1OicH6fGo3A==} + /@umijs/utils@4.1.2: + resolution: {integrity: sha512-YBzN7Zn3595W93t8XPh8IbKMInr6NecXPtHVD+L7fJFv5oCrzHxCkvSZBTmTXuFMyW+9rHT0TlsXM4gqQ1n18Q==} dependencies: chokidar: 3.5.3 pino: 7.11.0 @@ -18680,8 +18976,8 @@ packages: - react dev: true - /@umijs/zod2ts@4.0.90: - resolution: {integrity: sha512-W2L6Sp/aSYDnWwNICgwACzxmkX0WcpHW3zUIwCqEfcj8EhuWoB8E79bP7ENoVeFgjEh+u4SR7C+7T27I3ngq+g==} + /@umijs/zod2ts@4.1.2: + resolution: {integrity: sha512-h5P45gXxTVWdDeIuB/EQ9lDqJgPrm747Ox77WvK1ooG+jN4xBB6uoH5slCLenl3ig+M1nRLIadVsD/8kjrWWHw==} dev: true /@unocss/cli@0.33.5: @@ -18985,7 +19281,7 @@ packages: resolution: {integrity: sha512-JGZ11QV+/ZcfudW2Cz2JVp54/pJNXbsuWRgSh2ZmmZdQBKXqBtIGrwI1Wyx8nlbzAiEFe7FHi4K1zX4//jxTnQ==} dev: true - /@vitejs/plugin-legacy@4.1.1(vite@4.3.1): + /@vitejs/plugin-legacy@4.1.1(vite@4.5.2): resolution: {integrity: sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -18999,7 +19295,7 @@ packages: magic-string: 0.30.4 regenerator-runtime: 0.13.11 systemjs: 6.14.2 - vite: 4.3.1(@types/node@18.11.18)(less@4.1.3)(sass@1.65.1) + vite: 4.5.2(@types/node@18.11.18)(less@4.1.3) transitivePeerDependencies: - supports-color dev: true @@ -19048,6 +19344,22 @@ packages: vite: 4.3.1(@types/node@18.11.18)(less@4.1.3)(sass@1.65.1) transitivePeerDependencies: - supports-color + dev: true + + /@vitejs/plugin-react@4.0.0(vite@4.5.2): + resolution: {integrity: sha512-HX0XzMjL3hhOYm+0s95pb0Z7F8O81G7joUHgfDd/9J/ZZf5k4xX6QAMFkKsHFxaHlf6X7GD7+XuaZ66ULiJuhQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.2.0 + dependencies: + '@babel/core': 7.23.6 + '@babel/plugin-transform-react-jsx-self': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.6) + react-refresh: 0.14.0 + vite: 4.5.2(@types/node@18.11.18)(less@4.1.3) + transitivePeerDependencies: + - supports-color + dev: false /@vitejs/plugin-vue-jsx@3.0.1(vue@3.2.45): resolution: {integrity: sha512-+Jb7ggL48FSPS1uhPnJbJwWa9Sr90vQ+d0InW+AhBM22n+cfuYqJZDckBc+W3QSHe1WDvewMZfa4wZOtk5pRgw==} @@ -19538,6 +19850,7 @@ packages: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: acorn: 7.4.1 + dev: true /acorn-jsx@5.3.2(acorn@8.8.2): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} @@ -19777,6 +20090,7 @@ packages: /ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} + dev: true /ansi-escapes@3.2.0: resolution: {integrity: sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==} @@ -20904,6 +21218,25 @@ packages: postcss-value-parser: 4.2.0 dev: true + /autoprefixer@10.4.13(postcss@8.4.35): + resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==} + engines: {node: ^10 || ^12 || >=14} + hasBin: true + peerDependencies: + postcss: ^8.1.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + browserslist: 4.22.2 + caniuse-lite: 1.0.30001571 + fraction.js: 4.2.0 + normalize-range: 0.1.2 + picocolors: 1.0.0 + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /autoprefixer@9.8.8: resolution: {integrity: sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==} dependencies: @@ -21302,7 +21635,7 @@ packages: dependencies: '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.4.5) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.20.12) lodash: 4.17.21 picomatch: 2.3.1 styled-components: 6.1.1(react-dom@18.1.0)(react@18.1.0) @@ -22407,6 +22740,23 @@ packages: optionalDependencies: fsevents: 2.3.3 + /chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + requiresBuild: true + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: false + optional: true + /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} dev: true @@ -23381,7 +23731,6 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 dev: false - bundledDependencies: false /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} @@ -23484,6 +23833,20 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /css-blank-pseudo@3.0.3(postcss@8.4.35): + resolution: {integrity: sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==} + engines: {node: ^12 || ^14 || >=16} + hasBin: true + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /css-color-keywords@1.0.0: resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==} engines: {node: '>=4'} @@ -23543,6 +23906,20 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /css-has-pseudo@3.0.4(postcss@8.4.35): + resolution: {integrity: sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==} + engines: {node: ^12 || ^14 || >=16} + hasBin: true + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /css-in-js-utils@2.0.1: resolution: {integrity: sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==} dependencies: @@ -23631,6 +24008,19 @@ packages: postcss: 8.4.32 dev: true + /css-prefers-color-scheme@6.0.3(postcss@8.4.35): + resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==} + engines: {node: ^12 || ^14 || >=16} + hasBin: true + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /css-select-base-adapter@0.1.1: resolution: {integrity: sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==} dev: true @@ -24847,9 +25237,9 @@ packages: '@swc/core': 1.3.72 '@types/hast': 2.3.5 '@types/mdast': 3.0.12 - '@umijs/bundler-utils': 4.0.90 - '@umijs/core': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/bundler-utils': 4.1.2 + '@umijs/core': 4.1.2 + '@umijs/utils': 4.1.2 animated-scroll-to: 2.3.0 classnames: 2.3.2 codesandbox: 2.2.3 @@ -24898,7 +25288,7 @@ packages: remark-rehype: 10.1.0 sass: 1.65.1 sitemap: 7.1.1 - umi: 4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(jest@29.4.3)(prettier@2.8.4)(react-dom@18.1.0)(react@18.1.0)(sass@1.65.1)(typescript@4.9.5) + umi: 4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(jest@29.4.3)(prettier@2.8.4)(react-dom@18.1.0)(react@18.1.0)(sass@1.65.1)(typescript@4.9.5) unified: 10.1.2 unist-util-visit: 4.1.2 unist-util-visit-parents: 5.1.3 @@ -25149,6 +25539,7 @@ packages: engines: {node: '>=8.6'} dependencies: ansi-colors: 4.1.3 + dev: true /entities@1.1.2: resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==} @@ -25340,6 +25731,10 @@ packages: resolution: {integrity: sha512-GDJTmDGd65qyDk9fGClO+MOUgHuBuGMCL6EawvLH8Ob+HN8ui1OJwa4fEK0qh3fg2ieT2/pdZj41yrxnmOrK8w==} dev: true + /es5-imcompatible-versions@0.1.89: + resolution: {integrity: sha512-metQ5Hi5dgBiaoc2VjGx2IABciw0djiE1+KbRWHbgQng9KnJQ1niBIA6vvLKWgA9R02kQZQRvFJ504ev0AQbzQ==} + dev: true + /es6-error@4.1.1: resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==} dev: true @@ -26282,6 +26677,35 @@ packages: '@esbuild/win32-ia32': 0.17.19 '@esbuild/win32-x64': 0.17.19 + /esbuild@0.18.20: + resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.18.20 + '@esbuild/android-arm64': 0.18.20 + '@esbuild/android-x64': 0.18.20 + '@esbuild/darwin-arm64': 0.18.20 + '@esbuild/darwin-x64': 0.18.20 + '@esbuild/freebsd-arm64': 0.18.20 + '@esbuild/freebsd-x64': 0.18.20 + '@esbuild/linux-arm': 0.18.20 + '@esbuild/linux-arm64': 0.18.20 + '@esbuild/linux-ia32': 0.18.20 + '@esbuild/linux-loong64': 0.18.20 + '@esbuild/linux-mips64el': 0.18.20 + '@esbuild/linux-ppc64': 0.18.20 + '@esbuild/linux-riscv64': 0.18.20 + '@esbuild/linux-s390x': 0.18.20 + '@esbuild/linux-x64': 0.18.20 + '@esbuild/netbsd-x64': 0.18.20 + '@esbuild/openbsd-x64': 0.18.20 + '@esbuild/sunos-x64': 0.18.20 + '@esbuild/win32-arm64': 0.18.20 + '@esbuild/win32-ia32': 0.18.20 + '@esbuild/win32-x64': 0.18.20 + /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -26714,6 +27138,7 @@ packages: engines: {node: '>=6'} dependencies: eslint-visitor-keys: 1.3.0 + dev: true /eslint-utils@3.0.0(eslint@7.32.0): resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} @@ -26743,6 +27168,7 @@ packages: /eslint-visitor-keys@1.3.0: resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} engines: {node: '>=4'} + dev: true /eslint-visitor-keys@2.1.0: resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} @@ -26806,6 +27232,7 @@ packages: v8-compile-cache: 2.3.0 transitivePeerDependencies: - supports-color + dev: true /eslint@8.35.0: resolution: {integrity: sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==} @@ -26861,6 +27288,7 @@ packages: acorn: 7.4.1 acorn-jsx: 5.3.2(acorn@7.4.1) eslint-visitor-keys: 1.3.0 + dev: true /espree@9.4.1: resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} @@ -27391,11 +27819,11 @@ packages: hasBin: true dependencies: '@microsoft/api-extractor': 7.34.3(@types/node@18.11.18) - '@umijs/babel-preset-umi': 4.0.90 - '@umijs/bundler-utils': 4.0.90 - '@umijs/bundler-webpack': 4.0.90(typescript@4.8.4) - '@umijs/core': 4.0.90 - '@umijs/utils': 4.0.90 + '@umijs/babel-preset-umi': 4.1.2 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-webpack': 4.1.2(typescript@4.8.4) + '@umijs/core': 4.1.2 + '@umijs/utils': 4.1.2 '@vercel/ncc': 0.33.3 babel-plugin-dynamic-import-node: 2.3.3 babel-plugin-module-resolver: 4.1.0 @@ -28098,6 +28526,7 @@ packages: /functional-red-black-tree@1.0.1: resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==} + dev: true /functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} @@ -29472,6 +29901,7 @@ packages: /ignore@4.0.6: resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==} engines: {node: '>= 4'} + dev: true /ignore@5.2.0: resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==} @@ -29513,6 +29943,7 @@ packages: /immutable@4.1.0: resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==} + dev: true /import-fresh@2.0.0: resolution: {integrity: sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==} @@ -31403,7 +31834,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.11 + graceful-fs: 4.2.10 /jsonparse@1.3.1: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} @@ -35716,6 +36147,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-attribute-case-insensitive@5.0.1(postcss@8.4.35): + resolution: {integrity: sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-calc@8.2.4(postcss@8.4.21): resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==} peerDependencies: @@ -35768,6 +36212,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-clamp@4.1.0(postcss@8.4.35): + resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==} + engines: {node: '>=7.6.0'} + peerDependencies: + postcss: ^8.4.6 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-color-functional-notation@4.2.3(postcss@8.4.21): resolution: {integrity: sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==} engines: {node: ^12 || ^14 || >=16} @@ -35793,6 +36250,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-color-functional-notation@4.2.3(postcss@8.4.35): + resolution: {integrity: sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-color-hex-alpha@8.0.4(postcss@8.4.21): resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==} engines: {node: ^12 || ^14 || >=16} @@ -35818,6 +36288,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-color-hex-alpha@8.0.4(postcss@8.4.35): + resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-color-rebeccapurple@7.1.0(postcss@8.4.21): resolution: {integrity: sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==} engines: {node: ^12 || ^14 || >=16} @@ -35843,6 +36326,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-color-rebeccapurple@7.1.0(postcss@8.4.35): + resolution: {integrity: sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-colormin@5.3.0(postcss@8.4.21): resolution: {integrity: sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==} engines: {node: ^10 || ^12 || >=14.0} @@ -35928,6 +36424,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-custom-media@8.0.2(postcss@8.4.35): + resolution: {integrity: sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-custom-properties@12.1.8(postcss@8.4.21): resolution: {integrity: sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==} engines: {node: ^12 || ^14 || >=16} @@ -35953,6 +36462,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-custom-properties@12.1.8(postcss@8.4.35): + resolution: {integrity: sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-custom-selectors@6.0.3(postcss@8.4.21): resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==} engines: {node: ^12 || ^14 || >=16} @@ -35978,6 +36500,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-custom-selectors@6.0.3(postcss@8.4.35): + resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-dir-pseudo-class@6.0.4(postcss@8.4.21): resolution: {integrity: sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==} engines: {node: ^12 || ^14 || >=16} @@ -36003,6 +36538,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-dir-pseudo-class@6.0.4(postcss@8.4.35): + resolution: {integrity: sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-discard-comments@5.1.2(postcss@8.4.21): resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==} engines: {node: ^10 || ^12 || >=14.0} @@ -36126,6 +36674,20 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-double-position-gradients@3.1.1(postcss@8.4.35): + resolution: {integrity: sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-env-function@4.0.6(postcss@8.4.21): resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==} engines: {node: ^12 || ^14 || >=16} @@ -36151,6 +36713,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-env-function@4.0.6(postcss@8.4.35): + resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-flexbugs-fixes@5.0.2(postcss@8.4.21): resolution: {integrity: sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==} peerDependencies: @@ -36172,6 +36747,17 @@ packages: postcss: 8.4.32 dev: true + /postcss-flexbugs-fixes@5.0.2(postcss@8.4.35): + resolution: {integrity: sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==} + peerDependencies: + postcss: ^8.1.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-focus-visible@6.0.4(postcss@8.4.21): resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==} engines: {node: ^12 || ^14 || >=16} @@ -36197,6 +36783,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-focus-visible@6.0.4(postcss@8.4.35): + resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-focus-within@5.0.4(postcss@8.4.21): resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==} engines: {node: ^12 || ^14 || >=16} @@ -36222,6 +36821,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-focus-within@5.0.4(postcss@8.4.35): + resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-font-variant@5.0.0(postcss@8.4.21): resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==} peerDependencies: @@ -36243,6 +36855,17 @@ packages: postcss: 8.4.32 dev: true + /postcss-font-variant@5.0.0(postcss@8.4.35): + resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==} + peerDependencies: + postcss: ^8.1.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-gap-properties@3.0.3(postcss@8.4.21): resolution: {integrity: sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==} engines: {node: ^12 || ^14 || >=16} @@ -36266,6 +36889,18 @@ packages: postcss: 8.4.32 dev: true + /postcss-gap-properties@3.0.3(postcss@8.4.35): + resolution: {integrity: sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-html@0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39): resolution: {integrity: sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==} peerDependencies: @@ -36305,6 +36940,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-image-set-function@4.0.6(postcss@8.4.35): + resolution: {integrity: sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-import@14.1.0(postcss@8.4.21): resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} engines: {node: '>=10.0.0'} @@ -36340,6 +36988,17 @@ packages: postcss: 8.4.32 dev: true + /postcss-initial@4.0.1(postcss@8.4.35): + resolution: {integrity: sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==} + peerDependencies: + postcss: ^8.0.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-js@4.0.0(postcss@8.4.21): resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==} engines: {node: ^12 || ^14 || >= 16} @@ -36379,6 +37038,20 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-lab-function@4.2.0(postcss@8.4.35): + resolution: {integrity: sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-less@3.1.4: resolution: {integrity: sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==} engines: {node: '>=6.14.4'} @@ -36463,6 +37136,18 @@ packages: postcss: 8.4.32 dev: true + /postcss-logical@5.0.4(postcss@8.4.35): + resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-media-minmax@5.0.0(postcss@8.4.21): resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==} engines: {node: '>=10.0.0'} @@ -36486,6 +37171,18 @@ packages: postcss: 8.4.32 dev: true + /postcss-media-minmax@5.0.0(postcss@8.4.35): + resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + postcss: ^8.1.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-media-query-parser@0.2.3: resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==} requiresBuild: true @@ -36750,6 +37447,20 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-nesting@10.1.8(postcss@8.4.35): + resolution: {integrity: sha512-txdb3/idHYsBbNDFo1PFY0ExCgH5nfWi8G5lO49e6iuU42TydbODTzJgF5UuL5bhgeSlnAtDgfFTDG0Cl1zaSQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/selector-specificity': 2.0.1(postcss-selector-parser@6.0.10)(postcss@8.4.35) + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-normalize-charset@5.1.0(postcss@8.4.21): resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==} engines: {node: ^10 || ^12 || >=14.0} @@ -37040,6 +37751,18 @@ packages: postcss: 8.4.32 dev: true + /postcss-overflow-shorthand@3.0.3(postcss@8.4.35): + resolution: {integrity: sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-page-break@3.0.4(postcss@8.4.21): resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==} peerDependencies: @@ -37061,6 +37784,17 @@ packages: postcss: 8.4.32 dev: true + /postcss-page-break@3.0.4(postcss@8.4.35): + resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==} + peerDependencies: + postcss: ^8 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-place@7.0.4(postcss@8.4.21): resolution: {integrity: sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==} engines: {node: ^12 || ^14 || >=16} @@ -37086,6 +37820,19 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-place@7.0.4(postcss@8.4.35): + resolution: {integrity: sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-value-parser: 4.2.0 + dev: true + /postcss-prefix-selector@1.16.0(postcss@8.4.21): resolution: {integrity: sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q==} peerDependencies: @@ -37097,7 +37844,7 @@ packages: postcss: 8.4.21 dev: false - /postcss-prefix-selector@1.16.0(postcss@8.4.32): + /postcss-prefix-selector@1.16.0(postcss@8.4.35): resolution: {integrity: sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q==} peerDependencies: postcss: '>4 <9' @@ -37105,7 +37852,7 @@ packages: postcss: optional: true dependencies: - postcss: 8.4.32 + postcss: 8.4.35 dev: true /postcss-preset-env@7.5.0(postcss@8.4.21): @@ -37221,6 +37968,63 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-preset-env@7.5.0(postcss@8.4.35): + resolution: {integrity: sha512-0BJzWEfCdTtK2R3EiKKSdkE51/DI/BwnhlnicSW482Ym6/DGHud8K0wGLcdjip1epVX0HKo4c8zzTeV/SkiejQ==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + '@csstools/postcss-color-function': 1.1.0(postcss@8.4.35) + '@csstools/postcss-font-format-keywords': 1.0.0(postcss@8.4.35) + '@csstools/postcss-hwb-function': 1.0.1(postcss@8.4.35) + '@csstools/postcss-ic-unit': 1.0.0(postcss@8.4.35) + '@csstools/postcss-is-pseudo-class': 2.0.5(postcss@8.4.35) + '@csstools/postcss-normalize-display-values': 1.0.0(postcss@8.4.35) + '@csstools/postcss-oklab-function': 1.1.0(postcss@8.4.35) + '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.35) + '@csstools/postcss-stepped-value-functions': 1.0.0(postcss@8.4.35) + '@csstools/postcss-unset-value': 1.0.1(postcss@8.4.35) + autoprefixer: 10.4.13(postcss@8.4.35) + browserslist: 4.22.2 + css-blank-pseudo: 3.0.3(postcss@8.4.35) + css-has-pseudo: 3.0.4(postcss@8.4.35) + css-prefers-color-scheme: 6.0.3(postcss@8.4.35) + cssdb: 6.6.3 + postcss: 8.4.35 + postcss-attribute-case-insensitive: 5.0.1(postcss@8.4.35) + postcss-clamp: 4.1.0(postcss@8.4.35) + postcss-color-functional-notation: 4.2.3(postcss@8.4.35) + postcss-color-hex-alpha: 8.0.4(postcss@8.4.35) + postcss-color-rebeccapurple: 7.1.0(postcss@8.4.35) + postcss-custom-media: 8.0.2(postcss@8.4.35) + postcss-custom-properties: 12.1.8(postcss@8.4.35) + postcss-custom-selectors: 6.0.3(postcss@8.4.35) + postcss-dir-pseudo-class: 6.0.4(postcss@8.4.35) + postcss-double-position-gradients: 3.1.1(postcss@8.4.35) + postcss-env-function: 4.0.6(postcss@8.4.35) + postcss-focus-visible: 6.0.4(postcss@8.4.35) + postcss-focus-within: 5.0.4(postcss@8.4.35) + postcss-font-variant: 5.0.0(postcss@8.4.35) + postcss-gap-properties: 3.0.3(postcss@8.4.35) + postcss-image-set-function: 4.0.6(postcss@8.4.35) + postcss-initial: 4.0.1(postcss@8.4.35) + postcss-lab-function: 4.2.0(postcss@8.4.35) + postcss-logical: 5.0.4(postcss@8.4.35) + postcss-media-minmax: 5.0.0(postcss@8.4.35) + postcss-nesting: 10.1.8(postcss@8.4.35) + postcss-opacity-percentage: 1.1.2 + postcss-overflow-shorthand: 3.0.3(postcss@8.4.35) + postcss-page-break: 3.0.4(postcss@8.4.35) + postcss-place: 7.0.4(postcss@8.4.35) + postcss-pseudo-class-any-link: 7.1.4(postcss@8.4.35) + postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.35) + postcss-selector-not: 5.0.0(postcss@8.4.35) + postcss-value-parser: 4.2.0 + dev: true + /postcss-pseudo-class-any-link@7.1.4(postcss@8.4.21): resolution: {integrity: sha512-JxRcLXm96u14N3RzFavPIE9cRPuOqLDuzKeBsqi4oRk4vt8n0A7I0plFs/VXTg7U2n7g/XkQi0OwqTO3VWBfEg==} engines: {node: ^12 || ^14 || >=16} @@ -37246,6 +38050,19 @@ packages: postcss-selector-parser: 6.0.10 dev: true + /postcss-pseudo-class-any-link@7.1.4(postcss@8.4.35): + resolution: {integrity: sha512-JxRcLXm96u14N3RzFavPIE9cRPuOqLDuzKeBsqi4oRk4vt8n0A7I0plFs/VXTg7U2n7g/XkQi0OwqTO3VWBfEg==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + postcss: ^8.4 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + postcss-selector-parser: 6.0.10 + dev: true + /postcss-reduce-initial@5.1.0(postcss@8.4.21): resolution: {integrity: sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==} engines: {node: ^10 || ^12 || >=14.0} @@ -37321,6 +38138,17 @@ packages: postcss: 8.4.32 dev: true + /postcss-replace-overflow-wrap@4.0.0(postcss@8.4.35): + resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==} + peerDependencies: + postcss: ^8.0.3 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-resolve-nested-selector@0.1.1: resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==} requiresBuild: true @@ -37380,6 +38208,18 @@ packages: postcss: 8.4.32 dev: true + /postcss-selector-not@5.0.0(postcss@8.4.35): + resolution: {integrity: sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==} + peerDependencies: + postcss: ^8.1.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + balanced-match: 1.0.2 + postcss: 8.4.35 + dev: true + /postcss-selector-parser@6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} engines: {node: '>=4'} @@ -37518,6 +38358,32 @@ packages: postcss: 8.4.32 dev: true + /postcss-syntax@0.36.2(postcss@8.4.35): + resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==} + peerDependencies: + postcss: '>=5.0.0' + postcss-html: '*' + postcss-jsx: '*' + postcss-less: '*' + postcss-markdown: '*' + postcss-scss: '*' + peerDependenciesMeta: + postcss: + optional: true + postcss-html: + optional: true + postcss-jsx: + optional: true + postcss-less: + optional: true + postcss-markdown: + optional: true + postcss-scss: + optional: true + dependencies: + postcss: 8.4.35 + dev: true + /postcss-unique-selectors@5.1.1(postcss@8.4.21): resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==} engines: {node: ^10 || ^12 || >=14.0} @@ -37598,6 +38464,14 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.35: + resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 + /potpack@1.0.2: resolution: {integrity: sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==} dev: false @@ -37831,6 +38705,7 @@ packages: /progress@2.0.3: resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} engines: {node: '>=0.4.0'} + dev: true /promise-all-reject-late@1.0.1: resolution: {integrity: sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==} @@ -43818,8 +44693,8 @@ packages: fsevents: 2.3.3 dev: true - /rollup@3.20.7: - resolution: {integrity: sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA==} + /rollup@3.29.4: + resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -44003,6 +44878,7 @@ packages: chokidar: 3.5.3 immutable: 4.1.0 source-map-js: 1.0.2 + dev: true /sax@1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} @@ -45927,6 +46803,10 @@ packages: /systemjs@6.14.2: resolution: {integrity: sha512-1TlOwvKWdXxAY9vba+huLu99zrQURDWA8pUTYsRIYDZYQbGyK+pyEP4h4dlySsqo7ozyJBmYD20F+iUHhAltEg==} + /systemjs@6.14.3: + resolution: {integrity: sha512-hQv45irdhXudAOr8r6SVSpJSGtogdGZUbJBRKCE5nsIS7tsxxvnIHqT4IOPWj+P+HcSzeWzHlGCGpmhPDIKe+w==} + dev: true + /table@6.8.0: resolution: {integrity: sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==} engines: {node: '>=10.0.0'} @@ -46944,8 +47824,8 @@ packages: dependencies: '@alita/plugins': 3.1.0(@types/react-dom@18.0.10)(@types/react@18.0.26)(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2) '@umijs/max-plugin-openapi': 1.0.7(eslint@8.35.0)(jest@29.4.3)(prettier@2.8.4)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5) - '@umijs/plugins': 4.0.90(@types/react-dom@18.0.10)(@types/react@18.0.26)(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2) - umi: 4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(eslint@8.35.0)(jest@29.4.3)(prettier@2.8.4)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5) + '@umijs/plugins': 4.1.2(@types/react-dom@18.0.10)(@types/react@18.0.26)(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2) + umi: 4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(eslint@8.35.0)(jest@29.4.3)(prettier@2.8.4)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5) transitivePeerDependencies: - '@babel/core' - '@types/lodash.merge' @@ -47073,21 +47953,21 @@ packages: - webpack-plugin-serve dev: true - /umi@4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(eslint@8.35.0)(jest@29.4.3)(prettier@2.8.4)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5): - resolution: {integrity: sha512-jgTiJv4fnHTC2a1hwM+dXmkyKoaZaDTqiJv2w4welDJUfpP+uyhR0zcDXwLuu9KTaUUlGxbIW0fGAeM//fxZ+Q==} + /umi@4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(eslint@8.35.0)(jest@29.4.3)(prettier@2.8.4)(react-dom@17.0.2)(react@17.0.2)(typescript@4.9.5): + resolution: {integrity: sha512-lP/qxOo4CmjcJKFrOy8PCIsW/nRLGXsH5CY0/WEUAkHd63M+osbv/t1fhAhsgKpb7/ofaiSpkNsev5XJz+M3aQ==} engines: {node: '>=14'} hasBin: true dependencies: - '@babel/runtime': 7.23.2 - '@umijs/bundler-utils': 4.0.90 - '@umijs/bundler-webpack': 4.0.90(typescript@4.9.5) - '@umijs/core': 4.0.90 - '@umijs/lint': 4.0.90(eslint@8.35.0)(jest@29.4.3)(typescript@4.9.5) - '@umijs/preset-umi': 4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5) - '@umijs/renderer-react': 4.0.90(react-dom@17.0.2)(react@17.0.2) - '@umijs/server': 4.0.90 - '@umijs/test': 4.0.90 - '@umijs/utils': 4.0.90 + '@babel/runtime': 7.23.6 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-webpack': 4.1.2(typescript@4.9.5) + '@umijs/core': 4.1.2 + '@umijs/lint': 4.1.2(eslint@8.35.0)(jest@29.4.3)(typescript@4.9.5) + '@umijs/preset-umi': 4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5) + '@umijs/renderer-react': 4.1.2(react-dom@17.0.2)(react@17.0.2) + '@umijs/server': 4.1.2 + '@umijs/test': 4.1.2 + '@umijs/utils': 4.1.2 prettier-plugin-organize-imports: 3.2.2(prettier@2.8.4)(typescript@4.9.5) prettier-plugin-packagejson: 2.4.3(prettier@2.8.4) transitivePeerDependencies: @@ -47123,21 +48003,21 @@ packages: - webpack-plugin-serve dev: true - /umi@4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(jest@29.4.3)(prettier@2.8.4)(react-dom@18.1.0)(react@18.1.0)(sass@1.65.1)(typescript@4.9.5): - resolution: {integrity: sha512-jgTiJv4fnHTC2a1hwM+dXmkyKoaZaDTqiJv2w4welDJUfpP+uyhR0zcDXwLuu9KTaUUlGxbIW0fGAeM//fxZ+Q==} + /umi@4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(jest@29.4.3)(prettier@2.8.4)(react-dom@18.1.0)(react@18.1.0)(sass@1.65.1)(typescript@4.9.5): + resolution: {integrity: sha512-lP/qxOo4CmjcJKFrOy8PCIsW/nRLGXsH5CY0/WEUAkHd63M+osbv/t1fhAhsgKpb7/ofaiSpkNsev5XJz+M3aQ==} engines: {node: '>=14'} hasBin: true dependencies: - '@babel/runtime': 7.23.2 - '@umijs/bundler-utils': 4.0.90 - '@umijs/bundler-webpack': 4.0.90(typescript@4.9.5) - '@umijs/core': 4.0.90 - '@umijs/lint': 4.0.90(jest@29.4.3)(typescript@4.9.5) - '@umijs/preset-umi': 4.0.90(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5) - '@umijs/renderer-react': 4.0.90(react-dom@18.1.0)(react@18.1.0) - '@umijs/server': 4.0.90 - '@umijs/test': 4.0.90 - '@umijs/utils': 4.0.90 + '@babel/runtime': 7.23.6 + '@umijs/bundler-utils': 4.1.2 + '@umijs/bundler-webpack': 4.1.2(typescript@4.9.5) + '@umijs/core': 4.1.2 + '@umijs/lint': 4.1.2(jest@29.4.3)(typescript@4.9.5) + '@umijs/preset-umi': 4.1.2(@types/node@18.11.18)(@types/react@18.0.26)(sass@1.65.1)(typescript@4.9.5) + '@umijs/renderer-react': 4.1.2(react-dom@18.1.0)(react@18.1.0) + '@umijs/server': 4.1.2 + '@umijs/test': 4.1.2 + '@umijs/utils': 4.1.2 prettier-plugin-organize-imports: 3.2.2(prettier@2.8.4)(typescript@4.9.5) prettier-plugin-packagejson: 2.4.3(prettier@2.8.4) transitivePeerDependencies: @@ -47985,11 +48865,48 @@ packages: '@types/node': 18.11.18 esbuild: 0.17.19 less: 4.1.3 - postcss: 8.4.21 - rollup: 3.20.7 + postcss: 8.4.35 + rollup: 3.29.4 sass: 1.65.1 optionalDependencies: fsevents: 2.3.3 + dev: true + + /vite@4.5.2(@types/node@18.11.18)(less@4.1.3): + resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 18.11.18 + esbuild: 0.18.20 + less: 4.1.3 + postcss: 8.4.35 + rollup: 3.29.4 + optionalDependencies: + fsevents: 2.3.3 /vitest@0.16.0: resolution: {integrity: sha512-Ntp6jrM8wf2NMtamMBLkRBBdeqHkgAH/WMh5Xryts1j2ft2D8QZQbiSVFkSl4WmEQzcPP0YM069g/Ga1vtnEtg==} From 66b4809a6214c99f77dfba5492d95d6a7f91a1c8 Mon Sep 17 00:00:00 2001 From: Devin Date: Fri, 15 Mar 2024 00:45:52 +0800 Subject: [PATCH 24/26] chore: update TS and husky version used by generate command(#12191) * chore(dependencies): Update typescript version to ^5 * chore(preset-umi): Upgrade husky from v8 to v9 * chore(deps): Update swr and husky versions * chore: update version --------- Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- examples/libs/package.json | 2 +- .../templates/max/.husky/commit-msg | 3 --- .../templates/max/.husky/pre-commit | 3 --- .../create-umi/templates/max/package.json.tpl | 4 ++-- .../src/commands/generators/jest.ts | 2 +- .../src/commands/generators/precommit.ts | 16 +++++---------- .../src/commands/generators/tsconfig.ts | 2 +- pnpm-lock.yaml | 20 +++++++++---------- 8 files changed, 19 insertions(+), 33 deletions(-) diff --git a/examples/libs/package.json b/examples/libs/package.json index e8c1c1254815..f5a9163355bb 100644 --- a/examples/libs/package.json +++ b/examples/libs/package.json @@ -15,7 +15,7 @@ "react-redux": "^8.0.5", "redux": "^4.2.1", "swiper": "^8.4.5", - "swr": "2.0.4", + "swr": "^2.2.5", "umi": "workspace:*" } } diff --git a/packages/create-umi/templates/max/.husky/commit-msg b/packages/create-umi/templates/max/.husky/commit-msg index d432988a8ce3..bdab3b586d0d 100755 --- a/packages/create-umi/templates/max/.husky/commit-msg +++ b/packages/create-umi/templates/max/.husky/commit-msg @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no-install max verify-commit $1 diff --git a/packages/create-umi/templates/max/.husky/pre-commit b/packages/create-umi/templates/max/.husky/pre-commit index 8f72062a2cb0..1f54b373ad9e 100755 --- a/packages/create-umi/templates/max/.husky/pre-commit +++ b/packages/create-umi/templates/max/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no-install lint-staged --quiet diff --git a/packages/create-umi/templates/max/package.json.tpl b/packages/create-umi/templates/max/package.json.tpl index 34e249cc6635..fc5385d67d44 100644 --- a/packages/create-umi/templates/max/package.json.tpl +++ b/packages/create-umi/templates/max/package.json.tpl @@ -5,7 +5,7 @@ "dev": "max dev", "build": "max build", "format": "prettier --cache --write .",{{#withHusky}} - "prepare": "husky install",{{/withHusky}} + "prepare": "husky",{{/withHusky}} "postinstall": "max setup", "setup": "max setup", "start": "npm run dev" @@ -19,7 +19,7 @@ "devDependencies": { "@types/react": "^18.0.33", "@types/react-dom": "^18.0.11",{{#withHusky}} - "husky": "^8.0.3",{{/withHusky}} + "husky": "^9",{{/withHusky}} "lint-staged": "^13.2.0", "prettier": "^2.8.7", "prettier-plugin-organize-imports": "^3.2.2", diff --git a/packages/preset-umi/src/commands/generators/jest.ts b/packages/preset-umi/src/commands/generators/jest.ts index 94001c11a255..df8af54818bb 100644 --- a/packages/preset-umi/src/commands/generators/jest.ts +++ b/packages/preset-umi/src/commands/generators/jest.ts @@ -41,7 +41,7 @@ export default (api: IApi) => { jest: jestMajorVersion, '@types/jest': jestMajorVersion, // we use `jest.config.ts` so jest needs ts and ts-node - typescript: '^4', + typescript: '^5', 'ts-node': '^10', 'cross-env': '^7', }; diff --git a/packages/preset-umi/src/commands/generators/precommit.ts b/packages/preset-umi/src/commands/generators/precommit.ts index ec8e366a4654..7a08d8c8ec8c 100644 --- a/packages/preset-umi/src/commands/generators/precommit.ts +++ b/packages/preset-umi/src/commands/generators/precommit.ts @@ -1,6 +1,6 @@ import { GeneratorType } from '@umijs/core'; -import { logger, execa } from '@umijs/utils'; -import { existsSync, writeFileSync, mkdirSync } from 'fs'; +import { execa, logger } from '@umijs/utils'; +import { existsSync, mkdirSync, writeFileSync } from 'fs'; import { join } from 'path'; import { IApi } from '../../types'; import { GeneratorHelper } from './utils'; @@ -20,13 +20,13 @@ export default (api: IApi) => { const cliName = api.appData.umi.cliName; h.addDevDeps({ - husky: '^8', + husky: '^9', prettier: '^2', - typescript: '^4', + typescript: '^5', 'lint-staged': '^13', }); - h.addScript('prepare', 'husky install'); + h.addScript('prepare', 'husky'); // create .lintstagedrc if ( @@ -69,9 +69,6 @@ export default (api: IApi) => { writeFileSync( join(api.cwd, '.husky/commit-msg'), ` -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no-install ${cliName} verify-commit $1 `.trimStart(), ); @@ -86,9 +83,6 @@ npx --no-install ${cliName} verify-commit $1 writeFileSync( join(api.cwd, '.husky/pre-commit'), ` -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no-install lint-staged --quiet `.trimStart(), ); diff --git a/packages/preset-umi/src/commands/generators/tsconfig.ts b/packages/preset-umi/src/commands/generators/tsconfig.ts index 3fc6a2055385..4d4985bc6779 100644 --- a/packages/preset-umi/src/commands/generators/tsconfig.ts +++ b/packages/preset-umi/src/commands/generators/tsconfig.ts @@ -33,7 +33,7 @@ export default (api: IApi) => { const reactMajorVersion = parseInt(reactVersion.split('.')[0], 10) || 18; h.addDevDeps({ - typescript: '^4', + typescript: '^5', '@types/react': `^${reactMajorVersion}`, '@types/react-dom': `^${reactMajorVersion}`, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f6403eff4970..6852c0884cf0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -698,8 +698,8 @@ importers: specifier: ^8.4.5 version: 8.4.5 swr: - specifier: 2.0.4 - version: 2.0.4(react@18.1.0) + specifier: ^2.2.5 + version: 2.2.5(react@18.1.0) umi: specifier: workspace:* version: link:../../packages/umi @@ -20020,9 +20020,6 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependenciesMeta: - ajv: - optional: true dependencies: ajv: 8.11.0 @@ -22962,6 +22959,10 @@ packages: - react-dom dev: true + /client-only@0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + dev: false + /clipboardy@2.1.0: resolution: {integrity: sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ==} engines: {node: '>=8'} @@ -46776,15 +46777,15 @@ packages: react: 18.1.0 dev: false - /swr@2.0.4(react@18.1.0): - resolution: {integrity: sha512-4GUiTjknRUVuw4MWUHR7mzJ9G/DWL+yZz/TgWDfiA0OZ9tL6qyrTkN2wPeboBpL3OJTkej3pexh3mWCnv8cFkQ==} - engines: {pnpm: '7'} + /swr@2.2.5(react@18.1.0): + resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==} peerDependencies: react: ^16.11.0 || ^17.0.0 || ^18.0.0 peerDependenciesMeta: react: optional: true dependencies: + client-only: 0.0.1 react: 18.1.0 use-sync-external-store: 1.2.0(react@18.1.0) dev: false @@ -46821,9 +46822,6 @@ packages: resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==} engines: {node: '>=12.13.0'} hasBin: true - peerDependenciesMeta: - postcss: - optional: true dependencies: arg: 5.0.2 chokidar: 3.5.3 From 23fd3c7623fd4fb166ea125d580eef62c5c64b47 Mon Sep 17 00:00:00 2001 From: max Date: Sun, 17 Mar 2024 01:13:48 +0800 Subject: [PATCH 25/26] docs(antd): conditions for runtime config to take effect (#12202) * docs: update `antd.md` * docs: update --------- Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- docs/docs/docs/max/antd.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/docs/docs/max/antd.md b/docs/docs/docs/max/antd.md index c5dc72f9f827..511a5801f8ee 100644 --- a/docs/docs/docs/max/antd.md +++ b/docs/docs/docs/max/antd.md @@ -139,7 +139,17 @@ export default { ### 运行时配置 -在 app.ts(x) 文件中可以对 antd 进行更丰富的配置，比如配置 antd5 的预设算法和 message 最大显示数： +在 `app.ts(x)` 运行时配置中可以修改 antd `ConfigProvider` 的值，使用此功能前，**确保你已经打开了 `antd.configProvider` 选项**，否则对 `ConfigProvider` 的修改不会生效： + +```ts +// .umirc.ts + + antd: { + configProvider: {} + } +``` + +如配置 antd 5 的主题预设算法和 `message` 弹出框最大数： ```ts // app.ts From c952494d991919dcc9963f3c6335d23553b92a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=87=AF=E6=96=8C?= <799870386@qq.com> Date: Sun, 17 Mar 2024 09:10:45 +0800 Subject: [PATCH 26/26] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8FUMI=5FDEV=5FSERVER=5FCOMPRESS?= =?UTF-8?q?=E6=9D=A5=E6=8E=A7=E5=88=B6dev=20server=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=8E=8B=E7=BC=A9=20(#12166)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 使用环境变量UMI_DEV_SERVER_COMPRESS来控制dev server是否进行压缩 * feat: 使用环境变量UMI_DEV_SERVER_COMPRESS来控制dev server是否进行压缩 * example: update * docs: `UMI_DEV_SERVER_COMPRESS` * example: update * docs: comment --------- Co-authored-by: 王凯斌 Co-authored-by: fz6m <59400654+fz6m@users.noreply.github.com> --- docs/docs/docs/guides/env-variables.md | 8 +++ examples/with-no-compress-for-sse/.umirc.ts | 1 + .../with-no-compress-for-sse/package.json | 15 ++++++ .../with-no-compress-for-sse/pages/index.tsx | 52 +++++++++++++++++++ examples/with-no-compress-for-sse/plugin.ts | 8 +++ examples/with-no-compress-for-sse/readme.md | 9 ++++ .../sse-middleware.ts | 29 +++++++++++ packages/bundler-webpack/src/server/server.ts | 6 ++- pnpm-lock.yaml | 10 ++++ 9 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 examples/with-no-compress-for-sse/.umirc.ts create mode 100644 examples/with-no-compress-for-sse/package.json create mode 100644 examples/with-no-compress-for-sse/pages/index.tsx create mode 100644 examples/with-no-compress-for-sse/plugin.ts create mode 100644 examples/with-no-compress-for-sse/readme.md create mode 100644 examples/with-no-compress-for-sse/sse-middleware.ts diff --git a/docs/docs/docs/guides/env-variables.md b/docs/docs/docs/guides/env-variables.md index 8f18c40e7db8..9114a8e4c38a 100644 --- a/docs/docs/docs/guides/env-variables.md +++ b/docs/docs/docs/guides/env-variables.md @@ -198,6 +198,14 @@ $ UMI_PLUGINS=./path/to/plugin1,./path/to/plugin2 umi dev $ UMI_PRESETS=./path/to/preset1,./path/to/preset2 umi dev ``` +### UMI_DEV_SERVER_COMPRESS + +默认 Umi 开发服务器自带 [compress](https://github.com/expressjs/compression) 压缩中间件，这会使开发时 SSE 数据的传输 [无法流式获取](https://github.com/umijs/umi/issues/12144) ，通过指定 `UMI_DEV_SERVER_COMPRESS=none` 来关闭 compress 压缩功能： + +```bash + UMI_DEV_SERVER_COMPRESS=none umi dev +``` + ### WEBPACK_FS_CACHE_DEBUG 开启 webpack 的物理缓存 debug 日志。 diff --git a/examples/with-no-compress-for-sse/.umirc.ts b/examples/with-no-compress-for-sse/.umirc.ts new file mode 100644 index 000000000000..ff8b4c56321a --- /dev/null +++ b/examples/with-no-compress-for-sse/.umirc.ts @@ -0,0 +1 @@ +export default {}; diff --git a/examples/with-no-compress-for-sse/package.json b/examples/with-no-compress-for-sse/package.json new file mode 100644 index 000000000000..949318ff8d8f --- /dev/null +++ b/examples/with-no-compress-for-sse/package.json @@ -0,0 +1,15 @@ +{ + "name": "@example/with-no-compress-for-sse", + "private": true, + "scripts": { + "build": "umi build", + "dev": "umi dev", + "dev:nocompress": "cross-env UMI_DEV_SERVER_COMPRESS=none npm run dev" + }, + "dependencies": { + "umi": "workspace:*" + }, + "devDependencies": { + "cross-env": "^7.0.3" + } +} diff --git a/examples/with-no-compress-for-sse/pages/index.tsx b/examples/with-no-compress-for-sse/pages/index.tsx new file mode 100644 index 000000000000..2ef38e04f2ef --- /dev/null +++ b/examples/with-no-compress-for-sse/pages/index.tsx @@ -0,0 +1,52 @@ +import React, { useEffect, useState } from 'react'; + +class Event { + data: string; + timeString: string; + + constructor(data: string) { + this.data = data; + this.timeString = new Date().toLocaleTimeString(); + } +} + +export default function HomePage() { + const [events, setEvents] = useState([]); + + useEffect(() => { + console.log('开始请求'); + const eventSource = new EventSource('/events/number'); + let startEvent = new Event('开始请求'); + setEvents((prev) => [...prev, startEvent]); + eventSource.onmessage = function (e: any) { + let item = new Event(e.data); + setEvents((prev) => [...prev, item]); + }; + eventSource.onerror = (e) => { + console.log('EventSource failed:', e); + eventSource.close(); + }; + }, []); + + return ( +
+

{`演示：当默认存在 compress 时，数据无法流式获取。`}

+ + + + + + + + + {events.map((event, index) => ( + + + + + ))} + +
事件内容接收时间
{event.data}{event.timeString}
+
+ ); +} diff --git a/examples/with-no-compress-for-sse/plugin.ts b/examples/with-no-compress-for-sse/plugin.ts new file mode 100644 index 000000000000..e3d4901cdbbb --- /dev/null +++ b/examples/with-no-compress-for-sse/plugin.ts @@ -0,0 +1,8 @@ +import { IApi } from 'umi'; +import { sseMiddleware } from './sse-middleware'; + +export default (api: IApi) => { + api.onBeforeMiddleware(({ app }) => { + sseMiddleware(app); + }); +}; diff --git a/examples/with-no-compress-for-sse/readme.md b/examples/with-no-compress-for-sse/readme.md new file mode 100644 index 000000000000..15e5513baac3 --- /dev/null +++ b/examples/with-no-compress-for-sse/readme.md @@ -0,0 +1,9 @@ +# with-no-compress-for-sse + +### 背景 + +[来源](https://github.com/umijs/umi/issues/12144)，在开发环境下由于 umi dev server 内置了 `compress` 中间件，导致 SSE 流在开发时传递不符合预期。 + +### 解决 + +本示例演示了此问题，并通过启动时附加 `UMI_DEV_SERVER_COMPRESS=none` 来关闭 `compress` 中间件，使 SSE 在本地开发时正常运作。 diff --git a/examples/with-no-compress-for-sse/sse-middleware.ts b/examples/with-no-compress-for-sse/sse-middleware.ts new file mode 100644 index 000000000000..bddbfcb10b11 --- /dev/null +++ b/examples/with-no-compress-for-sse/sse-middleware.ts @@ -0,0 +1,29 @@ +import type { Express } from '@umijs/bundler-utils/compiled/express'; + +export const sseMiddleware = (app: Express) => { + app.get('/events/number', (req, res) => { + console.log('new connection'); + res.writeHead(200, { + 'Content-Type': 'text/event-stream', + 'Cache-Control': 'no-cache', + Connection: 'keep-alive', + }); + + let counter = 1; + const intervalId = setInterval(() => { + if (counter === 5) { + clearInterval(intervalId); + res.end(`data: 事件${counter}\n\n`); + return; + } + res.write(`data: 事件${counter}\n\n`); + + counter++; + }, 1000); + + req.on('close', () => { + clearInterval(intervalId); + res.end(); + }); + }); +}; diff --git a/packages/bundler-webpack/src/server/server.ts b/packages/bundler-webpack/src/server/server.ts index 2553b66e7ded..b6296e867bae 100644 --- a/packages/bundler-webpack/src/server/server.ts +++ b/packages/bundler-webpack/src/server/server.ts @@ -44,8 +44,10 @@ export async function createServer(opts: IOpts): Promise { }), ); - // compression - app.use(require('@umijs/bundler-webpack/compiled/compression')()); + // See https://github.com/umijs/umi/issues/12144 + if (process.env.UMI_DEV_SERVER_COMPRESS !== 'none') { + app.use(require('@umijs/bundler-webpack/compiled/compression')()); + } // debug all js file app.use((req, res, next) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6852c0884cf0..c40b3bfe9894 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1383,6 +1383,16 @@ importers: specifier: ^18.0.10 version: 18.0.10 + examples/with-no-compress-for-sse: + dependencies: + umi: + specifier: workspace:* + version: link:../../packages/umi + devDependencies: + cross-env: + specifier: ^7.0.3 + version: 7.0.3 + examples/with-react-17: dependencies: react: