vike-lite 1.17.0 → 1.17.2

package/README.md

@@ -43,10 +43,10 @@ When set to `true`, at the end of each production build (client and server) the
 
 ```sh
 
-📦 [Client bundle] package.json dependencies used (1):
+📦 [Client bundle] 1 dependencies used from package.json:
    - solid-js@^1.9.3
 
-📦 [Server bundle] package.json dependencies used (2):
+📦 [Server bundle] 2 dependencies used from package.json:
    - solid-js@^1.9.3
    - hono@^4.12.31
 ```

package/dist/__internal/client.d.mts

@@ -1,4 +1,4 @@
-import { t as VikeState } from "../store-9UNcAe5D.mjs";
+import { t as VikeState } from "../store-DRuFjsY3.mjs";
 //#region src/__internal/client.d.ts
 declare function createLinkClickHandler(onNavigate: (url: URL) => void): (e: MouseEvent) => void;
 declare function createLinkPrefetchHandler(onPrefetch: (url: URL) => void): (e: Event) => void;

package/dist/__internal/server.d.mts

@@ -1,4 +1,4 @@
-import { n as setVikeState, r as store, t as VikeState } from "../store-9UNcAe5D.mjs";
+import { n as setVikeState, r as store, t as VikeState } from "../store-DRuFjsY3.mjs";
 //#region src/__internal/server.d.ts
 interface HtmlShellParams {
   pageTitleTag: string;

package/dist/__internal/server.mjs

@@ -1,4 +1,4 @@
-import { n as store, t as setVikeState } from "../store-BCs8gL_o.mjs";
+import { n as store, t as setVikeState } from "../store-D-6PbvfY.mjs";
 //#region src/__internal/server.ts
 /**
 * Renders the HTML document shell shared by every adapter: doctype, meta tags,

package/dist/__internal/shared.d.mts

@@ -14,7 +14,6 @@ interface RenderContext {
   };
   nonce?: string;
 }
-declare function escapeRegex(str: string): string;
 declare function matchRoute(urlPathname: string, routes: typeof import('virtual:vike-lite/routes').routes): {
   route: any;
   routeParams: Record<string, string>;
@@ -31,4 +30,4 @@ declare function stripBase(pathname: string): string;
  */
 declare function prependBase(pathname: string): string;
 //#endregion
-export { BASE_URL, RenderContext, escapeRegex, matchRoute, prependBase, stripBase };
+export { BASE_URL, RenderContext, matchRoute, prependBase, stripBase };

package/dist/__internal/shared.mjs

@@ -1,8 +1,6 @@
+import { t as escapeRegex } from "../shared-Dh8Fb_3P.mjs";
 //#region src/__internal/shared.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(":")) {
@@ -62,4 +60,4 @@ function prependBase(pathname) {
 	return BASE_URL + (pathname === "/" ? "" : pathname);
 }
 //#endregion
-export { BASE_URL, escapeRegex, matchRoute, prependBase, stripBase };
+export { BASE_URL, matchRoute, prependBase, stripBase };

package/dist/server.mjs

@@ -1,6 +1,6 @@
 import { BASE_URL, matchRoute, stripBase } from "./__internal/shared.mjs";
 import { AbortRedirect, AbortRender } from "./server/abort.mjs";
-import { n as store } from "./store-BCs8gL_o.mjs";
+import { n as store } from "./store-D-6PbvfY.mjs";
 //#region src/utils/serializeContext.ts
 const ESCAPE_LOOKUP = {
 	"&": String.raw`\u0026`,

package/dist/shared-Dh8Fb_3P.mjs

@@ -0,0 +1,6 @@
+//#region src/shared/index.ts
+function escapeRegex(str) {
+	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}
+//#endregion
+export { escapeRegex as t };

package/dist/{store-BCs8gL_o.mjs → store-D-6PbvfY.mjs}

@@ -1,4 +1,4 @@
-//#region src/server/store.ts
+//#region src/shared/store.ts
 const KEY = Symbol.for("vike-lite:store");
 const store = globalThis[KEY] ??= {
 	routes: [],

package/dist/{store-9UNcAe5D.d.mts → store-DRuFjsY3.d.mts}

@@ -1,4 +1,4 @@
-//#region src/server/store.d.ts
+//#region src/shared/store.d.ts
 interface VikeState {
   routes: typeof import('virtual:vike-lite/routes')['routes'] | [];
   errorRoute: typeof import('virtual:vike-lite/routes')['errorRoute'] | null;

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { escapeRegex } from "./__internal/shared.mjs";
+import { t as escapeRegex } from "./shared-Dh8Fb_3P.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { Readable } from "node:stream";
@@ -121,15 +121,18 @@ function findPackageJsonPath(startDir) {
 		dir = parent;
 	}
 }
-function extractPackageNameFromPath(moduleId) {
-	const matches = [...moduleId.replaceAll("\\", "/").matchAll(/node_modules\/(@[^/]+\/[^/]+|[^/]+)/g)];
-	if (matches.length === 0) return null;
-	return matches[matches.length - 1][1];
-}
-function extractPackageNameFromImport(imp) {
-	if (imp.startsWith(".") || imp.startsWith("/") || imp.startsWith("\0") || path.isAbsolute(imp) || imp.startsWith("node:")) return null;
-	const parts = imp.split("/");
-	return imp.startsWith("@") && parts.length > 1 ? `${parts[0]}/${parts[1]}` : parts[0];
+function extractPkgName(id) {
+	const normalized = id.replaceAll("\\", "/");
+	const matches = [...normalized.matchAll(/(?:node_modules|\.yarn(?:\/__virtual__)?)\/(@[^/]+\/[^/]+|[^/]+)/g)];
+	if (matches.length > 0) {
+		const pkg = matches[matches.length - 1][1];
+		if (pkg !== ".pnpm") return pkg;
+	}
+	if (!normalized.startsWith(".") && !normalized.startsWith("/") && !normalized.includes(":")) {
+		const parts = normalized.split("/");
+		return normalized.startsWith("@") && parts.length > 1 ? `${parts[0]}/${parts[1]}` : parts[0];
+	}
+	return null;
 }
 //#endregion
 //#region src/vite/index.ts
@@ -167,10 +170,18 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 				const pkgJsonPath = findPackageJsonPath(viteConfigRoot);
 				if (pkgJsonPath) {
 					const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
-					projectDependencies = {
-						...pkgJson.dependencies,
-						...pkgJson.devDependencies,
-						...pkgJson.peerDependencies
+					projectDependencies = {};
+					for (const [k, v] of Object.entries(pkgJson.dependencies || {})) projectDependencies[k] = {
+						version: v,
+						type: ""
+					};
+					for (const [k, v] of Object.entries(pkgJson.devDependencies || {})) projectDependencies[k] = {
+						version: v,
+						type: "dev"
+					};
+					for (const [k, v] of Object.entries(pkgJson.peerDependencies || {})) if (!projectDependencies[k]) projectDependencies[k] = {
+						version: v,
+						type: "peer"
 					};
 				}
 			}
@@ -336,27 +347,25 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 			if (!printDependencies || !projectDependencies) return;
 			const envName = this.environment.name;
 			if (envName !== "client" && envName !== "ssr") return;
-			const usedPackages = /* @__PURE__ */ new Set();
-			for (const file of Object.values(bundle)) {
-				if (file.type !== "chunk") continue;
-				for (const moduleId of file.moduleIds) {
-					const pkgName = extractPackageNameFromPath(moduleId);
-					if (pkgName && projectDependencies[pkgName] !== void 0) usedPackages.add(pkgName);
-				}
-				for (const imp of file.imports) {
-					const pkgName = extractPackageNameFromImport(imp);
-					if (pkgName && projectDependencies[pkgName] !== void 0) usedPackages.add(pkgName);
+			const usedDeps = /* @__PURE__ */ new Map();
+			for (const chunk of Object.values(bundle)) {
+				if (chunk.type !== "chunk") continue;
+				for (const id of chunk.moduleIds) {
+					const pkg = extractPkgName(id);
+					if (pkg && !pkg.startsWith("vike-lite") && Object.hasOwn(projectDependencies, pkg)) usedDeps.set(pkg, projectDependencies[pkg]);
 				}
-				for (const imp of file.dynamicImports) {
-					const pkgName = extractPackageNameFromImport(imp);
-					if (pkgName && projectDependencies[pkgName] !== void 0) usedPackages.add(pkgName);
+				for (const imp of [...chunk.imports, ...chunk.dynamicImports]) {
+					const pkg = extractPkgName(imp);
+					if (pkg && !pkg.startsWith("vike-lite") && Object.hasOwn(projectDependencies, pkg)) usedDeps.set(pkg, projectDependencies[pkg]);
 				}
 			}
-			const label = envName === "client" ? "Client" : "Server";
-			const sorted = [...usedPackages].sort();
-			console.log(`📦 [${label} bundle] package.json dependencies used (${sorted.length}):`);
-			if (sorted.length === 0) console.log(`   (None)`);
-			else for (const dep of sorted) console.log(`   - ${dep}@${projectDependencies[dep]}`);
+			const sorted = [...usedDeps.entries()].sort(([a], [b]) => a.localeCompare(b));
+			console.log(`\n📦 [${envName === "client" ? "Client" : "Server"} bundle] ${sorted.length} dependencies used from package.json:`);
+			if (sorted.length === 0) console.log("   (None)");
+			else for (const [name, info] of sorted) {
+				const typeTag = info.type ? ` \u{1B}[33m[${info.type}]\u{1B}[0m` : "";
+				console.log(`   - \u{1B}[36m${name}@${info.version}\u{1B}[0m${typeTag}`);
+			}
 		},
 		closeBundle: {
 			order: "pre",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "license": "MIT",
   "repository": {
     "type": "git",