nowebcli 0.2.14 → 0.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nowebcli",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Create, preview and publish community templates for Noweb",
   "license": "MIT",
   "repository": {

package/scripts/noweb.mjs

@@ -4,7 +4,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
 import { existsSync } from "node:fs";
 import { createServer } from "node:http";
-import { access, chmod, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
+import { access, chmod, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, extname, join, resolve, sep } from "node:path";
 import { createInterface } from "node:readline/promises";
@@ -46,6 +46,7 @@ function usage() {
   console.log(`noweb
 
   create [slug]   scaffold the current folder
+  reset [slug]    reset template files and public/; keep dependencies (--yes)
   setup           install local React and TypeScript dependencies
   dev             preview at http://127.0.0.1:4173
   check           validate and compile this template
@@ -58,7 +59,7 @@ function usage() {
   publish         make the uploaded template public`);
 }
 
-async function createTemplate(value) {
+async function createTemplate(value, install = shouldInstall) {
   const validSlug = requireSlug(value || `template-${randomBytes(6).toString("hex")}`);
   const directory = root;
 
@@ -73,10 +74,32 @@ async function createTemplate(value) {
     writeFile(join(directory, "customizations.json"), starterCustomizations),
     writeFile(join(directory, "public/.gitkeep"), ""),
   ]);
-  await setupWorkspace(shouldInstall);
+  await setupWorkspace(install);
   success(`Created ${validSlug} in ${directory}. Add a 16:9 public/cover.jpg (JPEG, up to 5 MB).`);
 }
 
+async function resetTemplate(value) {
+  const files = ["Template.tsx", "customizations.json", "template.json"];
+  if (root === engineRoot || !files.every((file) => existsSync(join(root, file)))) {
+    throw new Error("Run reset inside a template folder containing Template.tsx, customizations.json and template.json.");
+  }
+  const validSlug = requireSlug(value || `template-${randomBytes(6).toString("hex")}`);
+  if (!cliArgs.includes("--yes")) {
+    if (!process.stdin.isTTY) throw new Error("Pass --yes to confirm resetting the template files and public/.");
+    const prompt = createInterface({ input: process.stdin, output: process.stdout });
+    let answer;
+    try {
+      answer = await prompt.question(`Reset ${root}? Template files and public/ will be deleted; node_modules, package files and Git stay. [y/N] `);
+    } finally {
+      prompt.close();
+    }
+    if (!/^y(?:es)?$/i.test(answer.trim())) return;
+  }
+  progress.start("Resetting template files…");
+  for (const file of [...files, "public"]) await rm(join(root, file), { recursive: true, force: true });
+  await createTemplate(validSlug, false);
+}
+
 async function setupWorkspace(install = true) {
   const packagePath = join(root, "package.json");
   if (!existsSync(packagePath)) {
@@ -278,7 +301,7 @@ async function upload() {
   if (!response.ok) throw new Error(result.error || `Upload failed (${response.status}).`);
   if (!Number.isInteger(result.id) || result.id < 1) throw new Error("Upload returned an invalid template ID.");
   await writeFile(join(root, "template.json"), `${JSON.stringify({ id: result.id, slug: template.slug, type: template.type }, null, 2)}\n`);
-  success(`Uploaded ${template.slug} (unpublished): ${new URL(result.url, apiBase)}`);
+  success(`Uploaded ${template.slug} (${result.is_published ? "public" : "unpublished"}): ${new URL(result.url, apiBase)}`);
 }
 
 async function publishUploadedTemplate() {
@@ -758,6 +781,7 @@ try {
   await access(join(engineRoot, "templates/templateCompiler.ts"));
 
   if (command === "create") await createTemplate(slug);
+  else if (command === "reset") await resetTemplate(slug);
   else if (command === "setup") await setupWorkspace(shouldInstall);
   else if (command === "check") await (slug && engineRoot === root ? checkRepositoryTemplates(slug) : checkProject());
   else if (command === "dev") await dev();

package/templates/templateCompiler.ts

@@ -1,5 +1,4 @@
 import { execFile } from "node:child_process";
-import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -13,12 +12,9 @@ import { validateTemplateCode } from "./validateTemplateCode.ts";
 
 const run = promisify(execFile);
 const templatesPath = path.dirname(fileURLToPath(import.meta.url));
-const packageModulesPath = path.join(path.dirname(templatesPath), "node_modules");
-const modulesPath = existsSync(path.join(packageModulesPath, ".bin", "esbuild"))
-  ? packageModulesPath
-  : path.join(process.cwd(), "node_modules");
-
 const require = createRequire(import.meta.url);
+const esbuildPath = require.resolve("esbuild/bin/esbuild");
+const modulesPath = path.dirname(path.dirname(require.resolve("react/package.json")));
 
 const TEMPLATE_COMPILE_TIMEOUT_MS = 10_000;
 const TEMPLATE_COMPILE_MAX_BUFFER = 8 * 1024 * 1024;
@@ -46,7 +42,7 @@ export async function compileTemplate(
     await writeFile(input, withRuntimeImports(code));
     const nodePath = modulesPath;
 
-    await runTemplateCommand(path.join(nodePath, ".bin", "esbuild"), [
+    await runTemplateCommand(esbuildPath, [
       input,
       "--bundle",
       "--format=esm",
@@ -121,7 +117,7 @@ window.__nowebRenderTemplate = (element, props) => {
 
     const nodePath = modulesPath;
 
-    await runTemplateCommand(path.join(nodePath, ".bin", "esbuild"), [
+    await runTemplateCommand(esbuildPath, [
       entry,
       "--bundle",
       "--format=iife",
@@ -203,5 +199,9 @@ async function runTemplateCommand(
     },
     maxBuffer: TEMPLATE_COMPILE_MAX_BUFFER,
     timeout: TEMPLATE_COMPILE_TIMEOUT_MS,
+  }).catch((error) => {
+    throw new Error(error.killed
+      ? "Template compilation timed out after 10 seconds."
+      : error.stderr?.trim() || "Template compilation failed.");
   });
 }