@jxsuite/create 0.28.0 → 0.28.3

package/generate.ts

@@ -1,11 +1,11 @@
 /** Shared project generation logic. Used by both the CLI scaffolder and the Studio server endpoint. */
 
-import { mkdir, writeFile, cp } from "node:fs/promises";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
+import { cp, mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+
 import { existsSync } from "node:fs";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+const __dirname = import.meta.dirname;
 const TEMPLATE_DIR = join(__dirname, "template");
 
 export interface ProjectOptions {
@@ -15,7 +15,7 @@ export interface ProjectOptions {
   adapter?: "static" | "cloudflare-pages" | "cloudflare-workers" | "node" | "bun";
 }
 
-const CF_ADAPTERS = ["cloudflare-pages", "cloudflare-workers"];
+const CF_ADAPTERS = new Set(["cloudflare-pages", "cloudflare-workers"]);
 
 /**
  * Generate a new Jx project at the given path.
@@ -38,19 +38,19 @@ export async function generateProject(destPath: string, opts: ProjectOptions) {
   await mkdir(join(destPath, "public"), { recursive: true });
   await mkdir(join(destPath, "content"), { recursive: true });
 
-  const projectJson = buildProjectJson({ name, description, url, adapter });
-  const packageJson = buildPackageJson({ name, description, adapter });
+  const projectJson = buildProjectJson({ adapter, description, name, url });
+  const packageJson = buildPackageJson({ adapter, description, name });
 
   const writes = [
-    writeFile(join(destPath, "project.json"), JSON.stringify(projectJson, null, "\t") + "\n"),
-    writeFile(join(destPath, "package.json"), JSON.stringify(packageJson, null, "  ") + "\n"),
+    writeFile(join(destPath, "project.json"), `${JSON.stringify(projectJson, null, "\t")}\n`),
+    writeFile(join(destPath, "package.json"), `${JSON.stringify(packageJson, null, "  ")}\n`),
     cp(join(TEMPLATE_DIR, "gitignore"), join(destPath, ".gitignore")),
     cp(join(TEMPLATE_DIR, "layouts"), join(destPath, "layouts"), { recursive: true }),
     cp(join(TEMPLATE_DIR, "pages"), join(destPath, "pages"), { recursive: true }),
   ];
 
-  if (adapter && CF_ADAPTERS.includes(adapter)) {
-    const wranglerJsonc = buildWranglerJsonc({ slug: packageJson.name, adapter });
+  if (adapter && CF_ADAPTERS.has(adapter)) {
+    const wranglerJsonc = buildWranglerJsonc({ adapter, slug: packageJson.name });
     writes.push(writeFile(join(destPath, "wrangler.jsonc"), wranglerJsonc));
   }
 
@@ -58,52 +58,52 @@ export async function generateProject(destPath: string, opts: ProjectOptions) {
 }
 
 /**
- * Build a wrangler.jsonc for Cloudflare adapters. Includes the Images binding so `images.service:
- * "cloudflare"` works out of the box.
+ * Build a wrangler.jsonc for Cloudflare adapters.
  *
  * @param {{ slug: string; adapter: string }} opts
  */
 function buildWranglerJsonc({ slug, adapter }: { slug: string; adapter: string }) {
   const compatibilityDate = new Date().toISOString().slice(0, 10);
 
+  // Nodejs_compat: server functions routinely pull in Node-flavored npm packages
   const config =
     adapter === "cloudflare-workers"
       ? {
-          name: slug,
-          main: "./dist/worker.js",
+          assets: { binding: "ASSETS", directory: "./dist" },
           compatibility_date: compatibilityDate,
-          assets: { directory: "./dist", binding: "ASSETS" },
-          images: { binding: "IMAGES" },
+          compatibility_flags: ["nodejs_compat"],
+          main: "./dist/worker.js",
+          name: slug,
         }
       : {
-          name: slug,
           compatibility_date: compatibilityDate,
+          compatibility_flags: ["nodejs_compat"],
+          name: slug,
           pages_build_output_dir: "./dist",
-          images: { binding: "IMAGES" },
         };
 
-  return JSON.stringify(config, null, "\t") + "\n";
+  return `${JSON.stringify(config, null, "\t")}\n`;
 }
 
 /** @param {ProjectOptions} opts */
 function buildProjectJson({ name, description, url, adapter }: ProjectOptions) {
   const $head = [
     {
+      attributes: { content: "width=device-width, initial-scale=1", name: "viewport" },
       tagName: "meta",
-      attributes: { name: "viewport", content: "width=device-width, initial-scale=1" },
     },
   ];
 
   if (description) {
     $head.push({
+      attributes: { content: description, name: "description" },
       tagName: "meta",
-      attributes: { name: "description", content: description },
     });
   }
 
   const build: { outDir: string; format: string; trailingSlash: string; adapter?: string } = {
-    outDir: "./dist",
     format: "directory",
+    outDir: "./dist",
     trailingSlash: "always",
   };
 
@@ -112,12 +112,6 @@ function buildProjectJson({ name, description, url, adapter }: ProjectOptions) {
   }
 
   return {
-    name,
-    url: url || "https://example.com",
-    defaults: {
-      layout: "./layouts/base.json",
-      lang: "en",
-    },
     $head,
     $media: {
       "--": "1280px",
@@ -125,14 +119,20 @@ function buildProjectJson({ name, description, url, adapter }: ProjectOptions) {
       "--md": "(max-width: 768px)",
       "--sm": "(max-width: 640px)",
     },
+    build,
+    defaults: {
+      lang: "en",
+      layout: "./layouts/base.json",
+    },
+    name,
     style: {
-      margin: "0",
-      padding: "0",
+      color: "#1a1a1a",
       fontFamily: "system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif",
       lineHeight: "1.6",
-      color: "#1a1a1a",
+      margin: "0",
+      padding: "0",
     },
-    build,
+    url: url || "https://example.com",
   };
 }
 
@@ -148,9 +148,10 @@ function buildPackageJson({
 }) {
   const slug = name
     .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-|-$/g, "");
+    .replaceAll(/[^a-z0-9]+/g, "-")
+    .replaceAll(/^-|-$/g, "");
 
+  const dependencies: Record<string, string> = {};
   const devDependencies: Record<string, string> = {
     "@jxsuite/compiler": "^0.19.0",
     "@jxsuite/runtime": "^0.19.0",
@@ -161,18 +162,24 @@ function buildPackageJson({
     dev: "jx dev",
   };
 
-  if (adapter && CF_ADAPTERS.includes(adapter)) {
+  if (adapter && adapter !== "static") {
+    // The generated server worker imports hono; wrangler/node/bun resolve it from node_modules
+    dependencies["hono"] = "^4";
+  }
+
+  if (adapter && CF_ADAPTERS.has(adapter)) {
     devDependencies["wrangler"] = "^4";
     scripts.deploy =
       adapter === "cloudflare-workers" ? "wrangler deploy" : "wrangler pages deploy dist";
   }
 
   return {
-    name: slug,
-    private: true,
     description: description || "",
+    devDependencies,
     license: "MIT",
+    name: slug,
+    private: true,
     scripts,
-    devDependencies,
+    ...(Object.keys(dependencies).length > 0 && { dependencies }),
   };
 }

package/index.ts

@@ -7,10 +7,10 @@
 
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
-import { resolve, basename } from "node:path";
+import { basename, resolve } from "node:path";
 import { generateProject } from "./generate";
 
-const dest = process.argv[2];
+const [dest] = process.argv.slice(2);
 if (!dest) {
   console.error("Usage: bun create @jxsuite <directory>");
   process.exit(1);
@@ -45,7 +45,7 @@ const adapterMap = {
 };
 const adapter = adapterMap[adapterChoice] || "static";
 
-await generateProject(destPath, { name, description, url, adapter });
+await generateProject(destPath, { adapter, description, name, url });
 
 console.log(`
 Project created at ${destPath}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/create",
-  "version": "0.28.0",
+  "version": "0.28.3",
   "description": "Scaffold a new Jx project",
   "license": "MIT",
   "repository": {