chore: update mako bundler for new mako version (#1229)

* chore: update bundler-mako for new mako version * chore: build watch default false * chore: update some config from opts.config to opts
umijs · May 31, 2024 · 32ee59e · 32ee59e
1 parent 5c3d18f
commit 32ee59e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -520,7 +520,7 @@ Whether to output umd format.
 
 ### watch
 
-- Type: `{ ignorePaths: string[] }`
+- Type: `{ ignorePaths: string[] } | false`
 - Default: `{ ignorePaths: [] }`
 
 Watch related configuration.

diff --git a/packages/bundler-mako/index.js b/packages/bundler-mako/index.js
@@ -43,11 +43,11 @@ exports.build = async function (opts) {
         math: opts.config.lessLoader?.math,
         plugins: opts.config.lessLoader?.plugins,
       },
-      hooks: {
-        ...opts.config.hooks,
-      },
+      plugins: opts.plugins || [],
       forkTSChecker: makoConfig.forkTSChecker,
-      watch: false,
+      watch: opts.watch || false,
+      hmr: opts.hmr || false,
+      devServer: opts.devServer || false,
     });
   } catch (e) {
     console.error(e.message);
@@ -213,12 +213,13 @@ exports.dev = async function (opts) {
         plugins: opts.config.lessLoader?.plugins,
       },
       forkTSChecker: makoConfig.forkTSChecker,
-      hooks: {
+      plugins: (opts.plugins || []).concat({
+        name: 'default',
         generateEnd: (args) => {
           opts.onDevCompileDone(args);
         },
-        ...opts.config.hooks,
-      },
+      }),
+
       watch: true,
     });
   } catch (e) {