@batijs/cli 0.0.23 → 0.0.25

package/dist/boilerplates/@batijs/solid/files/pages/star-wars/filterMovieData.ts

@@ -1,11 +1,11 @@
-import type { MovieDetails } from "./types";
-
-export { filterMovieData };
-
-function filterMovieData(
-  movie: MovieDetails & Record<string, unknown>
-): MovieDetails {
-  const { id, title, release_date, director, producer } = movie;
-  movie = { id, title, release_date, director, producer };
-  return movie;
-}
+import type { MovieDetails } from "./types";
+
+export { filterMovieData };
+
+function filterMovieData(
+  movie: MovieDetails & Record<string, unknown>
+): MovieDetails {
+  const { id, title, release_date, director, producer } = movie;
+  movie = { id, title, release_date, director, producer };
+  return movie;
+}

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

@@ -1,22 +1,22 @@
-import { For } from "solid-js";
-import type { Movie } from "../types";
-
-export default function Page(props: { movies: Movie[] }) {
-  return (
-    <>
-      <h1>Star Wars Movies</h1>
-      <ol>
-        <For each={props.movies}>
-          {(movie, i) => (
-            <li>
-              <a href={`/star-wars/${movie.id}`}>{movie.title}</a> ({movie.release_date})
-            </li>
-          )}
-        </For>
-      </ol>
-      <p>
-        Source: <a href="https://star-wars.brillout.com">star-wars.brillout.com</a>.
-      </p>
-    </>
-  );
-}
+import { For } from "solid-js";
+import type { Movie } from "../types";
+
+export default function Page(props: { movies: Movie[] }) {
+  return (
+    <>
+      <h1>Star Wars Movies</h1>
+      <ol>
+        <For each={props.movies}>
+          {(movie, i) => (
+            <li>
+              <a href={`/star-wars/${movie.id}`}>{movie.title}</a> ({movie.release_date})
+            </li>
+          )}
+        </For>
+      </ol>
+      <p>
+        Source: <a href="https://star-wars.brillout.com">star-wars.brillout.com</a>.
+      </p>
+    </>
+  );
+}

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

@@ -1,80 +1,80 @@
-export default onBeforeRender;
-
-import fetch from "cross-fetch";
-//import { filterMovieData } from '../filterMovieData'
-import type { Movie, MovieDetails } from "../types";
-
-// export { prerender }
-
-async function onBeforeRender() {
-  const movies = await getStarWarsMovies();
-  return {
-    pageContext: {
-      pageProps: {
-        // We remove data we don't need because we pass `pageContext.movies` to
-        // the client; we want to minimize what is sent over the network.
-        movies: filterMoviesData(movies),
-      },
-      // The page's <title>
-      title: getTitle(movies),
-    },
-  };
-}
-
-async function getStarWarsMovies(): Promise<MovieDetails[]> {
-  const response = await fetch("https://star-wars.brillout.com/api/films.json");
-  let movies: MovieDetails[] = ((await response.json()) as any).results;
-  movies = movies.map((movie: MovieDetails, i: number) => ({
-    ...movie,
-    id: String(i + 1),
-  }));
-  return movies;
-}
-
-function filterMoviesData(movies: MovieDetails[]): Movie[] {
-  return movies.map((movie: MovieDetails) => {
-    const { title, release_date, id } = movie;
-    return { title, release_date, id };
-  });
-}
-
-/*
-async function prerender() {
-  const movies = await getStarWarsMovies()
-  return [
-    {
-      url: '/star-wars',
-      // We already provide `pageContext` here so that Vike
-      // will *not* have to call the `onBeforeRender()` hook defined
-      // above in this file.
-      pageContext: {
-        pageProps: {
-          movies: filterMoviesData(movies)
-        },
-        documentProps: { title: getTitle(movies) }
-      }
-    },
-    ...movies.map((movie) => {
-      const url = `/star-wars/${movie.id}`
-      return {
-        url,
-        // Note that we can also provide the `pageContext` of other pages.
-        // 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: {
-          pageProps: {
-            movie: filterMovieData(movie)
-          },
-          documentProps: { title: movie.title }
-        }
-      }
-    })
-  ]
-}
-*/
-
-function getTitle(movies: Movie[] | MovieDetails[]): string {
-  const title = `${movies.length} Star Wars Movies`;
-  return title;
-}
+export default onBeforeRender;
+
+import fetch from "cross-fetch";
+//import { filterMovieData } from '../filterMovieData'
+import type { Movie, MovieDetails } from "../types";
+
+// export { prerender }
+
+async function onBeforeRender() {
+  const movies = await getStarWarsMovies();
+  return {
+    pageContext: {
+      pageProps: {
+        // We remove data we don't need because we pass `pageContext.movies` to
+        // the client; we want to minimize what is sent over the network.
+        movies: filterMoviesData(movies),
+      },
+      // The page's <title>
+      title: getTitle(movies),
+    },
+  };
+}
+
+async function getStarWarsMovies(): Promise<MovieDetails[]> {
+  const response = await fetch("https://star-wars.brillout.com/api/films.json");
+  let movies: MovieDetails[] = ((await response.json()) as any).results;
+  movies = movies.map((movie: MovieDetails, i: number) => ({
+    ...movie,
+    id: String(i + 1),
+  }));
+  return movies;
+}
+
+function filterMoviesData(movies: MovieDetails[]): Movie[] {
+  return movies.map((movie: MovieDetails) => {
+    const { title, release_date, id } = movie;
+    return { title, release_date, id };
+  });
+}
+
+/*
+async function prerender() {
+  const movies = await getStarWarsMovies()
+  return [
+    {
+      url: '/star-wars',
+      // We already provide `pageContext` here so that Vike
+      // will *not* have to call the `onBeforeRender()` hook defined
+      // above in this file.
+      pageContext: {
+        pageProps: {
+          movies: filterMoviesData(movies)
+        },
+        documentProps: { title: getTitle(movies) }
+      }
+    },
+    ...movies.map((movie) => {
+      const url = `/star-wars/${movie.id}`
+      return {
+        url,
+        // Note that we can also provide the `pageContext` of other pages.
+        // 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: {
+          pageProps: {
+            movie: filterMovieData(movie)
+          },
+          documentProps: { title: movie.title }
+        }
+      }
+    })
+  ]
+}
+*/
+
+function getTitle(movies: Movie[] | MovieDetails[]): string {
+  const title = `${movies.length} Star Wars Movies`;
+  return title;
+}

package/dist/boilerplates/@batijs/solid/files/pages/star-wars/types.ts

@@ -1,13 +1,13 @@
-export type Movie = {
-  id: string;
-  title: string;
-  release_date: string;
-};
-
-export type MovieDetails = {
-  id: string;
-  title: string;
-  release_date: string;
-  director: string;
-  producer: string;
-};
+export type Movie = {
+  id: string;
+  title: string;
+  release_date: string;
+};
+
+export type MovieDetails = {
+  id: string;
+  title: string;
+  release_date: string;
+  director: string;
+  producer: string;
+};

package/dist/boilerplates/@batijs/solid/{package-FCCXLXQM.js → package-DVZ6BETH.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/solid";
 var private2 = true;
-var version = "0.0.23";
+var version = "0.0.25";
 var description = "";
 var type = "module";
 var scripts = {
@@ -12,11 +12,12 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@types/node": "^16.18.34",
+  "@types/node": "^16.18.36",
   "cross-fetch": "^3.1.6",
-  "solid-js": "^1.7.5",
+  "solid-js": "^1.7.6",
   tailwindcss: "^3.3.2",
-  typescript: "^5.0.4",
+  tsup: "^6.7.0",
+  typescript: "^5.1.3",
   "vike-solid": "^0.0.7",
   vite: "^4.3.9",
   "vite-plugin-solid": "^2.7.0",

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-RQHE6P6I.js"), {
+  return addDependency(packageJson, await import("../package-7CSFX2AA.js"), {
     devDependencies: ["tailwindcss", "postcss", "autoprefixer"]
   });
 }

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

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

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

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

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

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

package/dist/boilerplates/@batijs/tailwindcss/{package-RQHE6P6I.js → package-7CSFX2AA.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/tailwindcss";
 var private2 = true;
-var version = "0.0.23";
+var version = "0.0.25";
 var description = "";
 var type = "module";
 var scripts = {
@@ -12,10 +12,11 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@types/node": "^16.18.34",
+  "@types/node": "^16.18.36",
   autoprefixer: "^10.4.14",
   postcss: "^8.4.24",
   tailwindcss: "^3.3.2",
+  tsup: "^6.7.0",
   vite: "^4.3.9",
   "vite-plugin-ssr": "^0.4.131"
 };

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-KNRGQRR5.js"), {
+  return addDependency(packageJson, await import("../package-42IE3DIX.js"), {
     dependencies: ["telefunc"]
   });
 }

package/dist/boilerplates/@batijs/telefunc/{package-KNRGQRR5.js → package-42IE3DIX.js}

@@ -1,7 +1,7 @@
 // package.json
 var name = "@batijs/telefunc";
 var private2 = true;
-var version = "0.0.23";
+var version = "0.0.25";
 var description = "";
 var type = "module";
 var scripts = {
@@ -12,8 +12,9 @@ var author = "";
 var license = "MIT";
 var devDependencies = {
   "@batijs/tsup": "workspace:*",
-  "@types/node": "^16.18.34",
-  telefunc: "^0.1.53",
+  "@types/node": "^16.18.36",
+  telefunc: "^0.1.55",
+  tsup: "^6.7.0",
   vite: "^4.3.9",
   "vite-plugin-ssr": "^0.4.131"
 };

package/dist/index.js

@@ -554,6 +554,7 @@ import { copyFile, mkdir, opendir, readFile, writeFile } from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
 var reIgnoreFile = /^(chunk-|asset-|#)/gi;
+var isWin = process.platform === "win32";
 function toDist(filepath, source, dist) {
   const split = filepath.split(path.sep);
   split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1");
@@ -585,6 +586,8 @@ async function* walk(dir) {
   }
 }
 function transformFileAfterExec(filepath, fileContent) {
+  if (fileContent === void 0 || fileContent === null)
+    return null;
   const parsed = path.parse(filepath);
   const ext = parsed.ext || parsed.name;
   switch (ext) {
@@ -593,6 +596,7 @@ function transformFileAfterExec(filepath, fileContent) {
     case ".tsx":
     case ".jsx":
     case ".env":
+    case ".html":
       return fileContent;
     case ".json":
       return JSON.stringify(fileContent, null, 2);
@@ -619,7 +623,8 @@ async function main(options, meta) {
 Please report this issue to https://github.com/magne4000/bati`
         );
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
-        const f = await import(p);
+        const importFile = isWin ? "file://" + p : p;
+        const f = await import(importFile);
         const fileContent = transformFileAfterExec(
           target,
           await f.default(targets.has(target) ? () => readFile(target, { encoding: "utf-8" }) : void 0, meta)
@@ -648,14 +653,14 @@ Please report this issue to https://github.com/magne4000/bati`
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.23",
+  version: "0.0.25",
   description: "Scaffold typescript projects with ease and modularity",
   type: "module",
   scripts: {
-    prerelease: "rm -rf ./dist",
+    prerelease: "rimraf ./dist",
     prepublishOnly: "pnpm run build",
     test: "pnpm run build && vitest run --test-timeout=50000",
-    build: "rm -rf dist && tsup"
+    build: "rimraf ./dist && tsup"
   },
   keywords: [],
   author: "",
@@ -663,17 +668,20 @@ var package_default = {
   devDependencies: {
     "@batijs/build": "workspace:*",
     "@batijs/tsup": "workspace:*",
-    "@types/node": "^16.18.34",
+    "@types/node": "^16.18.36",
     citty: "^0.1.1",
     colorette: "^2.0.20",
-    esbuild: "^0.17.19",
+    esbuild: "^0.18.2",
     espree: "^9.5.2",
     execa: "^7.1.1",
-    "get-port": "^6.1.2",
+    "get-port": "^7.0.0",
     "node-fetch": "^3.3.1",
-    typescript: "^5.0.4",
-    vitest: "^0.31.2",
-    "wait-for-localhost": "^4.0.1"
+    rimraf: "^5.0.1",
+    "tree-kill": "^1.2.2",
+    tsup: "^6.7.0",
+    typescript: "^5.1.3",
+    vite: "^4.3.9",
+    vitest: "^0.32.0"
   },
   dependencies: {
     "@batijs/core": "workspace:*"
@@ -819,6 +827,7 @@ var {
 // index.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
+var isWin2 = process.platform === "win32";
 function boilerplatesDir() {
   if (existsSync2(join(__dirname, "boilerplates", "boilerplates.json"))) {
     return join(__dirname, "boilerplates");
@@ -923,12 +932,13 @@ async function retrieveHooks(hooks) {
   for (const hook of hooks) {
     for await (const file of walk(hook)) {
       const parsed = parse(file);
+      const importFile = isWin2 ? "file://" + file : file;
       switch (parsed.name) {
         case "cli":
           if (!map.has("cli")) {
             map.set("cli", []);
           }
-          map.get("cli").push((await import(file)).default);
+          map.get("cli").push((await import(importFile)).default);
           break;
         default:
           throw new Error(`Unsupported hook ${parsed.name}`);

package/package.json

@@ -1,28 +1,31 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "Scaffold typescript projects with ease and modularity",
   "type": "module",
   "keywords": [],
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^16.18.34",
+    "@types/node": "^16.18.36",
     "citty": "^0.1.1",
     "colorette": "^2.0.20",
-    "esbuild": "^0.17.19",
+    "esbuild": "^0.18.2",
     "espree": "^9.5.2",
     "execa": "^7.1.1",
-    "get-port": "^6.1.2",
+    "get-port": "^7.0.0",
     "node-fetch": "^3.3.1",
-    "typescript": "^5.0.4",
-    "vitest": "^0.31.2",
-    "wait-for-localhost": "^4.0.1",
-    "@batijs/build": "0.0.23",
-    "@batijs/tsup": "0.0.23"
+    "rimraf": "^5.0.1",
+    "tree-kill": "^1.2.2",
+    "tsup": "^6.7.0",
+    "typescript": "^5.1.3",
+    "vite": "^4.3.9",
+    "vitest": "^0.32.0",
+    "@batijs/build": "0.0.25",
+    "@batijs/tsup": "0.0.25"
   },
   "dependencies": {
-    "@batijs/core": "0.0.23"
+    "@batijs/core": "0.0.25"
   },
   "bin": "./dist/index.js",
   "exports": {
@@ -39,8 +42,8 @@
     "dist/"
   ],
   "scripts": {
-    "prerelease": "rm -rf ./dist",
+    "prerelease": "rimraf ./dist",
     "test": "pnpm run build && vitest run --test-timeout=50000",
-    "build": "rm -rf dist && tsup"
+    "build": "rimraf ./dist && tsup"
   }
 }