@vistagenic/vista 0.3.2 → 0.3.4

package/dist/server/ssr-webpack-shim.d.ts

@@ -0,0 +1,6 @@
+/**
+ * react-server-dom-webpack/client.node calls __webpack_require__ while decoding
+ * Flight into a React tree. Vista SSR/SSG run in plain Node, so this shim maps
+ * webpack specifiers (including file:// URLs) onto require().
+ */
+export declare function installSSRWebpackShim(): void;

package/dist/server/ssr-webpack-shim.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installSSRWebpackShim = installSSRWebpackShim;
+const url_1 = require("url");
+/**
+ * react-server-dom-webpack/client.node calls __webpack_require__ while decoding
+ * Flight into a React tree. Vista SSR/SSG run in plain Node, so this shim maps
+ * webpack specifiers (including file:// URLs) onto require().
+ */
+function installSSRWebpackShim() {
+    if (typeof globalThis.__webpack_require__ === 'function') {
+        return;
+    }
+    globalThis.__webpack_require__ = function ssrWebpackRequire(specifier) {
+        let modulePath = specifier;
+        if (specifier.startsWith('file://')) {
+            try {
+                modulePath = (0, url_1.fileURLToPath)(specifier);
+            }
+            catch {
+                modulePath = specifier;
+            }
+        }
+        return require(modulePath);
+    };
+    globalThis.__webpack_chunk_load__ = function ssrChunkLoad(_chunkId) {
+        return Promise.resolve();
+    };
+}

package/dist/server/static-generator.d.ts

@@ -34,6 +34,8 @@ export interface StaticGeneratorResult {
     /** The prerender manifest */
     manifest: PrerenderManifest;
 }
+/** Embed Flight on SSG HTML so the client can hydrate without a live /rsc server. */
+export declare function injectInlineFlightBootstrap(html: string, flightText: string): string;
 /**
  * Run static generation for all eligible routes.
  */

package/dist/server/static-generator.js

@@ -12,12 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectInlineFlightBootstrap = injectInlineFlightBootstrap;
 exports.generateStaticPages = generateStaticPages;
 exports.revalidatePath = revalidatePath;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const constants_1 = require("../constants");
+const hydration_chunks_1 = require("./hydration-chunks");
 const static_cache_1 = require("./static-cache");
 const module_compile_hook_1 = require("./module-compile-hook");
 const request_context_1 = require("./request-context");
@@ -28,6 +30,7 @@ const config_1 = require("../config");
 const ppr_1 = require("./ppr");
 const vista_import_map_1 = require("./vista-import-map");
 const project_alias_resolver_1 = require("./project-alias-resolver");
+const app_dir_1 = require("./app-dir");
 const CjsModule = require('module');
 let staticRuntimeReady = false;
 let reactResolutionInstalled = false;
@@ -260,7 +263,7 @@ async function prerenderPage(urlPath, route, params, cwd, vistaDirRoot, appPprEn
                 return React.createElement(component, props, child);
             };
             const renderStaticSubtree = async (input) => {
-                const appDir = path_1.default.join(cwd, 'app');
+                const appDir = (0, app_dir_1.resolveAppDir)(cwd);
                 const RouteModule = require(input.entryFilePath);
                 const RouteComponent = RouteModule.default;
                 if (!RouteComponent) {
@@ -353,7 +356,7 @@ async function prerenderPage(urlPath, route, params, cwd, vistaDirRoot, appPprEn
                 metadataHtml = '';
             }
             const element = await renderStaticSubtree({
-                subtreeRootDir: path_1.default.join(cwd, 'app'),
+                subtreeRootDir: (0, app_dir_1.resolveAppDir)(cwd),
                 entryFilePath: route.pagePath,
                 pathname: urlPath,
                 params: params || {},
@@ -365,7 +368,7 @@ async function prerenderPage(urlPath, route, params, cwd, vistaDirRoot, appPprEn
             if (pprEnabled && route.loadingPath) {
                 try {
                     const shellElement = await renderStaticSubtree({
-                        subtreeRootDir: path_1.default.join(cwd, 'app'),
+                        subtreeRootDir: (0, app_dir_1.resolveAppDir)(cwd),
                         entryFilePath: route.loadingPath,
                         pathname: urlPath,
                         params: params || {},
@@ -408,6 +411,30 @@ function injectBeforeClosingTag(html, tagName, injection) {
     }
     return html;
 }
+function buildInlineFlightBootstrapScript(flightText) {
+    return `<script>window.${constants_1.RSC_DATA_FLAG}=${JSON.stringify(flightText)};</script>`;
+}
+/** Embed Flight on SSG HTML so the client can hydrate without a live /rsc server. */
+function injectInlineFlightBootstrap(html, flightText) {
+    if (!flightText || html.includes(`window.${constants_1.RSC_DATA_FLAG}=`)) {
+        return html;
+    }
+    const script = `  ${buildInlineFlightBootstrapScript(flightText)}\n`;
+    const deferIdx = html.search(/<script\s+defer\b/i);
+    if (deferIdx !== -1) {
+        return `${html.slice(0, deferIdx)}${script}${html.slice(deferIdx)}`;
+    }
+    return injectBeforeClosingTag(html, 'body', `\n${script}`);
+}
+async function attachFlightPayload(page, flightData, _cwd) {
+    if (!flightData)
+        return;
+    page.flightData = flightData;
+    page.html = injectInlineFlightBootstrap(page.html, flightData);
+    if (page.shellHtml) {
+        page.shellHtml = injectInlineFlightBootstrap(page.shellHtml, flightData);
+    }
+}
 function getCSSLinks(cwd) {
     const links = ['<link rel="stylesheet" href="/styles.css" />'];
     const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
@@ -425,32 +452,12 @@ function getCSSLinks(cwd) {
     return links.join('\n  ');
 }
 function getChunkScripts(cwd) {
-    const chunksDir = path_1.default.join(cwd, constants_1.BUILD_DIR, 'static', 'chunks');
     try {
-        if (!fs_1.default.existsSync(chunksDir)) {
-            return '';
-        }
-        const files = fs_1.default
-            .readdirSync(chunksDir)
-            .filter((entry) => entry.endsWith('.js') && !entry.endsWith('.map') && !entry.includes('.hot-update.'));
-        const priority = ['webpack.js', 'framework.js', 'vendor.js'];
-        files.sort((a, b) => {
-            const ai = priority.indexOf(a);
-            const bi = priority.indexOf(b);
-            if (ai !== -1 && bi !== -1)
-                return ai - bi;
-            if (ai !== -1)
-                return -1;
-            if (bi !== -1)
-                return 1;
-            return a.localeCompare(b);
-        });
-        return files
+        return (0, hydration_chunks_1.listHydrationChunkFiles)(cwd, false)
             .map((file) => `<script defer src="${constants_1.STATIC_CHUNKS_PATH}${file}"></script>`)
             .join('\n  ');
     }
     catch {
-        // Ignore chunk discovery failures during static generation.
         return '';
     }
 }
@@ -659,10 +666,7 @@ async function generateStaticPages(options) {
                 const page = await prerenderPage(urlPath, route, undefined, cwd, vistaDirRoot, appPprEnabled);
                 if (page) {
                     if (flightUpstream) {
-                        const flightData = await flightUpstream.fetchFlight(urlPath);
-                        if (flightData) {
-                            page.flightData = flightData;
-                        }
+                        await attachFlightPayload(page, await flightUpstream.fetchFlight(urlPath), cwd);
                     }
                     (0, static_cache_1.setCachedPage)(urlPath, page);
                     (0, static_cache_1.writeStaticPageToDisk)(vistaDirRoot, urlPath, page);
@@ -685,10 +689,7 @@ async function generateStaticPages(options) {
                     const page = await prerenderPage(urlPath, route, params, cwd, vistaDirRoot, appPprEnabled);
                     if (page) {
                         if (flightUpstream) {
-                            const flightData = await flightUpstream.fetchFlight(urlPath);
-                            if (flightData) {
-                                page.flightData = flightData;
-                            }
+                            await attachFlightPayload(page, await flightUpstream.fetchFlight(urlPath), cwd);
                         }
                         (0, static_cache_1.setCachedPage)(urlPath, page);
                         (0, static_cache_1.writeStaticPageToDisk)(vistaDirRoot, urlPath, page);

package/dist/server/structure-validator.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAppStructure = validateAppStructure;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const app_dir_1 = require("./app-dir");
 // ============================================================================
 // Constants
 // ============================================================================
@@ -364,7 +365,7 @@ function walkRouteDirectories(dir, callback) {
 }
 function validateAppStructure(input) {
     const { cwd, notFoundRoute } = input;
-    const appDir = path_1.default.join(cwd, 'app');
+    const appDir = (0, app_dir_1.resolveAppDir)(cwd);
     const issues = [];
     // 1. Root exists
     checkRootExists(appDir, issues);

package/dist/server/structure-watch.js

@@ -48,6 +48,8 @@ class StructureWatcher extends events_1.EventEmitter {
             const watchPaths = [
                 path_1.default.join(this.cwd, 'app', '**', '*'),
                 path_1.default.join(this.cwd, 'components', '**', '*'),
+                path_1.default.join(this.cwd, 'src', 'app', '**', '*'),
+                path_1.default.join(this.cwd, 'src', 'components', '**', '*'),
                 path_1.default.join(this.cwd, 'vista.config.ts'),
                 path_1.default.join(this.cwd, 'vista.config.js'),
             ];