@batijs/cli 0.0.679 → 0.0.680

package/dist/{asset-package.json-ZxmvjHsQ.js → asset-package.json-D8gWgpen.js}

@@ -30,7 +30,7 @@ var package_default = {
 		"postgres": "^3.4.9",
 		"tsx": "^4.23.12"
 	},
-	dependencies: { "better-auth": "^1.6.26" },
+	dependencies: { "better-auth": "^1.7.1" },
 	files: ["dist/"],
 	exports: {
 		"./database/better-auth/migrate": { "types": "./dist/types/database/better-auth/migrate.d.mts" },

package/dist/boilerplates/@batijs/better-auth/files/$package.json.js

@@ -3,7 +3,7 @@
 import { loadPackageJson, packageManager } from "@batijs/core";
 //#region ../../boilerplates/better-auth/dist/files/$package.json.mjs
 async function getPackageJson(props) {
-	const packageJson = await loadPackageJson(props, await import("../../../../asset-package.json-ZxmvjHsQ.js").then((x) => x.default));
+	const packageJson = await loadPackageJson(props, await import("../../../../asset-package.json-D8gWgpen.js").then((x) => x.default));
 	const { BATI } = props.meta;
 	packageJson.addDependencies(["better-auth", "@universal-middleware/core"]);
 	if (BATI.has("drizzle")) return packageJson;

package/dist/boilerplates/@batijs/better-auth/files/asset-package.json.mjs

@@ -28,7 +28,7 @@ var package_default = {
 		"postgres": "^3.4.9",
 		"tsx": "^4.23.12"
 	},
-	dependencies: { "better-auth": "^1.6.26" },
+	dependencies: { "better-auth": "^1.7.1" },
 	files: ["dist/"],
 	exports: {
 		"./database/better-auth/migrate": { "types": "./dist/types/database/better-auth/migrate.d.mts" },

package/dist/boilerplates/@batijs/better-auth/files/database/drizzle/schema/auth.ts

@@ -1,9 +1,9 @@
 /* $$.keepFileIfImported */
-import { boolean, pgTable, text as pgText, timestamp } from "drizzle-orm/pg-core";
-import { integer, sqliteTable, text as sqliteText } from "drizzle-orm/sqlite-core";
+import { boolean, pgTable, text as pgText, timestamp, uniqueIndex as pgUniqueIndex } from "drizzle-orm/pg-core";
+import { integer, sqliteTable, text as sqliteText, uniqueIndex as sqliteUniqueIndex } from "drizzle-orm/sqlite-core";
 
 // Better Auth's tables, owned by Drizzle so its migrations create them.
-// Regenerate with `npx @better-auth/cli generate` if you customize the Better Auth config.
+// Regenerate with `npx auth generate` if you customize the Better Auth config.
 // Column names are snake_case to match Better Auth's Drizzle adapter defaults.
 
 export const user = $$.BATI.has("postgres")
@@ -48,37 +48,49 @@ export const session = $$.BATI.has("postgres")
       userId: sqliteText("user_id").notNull(),
     });
 
+// Since Better Auth 1.7 account identity is scoped by `issuer`: the column is required and
+// (issuer, accountId) must be unique. https://better-auth.com/docs/guides/1-7-upgrade-guide
 export const account = $$.BATI.has("postgres")
-  ? pgTable("account", {
-      id: pgText("id").primaryKey(),
-      accountId: pgText("account_id").notNull(),
-      providerId: pgText("provider_id").notNull(),
-      userId: pgText("user_id").notNull(),
-      accessToken: pgText("access_token"),
-      refreshToken: pgText("refresh_token"),
-      idToken: pgText("id_token"),
-      accessTokenExpiresAt: timestamp("access_token_expires_at"),
-      refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
-      scope: pgText("scope"),
-      password: pgText("password"),
-      createdAt: timestamp("created_at").notNull(),
-      updatedAt: timestamp("updated_at").notNull(),
-    })
-  : sqliteTable("account", {
-      id: sqliteText("id").primaryKey(),
-      accountId: sqliteText("account_id").notNull(),
-      providerId: sqliteText("provider_id").notNull(),
-      userId: sqliteText("user_id").notNull(),
-      accessToken: sqliteText("access_token"),
-      refreshToken: sqliteText("refresh_token"),
-      idToken: sqliteText("id_token"),
-      accessTokenExpiresAt: integer("access_token_expires_at", { mode: "timestamp_ms" }),
-      refreshTokenExpiresAt: integer("refresh_token_expires_at", { mode: "timestamp_ms" }),
-      scope: sqliteText("scope"),
-      password: sqliteText("password"),
-      createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
-      updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
-    });
+  ? pgTable(
+      "account",
+      {
+        id: pgText("id").primaryKey(),
+        accountId: pgText("account_id").notNull(),
+        providerId: pgText("provider_id").notNull(),
+        issuer: pgText("issuer").notNull(),
+        userId: pgText("user_id").notNull(),
+        accessToken: pgText("access_token"),
+        refreshToken: pgText("refresh_token"),
+        idToken: pgText("id_token"),
+        accessTokenExpiresAt: timestamp("access_token_expires_at"),
+        refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
+        scope: pgText("scope"),
+        password: pgText("password"),
+        createdAt: timestamp("created_at").notNull(),
+        updatedAt: timestamp("updated_at").notNull(),
+      },
+      (table) => [pgUniqueIndex("account_issuer_accountId_uidx").on(table.issuer, table.accountId)],
+    )
+  : sqliteTable(
+      "account",
+      {
+        id: sqliteText("id").primaryKey(),
+        accountId: sqliteText("account_id").notNull(),
+        providerId: sqliteText("provider_id").notNull(),
+        issuer: sqliteText("issuer").notNull(),
+        userId: sqliteText("user_id").notNull(),
+        accessToken: sqliteText("access_token"),
+        refreshToken: sqliteText("refresh_token"),
+        idToken: sqliteText("id_token"),
+        accessTokenExpiresAt: integer("access_token_expires_at", { mode: "timestamp_ms" }),
+        refreshTokenExpiresAt: integer("refresh_token_expires_at", { mode: "timestamp_ms" }),
+        scope: sqliteText("scope"),
+        password: sqliteText("password"),
+        createdAt: integer("created_at", { mode: "timestamp_ms" }).notNull(),
+        updatedAt: integer("updated_at", { mode: "timestamp_ms" }).notNull(),
+      },
+      (table) => [sqliteUniqueIndex("account_issuer_accountId_uidx").on(table.issuer, table.accountId)],
+    );
 
 export const verification = $$.BATI.has("postgres")
   ? pgTable("verification", {

package/dist/boilerplates/@batijs/better-auth/files/database/migrations/$better-auth.sql.js

@@ -28,6 +28,7 @@ CREATE TABLE IF NOT EXISTS "account" (
   "id" text NOT NULL PRIMARY KEY,
   "accountId" text NOT NULL,
   "providerId" text NOT NULL,
+  "issuer" text NOT NULL,
   "userId" text NOT NULL REFERENCES "user" ("id"),
   "accessToken" text,
   "refreshToken" text,
@@ -40,6 +41,8 @@ CREATE TABLE IF NOT EXISTS "account" (
   "updatedAt" date NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
+CREATE UNIQUE INDEX IF NOT EXISTS "account_issuer_accountId_uidx" ON "account" ("issuer", "accountId");
+
 CREATE TABLE IF NOT EXISTS "verification" (
   "id" text NOT NULL PRIMARY KEY,
   "identifier" text NOT NULL,

package/dist/boilerplates/@batijs/better-auth/types/database/drizzle/schema/auth.d.mts

@@ -608,6 +608,23 @@ declare const account: import("drizzle-orm/pg-core").PgTableWithColumns<{
       identity: undefined;
       generated: undefined;
     }, {}, {}>;
+    issuer: import("drizzle-orm/pg-core").PgColumn<{
+      name: "issuer";
+      tableName: "account";
+      dataType: "string";
+      columnType: "PgText";
+      data: string;
+      driverParam: string;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {}>;
     userId: import("drizzle-orm/pg-core").PgColumn<{
       name: "user_id";
       tableName: "account";
@@ -841,6 +858,25 @@ declare const account: import("drizzle-orm/pg-core").PgTableWithColumns<{
     }, {}, {
       length: number | undefined;
     }>;
+    issuer: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+      name: "issuer";
+      tableName: "account";
+      dataType: "string";
+      columnType: "SQLiteText";
+      data: string;
+      driverParam: string;
+      notNull: true;
+      hasDefault: false;
+      isPrimaryKey: false;
+      isAutoincrement: false;
+      hasRuntimeDefault: false;
+      enumValues: [string, ...string[]];
+      baseColumn: never;
+      identity: undefined;
+      generated: undefined;
+    }, {}, {
+      length: number | undefined;
+    }>;
     userId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
       name: "user_id";
       tableName: "account";

package/dist/boilerplates/@batijs/react-sentry/files/pages/sentry/+Page.tsx

@@ -1,21 +1,21 @@
 import * as Sentry from "@sentry/react";
-import { useEffect, useState } from "react";
+import { useEffect, useSyncExternalStore } from "react";
+
+const subscribe = () => () => {};
 
 export default function ReactSentryErrorPage() {
-  const [sentryClientStatus, setSentryClientStatus] = useState({
-    client_not_loaded: false,
-    enabled: true,
-    dsn_missing: false,
-  });
+  // Sentry is initialized in the browser only, so read its client via useSyncExternalStore:
+  // the server (and hydration) snapshot has no client, and the page re-renders with the real
+  // client state right after hydration — without a setState inside an effect.
+  const options = useSyncExternalStore(subscribe, () => Sentry?.getClient()?.getOptions(), () => undefined);
+  const sentryClientStatus = {
+    client_not_loaded: !options,
+    dsn_missing: (options?.dsn?.length ?? 0) < 2,
+    enabled: options?.enabled ?? true,
+  };
   useEffect(() => {
-    const options = Sentry?.getClient()?.getOptions();
-    setSentryClientStatus({
-      client_not_loaded: !options,
-      dsn_missing: (options?.dsn?.length ?? 0) < 2,
-      enabled: options?.enabled ?? true,
-    });
     console.log("Sentry DSN: ", options?.dsn);
-  }, []);
+  }, [options]);
 
   return (
     <>

package/dist/index.js

@@ -2638,7 +2638,7 @@ function kebabCase(str, joiner) {
 //#endregion
 //#region package.json
 var name = "@batijs/cli";
-var version = "0.0.679";
+var version = "0.0.680";
 var description = "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want";
 //#endregion
 //#region rules.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.679",
+  "version": "0.0.680",
   "type": "module",
   "scripts": {
     "check-types": "tsc --noEmit",
@@ -13,8 +13,8 @@
   "repository": "https://github.com/vikejs/bati",
   "license": "MIT",
   "devDependencies": {
-    "@batijs/build": "0.0.679",
-    "@batijs/compile": "0.0.679",
+    "@batijs/build": "0.0.680",
+    "@batijs/compile": "0.0.680",
     "@inquirer/prompts": "^8.5.2",
     "@types/node": "^20.19.37",
     "@types/which": "^3.0.4",
@@ -30,8 +30,8 @@
     "vite": "^8.2.1"
   },
   "dependencies": {
-    "@batijs/core": "0.0.679",
-    "@batijs/features": "0.0.679"
+    "@batijs/core": "0.0.680",
+    "@batijs/features": "0.0.680"
   },
   "bin": "./cli.js",
   "exports": {