olovaplugin 1.0.9 → 1.0.11

package/dist/olova-plugins.cjs

@@ -91,6 +91,11 @@ function configPlugin() {
       return {
         appType: "custom",
         cacheDir: "./.olova/cache",
+        // Exclude olova from pre-bundling because it imports virtual:olova-routes
+        // which is only resolved at runtime by the routerPlugin
+        optimizeDeps: {
+          exclude: ["olova", "olova/Router", "olova/Link", "olova/client", "olova/server", "olova/useParams", "olova/usePathname", "olova/useSearchParams"]
+        },
         build: {
           outDir: "./.olova/dist",
           sourcemap: false,
@@ -151,7 +156,7 @@ function configPlugin() {
 var import_fs2 = __toESM(require("fs"), 1);
 var import_path2 = __toESM(require("path"), 1);
 function routerPlugin() {
-  const virtualModuleId = "olova/routes";
+  const virtualModuleId = "virtual:olova-routes";
   const resolvedVirtualModuleId = "\0" + virtualModuleId;
   let server = null;
   let root = process.cwd();
@@ -304,7 +309,7 @@ function frameworkPlugin() {
 import React from 'react';
 import { hydrateRoot, createRoot } from 'react-dom/client';
 import Layout, { metadata as defaultMetadata } from '/src/root.tsx';
-import { Router, loadRoute } from '/olova/route.tsx';
+import { Router, loadRoute } from 'olova/Router';
 
 // Helper to generate SEO meta tags
 function generateSeoTags(metadata) {
@@ -425,7 +430,7 @@ loadRoute(path).then((result) => {
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import Layout, { metadata as defaultMetadata } from '/src/root.tsx';
-import { Router, loadRoute } from '/olova/route.tsx';
+import { Router, loadRoute } from 'olova/Router';
 
 // Generate SEO head content
 function generateSeoHead(metadata) {
@@ -544,6 +549,8 @@ export { loadRoute };`;
 // router/virtual-html.ts
 var import_fs3 = __toESM(require("fs"), 1);
 var import_path3 = __toESM(require("path"), 1);
+var import_react = __toESM(require("react"), 1);
+var import_server = require("react-dom/server");
 
 // router/hydration.ts
 function generateOlovaHydration(data, buildId) {
@@ -803,13 +810,51 @@ function virtualHtmlPlugin() {
           const shouldSSR = isStaticRoute(routePath);
           try {
             if (shouldSSR) {
+              let RootLayout = void 0;
+              const srcDir = import_path3.default.resolve("src");
+              const layoutExtensions = [".tsx", ".jsx"];
+              let layoutPath = "";
+              for (const ext of layoutExtensions) {
+                const p = import_path3.default.join(srcDir, "root" + ext);
+                if (import_fs3.default.existsSync(p)) {
+                  layoutPath = "/src/root" + ext;
+                  break;
+                }
+              }
               const { render } = await server.ssrLoadModule("olova/server");
-              const { html: ssrHtml, hydrationData } = await render(routePath);
+              if (layoutPath) {
+                const mod = await server.ssrLoadModule(layoutPath);
+                RootLayout = mod.default;
+              }
+              const { html: ssrHtml, hydrationData } = await render(routePath, RootLayout);
               let fullHtml = ssrHtml;
-              const hydrationScript = `<script>window.__OLOVA_DATA__ = ${JSON.stringify(hydrationData)};</script>`;
+              if (layoutPath) {
+                const metadata = hydrationData.metadata || {};
+                if (metadata.title && !fullHtml.includes("<title>")) {
+                  fullHtml = fullHtml.replace("</head>", `<title>${metadata.title}</title>
+</head>`);
+                }
+                if (metadata.description && !fullHtml.includes('name="description"')) {
+                  fullHtml = fullHtml.replace("</head>", `<meta name="description" content="${metadata.description}" />
+</head>`);
+                }
+              }
+              const hydrationScript = `<script>window.__OLOVA_DATA__ = ${JSON.stringify(hydrationData)}; window.__OLOVA_HYDRATE_MANUAL__ = true;</script>`;
               fullHtml = fullHtml.replace("</body>", `${hydrationScript}
 </body>`);
-              const clientScript = `<script type="module" src="/olova/client"></script>`;
+              let clientScript;
+              if (layoutPath) {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    import RootLayout from '${layoutPath}';
+                                    hydrate(RootLayout);
+                                </script>`;
+              } else {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    hydrate();
+                                </script>`;
+              }
               fullHtml = fullHtml.replace("</body>", `${clientScript}
 </body>`);
               const devBuildId = "dev-" + Date.now().toString(36);
@@ -828,7 +873,7 @@ function virtualHtmlPlugin() {
               res.end(html);
             } else {
               const { renderShellWithMetadata } = await server.ssrLoadModule("olova/server");
-              const { loadRoute: clientLoadRoute } = await server.ssrLoadModule("/olova/route.tsx");
+              const { loadRoute: clientLoadRoute } = await server.ssrLoadModule("olova/Router");
               let pageMetadata = {};
               try {
                 const result = await clientLoadRoute(routePath);
@@ -837,8 +882,41 @@ function virtualHtmlPlugin() {
                 }
               } catch (e) {
               }
-              let fullHtml = renderShellWithMetadata(pageMetadata);
-              const clientScript = `<script type="module" src="/olova/client"></script>`;
+              let RootLayout = void 0;
+              const srcDir = import_path3.default.resolve("src");
+              const layoutExtensions = [".tsx", ".jsx"];
+              let layoutPath = "";
+              for (const ext of layoutExtensions) {
+                const p = import_path3.default.join(srcDir, "root" + ext);
+                if (import_fs3.default.existsSync(p)) {
+                  layoutPath = "/src/root" + ext;
+                  break;
+                }
+              }
+              if (layoutPath) {
+                const mod = await server.ssrLoadModule(layoutPath);
+                RootLayout = mod.default;
+              }
+              let fullHtml;
+              if (RootLayout && layoutPath) {
+                const App = import_react.default.createElement(RootLayout, null, import_react.default.createElement("div", null));
+                fullHtml = "<!DOCTYPE html>" + (0, import_server.renderToString)(App);
+              } else {
+                fullHtml = renderShellWithMetadata(pageMetadata);
+              }
+              let clientScript;
+              if (layoutPath) {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    import RootLayout from '${layoutPath}';
+                                    hydrate(RootLayout);
+                                </script>`;
+              } else {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    hydrate();
+                                </script>`;
+              }
               fullHtml = fullHtml.replace("</body>", `${clientScript}
 </body>`);
               const devBuildId = "dev-" + Date.now().toString(36);

package/dist/olova-plugins.js

@@ -31,6 +31,11 @@ function configPlugin() {
       return {
         appType: "custom",
         cacheDir: "./.olova/cache",
+        // Exclude olova from pre-bundling because it imports virtual:olova-routes
+        // which is only resolved at runtime by the routerPlugin
+        optimizeDeps: {
+          exclude: ["olova", "olova/Router", "olova/Link", "olova/client", "olova/server", "olova/useParams", "olova/usePathname", "olova/useSearchParams"]
+        },
         build: {
           outDir: "./.olova/dist",
           sourcemap: false,
@@ -91,7 +96,7 @@ function configPlugin() {
 import fs2 from "fs";
 import path2 from "path";
 function routerPlugin() {
-  const virtualModuleId = "olova/routes";
+  const virtualModuleId = "virtual:olova-routes";
   const resolvedVirtualModuleId = "\0" + virtualModuleId;
   let server = null;
   let root = process.cwd();
@@ -244,7 +249,7 @@ function frameworkPlugin() {
 import React from 'react';
 import { hydrateRoot, createRoot } from 'react-dom/client';
 import Layout, { metadata as defaultMetadata } from '/src/root.tsx';
-import { Router, loadRoute } from '/olova/route.tsx';
+import { Router, loadRoute } from 'olova/Router';
 
 // Helper to generate SEO meta tags
 function generateSeoTags(metadata) {
@@ -365,7 +370,7 @@ loadRoute(path).then((result) => {
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import Layout, { metadata as defaultMetadata } from '/src/root.tsx';
-import { Router, loadRoute } from '/olova/route.tsx';
+import { Router, loadRoute } from 'olova/Router';
 
 // Generate SEO head content
 function generateSeoHead(metadata) {
@@ -484,6 +489,8 @@ export { loadRoute };`;
 // router/virtual-html.ts
 import fs3 from "fs";
 import path3 from "path";
+import React from "react";
+import { renderToString } from "react-dom/server";
 
 // router/hydration.ts
 function generateOlovaHydration(data, buildId) {
@@ -743,13 +750,51 @@ function virtualHtmlPlugin() {
           const shouldSSR = isStaticRoute(routePath);
           try {
             if (shouldSSR) {
+              let RootLayout = void 0;
+              const srcDir = path3.resolve("src");
+              const layoutExtensions = [".tsx", ".jsx"];
+              let layoutPath = "";
+              for (const ext of layoutExtensions) {
+                const p = path3.join(srcDir, "root" + ext);
+                if (fs3.existsSync(p)) {
+                  layoutPath = "/src/root" + ext;
+                  break;
+                }
+              }
               const { render } = await server.ssrLoadModule("olova/server");
-              const { html: ssrHtml, hydrationData } = await render(routePath);
+              if (layoutPath) {
+                const mod = await server.ssrLoadModule(layoutPath);
+                RootLayout = mod.default;
+              }
+              const { html: ssrHtml, hydrationData } = await render(routePath, RootLayout);
               let fullHtml = ssrHtml;
-              const hydrationScript = `<script>window.__OLOVA_DATA__ = ${JSON.stringify(hydrationData)};</script>`;
+              if (layoutPath) {
+                const metadata = hydrationData.metadata || {};
+                if (metadata.title && !fullHtml.includes("<title>")) {
+                  fullHtml = fullHtml.replace("</head>", `<title>${metadata.title}</title>
+</head>`);
+                }
+                if (metadata.description && !fullHtml.includes('name="description"')) {
+                  fullHtml = fullHtml.replace("</head>", `<meta name="description" content="${metadata.description}" />
+</head>`);
+                }
+              }
+              const hydrationScript = `<script>window.__OLOVA_DATA__ = ${JSON.stringify(hydrationData)}; window.__OLOVA_HYDRATE_MANUAL__ = true;</script>`;
               fullHtml = fullHtml.replace("</body>", `${hydrationScript}
 </body>`);
-              const clientScript = `<script type="module" src="/olova/client"></script>`;
+              let clientScript;
+              if (layoutPath) {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    import RootLayout from '${layoutPath}';
+                                    hydrate(RootLayout);
+                                </script>`;
+              } else {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    hydrate();
+                                </script>`;
+              }
               fullHtml = fullHtml.replace("</body>", `${clientScript}
 </body>`);
               const devBuildId = "dev-" + Date.now().toString(36);
@@ -768,7 +813,7 @@ function virtualHtmlPlugin() {
               res.end(html);
             } else {
               const { renderShellWithMetadata } = await server.ssrLoadModule("olova/server");
-              const { loadRoute: clientLoadRoute } = await server.ssrLoadModule("/olova/route.tsx");
+              const { loadRoute: clientLoadRoute } = await server.ssrLoadModule("olova/Router");
               let pageMetadata = {};
               try {
                 const result = await clientLoadRoute(routePath);
@@ -777,8 +822,41 @@ function virtualHtmlPlugin() {
                 }
               } catch (e) {
               }
-              let fullHtml = renderShellWithMetadata(pageMetadata);
-              const clientScript = `<script type="module" src="/olova/client"></script>`;
+              let RootLayout = void 0;
+              const srcDir = path3.resolve("src");
+              const layoutExtensions = [".tsx", ".jsx"];
+              let layoutPath = "";
+              for (const ext of layoutExtensions) {
+                const p = path3.join(srcDir, "root" + ext);
+                if (fs3.existsSync(p)) {
+                  layoutPath = "/src/root" + ext;
+                  break;
+                }
+              }
+              if (layoutPath) {
+                const mod = await server.ssrLoadModule(layoutPath);
+                RootLayout = mod.default;
+              }
+              let fullHtml;
+              if (RootLayout && layoutPath) {
+                const App = React.createElement(RootLayout, null, React.createElement("div", null));
+                fullHtml = "<!DOCTYPE html>" + renderToString(App);
+              } else {
+                fullHtml = renderShellWithMetadata(pageMetadata);
+              }
+              let clientScript;
+              if (layoutPath) {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    import RootLayout from '${layoutPath}';
+                                    hydrate(RootLayout);
+                                </script>`;
+              } else {
+                clientScript = `<script type="module">
+                                    import { hydrate } from '/olova/client';
+                                    hydrate();
+                                </script>`;
+              }
               fullHtml = fullHtml.replace("</body>", `${clientScript}
 </body>`);
               const devBuildId = "dev-" + Date.now().toString(36);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "olovaplugin",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Vite plugins for Olova framework",
   "type": "module",
   "main": "dist/olova-plugins.cjs",
@@ -18,8 +18,13 @@
       }
     }
   },
+  "peerDependencies": {
+    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
+    "react": "*",
+    "react-dom": "*"
+  },
   "scripts": {
-    "build": "tsup olova-plugins.ts --format cjs,esm --dts --clean"
+    "build": "tsup olova-plugins.ts --format cjs,esm --dts --clean --external vite react react-dom react-dom/server util stream path fs"
   },
   "keywords": [
     "vite",
@@ -31,14 +36,10 @@
   ],
   "author": "Sera",
   "license": "MIT",
-  "peerDependencies": {
-    "vite": "^6.0.0 || ^5.0.0"
-  },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",
-    "vite": "^6.0.0"
+    "vite": "^7.2.4"
   }
-
 }