diff --git a/.github/workflows/node-bind-build.yml b/.github/workflows/node-bind-build.yml
index 55570f8cb..fc434eefa 100644
--- a/.github/workflows/node-bind-build.yml
+++ b/.github/workflows/node-bind-build.yml
@@ -65,6 +65,18 @@ jobs:
               set -e &&
               rustup target add aarch64-unknown-linux-musl &&
               pnpm --filter @umijs/mako build --target aarch64-unknown-linux-musl
+          - host: windows-latest
+            build: |
+              rustup target add x86_64-pc-windows-msvc
+              pnpm --filter @umijs/mako build --target x86_64-pc-windows-msvc
+              strip -x ./packages/mako/*.node
+            target: x86_64-pc-windows-msvc
+          - host: windows-latest
+            build: |
+              rustup target add i686-pc-windows-msvc
+              pnpm --filter @umijs/mako build --target i686-pc-windows-msvc
+              strip -x ./packages/mako/*.node
+            target: i686-pc-windows-msvc
     name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
     steps:
diff --git a/packages/bundler-mako/package.json b/packages/bundler-mako/package.json
index 635f34d51..7d24aec03 100644
--- a/packages/bundler-mako/package.json
+++ b/packages/bundler-mako/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@umijs/bundler-mako",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "dependencies": {
     "@umijs/bundler-utils": "^4.0.81",
-    "@umijs/mako": "0.8.8",
+    "@umijs/mako": "0.8.9-canary.20240906.2",
     "chalk": "^4.1.2",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
diff --git a/packages/mako/npm/darwin-arm64/package.json b/packages/mako/npm/darwin-arm64/package.json
index 6b0a29215..f538de210 100644
--- a/packages/mako/npm/darwin-arm64/package.json
+++ b/packages/mako/npm/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-darwin-arm64",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "darwin"
   ],
diff --git a/packages/mako/npm/darwin-x64/package.json b/packages/mako/npm/darwin-x64/package.json
index 8fced6346..8ec87c1a9 100644
--- a/packages/mako/npm/darwin-x64/package.json
+++ b/packages/mako/npm/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-darwin-x64",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "darwin"
   ],
diff --git a/packages/mako/npm/linux-arm64-gnu/package.json b/packages/mako/npm/linux-arm64-gnu/package.json
index 3fbca27d7..7fdcd2619 100644
--- a/packages/mako/npm/linux-arm64-gnu/package.json
+++ b/packages/mako/npm/linux-arm64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-linux-arm64-gnu",
-  "version": "0.0.0",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "linux"
   ],
@@ -18,4 +18,4 @@
   "libc": [
     "glibc"
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/mako/npm/linux-arm64-musl/package.json b/packages/mako/npm/linux-arm64-musl/package.json
index 67a5147ca..d4c619852 100644
--- a/packages/mako/npm/linux-arm64-musl/package.json
+++ b/packages/mako/npm/linux-arm64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-linux-arm64-musl",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "linux"
   ],
diff --git a/packages/mako/npm/linux-x64-gnu/package.json b/packages/mako/npm/linux-x64-gnu/package.json
index fc319ba5d..fb25d2188 100644
--- a/packages/mako/npm/linux-x64-gnu/package.json
+++ b/packages/mako/npm/linux-x64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-linux-x64-gnu",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "linux"
   ],
diff --git a/packages/mako/npm/linux-x64-musl/package.json b/packages/mako/npm/linux-x64-musl/package.json
index 7643e13f1..6b79000a6 100644
--- a/packages/mako/npm/linux-x64-musl/package.json
+++ b/packages/mako/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-linux-x64-musl",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "linux"
   ],
diff --git a/packages/mako/npm/win32-ia32-msvc/package.json b/packages/mako/npm/win32-ia32-msvc/package.json
index 3994b6bfd..fa97e43f7 100644
--- a/packages/mako/npm/win32-ia32-msvc/package.json
+++ b/packages/mako/npm/win32-ia32-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-win32-ia32-msvc",
-  "version": "0.0.0",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "win32"
   ],
@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/mako/npm/win32-x64-msvc/package.json b/packages/mako/npm/win32-x64-msvc/package.json
index 98a2ec03d..024e66f4d 100644
--- a/packages/mako/npm/win32-x64-msvc/package.json
+++ b/packages/mako/npm/win32-x64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako-win32-x64-msvc",
-  "version": "0.0.0",
+  "version": "0.8.9-canary.20240906.2",
   "os": [
     "win32"
   ],
@@ -15,4 +15,4 @@
   "engines": {
     "node": ">= 10"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/mako/package.json b/packages/mako/package.json
index 092f12f1c..ec9ccbfc4 100644
--- a/packages/mako/package.json
+++ b/packages/mako/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mako",
-  "version": "0.8.8",
+  "version": "0.8.9-canary.20240906.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -14,7 +14,9 @@
         "aarch64-apple-darwin",
         "aarch64-unknown-linux-gnu",
         "aarch64-unknown-linux-musl",
+        "i686-pc-windows-msvc",
         "x86_64-apple-darwin",
+        "x86_64-pc-windows-msvc",
         "x86_64-unknown-linux-gnu",
         "x86_64-unknown-linux-musl"
       ]
@@ -75,11 +77,14 @@
     "src:build": "father build"
   },
   "optionalDependencies": {
-    "@umijs/mako-darwin-arm64": "0.8.8",
-    "@umijs/mako-linux-arm64-musl": "0.8.8",
-    "@umijs/mako-darwin-x64": "0.8.8",
-    "@umijs/mako-linux-x64-gnu": "0.8.8",
-    "@umijs/mako-linux-x64-musl": "0.8.8"
+    "@umijs/mako-darwin-arm64": "0.8.9-canary.20240906.2",
+    "@umijs/mako-linux-arm64-gnu": "0.8.9-canary.20240906.2",
+    "@umijs/mako-linux-arm64-musl": "0.8.9-canary.20240906.2",
+    "@umijs/mako-win32-ia32-msvc": "0.8.9-canary.20240906.2",
+    "@umijs/mako-darwin-x64": "0.8.9-canary.20240906.2",
+    "@umijs/mako-win32-x64-msvc": "0.8.9-canary.20240906.2",
+    "@umijs/mako-linux-x64-gnu": "0.8.9-canary.20240906.2",
+    "@umijs/mako-linux-x64-musl": "0.8.9-canary.20240906.2"
   },
   "repository": "git@github.com:umijs/mako.git"
-}
+}
\ No newline at end of file
diff --git a/packages/mako/src/cli.ts b/packages/mako/src/cli.ts
index df1935a24..a35f86ebf 100644
--- a/packages/mako/src/cli.ts
+++ b/packages/mako/src/cli.ts
@@ -3,14 +3,6 @@ import yParser from 'yargs-parser';
 import { check } from './checker';
 
 (async () => {
-  let isWin = process.platform === 'win32';
-  if (isWin) {
-    console.error(
-      'mako is not supported on Windows yet, please visit https://makojs.dev/ to subscribe for updates',
-    );
-    process.exit(1);
-  }
-
   // use MAKO_CLI to identify if it's running in mako cli standalone
   // so that we can print extra information
   process.env.MAKO_CLI = '1';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 534466e2e..01cb9131e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -436,7 +436,7 @@ importers:
         specifier: ^4.0.81
         version: 4.1.6
       '@umijs/mako':
-        specifier: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
         version: link:../mako
       chalk:
         specifier: ^4.1.2
@@ -534,20 +534,29 @@ importers:
         version: 21.1.1
     optionalDependencies:
       '@umijs/mako-darwin-arm64':
-        specifier: 0.8.8
-        version: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
       '@umijs/mako-darwin-x64':
-        specifier: 0.8.8
-        version: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
+      '@umijs/mako-linux-arm64-gnu':
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
       '@umijs/mako-linux-arm64-musl':
-        specifier: 0.8.8
-        version: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
       '@umijs/mako-linux-x64-gnu':
-        specifier: 0.8.8
-        version: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
       '@umijs/mako-linux-x64-musl':
-        specifier: 0.8.8
-        version: 0.8.8
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
+      '@umijs/mako-win32-ia32-msvc':
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
+      '@umijs/mako-win32-x64-msvc':
+        specifier: 0.8.9-canary.20240906.2
+        version: 0.8.9-canary.20240906.2
     devDependencies:
       '@napi-rs/cli':
         specifier: ^2.18.0
@@ -6500,8 +6509,8 @@ packages:
     dev: true
     optional: true
 
-  /@umijs/mako-darwin-arm64@0.8.8:
-    resolution: {integrity: sha512-J1vRbu82HUqFT1PGUsYt19Vt5XqdDg4R0PlYSTxyytWUp8apB1DrhwW0Fuhg0gUbu5dq5lOssywJoWrhjJ2/nA==}
+  /@umijs/mako-darwin-arm64@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-1BT2CyCqlLr/9ky8OT+Zsrb6DW+2UCusfZDJwr8AVgv+CvodCP1hHwf0aI1O6n55CPXyroVDcxOXovViixpMvg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
@@ -6518,8 +6527,8 @@ packages:
     dev: true
     optional: true
 
-  /@umijs/mako-darwin-x64@0.8.8:
-    resolution: {integrity: sha512-flt3jVxVrAUWxgj5up+2KyHDT1NC/C+BAISDd/GUSVsK9g/v5hH+QCPjSbyR0UxqAOv3xxGb05bIL3u4xRk0HQ==}
+  /@umijs/mako-darwin-x64@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-uoyvK8U6yB912s6eoUT2YjyFX0+bk1+57ubjR0qv8MdWjSBbCKNsM4VTuq0m7mf+MwokEGWjeU3FwKWHi9DUBQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
@@ -6527,8 +6536,17 @@ packages:
     dev: false
     optional: true
 
-  /@umijs/mako-linux-arm64-musl@0.8.8:
-    resolution: {integrity: sha512-BCjC4f3QBIXdvvBkEpcCqRqQF5N+2JaGH7twIUitiRcEt6RaZyunotRZMVMkbDZOozsaDZPFI1oocrKBPV4yqg==}
+  /@umijs/mako-linux-arm64-gnu@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-XOfYWFAMBdlL8NdyMhPVs4Tt/Bqi4ARmqDFUWORSeqe4ja0Cs5fQXWlHWV9RfQHvCbcUhYay8SELgQvT2ubMew==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@umijs/mako-linux-arm64-musl@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-qFKKNHoyK+UzgIa3w9+4VLuX93/RA3eNv77oEGnaLCLcaAK5+w7bllttmrLUCkYTDFyJjPIhGkbyceXEBRjBFw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -6545,8 +6563,8 @@ packages:
     dev: true
     optional: true
 
-  /@umijs/mako-linux-x64-gnu@0.8.8:
-    resolution: {integrity: sha512-dBbl8bzcj96MM8LYv+alUTHCN0kKXsBlljAaW6WVdnis9AFD6Ij1tBbCQEpAyfdJUqzFxRj/uZq/vNN0/8jkHA==}
+  /@umijs/mako-linux-x64-gnu@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-rfIhRHtFuuvvVN4be5rS7wibUeXdr7LD1eRr9DgnlLmiAFyJkODpSQHwUzDvCQHtnPEfDQ/ik7LllTIzKhDJAw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -6563,8 +6581,8 @@ packages:
     dev: true
     optional: true
 
-  /@umijs/mako-linux-x64-musl@0.8.8:
-    resolution: {integrity: sha512-AZKqtGwXhk+0bGJMbOOCzpUk+4BARZkGAX2zl7odyaoDJH7lbqzcHII01uUFCsGh0FLobXczC2rdzG99mGv2KA==}
+  /@umijs/mako-linux-x64-musl@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-DFuASa7JGK0V7wn6n4kmV/pbzwykHbuot7f8o4OWA6VMekq6dVGR0zSnZzpJFzvAUgUYfBDc+SFpsJf/XqtEeg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -6572,6 +6590,24 @@ packages:
     dev: false
     optional: true
 
+  /@umijs/mako-win32-ia32-msvc@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-nhhNa6MO9Em7feKDCrPDlicnc9i1oIorouSUQfSrqgtvJDGfSUB1t3FuFJvxkHsmpkV9YEv1qRYeLBLhouE96w==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /@umijs/mako-win32-x64-msvc@0.8.9-canary.20240906.2:
+    resolution: {integrity: sha512-bZ9a1jc5yQPJ0oAeKzBSGpWdoKB1w6mV82X4vCAiDHV8JBXcuLUZCO+F/0i92++CYDwxEnTeW1b9ZWBVJJrfHA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
   /@umijs/mako@0.7.4:
     resolution: {integrity: sha512-Wgfv13DHliBnNwefgR/ZtG31wTjmbxUuCtsiGnmUPcYxOv0qTQ+yhq1iaVNvQZm48/ohc6M2NIZeghSbbFp+/Q==}
     engines: {node: '>= 16'}