@revojs/vue 0.1.39 → 0.1.41

package/dist/client/index.mjs

@@ -1,6 +1,5 @@
 import { $fetch, defineHook, getState, isClient, isServer, setState } from "revojs";
 import { customRef, inject, isRef, onScopeDispose, ref, toValue, watch } from "vue";
-
 //#region src/client/index.ts
 function useScope() {
 	const scope = inject("REVOJS_SCOPE");
@@ -62,6 +61,5 @@ async function refreshAsync(scope, input) {
 }
 const isServerSideRendering = import.meta.SERVER_SIDE_RENDERING ?? globalThis?.import?.meta?.SERVER_SIDE_RENDERING;
 const REFRESH_ASYNC_HOOK = defineHook("REFRESH_ASYNC_HOOK");
-
 //#endregion
-export { REFRESH_ASYNC_HOOK, isServerSideRendering, refreshAsync, useAsync, useFetch, useScope, useState };
+export { REFRESH_ASYNC_HOOK, isServerSideRendering, refreshAsync, useAsync, useFetch, useScope, useState };

package/dist/index.mjs

@@ -1,17 +1,18 @@
 import { addAlias, addRoutes, addTypes, useKit } from "revojs/kit";
-
 //#region src/index.ts
 function addPages(app, path) {
 	app.config.sources.pages?.entries.push(path);
 }
 function vue(options) {
 	return {
-		config: {
-			variables: { SERVER_SIDE_RENDERING: options?.serverSideRendering ?? true },
-			sources: { pages: {
-				match: "**/{page,layout}.vue",
-				entries: ["./routes"]
-			} }
+		config() {
+			return {
+				variables: { SERVER_SIDE_RENDERING: options?.serverSideRendering ?? true },
+				sources: { pages: {
+					match: "**/{page,layout}.vue",
+					entries: ["./routes"]
+				} }
+			};
 		},
 		setup(app) {
 			const { fromModule } = useKit(import.meta.url);
@@ -19,6 +20,18 @@ function vue(options) {
 				tagName: "script",
 				attributes: { type: "module" },
 				children: [`import "${fromModule("./module/entry.ts")}"`]
+			}, {
+				tagName: "script",
+				attributes: {
+					id: "states",
+					type: "application/json"
+				},
+				children: ["<!-- STATES -->"]
+			});
+			app.config.template.body.children.push({
+				tagName: "div",
+				attributes: { id: "app" },
+				children: ["<!-- APP -->"]
 			});
 			addRoutes(app, fromModule("./module/routes"));
 			addAlias(app, "vue/app", fromModule("./module/app.ts"));
@@ -27,6 +40,5 @@ function vue(options) {
 		}
 	};
 }
-
 //#endregion
-export { addPages, vue };
+export { addPages, vue };

package/dist/module/app.ts

@@ -1,5 +1,5 @@
 import Main from "#alias/vue/main";
-import { entries } from "#pages";
+import pages from "#pages";
 import { isServer, Radix, Scope, useUrl, type Node } from "revojs";
 import { createApp, createSSRApp, type Component } from "vue";
 import {
@@ -25,6 +25,14 @@ function toRoute(path: string, node: Node<Component>, index: number): RouteRecor
         children.push({ path: "", component: node.value });
     }
 
+    if (node.type === "WILDCARD") {
+        path = ":" + node.parameter + "(.*)*";
+    }
+
+    if (node.type === "OPTIONAL-WILDCARD") {
+        path = ":" + node.parameter + "(.*)?";
+    }
+
     if (node.type === "OPTIONAL-PARAMETER") {
         path = ":" + node.parameter + "?";
     }
@@ -45,7 +53,7 @@ function toRoute(path: string, node: Node<Component>, index: number): RouteRecor
 export default async (scope: Scope) => {
     const radix = new Radix<Component>();
 
-    for (const path in entries) {
+    for (const path in pages) {
         const segments = path.split("/");
 
         for (const attribute of segments.pop()?.split(".") ?? []) {
@@ -56,7 +64,7 @@ export default async (scope: Scope) => {
             segments.push(attribute);
         }
 
-        radix.use(segments, entries[path]);
+        radix.use(segments, pages[path]);
     }
 
     const rootNode = toRoute("/", radix.rootNode, 0);

package/dist/module/routes/[...]/get.ts

@@ -16,7 +16,7 @@ export default defineRoute({
             let exception;
             app.config.errorHandler = (value) => (exception = value);
 
-            content = content.replace("<!-- BODY -->", await renderToString(app));
+            content = content.replace("<!-- APP -->", await renderToString(app));
 
             if (exception) {
                 throw exception;
@@ -30,9 +30,6 @@ export default defineRoute({
             .replace(/\u2028/g, "\\u2028")
             .replace(/\u2029/g, "\\u2029");
 
-        return sendHtml(
-            scope,
-            content.replace("<!-- HEAD -->", "<script id='STATES' type='application/json'>" + value + "</script>"),
-        );
+        return sendHtml(scope, content.replace(`<!-- STATES -->`, value));
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/vue",
-    "version": "0.1.39",
+    "version": "0.1.41",
     "license": "MIT",
     "repository": "tellua/revojs",
     "files": [
@@ -30,11 +30,11 @@
     },
     "dependencies": {
         "revojs": "*",
-        "vue": "^3.5.27",
-        "vue-router": "^5.0.2"
+        "vue": "^3.5.30",
+        "vue-router": "^5.0.3"
     },
     "devDependencies": {
         "@revojs/tsconfig": "*",
-        "tsdown": "^0.20.3"
+        "tsdown": "^0.21.2"
     }
 }

package/src/types/pages.d.ts

@@ -1,5 +1,7 @@
 declare module "#pages" {
     import type { Component } from "vue";
 
-    export const entries: Record<string, Component>;
+    const entries: Record<string, Component>;
+
+    export default entries;
 }