vike-lite 1.4.0 → 1.6.0

package/README.md

@@ -1,11 +1,5 @@
 # vike-lite
 
-Light version of [Vike](https://vike.dev)
-
-### ✨ Features
-❯ **Zero dependencies:**<br> _light_ with less dependencies and essential checks
-❯ **Functionalities:**<br> [See documentation](doc/FUNCTIONALITIES.md)
-
 ### ⚙️ Install
 | Package Manager | Command
 | - | -
@@ -79,4 +73,4 @@ git clone https://github.com/node-ecosystem/vike-lite.git
 
 ---
 
-This project is licensed under the [MIT License](LICENSE).
+This project is licensed under the [MIT License](../../LICENSE).

package/dist/__internal/server.d.mts

@@ -1,9 +1,9 @@
-import { t as Config } from "../index-kftPCG4J.mjs";
+import { t as Config } from "../index-Dt5n1zWh.mjs";
 
 //#region src/server/store.d.ts
 interface VikeState {
-  routes: any[];
-  errorRoute: any | null;
+  routes: typeof import('virtual:routes')['routes'];
+  errorRoute: typeof import('virtual:routes')['errorRoute'] | null;
   config: Config | null;
   manifest: Manifest | undefined;
 }

package/dist/__internal/shared.d.mts

@@ -1,2 +1,2 @@
-import { n as RenderContext, r as matchRoute, t as Config } from "../index-kftPCG4J.mjs";
+import { n as RenderContext, r as matchRoute, t as Config } from "../index-Dt5n1zWh.mjs";
 export { Config, RenderContext, matchRoute };

package/dist/__internal/shared.mjs

@@ -1,2 +1,2 @@
-import { t as matchRoute } from "../matchRoute-BNUQpQu-.mjs";
+import { t as matchRoute } from "../matchRoute-nTNPxoMq.mjs";
 export { matchRoute };

package/dist/{index-kftPCG4J.d.mts → index-Dt5n1zWh.d.mts}

@@ -1,10 +1,10 @@
-//#region src/shared/matchRoute.d.ts
+//#region src/__internal/shared/matchRoute.d.ts
 declare function matchRoute(urlPathname: string, routes: typeof import('virtual:routes').routes): {
   route: any;
   routeParams: Record<string, string>;
 } | null;
 //#endregion
-//#region src/shared/index.d.ts
+//#region src/__internal/shared/index.d.ts
 interface RenderContext {
   pageContext: any;
   Page: unknown;

package/dist/{matchRoute-BNUQpQu-.mjs → matchRoute-nTNPxoMq.mjs}

@@ -1,5 +1,8 @@
-//#region src/shared/matchRoute.ts
+//#region src/__internal/shared/matchRoute.ts
 const regexCache = /* @__PURE__ */ new Map();
+function escapeRegex(str) {
+	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}
 function matchRoute(urlPathname, routes) {
 	for (const route of routes) {
 		if (!route.path.includes(":")) {
@@ -12,10 +15,13 @@ function matchRoute(urlPathname, routes) {
 		let compiled = regexCache.get(route.path);
 		if (!compiled) {
 			const paramNames = [];
-			const regexPath = route.path.replaceAll(/:([^/]+)/g, (_, name) => {
-				paramNames.push(name);
-				return "([^/]+)";
-			});
+			const regexPath = route.path.split("/").map((segment) => {
+				if (segment.startsWith(":")) {
+					paramNames.push(segment.slice(1));
+					return "([^/]+)";
+				}
+				return escapeRegex(segment);
+			}).join("/");
 			compiled = {
 				regex: new RegExp(`^${regexPath}/?$`),
 				paramNames
@@ -25,7 +31,7 @@ function matchRoute(urlPathname, routes) {
 		const match = urlPathname.match(compiled.regex);
 		if (match) {
 			const routeParams = {};
-			for (let i = 0; i < compiled.paramNames.length; i++) routeParams[compiled.paramNames[i]] = match[i + 1];
+			for (let i = 0; i < compiled.paramNames.length; i++) routeParams[compiled.paramNames[i]] = decodeURIComponent(match[i + 1]);
 			return {
 				route,
 				routeParams

package/dist/server.mjs

@@ -1,4 +1,4 @@
-import { t as matchRoute } from "./matchRoute-BNUQpQu-.mjs";
+import { t as matchRoute } from "./matchRoute-nTNPxoMq.mjs";
 import { n as store } from "./store-CfUB1COP.mjs";
 //#region src/utils/serializeContext.ts
 const ESCAPE_LOOKUP = {
@@ -26,11 +26,15 @@ var AbortRender = class extends Error {
 //#endregion
 //#region src/server/renderPage.ts
 const isProd = process.env.NODE_ENV === "production";
+const { BASE_URL } = import.meta.env;
+function withBase(file) {
+	return `${BASE_URL.replace(/\/$/, "")}/${file.replace(/^\//, "")}`;
+}
 function getAssets(route) {
 	if (!isProd) return {
 		cssLinks: "",
 		jsPreloads: "",
-		entryClient: "/@id/virtual:entry-client"
+		entryClient: withBase("@id/virtual:entry-client")
 	};
 	const cssFiles = /* @__PURE__ */ new Set();
 	const jsFiles = /* @__PURE__ */ new Set();
@@ -55,9 +59,9 @@ function getAssets(route) {
 	if (head) collectAssets(head);
 	if (layout) collectAssets(layout);
 	return {
-		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="/${href}">`).join(""),
-		jsPreloads: [...jsFiles].map((href) => `<link rel="modulepreload" href="/${href}">`).join(""),
-		entryClient: `/${manifest[virtualEntryClientKey].file}`
+		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="${withBase(href)}">`).join(""),
+		jsPreloads: [...jsFiles].map((href) => `<link rel="modulepreload" href="${withBase(href)}">`).join(""),
+		entryClient: withBase(manifest[virtualEntryClientKey].file)
 	};
 }
 async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
@@ -70,8 +74,8 @@ async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
 		urlPathname
 	};
 	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
-		route.data?.() ?? null,
-		route.title?.() ?? null,
+		route.Data?.() ?? null,
+		route.Title?.() ?? null,
 		isJsonRequest ? null : route.Page(),
 		isJsonRequest ? null : route.Head?.() ?? null,
 		isJsonRequest ? null : route.Layout?.() ?? null
@@ -133,7 +137,12 @@ async function renderErrorPage(req, status, urlPathname, error) {
 	}
 }
 async function renderPage(req) {
-	const { pathname } = new URL(req.url);
+	let pathname = new URL(req.url).pathname;
+	if (BASE_URL !== "/") {
+		const baseSlashed = BASE_URL.endsWith("/") ? BASE_URL : BASE_URL + "/";
+		const baseNoSlash = baseSlashed.slice(0, -1);
+		pathname = pathname === baseNoSlash ? "/" : pathname.slice(baseSlashed.length - 1);
+	}
 	const isJsonRequest = pathname.endsWith(".pageContext.json");
 	let targetPathname = pathname;
 	if (isJsonRequest) {

package/dist/vite.d.mts

@@ -6,9 +6,24 @@ declare function routerPlugin({
   serverEntry,
   apiPrefix
 }?: {
-  pagesDir?: string | undefined;
-  serverEntry?: string | undefined;
-  apiPrefix?: string | undefined;
+  /**
+   * The directory where your page components are located.
+   * This is where the plugin will look for your page files to generate routes.
+   * @default 'pages'
+   */
+  pagesDir?: string;
+  /**
+   * The entry point for your server application code.
+   * This is where you can define custom server logic, such as API routes or middleware.
+   * The build will produce dist/server/index.mjs, which is the entry point for your server application.
+   * @default 'server/index'
+   */
+  serverEntry?: string;
+  /**
+   * The prefix for your API routes.
+   * @default '/api'
+   */
+  apiPrefix?: string;
 }): Plugin;
 //#endregion
 export { routerPlugin as default };

package/dist/vite.mjs

@@ -4,6 +4,11 @@ import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { loadEnv } from "vite";
 //#region src/utils/generateRoutes.ts
+const pageExtensions = [".ts", ".js"];
+const pageExtensionsX = [".tsx", ".jsx"];
+function findFile(files, basename, extensions) {
+	return files.find((file) => extensions.some((ext) => file === `${basename}${ext}`));
+}
 function generateRoutes(viteRoot, pagesDir) {
 	const pagesAbsPath = path.resolve(viteRoot, pagesDir);
 	if (!fs.existsSync(pagesAbsPath)) return { routes: [] };
@@ -12,15 +17,20 @@ function generateRoutes(viteRoot, pagesDir) {
 	function walk(dir, routePath, parentLayout, parentHead) {
 		const files = fs.readdirSync(dir);
 		const importPath = path.relative(viteRoot, dir).replaceAll("\\", "/");
-		const currentLayout = files.includes("+Layout.tsx") ? `${importPath}/+Layout.tsx` : parentLayout;
-		const currentHead = files.includes("+Head.tsx") ? `${importPath}/+Head.tsx` : parentHead;
-		if (files.includes("+Page.tsx")) {
+		const layoutFile = findFile(files, "+Layout", pageExtensionsX);
+		const currentLayout = layoutFile ? `${importPath}/${layoutFile}` : parentLayout;
+		const headFile = findFile(files, "+Head", pageExtensionsX);
+		const currentHead = headFile ? `${importPath}/${headFile}` : parentHead;
+		const pageFile = findFile(files, "+Page", pageExtensionsX);
+		if (pageFile) {
 			const route = {
 				path: routePath || "/",
-				page: `${importPath}/+Page.tsx`,
-				hasData: files.includes("+data.ts"),
-				hasTitle: files.includes("+title.ts")
+				page: `${importPath}/${pageFile}`
 			};
+			const dataFile = findFile(files, "+data", pageExtensions);
+			if (dataFile) route.data = `${importPath}/${dataFile}`;
+			const titleFile = findFile(files, "+title", pageExtensions);
+			if (titleFile) route.title = `${importPath}/${titleFile}`;
 			if (currentLayout) route.layout = currentLayout;
 			if (currentHead) route.head = currentHead;
 			routes.push(route);
@@ -29,9 +39,10 @@ function generateRoutes(viteRoot, pagesDir) {
 			const fullPath = path.join(dir, file);
 			if (!fs.statSync(fullPath).isDirectory()) continue;
 			if (file === "_error") {
-				if (fs.readdirSync(fullPath).includes("+Page.tsx")) errorRoute = {
+				const errorPageFile = findFile(fs.readdirSync(fullPath), "+Page", pageExtensionsX);
+				if (errorPageFile) errorRoute = {
 					path: "_error",
-					page: `${importPath}/_error/+Page.tsx`,
+					page: `${importPath}/_error/${errorPageFile}`,
 					layout: currentLayout,
 					head: currentHead
 				};
@@ -172,10 +183,11 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 					code += `{path:'${r.path}',page:'${r.page}',Page:()=>import('/${r.page}'),`;
 					if (r.head) code += `head:'${r.head}',Head:()=>import('/${r.head}'),`;
 					if (r.layout) code += `layout:'${r.layout}',Layout:()=>import('/${r.layout}'),`;
-					code += `hasData:${r.hasData},hasTitle:${r.hasTitle},`;
+					if (r.data) code += `data:'${r.data}',`;
+					if (r.title) code += `title:'${r.title}',`;
 					if (isSSR) {
-						if (r.hasData) code += `data:()=>import('/${r.page.replace("+Page.tsx", "+data.ts")}'),`;
-						if (r.hasTitle) code += `title:()=>import('/${r.page.replace("+Page.tsx", "+title.ts")}'),`;
+						if (r.data) code += `Data:()=>import('/${r.data}'),`;
+						if (r.title) code += `Title:()=>import('/${r.title}'),`;
 					}
 					code += "},";
 				}
@@ -198,26 +210,23 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
           import { onRenderClient } from '${virtualRendererId}';
           const { default: render } = await onRenderClient();
           await render({ routes, errorRoute });`;
-			if (id === resolvedVirtualSetupId) return `
-          import { routes, errorRoute, config } from '${virtualModuleId}';
+			if (id === resolvedVirtualSetupId) return `import { routes, errorRoute, config } from '${virtualModuleId}';
           import { setVikeState } from 'vike-lite/__internal/server';
           let manifest;
           if (process.env.NODE_ENV === 'production') {
             manifest = (await import('${virtualManifestId}')).default;
           }
-          setVikeState({ routes, errorRoute, config, manifest });
-        `;
+          setVikeState({ routes, errorRoute, config, manifest });`;
 			if (id === resolvedVirtualEntryServerId) {
-				const extensions = [
-					".ts",
-					".js",
-					".mjs"
-				];
 				let hasCustomServer = false;
 				let customServerPath = "";
 				if (serverEntry) {
 					const basePath = path.resolve(viteConfigRoot, serverEntry);
-					for (const ext of ["", ...extensions]) if (fs.existsSync(basePath + ext)) {
+					for (const ext of [
+						".ts",
+						".js",
+						".mjs"
+					]) if (fs.existsSync(basePath + ext)) {
 						hasCustomServer = true;
 						customServerPath = (basePath + ext).replaceAll("\\", "/");
 						break;
@@ -243,11 +252,11 @@ if (process.env.NODE_ENV === 'production') {
   const __dirname = path.dirname(fileURLToPath(import.meta.url));
   const clientDir = path.resolve(__dirname, '../client');
   const MIME_TYPES = {
-    '.html': 'text/html',
-    '.js': 'text/javascript',
-    '.mjs': 'text/javascript',
-    '.css': 'text/css',
-    '.json': 'application/json',
+    '.html': 'text/html; charset=utf-8',
+    '.js': 'text/javascript; charset=utf-8',
+    '.mjs': 'text/javascript; charset=utf-8',
+    '.css': 'text/css; charset=utf-8',
+    '.json': 'application/json; charset=utf-8',
     '.png': 'image/png',
     '.jpg': 'image/jpeg',
     '.jpeg': 'image/jpeg',
@@ -256,23 +265,30 @@ if (process.env.NODE_ENV === 'production') {
     '.ico': 'image/x-icon',
     '.webmanifest': 'application/manifest+json',
     '.xml': 'application/xml',
-    '.txt': 'text/plain',
+    '.txt': 'text/plain; charset=utf-8',
     '.woff': 'font/woff',
-    '.woff2': 'font/woff2'
+    '.woff2': 'font/woff2',
+    '.wasm': 'application/wasm'
   };
+  const base = import.meta.env.BASE_URL;
   const server = createServer(async (req, res) => {
     try {
       const urlObj = new URL(req.url || '/', 'http://' + (req.headers.host || 'localhost'));
       const pathname = urlObj.pathname;
-      if (pathname !== '/') {
-        const filePath = path.join(clientDir, pathname);
+      let fileUrl = pathname;
+      if (base !== '/' && pathname.startsWith(base)) fileUrl = '/' + pathname.slice(base.length);
+      if (fileUrl !== '/') {
+        const filePath = path.resolve(clientDir, '.' + fileUrl)
+        if (!filePath.startsWith(clientDir + path.sep)) {
+          res.statusCode = 403
+          res.end('Forbidden')
+          return
+        }
         if (filePath.startsWith(clientDir) && fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
           const ext = path.extname(filePath).toLowerCase();
           const mimeType = MIME_TYPES[ext] || 'application/octet-stream';
           res.setHeader('Content-Type', mimeType);
-          if (pathname.startsWith('/assets/')) {
-            res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
-          }
+          res.setHeader('Cache-Control', fileUrl.startsWith('/assets/') ? 'public, max-age=31536000, immutable' : 'public, max-age=0, must-revalidate')
           fs.createReadStream(filePath).pipe(res);
           return;
         }
@@ -284,6 +300,10 @@ if (process.env.NODE_ENV === 'production') {
       }
       const { method } = req;
       const init = { method, headers };
+      if (req.method === 'HEAD') {
+        res.end()
+        return
+      }
       if (method !== 'GET' && method !== 'HEAD') {
         init.body = Readable.toWeb(req);
         init.duplex = 'half';
@@ -294,11 +314,8 @@ if (process.env.NODE_ENV === 'production') {
       for (const [key, val] of response.headers) {
         res.setHeader(key, val);
       }
-      if (response.body) {
-        await pipeline(Readable.fromWeb(response.body), res);
-      } else {
-        res.end();
-      }
+      if (response.body) await pipeline(Readable.fromWeb(response.body), res);
+      else res.end();
     } catch (e) {
       console.error(e);
       res.statusCode = 500;
@@ -315,6 +332,15 @@ if (process.env.NODE_ENV === 'production') {
 		},
 		configureServer(server) {
 			return () => {
+				const pagesPath = path.resolve(viteConfigRoot, pagesDir);
+				server.watcher.on("all", (event, file) => {
+					if (!((event === "add" || event === "unlink") && file.startsWith(pagesPath))) return;
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(resolvedVirtualModuleId);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+					server.ws.send({ type: "full-reload" });
+				});
 				server.middlewares.use(async (req, res, next) => {
 					try {
 						const { default: app } = await server.environments.ssr.runner.import(resolvedVirtualEntryServerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",

package/LICENSE

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2024-present node-ecosystem
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.