@vesk/vesk-cli 0.2.50-canary.2 → 0.2.50-canary.3

package/dist/cli.js

@@ -32504,7 +32504,7 @@ async function renderFullPage(source, componentName, props = {}, registry = /* @
       const cssUrls = options.cssUrls || (options.cssUrl ? [options.cssUrl] : []);
       const cssLink = cssUrls.map((u) => `	<link rel="stylesheet" href="${u}" />
 `).join("");
-      const clientScript = options.clientScriptUrl ? `	<script type="module" src="${options.clientScriptUrl}"></script>
+      const clientScript = options.clientScriptUrl ? `	<script type="module" src="${options.clientScriptUrl}"${options.clientScriptIntegrity ? ` integrity="${options.clientScriptIntegrity}" crossorigin="anonymous"` : ""}></script>
 ` : "";
       const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
       const dataScriptBlock = dataScripts.length > 0 ? "\n" + dataScripts.join("\n") + "\n" : "";
@@ -32640,7 +32640,7 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
     pruneSsrDataSlots();
     const dataScripts = buildDataScripts(ssrProps, ssrData, options.externalDataScript);
     const dataScriptBlock = dataScripts.length > 0 ? "\n" + dataScripts.join("\n") : "";
-    const clientScript = options.clientScriptUrl ? `	<script type="module" src="${options.clientScriptUrl}"></script>
+    const clientScript = options.clientScriptUrl ? `	<script type="module" src="${options.clientScriptUrl}"${options.clientScriptIntegrity ? ` integrity="${options.clientScriptIntegrity}" crossorigin="anonymous"` : ""}></script>
 ` : "";
     yield `
 </div>${dataScriptBlock}${clientScript}</body>
@@ -32745,7 +32745,7 @@ import {
   mkdirSync as mkdirSync6,
   statSync as statSync7
 } from "node:fs";
-import { resolve as resolve14, dirname as dirname11, join as join10, extname as extname4, basename } from "node:path";
+import { resolve as resolve14, dirname as dirname11, join as join10, extname as extname4, basename as basename2 } from "node:path";
 import { createRequire as createRequire4 } from "node:module";
 import { spawn } from "node:child_process";
 function defaultState() {
@@ -32803,7 +32803,7 @@ function resolvePackage(appDir, pkg) {
           break;
         }
         const parent = dirname11(cur);
-        if (parent !== cur && basename(cur) === "node_modules") break;
+        if (parent !== cur && basename2(cur) === "node_modules") break;
         cur = parent;
       }
     } catch {
@@ -46255,7 +46255,7 @@ function setRuntimeModule2(mod) {
 
 // ../adapter/dist/index.js
 import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync12, existsSync as existsSync22, readFileSync as readFileSync21 } from "node:fs";
-import { resolve as resolve21, dirname as dirname16, relative as relative4, basename as basename2 } from "node:path";
+import { resolve as resolve21, dirname as dirname16, relative as relative4, basename as basename3 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // ../adapter/src/runtime-bundle.ts
@@ -46738,7 +46738,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
   return { ${paramExprs.join(", ")} };
 }
 `;
-  const clientScriptOption = ', clientScriptUrl: "/_vesk/static/client.js"';
+  const clientScriptOption = `, clientScriptUrl: ${JSON.stringify(options?.clientScriptUrl || "/_vesk/static/client.js")}` + (options?.clientScriptIntegrity ? `, clientScriptIntegrity: ${JSON.stringify(options.clientScriptIntegrity)}` : "");
   const dataScriptOption = ", externalDataScript: storeDataScriptGlobal";
   let registryCode = "";
   const compRegEntries = [];
@@ -47288,6 +47288,43 @@ function generateApiFunction(apiNode, _apiDir, outDir, options) {
   return { funcPath, funcCode, name };
 }
 
+// ../adapter/src/asset-hash.ts
+import { createHash } from "node:crypto";
+var EXT_RE = /\.([a-z0-9]+)$/i;
+function hashedName(fileName, content) {
+  const m = EXT_RE.exec(fileName);
+  if (!m) return fileName;
+  const base = fileName.slice(0, m.index);
+  return `${base}.${hashOf(content)}${m[0]}`;
+}
+function hashOf(content) {
+  return createHash("sha256").update(content).digest("hex").slice(0, 10);
+}
+function integrityOf(content) {
+  return `sha384-${createHash("sha384").update(content).digest("base64")}`;
+}
+function describeAsset(fileName, content) {
+  return {
+    fileName: hashedName(fileName, content),
+    hash: hashOf(content),
+    bytes: typeof content === "string" ? Buffer.byteLength(content) : content.length,
+    integrity: integrityOf(content)
+  };
+}
+function isHashedName(fileName) {
+  const m = EXT_RE.exec(fileName);
+  if (!m) return false;
+  const base = fileName.slice(0, m.index);
+  const dot = base.lastIndexOf(".");
+  if (dot === -1) return false;
+  const suffix = base.slice(dot + 1);
+  return suffix.length === 10 && /^[0-9a-f]{10}$/.test(suffix);
+}
+function cacheControlFor(fileName, isDev) {
+  if (isDev) return "no-cache";
+  return isHashedName(fileName) ? "public, max-age=31536000, immutable" : "public, max-age=0, must-revalidate";
+}
+
 // ../adapter/src/middleware.ts
 import { readFileSync as readFileSync10 } from "node:fs";
 
@@ -47591,14 +47628,14 @@ async function compileEvents(appDir, outDir) {
 
 // ../adapter/src/client-bundle.ts
 init_esbuild_fallback();
-init_strip_ts();
-init_parser();
-init_client_codegen();
-init_vsk_collision();
 import { readFileSync as readFileSync11, existsSync as existsSync11, writeFileSync as writeFileSync4, unlinkSync as unlinkSync3, statSync as statSync3, rmSync, mkdtempSync, mkdirSync as mkdirSync3 } from "node:fs";
 import { resolve as resolve10, join as join7, dirname as dirname8, relative as relative2, sep } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { tmpdir } from "node:os";
+init_strip_ts();
+init_parser();
+init_client_codegen();
+init_vsk_collision();
 init_vsk_imports();
 init_md_inline();
 init_module_imports();
@@ -48184,8 +48221,11 @@ async function generateClientBundle(routeTree, appDir, componentMap, options) {
     }, annotate2 = function(nodes) {
       for (const node of nodes) {
         const chunkName = `page-${buildChunkName(node)}.js`;
-        const hasEntry = chunkEntries.some((e) => e.name === chunkName && e.code.trim());
-        if (hasEntry) node.chunk = `/_vesk/static/${chunkName}`;
+        const emitted = chunks.find((c) => c.name === chunkName && c.code.trim());
+        if (emitted) {
+          const fileName = options?.hmr ? chunkName : hashedName(chunkName, emitted.code);
+          node.chunk = `/_vesk/static/${fileName}`;
+        }
         annotate2(node.children || []);
       }
     };
@@ -48624,7 +48664,7 @@ function copyStaticAssets(publicDir, outDir) {
 
 // ../adapter/src/prod-server.ts
 import { readFileSync as readFileSync15, existsSync as existsSync15, statSync as statSync6 } from "node:fs";
-import { resolve as resolve13, extname as extname3, dirname as dirname10 } from "node:path";
+import { resolve as resolve13, extname as extname3, dirname as dirname10, basename } from "node:path";
 import { createServer } from "node:http";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 init_server_utils();
@@ -48935,9 +48975,13 @@ async function startProdServer(outDir, options) {
       return;
     }
     if (url.pathname === "/_vesk/runtime.js") {
-      const clientPath = resolve13(staticDir, "client.js");
+      const clientFile = buildConfig?.assets?.client?.file || "client.js";
+      const clientPath = resolve13(staticDir, clientFile);
       if (existsSync15(clientPath)) {
-        res.writeHead(200, { "Content-Type": "application/javascript" });
+        res.writeHead(200, {
+          "Content-Type": "application/javascript",
+          "Cache-Control": cacheControlFor(clientFile, false)
+        });
         res.end(readFileSync15(clientPath));
         return;
       }
@@ -48952,7 +48996,13 @@ async function startProdServer(outDir, options) {
       }
       if (existsSync15(staticPath) && statSync6(staticPath).isFile()) {
         const ext = extname3(staticPath);
-        res.writeHead(200, { "Content-Type": MIME[ext] || "application/octet-stream" });
+        res.writeHead(200, {
+          "Content-Type": MIME[ext] || "application/octet-stream",
+          // A content-hashed name can never change meaning, so it is immutable
+          // for a year; anything unhashed must be revalidated or a deploy would
+          // serve stale JS forever.
+          "Cache-Control": cacheControlFor(basename(staticPath), false)
+        });
         res.end(readFileSync15(staticPath));
         return;
       }
@@ -49150,7 +49200,7 @@ async function startProdServer(outDir, options) {
                   const src2 = readFileSync15(errPath, "utf-8");
                   const compName = resolveComponentName(src2) || "Error";
                   const expose = process.env.NODE_ENV !== "production";
-                  errorHtml = await renderFullPage2(src2, compName, { error: expose ? err.message : "Internal Server Error", stack: expose ? err.stack : "", statusCode: 500, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: "/_vesk/static/client.js", security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: errPath, headExtra: bakedHeadExtra });
+                  errorHtml = await renderFullPage2(src2, compName, { error: expose ? err.message : "Internal Server Error", stack: expose ? err.stack : "", statusCode: 500, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: pageCssUrls, clientScriptUrl: buildConfig?.assets?.client?.url || "/_vesk/static/client.js", clientScriptIntegrity: buildConfig?.assets?.client?.integrity, security: securityConfig?.security || {}, externalDataScript: storeDataScriptGlobal, sourcePath: errPath, headExtra: bakedHeadExtra });
                 } catch {
                 }
               }
@@ -49231,7 +49281,7 @@ function filterPluginsForBuild(plugins, state) {
   return filterActivePlugins2(plugins, state.plugins);
 }
 function veskDirFromOutDir(outDir) {
-  const base = basename2(outDir);
+  const base = basename3(outDir);
   if (base === "dev" || base === "build")
     return dirname16(outDir);
   return outDir;
@@ -49360,6 +49410,34 @@ async function build2(appDir, options) {
   const apiTree = existsSync22(apiDir) ? scanApiRoutes2(apiDir) : [];
   console.error(`vesk build: ${routeTree.length} root routes, ${apiTree.length} API routes`);
   markPhase("scan routes");
+  console.error("vesk build: bundling client runtime...");
+  const bundleOpts = {};
+  if (options?.codeSplit)
+    bundleOpts.codeSplit = true;
+  if (options?.hmr)
+    bundleOpts.hmr = true;
+  if (options?.routeDataCache !== void 0)
+    bundleOpts.routeDataCache = options.routeDataCache;
+  if (pluginsPipelines.length > 0)
+    bundleOpts.plugins = pluginsPipelines;
+  const { main, chunks } = await generateClientBundle(routeTree, appDir, componentMap, bundleOpts);
+  markPhase("client runtime + chunks");
+  const staticDir = resolve21(outDir, "static");
+  const hashed = !options?.hmr;
+  const clientAsset = describeAsset("client.js", main);
+  const clientFileName = hashed ? clientAsset.fileName : "client.js";
+  writeFileSync12(resolve21(staticDir, clientFileName), main, "utf-8");
+  const clientUrl = `/_vesk/static/${clientFileName}`;
+  const mode = chunks.length > 0 ? "code-split" : "monolithic";
+  console.error(`vesk build: client \u2192 static/${clientFileName}  (${main.length} bytes, ${mode}${hashed ? `, ${clientAsset.hash}` : ""})`);
+  const emittedAssets = [clientAsset];
+  for (const chunk of chunks) {
+    const asset = describeAsset(chunk.name, chunk.code);
+    emittedAssets.push(asset);
+    writeFileSync12(resolve21(staticDir, hashed ? asset.fileName : chunk.name), chunk.code, "utf-8");
+    console.error(`vesk build: chunk \u2192 static/${hashed ? asset.fileName : chunk.name}  (${chunk.code.length} bytes${hashed ? `, ${asset.hash}` : ""})`);
+  }
+  const clientIntegrity = hashed ? clientAsset.integrity : void 0;
   console.error("vesk build: bundling server runtime...");
   await bundleRuntime(appDir, outDir);
   const ssrRoutes = [];
@@ -49379,7 +49457,7 @@ async function build2(appDir, options) {
           mwCode = compileMiddlewareCode(mwSources);
         }
         const ssrAncestorLayouts = isStandalone ? [] : ancestorLayouts;
-        const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts: ssrAncestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra });
+        const { funcPath, funcCode, name } = generateSsrFunction(node, appDir, outDir, componentMap, { ancestorLayouts: ssrAncestorLayouts, middlewareCode: mwCode, headExtra: pluginHeadExtra, clientScriptUrl: clientUrl, clientScriptIntegrity: clientIntegrity });
         writeFileSync12(funcPath, funcCode, "utf-8");
         const pagePath = resolve21(appDir, node.sourceDir, "page.vsk");
         if (existsSync22(pagePath)) {
@@ -49439,28 +49517,6 @@ async function build2(appDir, options) {
   const hasEvents = await compileEvents(appDir, outDir);
   if (hasEvents)
     console.error("vesk build: evt  \u2192 server/events.js (onStart/onRequest/onStop)");
-  markPhase("api functions");
-  console.error("vesk build: bundling client runtime...");
-  const bundleOpts = {};
-  if (options?.codeSplit)
-    bundleOpts.codeSplit = true;
-  if (options?.hmr)
-    bundleOpts.hmr = true;
-  if (options?.routeDataCache !== void 0)
-    bundleOpts.routeDataCache = options.routeDataCache;
-  if (pluginsPipelines.length > 0)
-    bundleOpts.plugins = pluginsPipelines;
-  const { main, chunks } = await generateClientBundle(routeTree, appDir, componentMap, bundleOpts);
-  writeFileSync12(resolve21(outDir, "static", "client.js"), main, "utf-8");
-  const mode = chunks.length > 0 ? "code-split" : "monolithic";
-  console.error(`vesk build: client \u2192 static/client.js  (${main.length} bytes, ${mode})`);
-  if (chunks.length > 0) {
-    const staticDir = resolve21(outDir, "static");
-    for (const chunk of chunks) {
-      writeFileSync12(resolve21(staticDir, chunk.name), chunk.code, "utf-8");
-      console.error(`vesk build: chunk \u2192 static/${chunk.name}  (${chunk.code.length} bytes)`);
-    }
-  }
   copyStaticAssets(publicDir, outDir);
   markPhase("client runtime + chunks");
   console.error("vesk build: static \u2192 static/public/");
@@ -49503,6 +49559,11 @@ async function build2(appDir, options) {
   }
   markPhase("ssg+images+seo");
   const manifest = generateManifest(routeTree, ssrRoutes, apiRoutes, prerenderedRoutes, middlewareEnabled, actionMap, pluginHeadExtra, hasEvents);
+  manifest.assets = {
+    hashed,
+    client: { file: clientFileName, url: clientUrl, hash: clientAsset.hash, bytes: clientAsset.bytes, integrity: clientAsset.integrity },
+    chunks: emittedAssets.slice(1).map((a) => ({ file: a.fileName, hash: a.hash, bytes: a.bytes, integrity: a.integrity }))
+  };
   writeFileSync12(resolve21(outDir, "config.json"), JSON.stringify(manifest, null, 2) + "\n", "utf-8");
   console.error("vesk build: config \u2192 config.json");
   {
@@ -52202,7 +52263,7 @@ init_tokens();
 init_scan();
 init_strip_ts();
 import { readdirSync as readdirSync7, statSync as statSync12, existsSync as existsSync23, readFileSync as readFileSync22 } from "fs";
-import { join as join15, relative as relative5, basename as basename3 } from "path";
+import { join as join15, relative as relative5, basename as basename4 } from "path";
 function collapseSlashes2(p) {
   let out = "";
   let prevSlash = false;
@@ -52386,7 +52447,7 @@ function scanDirectory(rootDir, dir, parentPath, options) {
       continue;
     }
   }
-  let segName = basename3(dir);
+  let segName = basename4(dir);
   let isGroup = segName.startsWith("(") && segName.endsWith(")");
   let isDynamic = segName.startsWith("[") && segName.endsWith("]") && !segName.startsWith("[...");
   let isCatchAll = segName.startsWith("[...") && segName.endsWith("]");
@@ -52595,7 +52656,7 @@ function matchUrl(tree, pathname) {
 import { readdirSync as readdirSync8, statSync as statSync13, existsSync as existsSync24 } from "fs";
 import { join as join16 } from "path";
 init_server_utils();
-function basename4(p) {
+function basename5(p) {
   const idx = p.lastIndexOf("/");
   return idx === -1 ? p : p.slice(idx + 1);
 }
@@ -52621,7 +52682,7 @@ function scanApiDir(rootDir, dir, parentPath) {
       break;
     }
   }
-  const segName = basename4(dir);
+  const segName = basename5(dir);
   const isDynamic = segName.startsWith("[") && segName.endsWith("]") && !segName.startsWith("[...");
   const isCatchAll = segName.startsWith("[...") && segName.endsWith("]");
   const isPrivate = segName.startsWith("_");
@@ -54036,9 +54097,11 @@ async function generateClientBundle2(routeTree, appDir, componentMap, options) {
     }, annotate2 = function(nodes) {
       for (const node of nodes) {
         const chunkName = `page-${buildChunkName(node)}.js`;
-        const hasEntry = chunkEntries.some((e) => e.name === chunkName && e.code.trim());
-        if (hasEntry)
-          node.chunk = `/_vesk/static/${chunkName}`;
+        const emitted = chunks.find((c) => c.name === chunkName && c.code.trim());
+        if (emitted) {
+          const fileName = options?.hmr ? chunkName : hashedName(chunkName, emitted.code);
+          node.chunk = `/_vesk/static/${fileName}`;
+        }
         annotate2(node.children || []);
       }
     };
@@ -54520,7 +54583,7 @@ import { resolve as resolve28 } from "node:path";
 // ../adapter/dist/plugins.js
 init_paths();
 import { readFileSync as readFileSync26, writeFileSync as writeFileSync14, existsSync as existsSync30, mkdirSync as mkdirSync13, statSync as statSync16 } from "node:fs";
-import { resolve as resolve26, dirname as dirname19, join as join20, extname as extname7, basename as basename5 } from "node:path";
+import { resolve as resolve26, dirname as dirname19, join as join20, extname as extname7, basename as basename6 } from "node:path";
 import { createRequire as createRequire6 } from "node:module";
 import { spawn as spawn2 } from "node:child_process";
 var PLUGIN_STATE_FILENAME2 = "plugins.json";
@@ -54586,7 +54649,7 @@ function resolvePackage2(appDir, pkg) {
           break;
         }
         const parent = dirname19(cur);
-        if (parent !== cur && basename5(cur) === "node_modules")
+        if (parent !== cur && basename6(cur) === "node_modules")
           break;
         cur = parent;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.50-canary.2",
+  "version": "0.2.50-canary.3",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.50-canary.2",
-    "@vesk/compiler": "^0.2.50-canary.2",
-    "@vesk/plugin-tailwind": "^0.2.50-canary.2",
-    "@vesk/runtime": "^0.2.50-canary.2",
+    "@vesk/adapter": "^0.2.50-canary.3",
+    "@vesk/compiler": "^0.2.50-canary.3",
+    "@vesk/plugin-tailwind": "^0.2.50-canary.3",
+    "@vesk/runtime": "^0.2.50-canary.3",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",