chore: change plugins to makoPlugins

umijs · Jun 27, 2024 · da9315b · da9315b
1 parent a113db8
commit da9315b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/examples/ssr-demo/.umirc.ts b/examples/ssr-demo/.umirc.ts
@@ -5,7 +5,13 @@ export default {
   routePrefetch: {},
   manifest: {},
   clientLoader: {},
-  mako: {},
+  mako: {
+    plugins: [
+      {
+        load: () => {},
+      },
+    ],
+  },
   ssr: {
     builder: 'mako',
   },

diff --git a/packages/preset-umi/src/commands/build.ts b/packages/preset-umi/src/commands/build.ts
@@ -107,11 +107,9 @@ umi build --clean
         react: {
           runtime: shouldUseAutomaticRuntime ? 'automatic' : 'classic',
         },
-        plugins: api.config.mako?.plugins,
         config: {
           outputPath: api.userConfig.outputPath || 'dist',
           ...api.config,
-          inlineCSS: {},
         } as IServicePluginAPI['config'],
         cwd: api.cwd,
         entry,

diff --git a/packages/preset-umi/src/commands/dev/dev.ts b/packages/preset-umi/src/commands/dev/dev.ts
@@ -357,7 +357,6 @@ PORT=8888 umi dev
         react: {
           runtime: shouldUseAutomaticRuntime ? 'automatic' : 'classic',
         },
-        plugins: api.config.mako?.plugins,
         config: {
           outputPath: api.userConfig.outputPath || 'dist',
           ...api.config,

diff --git a/packages/preset-umi/src/features/mako/mako.ts b/packages/preset-umi/src/features/mako/mako.ts
@@ -10,10 +10,14 @@ export default (api: IApi) => {
       schema({ zod }) {
         return zod
           .object({
-            plugins: zod.object({
-              load: zod.function(),
-              generateEnd: zod.function(),
-            }),
+            plugins: zod.array(
+              zod
+                .object({
+                  load: zod.function(),
+                  generateEnd: zod.function(),
+                })
+                .partial(),
+            ),
           })
           .partial();
       },
@@ -31,6 +35,7 @@ export default (api: IApi) => {
       ...memo,
       mfsu: false,
       hmrGuardian: false,
+      makoPlugins: memo.mako?.plugins || [],
     };
   });
 

diff --git a/packages/preset-umi/src/features/ssr/mako/mako.ts b/packages/preset-umi/src/features/ssr/mako/mako.ts
@@ -25,8 +25,8 @@ export const build = async (api: IApi) => {
     entry: {
       'umi.server': entry,
     },
-    plugins: api.config.mako.plugins,
     config: {
+      makoPlugins: api.config.mako.plugins,
       ...api.config,
       jsMinifier: 'none',
       hash: useHash,
@@ -35,7 +35,6 @@ export const build = async (api: IApi) => {
         fileName: 'build-manifest.json',
       },
       devtool: false,
-      inlineCSS: {},
       cjs: true,
       dynamicImportToRequire: false,
     },

diff --git a/packages/preset-umi/src/features/ssr/ssr.ts b/packages/preset-umi/src/features/ssr/ssr.ts
@@ -89,7 +89,7 @@ export default (api: IApi) => {
     // mako builder need config manifest
     if (memo.ssr.builder === 'mako') {
       assert(
-        !memo.mako,
+        memo.mako,
         `The \`ssr.builder mako\` config is now allowed when \`mako\` is enable!`,
       );
       memo.manifest ??= {};