create-evikit 2.11.0 → 2.14.0

package/bin/create-evikit.js

@@ -5,7 +5,7 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import ownPackage from "../package.json" with { type: "json" };
-import { template } from "../src/routes/api/server.js";
+import { template, templateIndexJs } from "../src/routes/api/server.js";
 
 const ownRoot = dirname(dirname(fileURLToPath(import.meta.url)));
 const name = process.argv[2];
@@ -118,6 +118,10 @@ writeFileSync(
 
 // ---
 
+writeFileSync(join(target, "index.js"), templateIndexJs);
+
+// ---
+
 writeFileSync(
   join(target, ".env"),
   `
@@ -135,8 +139,8 @@ const pkg = {
   version: "0.1.0",
   private: true,
   scripts: {
-    dev: scripts.dev,
-    build: scripts.build,
+    dev: "vite dev",
+    build: "tsc && vite build",
     start: scripts.start,
     extract: scripts.extract,
     format: scripts.format,

package/index.css

@@ -1,5 +1,4 @@
-@import "tailwindcss";
-@plugin "daisyui";
+@import "evikit/css";
 
 [lang="uk"] p {
   text-wrap: balance;

package/index.js

@@ -1,21 +1,16 @@
 import { listen, production } from "evikit/server";
 import express from "express";
-import { readFile } from "node:fs/promises";
 import swaggerUi from "swagger-ui-express";
 
 import { api } from "./src/api.js";
 import { prerender } from "./src/prerender.js";
 
 const app = express();
+app.use("/node_modules", express.static("./node_modules"));
 app.use("/static", express.static("./static"));
 app.use("/robots.txt", express.static("./static/robots.txt"));
 app.use(api().onRequest);
 app.use("/openapi", swaggerUi.serve, swaggerUi.setup(api().openapi));
 app.use("/", express.static("./dist", { index: false, redirect: false }));
-app.use(
-  production({
-    html: await readFile("./dist/index.html", "utf-8"),
-    prerender,
-  }),
-);
+app.use(production({ prerender }));
 listen(app);

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "create-evikit",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "type": "module",
   "bin": "bin/create-evikit.js",
   "scripts": {
-    "dev": "vite dev",
-    "build": "tsc && vite build",
-    "start": "cross-env NODE_ENV=production node --env-file=.env index.js",
+    "dev": "node --env-file-if-exists=.env index.js dev",
+    "build": "tsc && node --env-file-if-exists=.env index.js build",
+    "start": "cross-env NODE_ENV=production node --env-file-if-exists=.env index.js",
     "extract": "evikit-extract",
     "format": "prettier --write . && eslint --fix .",
     "lint": "prettier --check . && eslint ."
@@ -22,6 +22,7 @@
     "@types/node": "^26.6.2",
     "@types/swagger-ui-express": "^4.1.8",
     "daisyui": "^5.7.46",
+    "esbuild": "^0.28.2",
     "eslint": "^10.11.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-perfectionist": "^5.12.1",
@@ -37,7 +38,7 @@
     "accept-language": "^3.0.20",
     "classnames": "^2.5.1",
     "cross-env": "^10.1.0",
-    "evikit": "^2.11.0",
+    "evikit": "^2.14.1",
     "express": "^5.2.1",
     "file-type": "^22.1.1",
     "hoofd": "^1.7.3",
@@ -47,6 +48,7 @@
     "valibot": "^1.5.0"
   },
   "allowScripts": {
-    "@scarf/scarf": false
+    "@scarf/scarf": false,
+    "esbuild": true
   }
 }

package/src/routes/api/server.js

@@ -20,6 +20,28 @@ export const template = [
   "index.html",
 ];
 
+export const templateIndexJs = `
+import { listen, production } from "evikit/server";
+import express from "express";
+import { readFile } from "node:fs/promises";
+import swaggerUi from "swagger-ui-express";
+
+import { api } from "./src/api.js";
+import { prerender } from "./src/prerender.js";
+
+const app = express();
+app.use(api().onRequest);
+app.use("/openapi", swaggerUi.serve, swaggerUi.setup(api().openapi));
+app.use("/", express.static("./dist", { index: false, redirect: false }));
+app.use(
+  production({
+    html: await readFile("./dist/index.html", "utf-8"),
+    prerender,
+  }),
+);
+listen(app);
+`.trimStart();
+
 export const HomeServer = {
   get: endpoint(HomeGet, async () => {
     const latest = Object.entries(
@@ -38,7 +60,10 @@ export const HomeServer = {
     return json({
       File: Object.fromEntries(
         await Promise.all(
-          template.map(async (path) => [path, await readFile(path, "utf8")]),
+          template.map(async (path) => [
+            path,
+            path == "index.js" ? templateIndexJs : await readFile(path, "utf8"),
+          ]),
         ),
       ),
       npm: { publishedAt: latest[1], version: latest[0] },

package/src/routes/api/todo/server.js

@@ -9,11 +9,11 @@ export const TodoServer = {
   ),
 
   post: endpoint(TodoPost, async ({ input }) => {
-    const [todo] = db.Todo.select({ where: { text: input.text } });
+    const [todo] = db.Todo.select({ text: input.text });
     if (todo) {
       db.Todo.update({
         set: { doneAt: todo.doneAt ? undefined : Date.now() },
-        where: { text: todo.text },
+        text: todo.text,
       });
     } else {
       db.Todo.upsert({ createdAt: Date.now(), text: input.text });

package/src/routes/page.js

@@ -132,7 +132,7 @@ export function HomePage() {
       pre(
         null,
         code(
-          { class: "!bg-transparent !border-0 shj-lang-bash" },
+          { class: "!bg-transparent !border-none shj-lang-bash" },
           `
 npx create-evikit my-app
 cd my-app
@@ -307,7 +307,7 @@ function Code({ children, class: className, file, lang, note, tag }) {
   const inner = pre(
     { class: "mt-4 overflow-auto text-sm" },
     code(
-      { class: `!border-0 shj-lang-${lang} w-full` },
+      { class: `!border-none shj-lang-${lang} w-full` },
       file
         ?.replace(/.*EviKit.*\r?\n/g, "")
         .replace(/\{[0-9a-z,\s]*?\} from/gi, (match) =>
@@ -322,7 +322,7 @@ function Code({ children, class: className, file, lang, note, tag }) {
         .replace(/.*\/static.*\s+/g, ""),
     ),
   );
-  const more = note ? p({ class: "mt-5", ...sanitize(note) }) : undefined;
+  const more = note ? p({ class: "mt-6", ...sanitize(note) }) : undefined;
   const style = `${className || ""} ${darkBg} mx-0 overflow-hidden p-4 rounded-xl`;
   return tag == "details"
     ? details({ class: style }, summary(null, children), inner, more)