@vesk/adapter 0.2.13 → 0.2.16

package/dist/ssr-function.js

@@ -1,6 +1,7 @@
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, relative, join } from 'node:path';
 import { resolveComponentName } from '@vesk/compiler/src/server-codegen';
+import { resolveCssUrls, hasUserCss, hasBuiltTailwindCss } from '@vesk/adapter/src/css';
 function escapeSource(src) {
     return src
         .replace(/\\/g, '\\\\')
@@ -72,23 +73,22 @@ function buildParamExtraction(node, urlParts) {
 export function generateSsrFunction(routeNode, appDir, outDir, componentMap, options) {
     const ancestorLayouts = options?.ancestorLayouts || [];
     const middlewareCode = options?.middlewareCode || null;
+    const headExtra = options?.headExtra || null;
     const pagePath = resolve(appDir, routeNode.sourceDir, 'page.vsk');
     const layoutPath = resolve(appDir, routeNode.sourceDir, 'layout.vsk');
     const parts = routeNode.fullPath.split('/').filter(Boolean);
     const name = routeName(parts);
     const funcDir = resolve(outDir, 'server', 'functions');
     const funcPath = resolve(funcDir, `${name}.js`);
-    const tailwindPath = resolve(outDir, 'static', '_tailwind.css');
-    const globalCssPath = resolve(appDir, '..', 'src', 'global.css');
-    const altCssPath = resolve(appDir, '..', 'src', 'app.css');
-    const hasGlobalCss = existsSync(globalCssPath) || existsSync(altCssPath);
-    const hasTailwind = existsSync(tailwindPath) && readFileSync(tailwindPath, 'utf-8').trim().length > 0;
-    const cssUrls = [];
-    if (hasTailwind)
-        cssUrls.push('/_vesk/static/_tailwind.css');
-    if (hasGlobalCss)
-        cssUrls.push('/_vesk/static/global.css');
+    const cssUrls = resolveCssUrls({
+        tailwind: hasBuiltTailwindCss(outDir),
+        userCss: hasUserCss(appDir),
+    });
     const cssOption = cssUrls.length > 0 ? `, cssUrls: ${JSON.stringify(cssUrls)}` : '';
+    // Static head snippet baked from the active onHead plugins — merged into
+    // every rendered head at request time (page tags win via mergeHeadHtml).
+    const headExtraOption = headExtra ? `, headExtra: ${JSON.stringify(headExtra)}` : '';
+    const bakedOptions = cssOption + headExtraOption;
     const hasLayout = !!routeNode.layout;
     const hasAncestorLayout = ancestorLayouts.length > 0;
     const pageSrc = readFileSync(pagePath, 'utf-8');
@@ -176,7 +176,7 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             "    const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "    page = { body: await __renderErrorBody({ params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' }), head: '' };",
             '  }',
-            "  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled" + cssOption + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
+            "  const html = await renderFullPage(_layoutSrc, _layoutComp, { params, children: (caughtError ? '<!--vesk-ssr-error:' + (caughtError && typeof caughtError === 'object' && 'message' in caughtError ? encodeURIComponent(__expose ? String(caughtError.message) : 'Internal Server Error') : '') + '-->' : '') + page.body }, __componentRegistry, { hydrate: true, cached: _layoutCompiled" + bakedOptions + clientScriptOption + dataScriptOption + ', pageHead: page.head, sourcePath: _layoutPath });',
             "  return new Response(html, { headers: { 'Content-Type': 'text/html' }, status: caughtError ? 500 : 200 });",
             '  });',
             '}',
@@ -191,14 +191,14 @@ export function generateSsrFunction(routeNode, appDir, outDir, componentMap, opt
             "  const message = err && typeof err === 'object' && 'message' in err ? String(err.message) : String(err);",
             "  const stack = err && typeof err === 'object' && 'stack' in err ? String(err.stack) : '';",
             "  const props = { params, statusCode: 500, error: __expose ? message : 'Internal Server Error', stack: __expose ? stack : '', url: requestUrl || '' };",
-            '  return renderFullPage(_errorSrc, _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled' + cssOption + clientScriptOption + dataScriptOption + ', sourcePath: _errorPath });',
+            '  return renderFullPage(_errorSrc, _errorComp, props, __componentRegistry, { hydrate: true, cached: _errorCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', sourcePath: _errorPath });',
             '}',
             '',
             'async function __renderHtml(params, requestUrl) {',
             '  return withSsrStore(async () => {',
             '  let stream;',
             '  try {',
-            '    stream = renderPageStream(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled' + cssOption + clientScriptOption + dataScriptOption + ', sourcePath: _srcPath });',
+            '    stream = renderPageStream(_src, _comp, { params }, __componentRegistry, { hydrate: true, cached: _srcCompiled' + bakedOptions + clientScriptOption + dataScriptOption + ', sourcePath: _srcPath });',
             '  } catch (err) {',
             '    if (err && (err.name === \'NotFoundError\' || err.name === \'Redirect\')) throw err;',
             '    const html = await __renderErrorFullPage(params, requestUrl, err);',

package/dist/static.d.ts

@@ -1,6 +1,6 @@
 import type { RouteNode, SsgRouteResult } from '@vesk/adapter/src/types';
 export declare function copyStaticAssets(publicDir: string, outDir: string): void;
-export declare function generateSsgRoutes(routeTree: RouteNode[], appDir: string, outDir: string): Promise<SsgRouteResult[]>;
+export declare function generateSsgRoutes(routeTree: RouteNode[], appDir: string, outDir: string, plugins?: import('@vesk/types').VeskPlugin[], headExtra?: string, cssUrls?: string[]): Promise<SsgRouteResult[]>;
 export declare function generateSitemap(_routeTree: RouteNode[], ssrRoutes: RouteNode[], prerenderedRoutes: SsgRouteResult[], { siteUrl }?: {
     siteUrl?: string;
 }): string;

package/dist/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAsBxE;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAwEzH;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,SAAS,EAAE,EACtB,iBAAiB,EAAE,cAAc,EAAE,EACnC,EAAE,OAAiC,EAAE,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/D,MAAM,CAoCR;AAED,wBAAgB,iBAAiB,CAAC,OAAO,SAA0B,GAAG,MAAM,CAK3E"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAsBxE;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,aAAa,EAAE,UAAU,EAAE,EAC5C,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CA0E3B;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,SAAS,EAAE,EACtB,iBAAiB,EAAE,cAAc,EAAE,EACnC,EAAE,OAAiC,EAAE,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/D,MAAM,CAoCR;AAED,wBAAgB,iBAAiB,CAAC,OAAO,SAA0B,GAAG,MAAM,CAK3E"}

package/dist/static.js

@@ -23,10 +23,11 @@ export function copyStaticAssets(publicDir, outDir) {
     }
     copyDir(publicDir, targetDir);
 }
-export async function generateSsgRoutes(routeTree, appDir, outDir) {
+export async function generateSsgRoutes(routeTree, appDir, outDir, plugins, headExtra, cssUrls) {
     const { ssg } = await import('@vesk/compiler/src/server-render');
     const prerenderDir = resolve(outDir, 'prerendered');
     mkdirSync(prerenderDir, { recursive: true });
+    const ssgOptions = { plugins, headExtra, cssUrls };
     const results = [];
     async function evaluateExport(src, exportName) {
         try {
@@ -55,7 +56,7 @@ export async function generateSsgRoutes(routeTree, appDir, outDir) {
                         for (const entry of paths) {
                             try {
                                 const params = entry.params || {};
-                                const result = await ssg(src, null, params, {});
+                                const result = await ssg(src, null, params, ssgOptions);
                                 const urlPath = entry.path || node.fullPath;
                                 // getStaticPaths output is app-controlled but must never write
                                 // outside the prerender output dir
@@ -78,7 +79,7 @@ export async function generateSsgRoutes(routeTree, appDir, outDir) {
                 }
                 else if (hasStaticProps) {
                     try {
-                        const result = await ssg(src, null, undefined, {});
+                        const result = await ssg(src, null, undefined, ssgOptions);
                         const htmlPath = resolve(prerenderDir, node.fullPath === '/' ? 'index.html' : `${node.fullPath.slice(1)}.html`);
                         mkdirSync(resolve(htmlPath, '..'), { recursive: true });
                         writeFileSync(htmlPath, result.html);

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-export type { RouteNode, ApiRouteNode, VeskPlugin, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, } from '@vesk/types';
+export type { RouteNode, ApiRouteNode, VeskPlugin, ServerEventContext, VeskEventHandlers, VeskSecurity, VeskCors, VeskRateLimit, VeskSecurityPreset, SecurityConfig, MiddlewareChainItem, MiddlewareExtractResult, AncestorLayout, BuildOptions, DevServerOptions, ProdServerOptions, SsrFunctionOptions, ApiFunctionOptions, ClientBundleOptions, ClientBundleFileEntry, ClientBundleCache, ChunkEntry, ClientBundleResult, MonolithicBundleParts, Manifest, ManifestRouteEntry, ManifestActionEntry, ManifestPrerenderedEntry, SsgRouteResult, BuildResult, ImageRef, ImageResult, SeoCheckIssue, SeoAuditResult, CombinedPageInfo, Tracked, Resource, UseFetchOptions, UseFetchStreamOptions, VeskRequest, VeskResponse, SetCookieOptions, CookieStore, ServerRequest, SsrDataSink, MdProps, MdConfig, MdHtmlMode, MarkdownOptions, MdHtmlWarning, } from '@vesk/types';
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,YAAY,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,EACvB,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,iBAAiB,EACjB,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,QAAQ,EACR,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,WAAW,EACX,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,EACV,eAAe,EACf,aAAa,GACd,MAAM,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/adapter",
-  "version": "0.2.13",
+  "version": "0.2.16",
   "type": "module",
   "description": "Vesk adapter — builds deployable .vesk/ output for Deno and Node serverless",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
     "sharp": "^0.35.3"
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.13",
-    "@vesk/runtime": "^0.2.13",
-    "@vesk/types": "^0.2.13"
+    "@vesk/compiler": "^0.2.16",
+    "@vesk/runtime": "^0.2.16",
+    "@vesk/types": "^0.2.16"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",