diff --git a/packages/frontend/web/src/index.tsx b/packages/frontend/web/src/index.tsx
index 9dafe62f44..eeda0a5def 100644
--- a/packages/frontend/web/src/index.tsx
+++ b/packages/frontend/web/src/index.tsx
@@ -1,5 +1,6 @@
 import './polyfill/dispose';
 import './polyfill/intl-segmenter';
+import './polyfill/promise-with-resolvers';
 import './polyfill/request-idle-callback';
 import '@affine/core/bootstrap/preload';
 
diff --git a/packages/frontend/web/src/polyfill/promise-with-resolvers.ts b/packages/frontend/web/src/polyfill/promise-with-resolvers.ts
new file mode 100644
index 0000000000..6d806c3a08
--- /dev/null
+++ b/packages/frontend/web/src/polyfill/promise-with-resolvers.ts
@@ -0,0 +1 @@
+import 'core-js/features/promise/with-resolvers';
diff --git a/tools/commitlint/.commitlintrc.json b/tools/commitlint/.commitlintrc.json
index aacdd6e174..20caaa161f 100644
--- a/tools/commitlint/.commitlintrc.json
+++ b/tools/commitlint/.commitlintrc.json
@@ -8,6 +8,7 @@
         "electron",
         "server",
         "core",
+        "web",
         "docs",
         "storybook",
         "component",