@batijs/cli 0.0.11 → 0.0.13

package/dist/boilerplates/@batijs/express/$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("./chunk-package-2REWQB6N.js"), {
+  return addDependency(packageJson, await import("./chunk-package-QR3QOE4L.js"), {
     devDependencies: ["@types/express"],
     dependencies: [
       "@hattip/adapter-node",

package/dist/boilerplates/@batijs/express/{chunk-package-2REWQB6N.js → chunk-package-QR3QOE4L.js}

@@ -1,6 +1,7 @@
 // package.json
 var name = "@batijs/express";
-var version = "0.0.11";
+var private2 = true;
+var version = "0.0.13";
 var description = "";
 var type = "module";
 var scripts = {
@@ -10,35 +11,21 @@ var keywords = [];
 var author = "";
 var license = "MIT";
 var devDependencies = {
-  "@auth/core": "^0.7.0",
+  "@auth/core": "^0.7.1",
   "@batijs/tsup": "workspace:*",
   "@hattip/adapter-node": "^0.0.33",
   "@types/express": "^4.17.17",
-  "@types/node": "^16.18.24",
+  "@types/node": "^16.18.27",
   express: "^4.18.2",
-  telefunc: "^0.1.52",
+  telefunc: "^0.1.53",
   tsx: "^3.12.7",
   "vike-authjs": "^0.0.2",
-  vite: "^4.3.2",
-  "vite-plugin-ssr": "^0.4.117"
+  vite: "^4.3.5",
+  "vite-plugin-ssr": "^0.4.123"
 };
 var dependencies = {
   "@batijs/core": "workspace:*"
 };
-var exports = {
-  ".": "./dist/index.js",
-  "./files": "./dist/index.js"
-};
-var typesVersions = {
-  "*": {
-    ".": [
-      "./dist/index.d.ts"
-    ],
-    files: [
-      "./dist/index.d.ts"
-    ]
-  }
-};
 var files = [
   "dist/"
 ];
@@ -48,6 +35,7 @@ var bati = {
 };
 var package_default = {
   name,
+  private: private2,
   version,
   description,
   type,
@@ -57,8 +45,6 @@ var package_default = {
   license,
   devDependencies,
   dependencies,
-  exports,
-  typesVersions,
   files,
   bati
 };
@@ -69,13 +55,12 @@ export {
   dependencies,
   description,
   devDependencies,
-  exports,
   files,
   keywords,
   license,
   name,
+  private2 as private,
   scripts,
   type,
-  typesVersions,
   version
 };

package/dist/boilerplates/@batijs/express/{$$express-entry.ts.ts → express-entry.ts}

@@ -34,21 +34,19 @@ async function startServer() {
   }
 
   if (import.meta.VIKE_MODULES?.includes("auth:authjs")) {
+    /**
+     * AuthJS
+     *
+     * TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
+     * TODO: Choose and implement providers
+     *
+     * @link {@see https://authjs.dev/guides/providers/custom-provider}
+     **/
     const Auth = VikeAuth({
-      secret: "bibou",
-      /**
-       * Add your providers here
-       *
-       * @link {@see https://authjs.dev/guides/providers/custom-provider}
-       * */
+      secret: "MY_SECRET",
       providers: [
         CredentialsProvider({
-          // The name to display on the sign in form (e.g. "Sign in with...")
           name: "Credentials",
-          // `credentials` is used to generate a form on the sign in page.
-          // You can specify which fields should be submitted, by adding keys to the `credentials` object.
-          // e.g. domain, username, password, 2FA token, etc.
-          // You can pass any HTML attribute to the <input> tag through the object.
           credentials: {
             username: { label: "Username", type: "text", placeholder: "jsmith" },
             password: { label: "Password", type: "password" },
@@ -57,15 +55,10 @@ async function startServer() {
             // Add logic here to look up the user from the credentials supplied
             const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
 
-            if (user) {
-              // Any object returned will be saved in `user` property of the JWT
-              return user;
-            } else {
-              // If you return null then an error will be displayed advising the user to check their details.
-              return null;
-
-              // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-            }
+            // Any object returned will be saved in `user` property of the JWT
+            // If you return null then an error will be displayed advising the user to check their details.
+            // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
+            return user ?? null;
           },
         }),
       ],
@@ -80,6 +73,11 @@ async function startServer() {
   }
 
   if (import.meta.VIKE_MODULES?.includes("rpc:telefunc")) {
+    /**
+     * Telefunc route
+     *
+     * @link {@see https://telefunc.com}
+     **/
     app.post(
       "/_telefunc",
       createMiddleware(
@@ -105,6 +103,11 @@ async function startServer() {
     );
   }
 
+  /**
+   * Vike route
+   *
+   * @link {@see https://vite-plugin-ssr.com}
+   **/
   app.all("*", async (req, res, next) => {
     const pageContextInit = { urlOriginal: req.originalUrl };
     const pageContext = await renderPage(pageContextInit);
@@ -118,7 +121,7 @@ async function startServer() {
     }
   });
 
-  app.listen(3000, "localhost", () => {
+  app.listen(process.env.PORT ? parseInt(process.env.PORT) : 3000, "localhost", () => {
     console.log("Server listening on http://localhost:3000");
   });
 }

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

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

package/dist/boilerplates/@batijs/hattip/{chunk-package-3MUI6HPS.js → chunk-package-R6L7KHPL.js}

@@ -1,6 +1,7 @@
 // package.json
 var name = "@batijs/hattip";
-var version = "0.0.11";
+var private2 = true;
+var version = "0.0.13";
 var description = "";
 var type = "module";
 var scripts = {
@@ -10,35 +11,21 @@ var keywords = [];
 var author = "";
 var license = "MIT";
 var devDependencies = {
-  "@auth/core": "^0.7.0",
+  "@auth/core": "^0.7.1",
   "@batijs/tsup": "workspace:*",
   "@hattip/adapter-node": "^0.0.33",
   "@hattip/router": "^0.0.33",
   "@hattip/vite": "^0.0.33",
-  "@types/node": "^16.18.24",
+  "@types/node": "^16.18.27",
   hattip: "^0.0.33",
-  telefunc: "^0.1.52",
+  telefunc: "^0.1.53",
   "vike-authjs": "^0.0.2",
-  vite: "^4.3.2",
-  "vite-plugin-ssr": "^0.4.117"
+  vite: "^4.3.5",
+  "vite-plugin-ssr": "^0.4.123"
 };
 var dependencies = {
   "@batijs/core": "workspace:*"
 };
-var exports = {
-  ".": "./dist/index.js",
-  "./files": "./dist/index.js"
-};
-var typesVersions = {
-  "*": {
-    ".": [
-      "./dist/index.d.ts"
-    ],
-    files: [
-      "./dist/index.d.ts"
-    ]
-  }
-};
 var files = [
   "dist/"
 ];
@@ -48,6 +35,7 @@ var bati = {
 };
 var package_default = {
   name,
+  private: private2,
   version,
   description,
   type,
@@ -57,8 +45,6 @@ var package_default = {
   license,
   devDependencies,
   dependencies,
-  exports,
-  typesVersions,
   files,
   bati
 };
@@ -69,13 +55,12 @@ export {
   dependencies,
   description,
   devDependencies,
-  exports,
   files,
   keywords,
   license,
   name,
+  private2 as private,
   scripts,
   type,
-  typesVersions,
   version
 };

package/dist/boilerplates/@batijs/hattip/{$$hattip-entry.ts.ts → hattip-entry.ts}

@@ -7,6 +7,11 @@ import CredentialsProvider from "@auth/core/providers/credentials";
 const router = createRouter();
 
 if (import.meta.VIKE_MODULES?.includes("rpc:telefunc")) {
+  /**
+   * Telefunc route
+   *
+   * @link {@see https://telefunc.com}
+   **/
   router.post("/_telefunc", async (context) => {
     const httpResponse = await telefunc({
       url: context.url.toString(),
@@ -25,38 +30,32 @@ if (import.meta.VIKE_MODULES?.includes("rpc:telefunc")) {
 }
 
 if (import.meta.VIKE_MODULES?.includes("auth:authjs")) {
+  /**
+   * AuthJS
+   *
+   * TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
+   * TODO: Choose and implement providers
+   *
+   * @link {@see https://authjs.dev/guides/providers/custom-provider}
+   **/
   const Auth = VikeAuth({
-    secret: "bibou",
-    /**
-     * Add your providers here
-     *
-     * @link {@see https://authjs.dev/guides/providers/custom-provider}
-     * */
+    secret: "MY_SECRET", // See
+
     providers: [
       CredentialsProvider({
-        // The name to display on the sign in form (e.g. "Sign in with...")
         name: "Credentials",
-        // `credentials` is used to generate a form on the sign in page.
-        // You can specify which fields should be submitted, by adding keys to the `credentials` object.
-        // e.g. domain, username, password, 2FA token, etc.
-        // You can pass any HTML attribute to the <input> tag through the object.
         credentials: {
-          username: { label: "Username", type: "text", placeholder: "jsmith" },
+          username: { label: "Username", type: "text", placeholder: "username" },
           password: { label: "Password", type: "password" },
         },
         async authorize(credentials, req) {
           // Add logic here to look up the user from the credentials supplied
           const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
 
-          if (user) {
-            // Any object returned will be saved in `user` property of the JWT
-            return user;
-          } else {
-            // If you return null then an error will be displayed advising the user to check their details.
-            return null;
-
-            // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-          }
+          // Any object returned will be saved in `user` property of the JWT
+          // If you return null then an error will be displayed advising the user to check their details.
+          // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
+          return user ?? null;
         },
       }),
     ],
@@ -66,6 +65,11 @@ if (import.meta.VIKE_MODULES?.includes("auth:authjs")) {
   router.post("/api/auth/*", Auth);
 }
 
+/**
+ * Vike route
+ *
+ * @link {@see https://vite-plugin-ssr.com}
+ **/
 router.use(async (context) => {
   const pageContextInit = { urlOriginal: context.request.url };
   const pageContext = await renderPage(pageContextInit);

package/dist/boilerplates/@batijs/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-app",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "type": "module",
   "scripts": {
@@ -11,7 +11,7 @@
   "keywords": [],
   "author": "",
   "devDependencies": {
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.4"
   },
   "dependencies": {}
 }

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

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

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

@@ -4,7 +4,7 @@ async function getTsConfig(currentContent) {
   const tsConfig = await loadAsJson(currentContent);
   tsConfig.compilerOptions.jsx = "preserve";
   tsConfig.compilerOptions.jsxImportSource = "solid-js";
-  tsConfig.compilerOptions.types = [...tsConfig.compilerOptions.types ?? [], "solide/types"];
+  tsConfig.compilerOptions.types = [...tsConfig.compilerOptions.types ?? [], "vike-solid/client"];
   return tsConfig;
 }
 export {

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

@@ -3,7 +3,7 @@ import { addVitePlugin, loadAsMagicast } from "@batijs/core";
 async function getViteConfig(currentContent) {
   const mod = await loadAsMagicast(currentContent);
   addVitePlugin(mod, {
-    from: "solide/vite",
+    from: "vike-solid/vite",
     constructor: "solid"
   });
   return mod.generate().code;

package/dist/boilerplates/@batijs/solid/{chunk-package-Q7HCPQTE.js → chunk-package-YV4T2FDR.js}

@@ -1,6 +1,7 @@
 // package.json
 var name = "@batijs/solid";
-var version = "0.0.11";
+var private2 = true;
+var version = "0.0.13";
 var description = "";
 var type = "module";
 var scripts = {
@@ -10,33 +11,20 @@ var keywords = [];
 var author = "";
 var license = "MIT";
 var devDependencies = {
-  "@types/node": "^16.18.24",
-  "cross-fetch": "^3.1.5",
-  "solid-js": "^1.7.3",
-  solide: "^0.0.2",
   "@batijs/tsup": "workspace:*",
+  "@types/node": "^16.18.27",
+  "cross-fetch": "^3.1.5",
+  "solid-js": "^1.7.5",
+  tailwindcss: "^3.3.2",
   typescript: "^5.0.4",
-  vite: "^4.3.2",
+  "vike-solid": "^0.0.6",
+  vite: "^4.3.5",
   "vite-plugin-solid": "^2.7.0",
-  "vite-plugin-ssr": "^0.4.117"
+  "vite-plugin-ssr": "^0.4.123"
 };
 var dependencies = {
   "@batijs/core": "workspace:*"
 };
-var exports = {
-  ".": "./dist/index.js",
-  "./files": "./dist/index.js"
-};
-var typesVersions = {
-  "*": {
-    ".": [
-      "./dist/index.d.ts"
-    ],
-    files: [
-      "./dist/index.d.ts"
-    ]
-  }
-};
 var files = [
   "dist/"
 ];
@@ -46,6 +34,7 @@ var bati = {
 };
 var package_default = {
   name,
+  private: private2,
   version,
   description,
   type,
@@ -55,8 +44,6 @@ var package_default = {
   license,
   devDependencies,
   dependencies,
-  exports,
-  typesVersions,
   files,
   bati
 };
@@ -67,13 +54,12 @@ export {
   dependencies,
   description,
   devDependencies,
-  exports,
   files,
   keywords,
   license,
   name,
+  private2 as private,
   scripts,
   type,
-  typesVersions,
   version
 };

package/dist/boilerplates/@batijs/solid/components/Link.tsx

@@ -1,7 +1,5 @@
-/** @jsxImportSource solid-js */
-
 import { createMemo } from "solid-js";
-import { usePageContext } from "solide/usePageContext";
+import { usePageContext } from "vike-solid/usePageContext";
 
 export function Link(props: { href: string; children: string }) {
   const pageContext = usePageContext();

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

@@ -1,5 +1,6 @@
-/** @jsxImportSource solid-js */
 import "./style.css";
+//# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+import "./tailwind.css";
 import logoUrl from "../assets/logo.svg";
 import { Link } from "../components/Link";
 import type { JSX } from "solid-js";
@@ -7,6 +8,9 @@ import type { JSX } from "solid-js";
 export default function LayoutDefault(props: { children?: JSX.Element }) {
   return (
     <div
+      //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+      class="flex max-w-5xl m-auto"
+      //# !import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
       style={{
         display: "flex",
         "max-width": "900px",
@@ -27,6 +31,9 @@ function Sidebar(props: { children: JSX.Element }) {
   return (
     <div
       id="sidebar"
+      //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+      class="p-5 flex flex-col shrink-0 border-r-2 border-r-gray-200"
+      //# !import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
       style={{
         padding: "20px",
         "flex-shrink": 0,
@@ -46,6 +53,9 @@ function Content(props: { children: JSX.Element }) {
     <div id="page-container">
       <div
         id="page-content"
+        //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+        class="p-5 pb-12 min-h-screen"
+        //# !import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
         style={{
           padding: "20px",
           "padding-bottom": "50px",
@@ -61,6 +71,9 @@ function Content(props: { children: JSX.Element }) {
 function Logo() {
   return (
     <div
+      //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+      class="p-5 mb-2"
+      //# !import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
       style={{
         "margin-top": "20px",
         "margin-bottom": "10px",

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

@@ -1,11 +1,11 @@
-import type { Config } from "solide";
+import type { Config } from "vike-solid";
 import Layout from "../layouts/LayoutDefault";
 
 // Default config (can be overriden by pages)
 export default {
   Layout,
   // <title>
-  title: "My Solide App",
+  title: "My Vike App",
   // <meta name="description">
-  description: "Demo showcasing Solide",
+  description: "Demo showcasing Vike",
 } satisfies Config;

package/dist/boilerplates/@batijs/solid/pages/_error/+Page.tsx

@@ -1,5 +1,3 @@
-/** @jsxImportSource solid-js */
-
 export default function Page(props: { is404: boolean; errorInfo?: string }) {
   if (props.is404) {
     return (

package/dist/boilerplates/@batijs/solid/pages/index/+Page.tsx

@@ -1,10 +1,14 @@
-/** @jsxImportSource solid-js */
 import { Counter } from "./Counter";
 
 export default function Page() {
   return (
     <>
-      <h1>My Solide app</h1>
+      <h1
+        //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+        class="font-bold text-3xl pb-4"
+      >
+        My Vike app
+      </h1>
       This page is:
       <ul>
         <li>Rendered to HTML.</li>

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

@@ -6,7 +6,12 @@ function Counter() {
   const [count, setCount] = createSignal(0);
 
   return (
-    <button onClick={() => setCount((count) => count + 1)}>
+    <button
+      type="button"
+      //# import.meta.VIKE_MODULES?.includes("uikit:tailwindcss")
+      class="inline-block border border-black rounded bg-gray-200 px-2 py-1 text-xs font-medium uppercase leading-normal"
+      onClick={() => setCount((count) => count + 1)}
+    >
       Counter {count()}
     </button>
   );

package/dist/boilerplates/@batijs/solid/pages/star-wars/@id/+Page.tsx

@@ -1,4 +1,3 @@
-/** @jsxImportSource solid-js */
 import type { MovieDetails } from "../types";
 
 export default function Page(props: { movie: MovieDetails }) {

package/dist/boilerplates/@batijs/solid/pages/star-wars/@id/+onBeforeRender.ts

@@ -2,13 +2,11 @@ export default onBeforeRender;
 
 import fetch from "cross-fetch";
 import { filterMovieData } from "../filterMovieData";
-import type { PageContextBuiltIn } from "solide";
+import type { PageContextBuiltIn } from "vike-solid";
 import type { MovieDetails } from "../types";
 
 async function onBeforeRender(pageContext: PageContextBuiltIn) {
-  const response = await fetch(
-    `https://star-wars.brillout.com/api/films/${pageContext.routeParams.id}.json`
-  );
+  const response = await fetch(`https://star-wars.brillout.com/api/films/${pageContext.routeParams.id}.json`);
   let movie = (await response.json()) as MovieDetails;
 
   // We remove data we don't need because we pass `pageContext.movie` to

package/dist/boilerplates/@batijs/solid/pages/star-wars/index/+Page.tsx

@@ -1,4 +1,3 @@
-/** @jsxImportSource solid-js */
 import { For } from "solid-js";
 import type { Movie } from "../types";
 

package/dist/boilerplates/@batijs/solid/pages/star-wars/index/+onBeforeRender.ts

@@ -44,7 +44,7 @@ async function prerender() {
   return [
     {
       url: '/star-wars',
-      // We already provide `pageContext` here so that Solide
+      // We already provide `pageContext` here so that Vike
       // will *not* have to call the `onBeforeRender()` hook defined
       // above in this file.
       pageContext: {
@@ -59,7 +59,7 @@ async function prerender() {
       return {
         url,
         // Note that we can also provide the `pageContext` of other pages.
-        // This means that Solide will not call any
+        // This means that Vike will not call any
         // `onBeforeRender()` hook and the Star Wars API will be called
         // only once (in this `prerender()` hook).
         pageContext: {

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

@@ -0,0 +1,11 @@
+// files/$package.json.ts
+import { addDependency, loadAsJson } from "@batijs/core";
+async function getPackageJson(currentContent, meta) {
+  const packageJson = await loadAsJson(currentContent);
+  return addDependency(packageJson, await import("./chunk-package-GHAJQRWT.js"), {
+    devDependencies: ["tailwindcss", "postcss", "autoprefixer"]
+  });
+}
+export {
+  getPackageJson as default
+};

package/dist/boilerplates/@batijs/tailwindcss/chunk-package-GHAJQRWT.js

@@ -0,0 +1,62 @@
+// package.json
+var name = "@batijs/tailwindcss";
+var private2 = true;
+var version = "0.0.13";
+var description = "";
+var type = "module";
+var scripts = {
+  build: "tsup"
+};
+var keywords = [];
+var author = "";
+var license = "MIT";
+var devDependencies = {
+  "@batijs/tsup": "workspace:*",
+  "@types/node": "^16.18.27",
+  autoprefixer: "^10.4.14",
+  postcss: "^8.4.23",
+  tailwindcss: "^3.3.2",
+  vite: "^4.3.5",
+  "vite-plugin-ssr": "^0.4.123"
+};
+var dependencies = {
+  "@batijs/core": "workspace:*"
+};
+var files = [
+  "dist/"
+];
+var bati = {
+  flag: "tailwindcss",
+  boilerplate: "./dist/files"
+};
+var package_default = {
+  name,
+  private: private2,
+  version,
+  description,
+  type,
+  scripts,
+  keywords,
+  author,
+  license,
+  devDependencies,
+  dependencies,
+  files,
+  bati
+};
+export {
+  author,
+  bati,
+  package_default as default,
+  dependencies,
+  description,
+  devDependencies,
+  files,
+  keywords,
+  license,
+  name,
+  private2 as private,
+  scripts,
+  type,
+  version
+};

package/dist/boilerplates/@batijs/tailwindcss/layouts/tailwind.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

package/dist/boilerplates/@batijs/tailwindcss/postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

package/dist/boilerplates/@batijs/tailwindcss/tailwind.config.js

@@ -0,0 +1,8 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: ["./{pages,layouts,components,src}/**/*.{html,js,jsx,ts,tsx}"],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};

package/dist/boilerplates/@batijs/telefunc/$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("./chunk-package-SB6YW4F2.js"), {
+  return addDependency(packageJson, await import("./chunk-package-ZIL4MEPW.js"), {
     dependencies: ["telefunc"]
   });
 }

package/dist/boilerplates/@batijs/telefunc/{chunk-package-SB6YW4F2.js → chunk-package-ZIL4MEPW.js}

@@ -1,6 +1,7 @@
 // package.json
 var name = "@batijs/telefunc";
-var version = "0.0.11";
+var private2 = true;
+var version = "0.0.13";
 var description = "";
 var type = "module";
 var scripts = {
@@ -11,28 +12,14 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@types/node": "^16.18.24",
-  telefunc: "^0.1.52",
-  vite: "^4.3.2",
-  "vite-plugin-ssr": "^0.4.117"
+  "@types/node": "^16.18.27",
+  telefunc: "^0.1.53",
+  vite: "^4.3.5",
+  "vite-plugin-ssr": "^0.4.123"
 };
 var dependencies = {
   "@batijs/core": "workspace:*"
 };
-var exports = {
-  ".": "./dist/index.js",
-  "./files": "./dist/index.js"
-};
-var typesVersions = {
-  "*": {
-    ".": [
-      "./dist/index.d.ts"
-    ],
-    files: [
-      "./dist/index.d.ts"
-    ]
-  }
-};
 var files = [
   "dist/"
 ];
@@ -42,6 +29,7 @@ var bati = {
 };
 var package_default = {
   name,
+  private: private2,
   version,
   description,
   type,
@@ -51,8 +39,6 @@ var package_default = {
   license,
   devDependencies,
   dependencies,
-  exports,
-  typesVersions,
   files,
   bati
 };
@@ -63,13 +49,12 @@ export {
   dependencies,
   description,
   devDependencies,
-  exports,
   files,
   keywords,
   license,
   name,
+  private2 as private,
   scripts,
   type,
-  typesVersions,
   version
 };

package/dist/boilerplates/boilerplates.json

@@ -1 +1 @@
-[{"config":{"flag":"express","boilerplate":"./dist/files"},"folder":"@batijs/express"},{"config":{"flag":"hattip","boilerplate":"./dist/files"},"folder":"@batijs/hattip"},{"config":{"boilerplate":"./dist/files"},"folder":"@batijs/shared"},{"config":{"flag":"solid","boilerplate":"./dist/files"},"folder":"@batijs/solid"},{"config":{"flag":"telefunc","boilerplate":"./dist/files"},"folder":"@batijs/telefunc"}]
+[{"config":{"flag":"express","boilerplate":"./dist/files"},"folder":"@batijs/express"},{"config":{"flag":"hattip","boilerplate":"./dist/files"},"folder":"@batijs/hattip"},{"config":{"boilerplate":"./files"},"folder":"@batijs/shared"},{"config":{"flag":"solid","boilerplate":"./dist/files"},"folder":"@batijs/solid"},{"config":{"flag":"tailwindcss","boilerplate":"./dist/files"},"folder":"@batijs/tailwindcss"},{"config":{"flag":"telefunc","boilerplate":"./dist/files"},"folder":"@batijs/telefunc"}]

package/dist/index.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 // ../../node_modules/.pnpm/citty@0.1.1/node_modules/citty/dist/index.mjs
 import * as tty from "tty";
 function toArray(val) {
@@ -584,6 +586,8 @@ function transformFileAfterExec(filepath, fileContent) {
   switch (parsed.ext) {
     case ".ts":
     case ".js":
+    case ".tsx":
+    case ".jsx":
       return fileContent;
     case ".json":
       return JSON.stringify(fileContent, null, 2);
@@ -591,6 +595,10 @@ function transformFileAfterExec(filepath, fileContent) {
       throw new Error(`Unsupported extension ${parsed.ext} (${filepath})`);
   }
 }
+async function fileContainsVikeMeta(filepath) {
+  const code = await readFile(filepath, { encoding: "utf-8" });
+  return code.includes("import.meta.VIKE_");
+}
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
   const targets = /* @__PURE__ */ new Map();
@@ -600,13 +608,6 @@ async function main(options, meta) {
       const parsed = path.parse(p);
       if (parsed.name.match(reIgnoreFile)) {
         continue;
-      } else if (parsed.name.startsWith("$$") && parsed.ext.match(/\.[tj]sx?$/)) {
-        const mod = await loadFile(p);
-        const fileContent = await transformAndGenerate(mod.$ast, meta);
-        if (fileContent) {
-          await safeWriteFile(target, fileContent);
-        }
-        targets.set(target, () => fileContent);
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
         throw new Error(`Typescript file needs to be compiled before it can be executed: '${p}'`);
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
@@ -616,6 +617,15 @@ async function main(options, meta) {
           await safeWriteFile(target, fileContent);
         }
         targets.set(target, () => fileContent);
+      } else if (parsed.ext.match(/\.[tj]sx?$/) && await fileContainsVikeMeta(p)) {
+        const mod = await loadFile(p);
+        const fileContent = await transformAndGenerate(mod.$ast, meta, {
+          filepath: p
+        });
+        if (fileContent) {
+          await safeWriteFile(target, fileContent);
+        }
+        targets.set(target, () => fileContent);
       } else {
         await safeCopyFile(p, target);
         targets.set(target, () => readFile(p, { encoding: "utf-8" }));
@@ -627,27 +637,32 @@ async function main(options, meta) {
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.11",
+  version: "0.0.13",
   description: "",
   type: "module",
   scripts: {
     prerelease: "rm -rf ./dist",
     prepublishOnly: "pnpm run build",
+    test: "pnpm run build && vitest run --test-timeout=50000",
     build: "rm -rf dist && tsup"
   },
   keywords: [],
   author: "",
   license: "MIT",
   devDependencies: {
+    "@batijs/build": "workspace:*",
     "@batijs/tsup": "workspace:*",
-    "@types/node": "^16.18.24",
+    "@types/node": "^16.18.27",
     citty: "^0.1.1",
     colorette: "^2.0.20",
     esbuild: "^0.17.18",
+    espree: "^9.5.2",
     execa: "^7.1.1",
-    "@batijs/build": "workspace:*",
-    espree: "^9.5.1",
-    typescript: "^5.0.4"
+    "get-port": "^6.1.2",
+    "node-fetch": "^3.3.1",
+    typescript: "^5.0.4",
+    vitest: "^0.31.0",
+    "wait-for-localhost": "^4.0.1"
   },
   dependencies: {
     "@batijs/core": "workspace:*"

package/package.json

@@ -1,24 +1,28 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "type": "module",
   "keywords": [],
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^16.18.24",
+    "@types/node": "^16.18.27",
     "citty": "^0.1.1",
     "colorette": "^2.0.20",
     "esbuild": "^0.17.18",
+    "espree": "^9.5.2",
     "execa": "^7.1.1",
-    "espree": "^9.5.1",
+    "get-port": "^6.1.2",
+    "node-fetch": "^3.3.1",
     "typescript": "^5.0.4",
-    "@batijs/tsup": "0.0.11",
-    "@batijs/build": "0.0.11"
+    "vitest": "^0.31.0",
+    "wait-for-localhost": "^4.0.1",
+    "@batijs/tsup": "0.0.13",
+    "@batijs/build": "0.0.13"
   },
   "dependencies": {
-    "@batijs/core": "0.0.11"
+    "@batijs/core": "0.0.13"
   },
   "bin": "./dist/index.js",
   "exports": {
@@ -36,6 +40,7 @@
   ],
   "scripts": {
     "prerelease": "rm -rf ./dist",
+    "test": "pnpm run build && vitest run --test-timeout=50000",
     "build": "rm -rf dist && tsup"
   }
 }