@batijs/cli 0.0.93 → 0.0.95

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

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

package/dist/boilerplates/@batijs/edgedb/{package-AB7SMJNM.js → package-6ZI46ULZ.js}

@@ -13,11 +13,11 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@edgedb/generate": "^0.3.3",
-  "@prisma/client": "^5.4.1",
+  "@edgedb/generate": "^0.3.4",
+  "@prisma/client": "^5.4.2",
   "@types/node": "^16.18.40",
   colorette: "^2.0.20",
-  edgedb: "^1.3.6",
+  edgedb: "^1.3.7",
   tsup: "^7.2.0"
 };
 var dependencies = {

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

@@ -8,7 +8,7 @@ async function getPackageJson(props) {
       precedence: 0
     }
   });
-  return addDependency(packageJson, await import("../package-GSTXS2EC.js"), {
+  return addDependency(packageJson, await import("../package-IO7HTZOL.js"), {
     devDependencies: ["eslint", "@typescript-eslint/parser", "@typescript-eslint/eslint-plugin"]
   });
 }

package/dist/boilerplates/@batijs/eslint/{package-GSTXS2EC.js → package-IO7HTZOL.js}

@@ -13,9 +13,9 @@ var scripts = {
 };
 var devDependencies = {
   "@batijs/tsup": "workspace:^",
-  "@typescript-eslint/eslint-plugin": "^6.7.3",
-  "@typescript-eslint/parser": "^6.7.3",
-  eslint: "^8.50.0",
+  "@typescript-eslint/eslint-plugin": "^6.7.5",
+  "@typescript-eslint/parser": "^6.7.5",
+  eslint: "^8.51.0",
   tsup: "^7.2.0"
 };
 var dependencies = {

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

@@ -18,7 +18,7 @@ async function getPackageJson(props) {
       precedence: 20
     }
   });
-  return addDependency(packageJson, await import("../package-5UDRG47T.js"), {
+  return addDependency(packageJson, await import("../package-ZPJEJFQC.js"), {
     devDependencies: ["@types/express"],
     dependencies: [
       "@hattip/adapter-node",

package/dist/boilerplates/@batijs/express/files/express-entry.ts

@@ -51,7 +51,7 @@ async function startServer() {
             username: { label: "Username", type: "text", placeholder: "jsmith" },
             password: { label: "Password", type: "password" },
           },
-          async authorize(credentials, req) {
+          async authorize() {
             // Add logic here to look up the user from the credentials supplied
             const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
 

package/dist/boilerplates/@batijs/express/{package-5UDRG47T.js → package-ZPJEJFQC.js}

@@ -15,7 +15,7 @@ var devDependencies = {
   "@auth/core": "^0.16.1",
   "@batijs/tsup": "workspace:*",
   "@hattip/adapter-node": "^0.0.35",
-  "@types/express": "^4.17.18",
+  "@types/express": "^4.17.19",
   "@types/node": "^16.18.40",
   esno: "^0.17.0",
   express: "^4.18.2",

package/dist/boilerplates/@batijs/h3/files/h3-entry.ts

@@ -70,7 +70,7 @@ async function startServer() {
             username: { label: "Username", type: "text", placeholder: "jsmith" },
             password: { label: "Password", type: "password" },
           },
-          async authorize(credentials, req) {
+          async authorize() {
             // Add logic here to look up the user from the credentials supplied
             const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
 

package/dist/boilerplates/@batijs/hattip/files/hattip-entry.ts

@@ -48,7 +48,7 @@ if (import.meta.BATI_MODULES?.includes("authjs")) {
           username: { label: "Username", type: "text", placeholder: "username" },
           password: { label: "Password", type: "password" },
         },
-        async authorize(credentials, req) {
+        async authorize() {
           // Add logic here to look up the user from the credentials supplied
           const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
 

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

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

package/dist/boilerplates/@batijs/prisma/{package-RF3WI4AN.js → package-DHO62QLY.js}

@@ -13,10 +13,10 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@prisma/client": "^5.4.1",
+  "@prisma/client": "^5.4.2",
   "@types/node": "^16.18.40",
   colorette: "^2.0.20",
-  prisma: "^5.4.1",
+  prisma: "^5.4.2",
   tsup: "^7.2.0"
 };
 var dependencies = {

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

@@ -3,11 +3,11 @@ import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   if (props.meta.BATI_MODULES?.includes("eslint")) {
-    addDependency(packageJson, await import("../package-HKBS52LO.js"), {
+    addDependency(packageJson, await import("../package-UB7NRNF7.js"), {
       devDependencies: ["eslint-config-react-app"]
     });
   }
-  return addDependency(packageJson, await import("../package-HKBS52LO.js"), {
+  return addDependency(packageJson, await import("../package-UB7NRNF7.js"), {
     devDependencies: ["vite", "@types/react", "@types/react-dom"],
     dependencies: ["@vitejs/plugin-react", "cross-fetch", "react", "react-dom", "vike", "vike-react"]
   });

package/dist/boilerplates/@batijs/react/{package-HKBS52LO.js → package-UB7NRNF7.js}

@@ -12,13 +12,13 @@ var keywords = [];
 var author = "";
 var license = "MIT";
 var devDependencies = {
-  "@babel/core": "^7.23.0",
+  "@babel/core": "^7.23.2",
   "@babel/plugin-syntax-flow": "^7.22.5",
   "@babel/plugin-transform-react-jsx": "^7.22.15",
   "@batijs/tsup": "workspace:*",
   "@types/node": "^16.18.40",
-  "@types/react": "^18.2.25",
-  "@types/react-dom": "^18.2.11",
+  "@types/react": "^18.2.28",
+  "@types/react-dom": "^18.2.13",
   "@vitejs/plugin-react": "^4.1.0",
   "cross-fetch": "^4.0.0",
   "eslint-config-react-app": "^7.0.1",

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

@@ -3,11 +3,11 @@ import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
   if (props.meta.BATI_MODULES?.includes("eslint")) {
-    addDependency(packageJson, await import("../package-F3DSO3FZ.js"), {
+    addDependency(packageJson, await import("../package-AH7QMR5B.js"), {
       devDependencies: ["eslint-plugin-solid"]
     });
   }
-  return addDependency(packageJson, await import("../package-F3DSO3FZ.js"), {
+  return addDependency(packageJson, await import("../package-AH7QMR5B.js"), {
     devDependencies: ["vite"],
     dependencies: ["cross-fetch", "solid-js", "vike-solid", "vike"]
   });

package/dist/boilerplates/@batijs/solid/{package-F3DSO3FZ.js → package-AH7QMR5B.js}

@@ -16,14 +16,14 @@ var devDependencies = {
   "@types/node": "^16.18.40",
   "cross-fetch": "^4.0.0",
   "eslint-plugin-solid": "^0.13.0",
-  "solid-js": "^1.7.12",
+  "solid-js": "^1.8.1",
   tailwindcss: "^3.3.3",
   tsup: "^7.2.0",
   typescript: "^5.2.2",
   vike: "^0.4.143",
   "vike-solid": "^0.2.1",
   vite: "^4.4.11",
-  "vite-plugin-solid": "^2.7.0"
+  "vite-plugin-solid": "^2.7.1"
 };
 var dependencies = {
   "@batijs/core": "workspace:*"

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

@@ -2,7 +2,7 @@
 import { addDependency, loadAsJson } from "@batijs/core";
 async function getPackageJson(props) {
   const packageJson = await loadAsJson(props);
-  return addDependency(packageJson, await import("../package-3OTPCELZ.js"), {
+  return addDependency(packageJson, await import("../package-Z3CBCFWC.js"), {
     dependencies: ["vite-plugin-vercel", "@vite-plugin-vercel/vike"]
   });
 }

package/dist/boilerplates/@batijs/vercel/{package-3OTPCELZ.js → package-Z3CBCFWC.js}

@@ -14,8 +14,8 @@ var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
   "@types/node": "^16.18.40",
-  "@vite-plugin-vercel/vike": "^0.4.1",
-  "vite-plugin-vercel": "^0.3.6",
+  "@vite-plugin-vercel/vike": "^0.4.2",
+  "vite-plugin-vercel": "^0.3.7",
   tsup: "^7.2.0",
   vite: "^4.4.11",
   vike: "^0.4.143"

package/dist/boilerplates/@batijs/vue/files/$.eslintrc.json.js

@@ -9,6 +9,9 @@ async function getEslintConfig(props) {
   eslintConfig.parserOptions.parser = "@typescript-eslint/parser";
   eslintConfig.rules ??= {};
   eslintConfig.rules["vue/multi-word-component-names"] = "off";
+  eslintConfig.rules["vue/singleline-html-element-content-newline"] = "off";
+  eslintConfig.rules["vue/max-attributes-per-line"] = "off";
+  eslintConfig.rules["vue/html-self-closing"] = "off";
   return eslintConfig;
 }
 export {

package/dist/boilerplates/@batijs/vue/files/components/Content.vue

@@ -1,24 +1,29 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
   <div id="page-container">
+    <!--  import.meta.BATI_MODULES?.includes("tailwindcss") -->
     <div
       id="page-content"
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
       class="p-5 pb-12 min-h-screen"
-{{{ #else }}}
+    >
+      <slot />
+    </div>
+    <!--  !import.meta.BATI_MODULES?.includes("tailwindcss") -->
+    <div
+      id="page-content"
       style="
         padding: 20px;
         padding-bottom: 50px;
         min-height: 100vh;
       "
-{{{ /if }}}
     >
       <slot />
     </div>
   </div>
 </template>
 
+<script setup lang="ts">
+</script>
+
 <style>
 /* Page Transition Animation */
 body.page-is-transitioning #page-content {
@@ -33,3 +38,4 @@ body.page-is-transitioning #page-content {
   transition: opacity 0.3s ease-in-out;
 }
 </style>
+

package/dist/boilerplates/@batijs/vue/files/components/Counter.vue

@@ -1,11 +1,15 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
+  <!--  import.meta.BATI_MODULES?.includes("tailwindcss") -->
   <button
     type="button"
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
     class="inline-block border border-black rounded bg-gray-200 px-2 py-1 text-xs font-medium uppercase leading-normal"
-{{{ /if }}}
+    @click="state.count++"
+  >
+    Counter {{ state.count }}
+  </button>
+  <!--  !import.meta.BATI_MODULES?.includes("tailwindcss") -->
+  <button
+    type="button"
     @click="state.count++"
   >
     Counter {{ state.count }}
@@ -13,7 +17,8 @@
 </template>
 
 <script lang="ts">
-import { reactive } from 'vue'
+import { reactive } from "vue";
+
 export default {
   setup() {
     const state = reactive({ count: 0 })

package/dist/boilerplates/@batijs/vue/files/components/Logo.vue

@@ -1,15 +1,22 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
+  <!--  import.meta.BATI_MODULES?.includes("tailwindcss") -->
   <div
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
     class="p-5 mb-2"
-{{{ #else }}}
+  >
+    <a href="/">
+      <img
+        src="../assets/logo.svg"
+        height="64"
+        width="64"
+      >
+    </a>
+  </div>
+  <!--  !import.meta.BATI_MODULES?.includes("tailwindcss") -->
+  <div
     style="
       margin-top: 20px;
       margin-bottom: 10px;
     "
-{{{ /if }}}
   >
     <a href="/">
       <img
@@ -20,3 +27,5 @@
     </a>
   </div>
 </template>
+<script setup lang="ts">
+</script>

package/dist/boilerplates/@batijs/vue/files/components/Sidebar.vue

@@ -1,11 +1,14 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
+  <!--  import.meta.BATI_MODULES?.includes("tailwindcss") -->
   <div
     id="sidebar"
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
     class="p-5 flex flex-col shrink-0 border-r-2 border-r-gray-200"
-{{{ #else }}}
+  >
+    <slot />
+  </div>
+  <!--  !import.meta.BATI_MODULES?.includes("tailwindcss") -->
+  <div
+    id="sidebar"
     style="
       padding: 20px;
       flex-shrink: 0;
@@ -14,8 +17,9 @@
       line-height: 1.8em;
       border-right: 2px solid #eee;
     "
-{{{ /if }}}
   >
     <slot />
   </div>
 </template>
+<script setup lang="ts">
+</script>

package/dist/boilerplates/@batijs/vue/files/layouts/HeadDefault.vue

@@ -1,5 +1,3 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <!-- Default <head> (can be overridden by pages) -->
 
 <template>
@@ -7,13 +5,13 @@
     name="viewport"
     content="width=device-width, initial-scale=1"
   >
-{{{ @if (it.import.meta.BATI_MODULES?.includes("plausible.io")) }}}
+
+  <!-- import.meta.BATI_MODULES?.includes("plausible.io") -->
   <!-- See https://plausible.io/docs/plausible-script -->
   <!-- TODO: update data-domain -->
-  <script
-    defer
-    data-domain="yourdomain.com"
-    src="https://plausible.io/js/script.js"
-  />
-{{{ /if }}}
+  <component :is="'script'" defer
+             data-domain="yourdomain.com"
+             src="https://plausible.io/js/script.js" />
 </template>
+<script setup lang="ts">
+</script>

package/dist/boilerplates/@batijs/vue/files/layouts/LayoutDefault.vue

@@ -1,6 +1,3 @@
-
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
   <div class="layout">
     <Sidebar>
@@ -8,11 +5,10 @@
       <Link href="/">
         Welcome
       </Link>
-{{{ @if (it.import.meta.BATI_MODULES?.includes("telefunc")) }}}
+      <!-- import.meta.BATI_MODULES?.includes("telefunc") -->
       <Link href="/todo">
         Todo
       </Link>
-{{{ /if }}}
       <Link href="/star-wars">
         Data Fetching
       </Link>
@@ -29,10 +25,11 @@ import Content from "../components/Content.vue";
 </script>
 
 <style>
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
-@import "./tailwind.css"; /* see https://stackoverflow.com/questions/55206901/how-to-import-css-files-in-vue-3-child-components */
+/*{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }*/
+/* see https://stackoverflow.com/questions/55206901/how-to-import-css-files-in-vue-3-child-components */
+@import "./tailwind.css";
+/*{ /if }*/
 
-{{{ /if }}}
 body {
   margin: 0;
   font-family: sans-serif;

package/dist/boilerplates/@batijs/vue/files/pages/index/+Page.vue

@@ -1,11 +1,10 @@
-{{{! /* We are using the SquirrellyJS template syntax */ _}}}
-
 <template>
-{{{ @if (it.import.meta.BATI_MODULES?.includes("tailwindcss")) }}}
+  <!--  import.meta.BATI_MODULES?.includes("tailwindcss") -->
   <h1 class="font-bold text-3xl pb-4">
-{{{ #else }}}
+    My Vike app
+  </h1>
+  <!--  !import.meta.BATI_MODULES?.includes("tailwindcss") -->
   <h1>
-{{{ /if }}}
     My Vike app
   </h1>
   This page is:
@@ -18,7 +17,8 @@
 </template>
 
 <script lang="ts">
-  import Counter from '../../components/Counter.vue'
-  const components = { Counter }
-  export default { components }
+import Counter from "../../components/Counter.vue";
+
+const components = { Counter }
+export default { components }
 </script>

package/dist/index.js

@@ -450,9 +450,9 @@ async function runMain(cmd, opts = {}) {
 
 // ../build/dist/index.js
 import { existsSync } from "fs";
-import { copyFile, mkdir, opendir, readFile, writeFile } from "fs/promises";
+import { mkdir, opendir, readFile, writeFile } from "fs/promises";
 import path from "path";
-import { loadFile, renderSquirrelly, transformAstAndGenerate } from "@batijs/core";
+import { transformAndFormat } from "@batijs/core";
 function queue() {
   const tasks = [];
   return {
@@ -474,13 +474,6 @@ function toDist(filepath, source, dist) {
   split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1");
   return split.join(path.sep).replace(source, dist);
 }
-async function safeCopyFile(source, destination) {
-  const destinationDir = path.dirname(destination);
-  await mkdir(destinationDir, {
-    recursive: true
-  });
-  await copyFile(source, destination);
-}
 async function safeWriteFile(destination, content) {
   const destinationDir = path.dirname(destination);
   await mkdir(destinationDir, {
@@ -518,10 +511,6 @@ function transformFileAfterExec(filepath, fileContent) {
       throw new Error(`Unsupported extension ${ext} (${filepath})`);
   }
 }
-async function fileContainsBatiMeta(filepath) {
-  const code = await readFile(filepath, { encoding: "utf-8" });
-  return code.includes("import.meta.BATI_");
-}
 async function importTransformer(p) {
   const importFile = isWin ? "file://" + p : p;
   const f = await import(importFile);
@@ -563,33 +552,17 @@ Please report this issue to https://github.com/magne4000/bati`
             targets.add(target);
           }
         });
-      } else if (await fileContainsBatiMeta(p)) {
+      } else {
         transformAndWriteQ.add(async () => {
-          let fileContent = "";
-          if (parsed.ext.match(/\.[tj]sx?$/)) {
-            const mod = await loadFile(p);
-            fileContent = await transformAstAndGenerate(mod.$ast, meta, {
-              filepath: p
-            });
-          } else {
-            const template = await readFile(p, { encoding: "utf-8" });
-            try {
-              fileContent = renderSquirrelly(template, meta);
-            } catch (e) {
-              console.error("SquirrellyJS error while rendering", p);
-              throw e;
-            }
-          }
+          const code = await readFile(p, { encoding: "utf-8" });
+          const fileContent = await transformAndFormat(code, meta, {
+            filepath: p
+          });
           if (fileContent) {
             await safeWriteFile(target, fileContent);
             targets.add(target);
           }
         });
-      } else {
-        simpleCopyQ.add(async () => {
-          await safeCopyFile(p, target);
-          targets.add(target);
-        });
       }
     }
   }
@@ -600,7 +573,7 @@ Please report this issue to https://github.com/magne4000/bati`
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.93",
+  version: "0.0.95",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -19,12 +19,12 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
-    "@batijs/build": "0.0.93",
-    "@batijs/tsup": "0.0.93"
+    "@batijs/build": "0.0.95",
+    "@batijs/tsup": "0.0.95"
   },
   "dependencies": {
-    "@batijs/core": "0.0.93",
-    "@batijs/features": "0.0.93"
+    "@batijs/core": "0.0.95",
+    "@batijs/features": "0.0.95"
   },
   "bin": "./dist/index.js",
   "exports": {