@batijs/cli 0.0.53 → 0.0.54

package/dist/boilerplates/@batijs/edgedb/files/$package.json.js

@@ -4,7 +4,7 @@ async function getPackageJson(currentContent) {
   const packageJson = await loadAsJson(currentContent);
   packageJson.scripts["edgedb:generate-queries"] = "@edgedb/generate queries";
   packageJson.scripts["edgedb:generate-edgeql-js"] = "@edgedb/generate edgeql-js";
-  return addDependency(packageJson, await import("../package-TLISE4ST.js"), {
+  return addDependency(packageJson, await import("../package-TEA6O33B.js"), {
     devDependencies: ["@edgedb/generate"],
     dependencies: ["edgedb"]
   });

package/dist/boilerplates/@batijs/edgedb/{package-TLISE4ST.js → package-TEA6O33B.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/edgedb";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/express/files/$package.json.js

@@ -4,7 +4,7 @@ async function getPackageJson(currentContent, meta) {
   const packageJson = await loadAsJson(currentContent);
   packageJson.scripts.dev = "tsx ./express-entry.ts";
   packageJson.scripts.build = "vite build";
-  return addDependency(packageJson, await import("../package-DCOKTSTT.js"), {
+  return addDependency(packageJson, await import("../package-VI6I3YOZ.js"), {
     devDependencies: ["@types/express"],
     dependencies: [
       "@hattip/adapter-node",

package/dist/boilerplates/@batijs/express/{package-DCOKTSTT.js → package-VI6I3YOZ.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/express";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/hattip/files/$package.json.js

@@ -7,7 +7,7 @@ async function getPackageJson(currentContent, meta) {
   if (packageJson.scripts.preview) {
     delete packageJson.scripts.preview;
   }
-  return addDependency(packageJson, await import("../package-AY7V4FWO.js"), {
+  return addDependency(packageJson, await import("../package-SW72O5IE.js"), {
     devDependencies: ["@hattip/vite", "@hattip/adapter-node"],
     dependencies: [
       "@hattip/router",

package/dist/boilerplates/@batijs/hattip/{package-AY7V4FWO.js → package-SW72O5IE.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/hattip";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/prisma/files/$package.json.js

@@ -4,7 +4,7 @@ async function getPackageJson(currentContent) {
   const packageJson = await loadAsJson(currentContent);
   packageJson.scripts["prisma:studio"] = "prisma studio";
   packageJson.scripts["prisma:generate"] = "prisma generate";
-  return addDependency(packageJson, await import("../package-AURTECWA.js"), {
+  return addDependency(packageJson, await import("../package-NMSSVOZZ.js"), {
     devDependencies: ["prisma"],
     dependencies: ["@prisma/client"]
   });

package/dist/boilerplates/@batijs/prisma/{package-AURTECWA.js → package-NMSSVOZZ.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/prisma";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/react/files/$package.json.js

@@ -2,7 +2,7 @@
 import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(currentContent) {
   const packageJson = await loadAsJson(currentContent);
-  return addDependency(packageJson, await import("../package-BXPDDISO.js"), {
+  return addDependency(packageJson, await import("../package-DWI5TO4Y.js"), {
     devDependencies: ["vite", "@types/react", "@types/react-dom"],
     dependencies: ["@vitejs/plugin-react", "cross-fetch", "react", "react-dom", "vite-plugin-ssr", "vike-react"]
   });

package/dist/boilerplates/@batijs/react/files/layouts/LayoutDefault.tsx

@@ -20,6 +20,7 @@ export default function LayoutDefault({ children }: { children: React.ReactNode
       <Sidebar>
         <Logo />
         <Link href="/">Welcome</Link>
+        {import.meta.BATI_MODULES?.includes("rpc:telefunc") ? <Link href="/todo">Todo</Link> : undefined}
         <Link href="/star-wars">Data Fetching</Link>
       </Sidebar>
       <Content>{children}</Content>

package/dist/boilerplates/@batijs/react/{package-BXPDDISO.js → package-DWI5TO4Y.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/react";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {
@@ -13,7 +13,7 @@ var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
   "@types/node": "^16.18.37",
-  "@types/react": "^18.2.15",
+  "@types/react": "^18.2.16",
   "@types/react-dom": "^18.2.7",
   "@vitejs/plugin-react": "^4.0.3",
   "cross-fetch": "^4.0.0",

package/dist/boilerplates/@batijs/react-telefunc/files/database/todoItems.ts

@@ -0,0 +1,12 @@
+export { todoItems };
+export type { TodoItem };
+
+type TodoItem = { text: string };
+const todoItems: TodoItem[] = [];
+init();
+
+// Initial data
+function init() {
+  todoItems.push({ text: "Buy milk" });
+  todoItems.push({ text: "Buy strawberries" });
+}

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

@@ -0,0 +1,26 @@
+import React, { useState } from "react";
+
+import { TodoList } from "./TodoList";
+import type { TodoItem } from "../../database/todoItems";
+
+export default function Page({ todoItemsInitial }: { todoItemsInitial: TodoItem[] }) {
+  return (
+    <>
+      <h1>To-do List</h1>
+      <TodoList todoItemsInitial={todoItemsInitial} />
+      <Counter />
+    </>
+  );
+}
+
+function Counter() {
+  const [count, setCount] = useState(0);
+  return (
+    <div>
+      This page is interactive:
+      <button type="button" onClick={() => setCount((count) => count + 1)}>
+        Counter {count}
+      </button>
+    </div>
+  );
+}

package/dist/boilerplates/@batijs/react-telefunc/files/pages/todo/+onBeforeRender.ts

@@ -0,0 +1,15 @@
+// https://vite-plugin-ssr.com/onBeforeRender
+export default onBeforeRender;
+
+import { todoItems } from "../../database/todoItems";
+
+function onBeforeRender() {
+  const todoItemsInitial = todoItems;
+  return {
+    pageContext: {
+      pageProps: {
+        todoItemsInitial,
+      },
+    },
+  };
+}

package/dist/boilerplates/@batijs/react-telefunc/files/pages/todo/TodoList.telefunc.ts

@@ -0,0 +1,8 @@
+export { onNewTodo };
+
+import { type TodoItem, todoItems } from "../../database/todoItems";
+
+async function onNewTodo({ text }: TodoItem) {
+  todoItems.push({ text });
+  return { todoItems };
+}

package/dist/boilerplates/@batijs/react-telefunc/files/pages/todo/TodoList.tsx

@@ -0,0 +1,31 @@
+import React, { useState } from "react";
+
+import { onNewTodo } from "./TodoList.telefunc.js";
+import type { TodoItem } from "../../database/todoItems.js";
+
+export function TodoList({ todoItemsInitial }: { todoItemsInitial: TodoItem[] }) {
+  const [todoItems, setTodoItems] = useState(todoItemsInitial);
+  const [draft, setDraft] = useState("");
+  return (
+    <>
+      <ul>
+        {todoItems.map((todoItem, i) => (
+          <li key={i}>{todoItem.text}</li>
+        ))}
+        <li>
+          <form
+            onSubmit={async (ev) => {
+              ev.preventDefault();
+              const { todoItems } = await onNewTodo({ text: draft });
+              setDraft("");
+              setTodoItems(todoItems);
+            }}
+          >
+            <input type="text" onChange={(ev) => setDraft(ev.target.value)} value={draft} />{" "}
+            <button type="submit">Add to-do</button>
+          </form>
+        </li>
+      </ul>
+    </>
+  );
+}

package/dist/boilerplates/@batijs/solid/files/$package.json.js

@@ -2,7 +2,7 @@
 import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(currentContent) {
   const packageJson = await loadAsJson(currentContent);
-  return addDependency(packageJson, await import("../package-NH4EKMOL.js"), {
+  return addDependency(packageJson, await import("../package-T6DNMWAL.js"), {
     devDependencies: ["vite"],
     dependencies: ["cross-fetch", "solid-js", "vike-solid"]
   });

package/dist/boilerplates/@batijs/solid/files/layouts/LayoutDefault.tsx

@@ -20,6 +20,7 @@ export default function LayoutDefault(props: { children?: JSX.Element }) {
       <Sidebar>
         <Logo />
         <Link href="/">Welcome</Link>
+        {import.meta.BATI_MODULES?.includes("rpc:telefunc") ? <Link href="/todo">Todo</Link> : undefined}
         <Link href="/star-wars">Data Fetching</Link>
       </Sidebar>
       <Content>{props.children}</Content>

package/dist/boilerplates/@batijs/solid/{package-NH4EKMOL.js → package-T6DNMWAL.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/solid";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/solid-telefunc/files/database/todoItems.ts

@@ -0,0 +1,12 @@
+export { todoItems };
+export type { TodoItem };
+
+type TodoItem = { text: string };
+const todoItems: TodoItem[] = [];
+init();
+
+// Initial data
+function init() {
+  todoItems.push({ text: "Buy milk" });
+  todoItems.push({ text: "Buy strawberries" });
+}

package/dist/boilerplates/@batijs/solid-telefunc/files/pages/todo/+Page.tsx

@@ -0,0 +1,26 @@
+import { createSignal } from "solid-js";
+
+import { TodoList } from "./TodoList";
+import type { TodoItem } from "../../database/todoItems";
+
+export default function Page({ todoItemsInitial }: { todoItemsInitial: TodoItem[] }) {
+  return (
+    <>
+      <h1>To-do List</h1>
+      <TodoList todoItemsInitial={todoItemsInitial} />
+      <Counter />
+    </>
+  );
+}
+
+function Counter() {
+  const [count, setCount] = createSignal(0);
+  return (
+    <div>
+      This page is interactive:
+      <button type="button" onClick={() => setCount((count) => count + 1)}>
+        Counter {count()}
+      </button>
+    </div>
+  );
+}

package/dist/boilerplates/@batijs/solid-telefunc/files/pages/todo/+onBeforeRender.ts

@@ -0,0 +1,15 @@
+// https://vite-plugin-ssr.com/onBeforeRender
+export default onBeforeRender;
+
+import { todoItems } from "../../database/todoItems";
+
+function onBeforeRender() {
+  const todoItemsInitial = todoItems;
+  return {
+    pageContext: {
+      pageProps: {
+        todoItemsInitial,
+      },
+    },
+  };
+}

package/dist/boilerplates/@batijs/solid-telefunc/files/pages/todo/TodoList.telefunc.ts

@@ -0,0 +1,8 @@
+export { onNewTodo };
+
+import { type TodoItem, todoItems } from "../../database/todoItems";
+
+async function onNewTodo({ text }: TodoItem) {
+  todoItems.push({ text });
+  return { todoItems };
+}

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

@@ -0,0 +1,29 @@
+import { createSignal, For, untrack } from "solid-js";
+
+import { onNewTodo } from "./TodoList.telefunc.js";
+import type { TodoItem } from "../../database/todoItems.js";
+
+export function TodoList({ todoItemsInitial }: { todoItemsInitial: TodoItem[] }) {
+  const [todoItems, setTodoItems] = createSignal(todoItemsInitial);
+  const [draft, setDraft] = createSignal("");
+  return (
+    <>
+      <ul>
+        <For each={todoItems()}>{(todoItem) => <li>{todoItem.text}</li>}</For>
+        <li>
+          <form
+            onSubmit={async (ev) => {
+              ev.preventDefault();
+              const { todoItems } = await onNewTodo({ text: untrack(draft) });
+              setDraft("");
+              setTodoItems(todoItems);
+            }}
+          >
+            <input type="text" onChange={(ev) => setDraft(ev.target.value)} value={draft()} />{" "}
+            <button type="submit">Add to-do</button>
+          </form>
+        </li>
+      </ul>
+    </>
+  );
+}

package/dist/boilerplates/@batijs/tailwindcss/files/$package.json.js

@@ -2,7 +2,7 @@
 import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(currentContent, meta) {
   const packageJson = await loadAsJson(currentContent);
-  return addDependency(packageJson, await import("../package-NTWITHIQ.js"), {
+  return addDependency(packageJson, await import("../package-UBTTDMAM.js"), {
     devDependencies: ["tailwindcss", "postcss", "autoprefixer"]
   });
 }

package/dist/boilerplates/@batijs/tailwindcss/{package-NTWITHIQ.js → package-UBTTDMAM.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/tailwindcss";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/@batijs/telefunc/files/$package.json.js

@@ -2,7 +2,7 @@
 import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(currentContent) {
   const packageJson = await loadAsJson(currentContent);
-  return addDependency(packageJson, await import("../package-LMYXQQZ7.js"), {
+  return addDependency(packageJson, await import("../package-JEX3N3YX.js"), {
     dependencies: ["telefunc"]
   });
 }

package/dist/boilerplates/@batijs/telefunc/{package-LMYXQQZ7.js → package-JEX3N3YX.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/telefunc";
 var private2 = true;
-var version = "0.0.53";
+var version = "0.0.54";
 var description = "";
 var type = "module";
 var scripts = {

package/dist/boilerplates/boilerplates.json

@@ -81,6 +81,19 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "includeIf": [
+        "react",
+        "telefunc"
+      ]
+    },
+    "folder": "@batijs/react-telefunc",
+    "description": "",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {},
     "folder": "@batijs/shared",
@@ -101,6 +114,19 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "includeIf": [
+        "solid",
+        "telefunc"
+      ]
+    },
+    "folder": "@batijs/solid-telefunc",
+    "description": "",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "flag": "tailwindcss",

package/dist/index.js

@@ -540,7 +540,7 @@ Please report this issue to https://github.com/magne4000/bati`
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.53",
+  version: "0.0.54",
   type: "module",
   scripts: {
     prerelease: "rimraf ./dist",
@@ -564,7 +564,7 @@ var package_default = {
     espree: "^9.6.1",
     execa: "^7.1.1",
     "get-port": "^7.0.0",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     rimraf: "^5.0.1",
     "tree-kill": "^1.2.2",
     tsup: "^7.1.0",
@@ -802,7 +802,9 @@ async function checkArguments(args) {
       await access(args.project, constants.W_OK);
     } catch (_) {
       console.error(
-        `${yellow("\u26A0")} Target folder ${cyan(args.project)} already exists but is not writable. ${yellow("Aborting")}.`
+        `${yellow("\u26A0")} Target folder ${cyan(args.project)} already exists but is not writable. ${yellow(
+          "Aborting"
+        )}.`
       );
       process.exit(3);
     }
@@ -837,6 +839,15 @@ async function retrieveHooks(hooks) {
   }
   return map;
 }
+function testFlags(flags, bl) {
+  if (flags.includes(bl.config.flag)) {
+    return true;
+  }
+  if (Array.isArray(bl.config.includeIf)) {
+    return bl.config.includeIf.every((f) => flags.includes(f));
+  }
+  return false;
+}
 async function run() {
   const dir = boilerplatesDir();
   const boilerplates = await parseBoilerplates(dir);
@@ -857,7 +868,7 @@ async function run() {
       const hooks = [];
       const features = [];
       const flags = Object.entries(args).filter(([, val]) => val === true).map(([key]) => key);
-      for (const bl of boilerplates.filter((b) => !b.config.flag)) {
+      for (const bl of boilerplates.filter((b) => !b.config.flag && !b.config.includeIf)) {
         if (bl.subfolders.includes("files")) {
           sources.push(join(dir, bl.folder, "files"));
         }
@@ -865,8 +876,8 @@ async function run() {
           hooks.push(join(dir, bl.folder, "hooks"));
         }
       }
-      for (const bl of boilerplates.filter((b) => Boolean(b.config.flag))) {
-        if (flags.includes(bl.config.flag)) {
+      for (const bl of boilerplates.filter((b) => Boolean(b.config.flag) || Array.isArray(b.config.includeIf))) {
+        if (testFlags(flags, bl)) {
           if (bl.subfolders.includes("files")) {
             sources.push(join(dir, bl.folder, "files"));
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -16,7 +16,7 @@
     "espree": "^9.6.1",
     "execa": "^7.1.1",
     "get-port": "^7.0.0",
-    "node-fetch": "^3.3.1",
+    "node-fetch": "^3.3.2",
     "rimraf": "^5.0.1",
     "tree-kill": "^1.2.2",
     "tsup": "^7.1.0",
@@ -24,11 +24,11 @@
     "vite": "^4.4.7",
     "vitest": "^0.33.0",
     "which": "^3.0.1",
-    "@batijs/tsup": "0.0.53",
-    "@batijs/build": "0.0.53"
+    "@batijs/build": "0.0.54",
+    "@batijs/tsup": "0.0.54"
   },
   "dependencies": {
-    "@batijs/core": "0.0.53"
+    "@batijs/core": "0.0.54"
   },
   "bin": "./dist/index.js",
   "exports": {