Merge branch 'main' into multi-char-suggestions

Author: nperez0111

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.31.2 (2025-06-05)
+
+### 🩹 Fixes
+
+- re-release ([0bc546e18](https://github.com/TypeCellOS/BlockNote/commit/0bc546e18))
+- ignore falsy values in boolean prop schema ([#1730](https://github.com/TypeCellOS/BlockNote/pull/1730))
+
+### ❤️ Thank You
+
+- Nick Perez
+- Nick the Sick
+
 ## 0.31.1 (2025-05-23)
 
 ### 🩹 Fixes

docs/auth.ts

@@ -223,25 +223,34 @@ export const auth = betterAuth({
         // webhooks have to be publicly accessible
         // ngrok http http://localhost:3000
         secret: process.env.POLAR_WEBHOOK_SECRET as string,
-        onSubscriptionUpdated: async (payload) => {
-          const authContext = await auth.$context;
-          const userId = payload.data.customer.externalId;
-          if (!userId) {
-            return;
-          }
-          if (payload.data.status === "active") {
-            const productId = payload.data.product.id;
-            const planType = Object.values(PRODUCTS).find(
-              (p) => p.id === productId,
-            )?.slug;
-            await authContext.internalAdapter.updateUser(userId, {
-              planType,
-            });
-          } else {
-            // No active subscription, so we need to remove the plan type
-            await authContext.internalAdapter.updateUser(userId, {
-              planType: null,
-            });
+        async onPayload(payload) {
+          switch (payload.type) {
+            case "subscription.active":
+            case "subscription.canceled":
+            case "subscription.updated":
+            case "subscription.revoked":
+            case "subscription.created":
+            case "subscription.uncanceled": {
+              const authContext = await auth.$context;
+              const userId = payload.data.customer.externalId;
+              if (!userId) {
+                return;
+              }
+              if (payload.data.status === "active") {
+                const productId = payload.data.product.id;
+                const planType = Object.values(PRODUCTS).find(
+                  (p) => p.id === productId,
+                )?.slug;
+                await authContext.internalAdapter.updateUser(userId, {
+                  planType,
+                });
+              } else {
+                // No active subscription, so we need to remove the plan type
+                await authContext.internalAdapter.updateUser(userId, {
+                  planType: null,
+                });
+              }
+            }
           }
         },
       },
@@ -262,6 +271,15 @@ export const auth = betterAuth({
         // After verifying email, send them a welcome email
         const newSession = ctx.context.newSession;
         if (newSession) {
+          const oneMinuteAgo = new Date(Date.now() - 60 * 1000);
+          if (
+            ctx.path === "/magic-link/verify" &&
+            newSession.user.createdAt < oneMinuteAgo
+          ) {
+            // magic link is for an account that was created more than a minute ago, so just a normal sign in
+            // no need to send welcome email
+            return false;
+          }
           await sendEmail({
             to: newSession.user.email,
             template: "welcome",

packages/ariakit/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/ariakit"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -57,8 +57,8 @@
   },
   "dependencies": {
     "@ariakit/react": "^0.4.3",
-    "@blocknote/core": "0.31.1",
-    "@blocknote/react": "0.31.1"
+    "@blocknote/core": "0.31.2",
+    "@blocknote/react": "0.31.2"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",

packages/code-block/package.json

@@ -9,7 +9,7 @@
     "directory": "packages/code-block"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -49,7 +49,7 @@
     "test-watch": "vitest watch"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.1",
+    "@blocknote/core": "0.31.2",
     "@shikijs/core": "^3.2.1",
     "@shikijs/engine-javascript": "^3.2.1",
     "@shikijs/langs-precompiled": "^3.2.1",

packages/core/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/core"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",

packages/dev-scripts/package.json

@@ -8,7 +8,7 @@
     "directory": "packages/dev-scripts"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "description": "",
   "type": "module",
   "scripts": {

packages/mantine/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/mantine"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -56,8 +56,8 @@
     "clean": "rimraf dist && rimraf types"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.1",
-    "@blocknote/react": "0.31.1",
+    "@blocknote/core": "0.31.2",
+    "@blocknote/react": "0.31.2",
     "@mantine/core": "^7.10.1",
     "@mantine/hooks": "^7.10.1",
     "@mantine/utils": "^6.0.21",

packages/react/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/react"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -58,7 +58,7 @@
     "clean": "rimraf dist && rimraf types"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.1",
+    "@blocknote/core": "0.31.2",
     "@emoji-mart/data": "^1.2.1",
     "@floating-ui/react": "^0.26.4",
     "@tiptap/core": "^2.12.0",

packages/server-util/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/server-util"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -56,8 +56,8 @@
     "test-watch": "vitest watch"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.1",
-    "@blocknote/react": "0.31.1",
+    "@blocknote/core": "0.31.2",
+    "@blocknote/react": "0.31.2",
     "@tiptap/core": "^2.12.0",
     "@tiptap/pm": "^2.12.0",
     "jsdom": "^25.0.1",

packages/shadcn/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/shadcn"
   },
   "license": "MPL-2.0",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "files": [
     "dist",
     "types",
@@ -56,8 +56,8 @@
     "clean": "rimraf dist && rimraf types"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.1",
-    "@blocknote/react": "0.31.1",
+    "@blocknote/core": "0.31.2",
+    "@blocknote/react": "0.31.2",
     "@hookform/resolvers": "^3.6.0",
     "@radix-ui/react-avatar": "^1.1.3",
     "@radix-ui/react-dropdown-menu": "^2.0.6",