@batijs/cli 0.0.650 → 0.0.651

package/dist/boilerplates/@batijs/shadcn-ui/files/$vite.config.ts.js

@@ -1,33 +1,11 @@
 #!/usr/bin/env node
 
-import { loadAsMagicast, yellow } from "@batijs/core";
+import { defineConfigArg, mergeObject, transformConfig } from "@batijs/core";
 //#region ../../boilerplates/shadcn-ui/dist/files/$vite.config.ts.mjs
-async function getViteConfig(props) {
-	const mod = await loadAsMagicast(props);
-	const replacement = `new URL("./", import.meta.url).pathname`;
-	addResolveAlias(mod, "@", replacement);
-	return mod.generate().code.replace(`"{{PLACEHOLDER_ALIAS}}"`, replacement);
-}
-function addResolveAlias(mod, find, replacement) {
-	const alias = mod.exports.default.$args[0]?.resolve?.alias ?? {};
-	const warnMsg = `${yellow("WARN")}: new resolve.alias: \`"${find}":${replacement}\` replaced existing in vite.config.ts.`;
-	if (alias?.length === void 0) {
-		if (alias[find]) console.warn(warnMsg);
-		alias[find] = "{{PLACEHOLDER_ALIAS}}";
-	} else {
-		const newAlias = {
-			find,
-			replacement: "{{PLACEHOLDER_ALIAS}}"
-		};
-		const index = alias.findIndex((a) => a?.find === find);
-		if (index >= 0) {
-			console.warn(warnMsg);
-			alias.splice(index, 1);
-		}
-		alias.push(newAlias);
-	}
-	if (!mod.exports.default.$args[0]?.resolve) mod.exports.default.$args[0].resolve = {};
-	mod.exports.default.$args[0].resolve.alias = alias;
+function getViteConfig(props) {
+	return transformConfig(props, (root) => {
+		mergeObject(defineConfigArg(root), { resolve: { alias: { "@": `new URL("./", import.meta.url).pathname` } } });
+	});
 }
 //#endregion
 export { getViteConfig as default };

package/dist/boilerplates/@batijs/shared/files/vite.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
   plugins: [vike()],
-  //# BATI.hasD1
+  // $$.BATI.hasD1
   build: {
     rollupOptions: {
       external: ["wrangler"],

package/dist/boilerplates/@batijs/shared-db/files/server/db-middleware.ts

@@ -1,4 +1,4 @@
-/*# BATI include-if-imported #*/
+/* $$.keepFileIfImported */
 
 import { getDbFromRuntime } from "@batijs/d1/database/d1/helpers";
 import { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
@@ -7,20 +7,20 @@ import { db as pgDb } from "@batijs/postgres/database/postgres/db";
 import { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 import { enhance, type UniversalMiddleware } from "@universal-middleware/core";
 
-//# BATI.hasDatabase
+// $$.BATI.hasDatabase
 declare global {
   namespace Universal {
     interface Context {
-      db: BATI.If<{
-        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
-        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
-        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof pgDb>;
-        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof sqliteDb>;
-        'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
-        'BATI.has("drizzle")': ReturnType<typeof dbD1>;
-        'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
-        'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1 && !BATI.hasOrm": D1Database;
+      db: $$.If<{
+        '$$.BATI.has("drizzle") && $$.BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        '$$.BATI.has("kysely") && $$.BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        '$$.BATI.has("postgres") && !$$.BATI.hasOrm': ReturnType<typeof pgDb>;
+        '$$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm': ReturnType<typeof sqliteDb>;
+        '$$.BATI.has("drizzle") && !$$.BATI.hasD1': ReturnType<typeof dbSqlite>;
+        '$$.BATI.has("drizzle")': ReturnType<typeof dbD1>;
+        '$$.BATI.has("kysely") && !$$.BATI.hasD1': ReturnType<typeof dbKysely>;
+        '$$.BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
+        "$$.BATI.hasD1 && !$$.BATI.hasOrm": D1Database;
       }>;
     }
   }
@@ -34,28 +34,28 @@ export const dbMiddleware: UniversalMiddleware = enhance(
   // The context we add here is automatically merged into pageContext
   async (_request, context, _runtime) => {
     const db =
-      BATI.has("drizzle") && BATI.has("postgres")
+      $$.BATI.has("drizzle") && $$.BATI.has("postgres")
         ? dbPostgres()
-        : BATI.has("kysely") && BATI.has("postgres")
+        : $$.BATI.has("kysely") && $$.BATI.has("postgres")
           ? dbKyselyPostgres()
-          : BATI.has("postgres") && !BATI.hasOrm
+          : $$.BATI.has("postgres") && !$$.BATI.hasOrm
             ? pgDb()
-            : BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm
+            : $$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm
               ? sqliteDb()
-              : BATI.has("drizzle") && !BATI.hasD1
+              : $$.BATI.has("drizzle") && !$$.BATI.hasD1
                 ? dbSqlite()
-                : BATI.has("kysely") && !BATI.hasD1
+                : $$.BATI.has("kysely") && !$$.BATI.hasD1
                   ? dbKysely()
-                  : BATI.has("kysely")
+                  : $$.BATI.has("kysely")
                     ? dbKyselyD1(await getDbFromRuntime(_runtime))
-                    : BATI.has("drizzle")
+                    : $$.BATI.has("drizzle")
                       ? dbD1(await getDbFromRuntime(_runtime))
                       : await getDbFromRuntime(_runtime);
 
     return {
       ...context,
       // Sets pageContext.db
-      db: db as BATI.Any,
+      db: db as $$.Any,
     };
   },
   {

package/dist/boilerplates/@batijs/shared-db/types/server/db-middleware.d.mts

@@ -8,16 +8,16 @@ import { UniversalMiddleware } from "@universal-middleware/core";
 declare global {
   namespace Universal {
     interface Context {
-      db: BATI.If<{
-        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
-        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
-        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof db>;
-        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof db$1>;
-        'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
-        'BATI.has("drizzle")': ReturnType<typeof dbD1>;
-        'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
-        'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1 && !BATI.hasOrm": D1Database;
+      db: $$.If<{
+        '$$.BATI.has("drizzle") && $$.BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        '$$.BATI.has("kysely") && $$.BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        '$$.BATI.has("postgres") && !$$.BATI.hasOrm': ReturnType<typeof db>;
+        '$$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm': ReturnType<typeof db$1>;
+        '$$.BATI.has("drizzle") && !$$.BATI.hasD1': ReturnType<typeof dbSqlite>;
+        '$$.BATI.has("drizzle")': ReturnType<typeof dbD1>;
+        '$$.BATI.has("kysely") && !$$.BATI.hasD1': ReturnType<typeof dbKysely>;
+        '$$.BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
+        "$$.BATI.hasD1 && !$$.BATI.hasOrm": D1Database;
       }>;
     }
   }

package/dist/boilerplates/@batijs/shared-env/files/server/env.ts

@@ -1,10 +1,12 @@
-/*# BATI include-if-imported #*/
+/* $$.keepFileIfImported */
 import { env as cloudflareEnv } from "cloudflare:workers";
-//# !BATI.has("cloudflare")
+// !$$.BATI.has("cloudflare")
 import "./load.js";
 
-export const env: BATI.If<{ '!BATI.has("cloudflare")': Record<string, string | undefined> }> = BATI.has("cloudflare")
-  ? (cloudflareEnv as BATI.Any)
+export const env: $$.If<{ '!$$.BATI.has("cloudflare")': Record<string, string | undefined> }> = $$.BATI.has(
+  "cloudflare",
+)
+  ? (cloudflareEnv as $$.Any)
   : typeof process?.env !== "undefined"
     ? process.env
     : {};

package/dist/boilerplates/@batijs/shared-env/files/server/load.ts

@@ -1,4 +1,4 @@
-/*# BATI include-if-imported #*/
+/* $$.keepFileIfImported */
 import { readFileSync } from "node:fs";
 import process from "node:process";
 import { parseEnv } from "node:util";

package/dist/boilerplates/@batijs/shared-env/types/server/env.d.mts

@@ -1,6 +1,6 @@
 //#region files/server/env.d.ts
-declare const env: BATI.If<{
-  '!BATI.has("cloudflare")': Record<string, string | undefined>;
+declare const env: $$.If<{
+  '!$$.BATI.has("cloudflare")': Record<string, string | undefined>;
 }>;
 //#endregion
 export { env };

package/dist/boilerplates/@batijs/shared-server/files/server/create-todo-handler.ts

@@ -1,4 +1,4 @@
-/*# BATI include-if-imported #*/
+/* $$.keepFileIfImported */
 
 import * as d1Queries from "@batijs/d1-sqlite/database/d1/queries/todos";
 import type { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
@@ -14,16 +14,16 @@ import { enhance, type UniversalHandler } from "@universal-middleware/core";
 // Note: You can directly define a server middleware instead of defining a Universal Middleware. (You can remove @universal-middleware/* — Vike's scaffolder uses it only to simplify its internal logic, see https://github.com/vikejs/vike/discussions/3116)
 export const createTodoHandler: UniversalHandler<
   Universal.Context &
-    BATI.If<{
-      'BATI.has("drizzle") && BATI.has("postgres")': { db: ReturnType<typeof dbPostgres> };
-      'BATI.has("kysely") && BATI.has("postgres")': { db: ReturnType<typeof dbKyselyPostgres> };
-      'BATI.has("postgres") && !BATI.hasOrm': { db: ReturnType<typeof pgDb> };
-      'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': { db: ReturnType<typeof sqliteDb> };
-      'BATI.has("drizzle") && !BATI.hasD1': { db: ReturnType<typeof dbSqlite> };
-      'BATI.has("drizzle")': { db: ReturnType<typeof dbD1> };
-      'BATI.has("kysely") && !BATI.hasD1': { db: ReturnType<typeof dbKysely> };
-      'BATI.has("kysely")': { db: ReturnType<typeof dbKyselyD1> };
-      "BATI.hasD1 && !BATI.hasOrm": { db: D1Database };
+    $$.If<{
+      '$$.BATI.has("drizzle") && $$.BATI.has("postgres")': { db: ReturnType<typeof dbPostgres> };
+      '$$.BATI.has("kysely") && $$.BATI.has("postgres")': { db: ReturnType<typeof dbKyselyPostgres> };
+      '$$.BATI.has("postgres") && !$$.BATI.hasOrm': { db: ReturnType<typeof pgDb> };
+      '$$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm': { db: ReturnType<typeof sqliteDb> };
+      '$$.BATI.has("drizzle") && !$$.BATI.hasD1': { db: ReturnType<typeof dbSqlite> };
+      '$$.BATI.has("drizzle")': { db: ReturnType<typeof dbD1> };
+      '$$.BATI.has("kysely") && !$$.BATI.hasD1': { db: ReturnType<typeof dbKysely> };
+      '$$.BATI.has("kysely")': { db: ReturnType<typeof dbKyselyD1> };
+      "$$.BATI.hasD1 && !$$.BATI.hasOrm": { db: D1Database };
       _: object;
     }>
 > = enhance(
@@ -31,15 +31,15 @@ export const createTodoHandler: UniversalHandler<
     // In a real case, user-provided data should ALWAYS be validated with tools like zod
     const newTodo = (await request.json()) as { text: string };
 
-    if (BATI.has("drizzle")) {
+    if ($$.BATI.has("drizzle")) {
       await drizzleQueries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
+    } else if ($$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm) {
       sqliteQueries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.has("kysely")) {
+    } else if ($$.BATI.has("kysely")) {
       await kyselyQueries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.hasD1 && !BATI.hasOrm) {
+    } else if ($$.BATI.hasD1 && !$$.BATI.hasOrm) {
       await d1Queries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.has("postgres") && !BATI.hasOrm) {
+    } else if ($$.BATI.has("postgres") && !$$.BATI.hasOrm) {
       await pgQueries.insertTodo(_context.db, newTodo.text);
     } else {
       // This is where you'd persist the data

package/dist/boilerplates/@batijs/shared-server/types/server/create-todo-handler.d.mts

@@ -5,32 +5,32 @@ import { db as db$1 } from "@batijs/sqlite/database/sqlite/db";
 import { UniversalHandler } from "@universal-middleware/core";
 
 //#region files/server/create-todo-handler.d.ts
-declare const createTodoHandler: UniversalHandler<Universal.Context & BATI.If<{
-  'BATI.has("drizzle") && BATI.has("postgres")': {
+declare const createTodoHandler: UniversalHandler<Universal.Context & $$.If<{
+  '$$.BATI.has("drizzle") && $$.BATI.has("postgres")': {
     db: ReturnType<typeof dbPostgres>;
   };
-  'BATI.has("kysely") && BATI.has("postgres")': {
+  '$$.BATI.has("kysely") && $$.BATI.has("postgres")': {
     db: ReturnType<typeof dbKyselyPostgres>;
   };
-  'BATI.has("postgres") && !BATI.hasOrm': {
+  '$$.BATI.has("postgres") && !$$.BATI.hasOrm': {
     db: ReturnType<typeof db>;
   };
-  'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': {
+  '$$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm': {
     db: ReturnType<typeof db$1>;
   };
-  'BATI.has("drizzle") && !BATI.hasD1': {
+  '$$.BATI.has("drizzle") && !$$.BATI.hasD1': {
     db: ReturnType<typeof dbSqlite>;
   };
-  'BATI.has("drizzle")': {
+  '$$.BATI.has("drizzle")': {
     db: ReturnType<typeof dbD1>;
   };
-  'BATI.has("kysely") && !BATI.hasD1': {
+  '$$.BATI.has("kysely") && !$$.BATI.hasD1': {
     db: ReturnType<typeof dbKysely>;
   };
-  'BATI.has("kysely")': {
+  '$$.BATI.has("kysely")': {
     db: ReturnType<typeof dbKyselyD1>;
   };
-  "BATI.hasD1 && !BATI.hasOrm": {
+  "$$.BATI.hasD1 && !$$.BATI.hasOrm": {
     db: D1Database;
   };
   _: object;

package/dist/boilerplates/@batijs/shared-todo/files/global.d.ts

@@ -3,20 +3,20 @@ import type { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/data
 import type { db as pgDb } from "@batijs/postgres/database/postgres/db";
 import type { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 
-//# BATI.hasDbDemo
+// $$.BATI.hasDbDemo
 declare global {
   namespace Vike {
     interface PageContextServer {
-      db: BATI.If<{
-        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
-        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
-        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof pgDb>;
-        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof sqliteDb>;
-        'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
-        'BATI.has("drizzle")': ReturnType<typeof dbD1>;
-        'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
-        'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1 && !BATI.hasOrm": D1Database;
+      db: $$.If<{
+        '$$.BATI.has("drizzle") && $$.BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        '$$.BATI.has("kysely") && $$.BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        '$$.BATI.has("postgres") && !$$.BATI.hasOrm': ReturnType<typeof pgDb>;
+        '$$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm': ReturnType<typeof sqliteDb>;
+        '$$.BATI.has("drizzle") && !$$.BATI.hasD1': ReturnType<typeof dbSqlite>;
+        '$$.BATI.has("drizzle")': ReturnType<typeof dbD1>;
+        '$$.BATI.has("kysely") && !$$.BATI.hasD1': ReturnType<typeof dbKysely>;
+        '$$.BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
+        "$$.BATI.hasD1 && !$$.BATI.hasOrm": D1Database;
       }>;
     }
   }

package/dist/boilerplates/@batijs/shared-todo/files/pages/todo/+config.ts

@@ -1,7 +1,4 @@
-/*{ @if (it.BATI.has("drizzle") || it.BATI.has("sqlite") || it.BATI.hasD1) }*/
-
+// $$.keepFileIf($$.BATI.has("drizzle") || $$.BATI.has("sqlite") || $$.BATI.hasD1)
 export const config = {
   prerender: false,
 };
-
-/*{ /if }*/

package/dist/boilerplates/@batijs/shared-todo/files/pages/todo/+data.ts

@@ -10,23 +10,23 @@ import type { PageContextServer } from "vike/types";
 export type Data = Awaited<ReturnType<typeof data>>;
 
 export async function data(_pageContext: PageContextServer) {
-  if (BATI.has("drizzle")) {
+  if ($$.BATI.has("drizzle")) {
     const todoItemsInitial = await drizzleQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
+  } else if ($$.BATI.has("sqlite") && !$$.BATI.hasD1 && !$$.BATI.hasOrm) {
     const todoItemsInitial = sqliteQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.has("kysely")) {
+  } else if ($$.BATI.has("kysely")) {
     const todoItemsInitial = await kyselyQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.hasD1 && !BATI.hasOrm) {
+  } else if ($$.BATI.hasD1 && !$$.BATI.hasOrm) {
     const todoItemsInitial = await d1Queries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.has("postgres") && !BATI.hasOrm) {
+  } else if ($$.BATI.has("postgres") && !$$.BATI.hasOrm) {
     const todoItemsInitial = await pgQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };

package/dist/boilerplates/@batijs/solid/files/$vite.config.ts.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-import { addVitePlugin, loadAsMagicast } from "@batijs/core";
+import { addVitePlugin, transformConfig } from "@batijs/core";
 //#region ../../boilerplates/solid/dist/files/$vite.config.ts.mjs
-async function getViteConfig(props) {
-	const mod = await loadAsMagicast(props);
-	addVitePlugin(mod, {
-		from: "vike-solid/vite",
-		constructor: "vikeSolid"
+function getViteConfig(props) {
+	return transformConfig(props, (root) => {
+		addVitePlugin(root, {
+			from: "vike-solid/vite",
+			constructor: "vikeSolid"
+		});
 	});
-	return mod.generate().code;
 }
 //#endregion
 export { getViteConfig as default };

package/dist/boilerplates/@batijs/solid/files/pages/+Head.tsx

@@ -1,11 +1,9 @@
-/* eslint-disable solid/no-innerhtml */
-
 // https://vike.dev/Head
 
 import logoUrl from "../assets/logo.svg";
 
 export function Head() {
-  if (BATI.has("plausible.io")) {
+  if ($$.BATI.has("plausible.io")) {
     return (
       <>
         <link rel="icon" href={logoUrl} />
@@ -14,7 +12,7 @@ export function Head() {
         <script defer data-domain="yourdomain.com" src="https://plausible.io/js/script.js" />
       </>
     );
-  } else if (BATI.has("google-analytics")) {
+  } else if ($$.BATI.has("google-analytics")) {
     return (
       <>
         <script
@@ -22,6 +20,7 @@ export function Head() {
           src={`https://www.googletagmanager.com/gtag/js?id=${import.meta.env.PUBLIC_ENV__GOOGLE_ANALYTICS}`}
         />
         <script
+          // eslint-disable-next-line solid/no-innerhtml
           innerHTML={`window.dataLayer = window.dataLayer || [];
           function gtag(){dataLayer.push(arguments);}
           gtag('js', new Date());

package/dist/boilerplates/@batijs/solid/files/pages/+Layout.tsx

@@ -1,7 +1,7 @@
 // https://vike.dev/Layout
 
 import "./Layout.css";
-//# BATI.has("tailwindcss")
+// $$.BATI.has("tailwindcss")
 import "./tailwind.css";
 import { AuthNav } from "@batijs/solid-better-auth/components/AuthNav";
 import type { JSX } from "solid-js";
@@ -11,9 +11,9 @@ import { Link } from "../components/Link";
 export default function Layout(props: { children?: JSX.Element }) {
   return (
     <div
-      //# BATI.has("tailwindcss")
+      // $$.BATI.has("tailwindcss")
       class={"flex max-w-5xl m-auto"}
-      //# !BATI.has("tailwindcss")
+      // !$$.BATI.has("tailwindcss")
       style={{
         display: "flex",
         "max-width": "900px",
@@ -25,7 +25,7 @@ export default function Layout(props: { children?: JSX.Element }) {
         <Link href="/">Welcome</Link>
         <Link href="/todo">Todo</Link>
         <Link href="/star-wars">Data Fetching</Link>
-        {BATI.has("better-auth") ? <AuthNav /> : null}
+        {$$.BATI.has("better-auth") ? <AuthNav /> : null}
       </Sidebar>
       <Content>{props.children}</Content>
     </div>
@@ -36,9 +36,9 @@ function Sidebar(props: { children: JSX.Element }) {
   return (
     <div
       id="sidebar"
-      //# BATI.has("tailwindcss")
+      // $$.BATI.has("tailwindcss")
       class={"p-5 flex flex-col shrink-0 border-r-2 border-r-gray-200"}
-      //# !BATI.has("tailwindcss")
+      // !$$.BATI.has("tailwindcss")
       style={{
         padding: "20px",
         "flex-shrink": 0,
@@ -58,9 +58,9 @@ function Content(props: { children: JSX.Element }) {
     <div id="page-container">
       <div
         id="page-content"
-        //# BATI.has("tailwindcss")
+        // $$.BATI.has("tailwindcss")
         class={"p-5 pb-12 min-h-screen"}
-        //# !BATI.has("tailwindcss")
+        // !$$.BATI.has("tailwindcss")
         style={{
           padding: "20px",
           "padding-bottom": "50px",
@@ -76,9 +76,9 @@ function Content(props: { children: JSX.Element }) {
 function Logo() {
   return (
     <div
-      //# BATI.has("tailwindcss")
+      // $$.BATI.has("tailwindcss")
       class={"p-5 mb-2"}
-      //# !BATI.has("tailwindcss")
+      // !$$.BATI.has("tailwindcss")
       style={{
         "margin-top": "20px",
         "margin-bottom": "10px",

package/dist/boilerplates/@batijs/solid/files/pages/+config.ts

@@ -9,14 +9,14 @@ const config: Config = {
   title: "My Vike App",
   description: "Demo showcasing Vike",
 
-  //# BATI.has("auth0") || BATI.has("authjs") || BATI.has("better-auth")
+  // $$.BATI.has("auth0") || $$.BATI.has("authjs") || $$.BATI.has("better-auth")
   passToClient: ["user"],
   extends: [vikeSolid],
 
-  //# BATI.has("vercel")
+  // $$.BATI.has("vercel")
   prerender: true,
 
-  //# BATI.hasUD && !BATI.hasServer
+  // $$.BATI.hasUD && !$$.BATI.hasServer
   // https://vike.dev/server
   server: true,
 };

package/dist/boilerplates/@batijs/solid/files/pages/index/Counter.tsx

@@ -8,9 +8,9 @@ function Counter() {
   return (
     <button
       type="button"
-      //# BATI.has("tailwindcss")
+      // $$.BATI.has("tailwindcss")
       class={
-        BATI.has("daisyui")
+        $$.BATI.has("daisyui")
           ? "btn"
           : "inline-block border border-black rounded bg-gray-200 px-2 py-1 text-xs font-medium uppercase leading-normal"
       }

package/dist/boilerplates/@batijs/solid/files/pages/todo/TodoList.tsx

@@ -22,12 +22,12 @@ export function TodoList() {
             const text = untrack(newTodo);
             setTodoItems((prev) => [...prev, { text }]);
             setNewTodo("");
-            if (BATI.hasServer) {
-              if (BATI.has("telefunc")) {
+            if ($$.BATI.hasServer) {
+              if ($$.BATI.has("telefunc")) {
                 await onNewTodo({ text });
-              } else if (BATI.has("trpc")) {
+              } else if ($$.BATI.has("trpc")) {
                 await trpc.onNewTodo.mutate(text);
-              } else if (BATI.has("ts-rest")) {
+              } else if ($$.BATI.has("ts-rest")) {
                 await client.createTodo({ body: { text } });
               } else {
                 const response = await fetch("/api/todo/create", {
@@ -46,14 +46,14 @@ export function TodoList() {
             type="text"
             onChange={(ev) => setNewTodo(ev.target.value)}
             value={newTodo()}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
           />
           <button
             type="submit"
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "text-white bg-blue-700 hover:bg-blue-800 focus:ring-2 focus:outline-hidden focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto p-2"
             }

package/dist/boilerplates/@batijs/solid-better-auth/files/pages/account/+Page.tsx

@@ -19,7 +19,7 @@ export default function Page() {
           await authClient.signOut();
           await navigate("/");
         }}
-        //# BATI.has("tailwindcss")
+        // $$.BATI.has("tailwindcss")
         class={
           "text-white bg-blue-700 hover:bg-blue-800 focus:ring-2 focus:outline-hidden focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto p-2"
         }

package/dist/boilerplates/@batijs/solid-better-auth/files/pages/login/+Page.tsx

@@ -32,7 +32,7 @@ export default function Page() {
             required
             value={email()}
             onInput={(ev) => setEmail(ev.currentTarget.value)}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
@@ -46,7 +46,7 @@ export default function Page() {
             required
             value={password()}
             onInput={(ev) => setPassword(ev.currentTarget.value)}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
@@ -54,7 +54,7 @@ export default function Page() {
         </p>
         <button
           type="submit"
-          //# BATI.has("tailwindcss")
+          // $$.BATI.has("tailwindcss")
           class={
             "text-white bg-blue-700 hover:bg-blue-800 focus:ring-2 focus:outline-hidden focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto p-2"
           }
@@ -68,7 +68,7 @@ export default function Page() {
         onClick={async () => {
           await authClient.signIn.social({ provider: "github" });
         }}
-        //# BATI.has("tailwindcss")
+        // $$.BATI.has("tailwindcss")
         class={
           "text-white bg-gray-800 hover:bg-gray-900 focus:ring-2 focus:outline-hidden focus:ring-gray-300 font-medium rounded-lg text-sm w-full sm:w-auto p-2"
         }

package/dist/boilerplates/@batijs/solid-better-auth/files/pages/signup/+Page.tsx

@@ -33,7 +33,7 @@ export default function Page() {
             required
             value={name()}
             onInput={(ev) => setName(ev.currentTarget.value)}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
@@ -47,7 +47,7 @@ export default function Page() {
             required
             value={email()}
             onInput={(ev) => setEmail(ev.currentTarget.value)}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
@@ -62,7 +62,7 @@ export default function Page() {
             minLength={8}
             value={password()}
             onInput={(ev) => setPassword(ev.currentTarget.value)}
-            //# BATI.has("tailwindcss")
+            // $$.BATI.has("tailwindcss")
             class={
               "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full sm:w-auto p-2 mr-1 mb-1"
             }
@@ -70,7 +70,7 @@ export default function Page() {
         </p>
         <button
           type="submit"
-          //# BATI.has("tailwindcss")
+          // $$.BATI.has("tailwindcss")
           class={
             "text-white bg-blue-700 hover:bg-blue-800 focus:ring-2 focus:outline-hidden focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto p-2"
           }