@pracht/cli 1.1.5 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @pracht/cli
 
+## 1.2.1
+
+### Patch Changes
+
+- [#116](https://github.com/JoviDeCroock/pracht/pull/116) [`411da18`](https://github.com/JoviDeCroock/pracht/commit/411da18d0fa8bbc20270729584c6677376be7f24) Thanks [@kinngh](https://github.com/kinngh)! - Strip server-only route and shell exports from client module imports so inline loaders can statically import server-only dependencies without evaluating them in browser bundles.
+
+- [#117](https://github.com/JoviDeCroock/pracht/pull/117) [`39a226d`](https://github.com/JoviDeCroock/pracht/commit/39a226d1023317c357df8b72e020034a2c68d896) Thanks [@JoviDeCroock](https://github.com/JoviDeCroock)! - Copy public/ folder contents to dist/client/ during build so that static assets like favicons and robots.txt are available for deployment platforms
+
+- Updated dependencies [[`f0ed41e`](https://github.com/JoviDeCroock/pracht/commit/f0ed41e4b886e751fbdfd29ae10f880c3aa364d4), [`49732fc`](https://github.com/JoviDeCroock/pracht/commit/49732fc78a776cbaabe9579e5a7f2fb154497479), [`d88c9e4`](https://github.com/JoviDeCroock/pracht/commit/d88c9e4b8347c4d3ecacdbc5f7674ee38af0092e), [`7ee2a93`](https://github.com/JoviDeCroock/pracht/commit/7ee2a936357a0f0b4ff7f5a7f6f3206b070f3890), [`00c4014`](https://github.com/JoviDeCroock/pracht/commit/00c401410b13c2d904c0beafc4da62dfb8f0f91e), [`f0ed41e`](https://github.com/JoviDeCroock/pracht/commit/f0ed41e4b886e751fbdfd29ae10f880c3aa364d4)]:
+  - @pracht/core@0.2.7
+
+## 1.2.0
+
+### Minor Changes
+
+- [#96](https://github.com/JoviDeCroock/pracht/pull/96) [`755dc1f`](https://github.com/JoviDeCroock/pracht/commit/755dc1fd80e0c0457f29e85abf59b2f2ff3f1bdc) Thanks [@JoviDeCroock](https://github.com/JoviDeCroock)! - Convert CLI codebase from JavaScript to TypeScript and replace custom flag parsing with citty
+
+### Patch Changes
+
+- Updated dependencies [[`f7b5366`](https://github.com/JoviDeCroock/pracht/commit/f7b5366cead40f2237d55e6027dc4bfb7f8b324f), [`d284596`](https://github.com/JoviDeCroock/pracht/commit/d284596fe00c3c74d56e7dc040ea1e8c9961eb99), [`2c95189`](https://github.com/JoviDeCroock/pracht/commit/2c95189209b4b09f862194078f7d2ced15f22dde)]:
+  - @pracht/core@0.2.6
+
 ## 1.1.5
 
 ### Patch Changes

package/bin/pracht.js

@@ -1,41 +1,2 @@
 #!/usr/bin/env node
-
-import { doctorCommand } from "../lib/commands/doctor.js";
-import { buildCommand } from "../lib/commands/build.js";
-import { devCommand } from "../lib/commands/dev.js";
-import { generateCommand } from "../lib/commands/generate.js";
-import { verifyCommand } from "../lib/commands/verify.js";
-import { inspectCommand } from "../lib/commands/inspect.js";
-import { handleCliError, printHelp } from "../lib/cli.js";
-import { VERSION } from "../lib/constants.js";
-
-const argv = process.argv.slice(2);
-const command = argv[0];
-const jsonOutput = argv.includes("--json");
-
-if (!command || command === "help" || command === "--help" || command === "-h") {
-  printHelp();
-  process.exit(0);
-}
-
-if (command === "--version" || command === "-v") {
-  console.log(VERSION);
-  process.exit(0);
-}
-
-const handlers = {
-  build: buildCommand,
-  dev: devCommand,
-  doctor: doctorCommand,
-  generate: generateCommand,
-  verify: verifyCommand,
-  inspect: inspectCommand,
-};
-
-if (!(command in handlers)) {
-  handleCliError(new Error(`Unknown pracht command: ${command}`), { json: false });
-}
-
-handlers[command](argv.slice(1)).catch((error) => {
-  handleCliError(error, { json: jsonOutput });
-});
+import "../dist/index.mjs";

package/dist/build-DlABFPbG.mjs

@@ -0,0 +1,214 @@
+import { r as VERSION } from "./index.mjs";
+import { t as readClientBuildAssets } from "./build-metadata-BOChHO8g.mjs";
+import { defineCommand } from "citty";
+import { cpSync, existsSync, mkdirSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { build } from "vite";
+//#region src/build-shared.ts
+const ROUTE_STATE_REQUEST_HEADER = "x-pracht-route-state-request";
+function writeVercelBuildOutput({ functionName, headersManifest = {}, isgRoutes, regions, root, staticRoutes }) {
+	const outputDir = join(root, ".vercel/output");
+	const staticDir = join(outputDir, "static");
+	const functionDir = join(outputDir, "functions", `${functionName || "render"}.func`);
+	rmSync(outputDir, {
+		force: true,
+		recursive: true
+	});
+	mkdirSync(outputDir, { recursive: true });
+	cpSync(join(root, "dist/client"), staticDir, { recursive: true });
+	cpSync(join(root, "dist/server"), functionDir, { recursive: true });
+	writeFileSync(join(outputDir, "config.json"), `${JSON.stringify(createVercelOutputConfig({
+		functionName,
+		headersManifest,
+		staticRoutes,
+		isgRoutes
+	}), null, 2)}\n`, "utf-8");
+	writeFileSync(join(functionDir, ".vc-config.json"), `${JSON.stringify(createVercelFunctionConfig({ regions }), null, 2)}\n`, "utf-8");
+	return ".vercel/output";
+}
+function createVercelOutputConfig({ functionName, headersManifest, staticRoutes, isgRoutes }) {
+	const target = `/${functionName || "render"}`;
+	const routes = [{
+		dest: target,
+		has: [{
+			type: "header",
+			key: ROUTE_STATE_REQUEST_HEADER,
+			value: "1"
+		}],
+		src: "/(.*)"
+	}];
+	for (const route of sortStaticRoutes(staticRoutes)) routes.push({
+		dest: routeToStaticHtmlPath(route),
+		src: routeToRouteExpression(route)
+	});
+	for (const route of isgRoutes) routes.push({
+		dest: target,
+		src: routeToRouteExpression(route)
+	});
+	routes.push({ handle: "filesystem" });
+	routes.push({
+		dest: target,
+		src: "/(.*)"
+	});
+	const headers = [{
+		headers: [
+			{
+				key: "permissions-policy",
+				value: "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()"
+			},
+			{
+				key: "referrer-policy",
+				value: "strict-origin-when-cross-origin"
+			},
+			{
+				key: "x-content-type-options",
+				value: "nosniff"
+			},
+			{
+				key: "x-frame-options",
+				value: "SAMEORIGIN"
+			}
+		],
+		source: "/(.*)"
+	}];
+	for (const route of sortStaticRoutes(staticRoutes)) {
+		const routeHeaders = headersManifest[route];
+		if (!routeHeaders) continue;
+		headers.push({
+			headers: Object.entries(routeHeaders).map(([key, value]) => ({
+				key,
+				value
+			})),
+			source: routeToHeaderSource(route)
+		});
+	}
+	return {
+		headers,
+		framework: { version: VERSION },
+		routes,
+		version: 3
+	};
+}
+function createVercelFunctionConfig({ regions }) {
+	const config = {
+		entrypoint: "server.js",
+		runtime: "edge"
+	};
+	if (regions) config.regions = regions;
+	return config;
+}
+function sortStaticRoutes(routes) {
+	return [...new Set(routes)].sort((left, right) => right.length - left.length);
+}
+function routeToRouteExpression(route) {
+	if (route === "/") return "^/$";
+	return `^${escapeRegex(route)}/?$`;
+}
+function routeToStaticHtmlPath(route) {
+	if (route === "/") return "/index.html";
+	return `${route}/index.html`;
+}
+function routeToHeaderSource(route) {
+	return route === "/" ? "/" : route;
+}
+function escapeRegex(value) {
+	return value.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+}
+//#endregion
+//#region src/commands/build.ts
+var build_default = defineCommand({
+	meta: {
+		name: "build",
+		description: "Production build (client + server)"
+	},
+	async run() {
+		const root = process.cwd();
+		console.log("\n  Building client...\n");
+		await build({
+			root,
+			build: {
+				outDir: "dist",
+				manifest: true,
+				rollupOptions: { input: "virtual:pracht/client" }
+			}
+		});
+		console.log("\n  Building server...\n");
+		await build({
+			root,
+			build: {
+				outDir: "dist/server",
+				ssr: "virtual:pracht/server"
+			}
+		});
+		const serverEntry = resolve(root, "dist/server/server.js");
+		let clientDir;
+		if (existsSync(resolve(root, "dist/client/.vite/manifest.json"))) clientDir = resolve(root, "dist/client");
+		else {
+			clientDir = resolve(root, "dist/client");
+			const distRoot = resolve(root, "dist");
+			mkdirSync(clientDir, { recursive: true });
+			for (const entry of readdirSync(distRoot)) {
+				if (entry === "server" || entry === "client") continue;
+				const sourcePath = join(distRoot, entry);
+				cpSync(sourcePath, join(clientDir, entry), { recursive: true });
+				rmSync(sourcePath, {
+					force: true,
+					recursive: true
+				});
+			}
+		}
+		const publicDir = resolve(root, "public");
+		if (existsSync(publicDir)) cpSync(publicDir, clientDir, { recursive: true });
+		if (existsSync(serverEntry)) {
+			const serverMod = await import(serverEntry);
+			const { prerenderApp } = serverMod;
+			const { clientEntryUrl, cssManifest, jsManifest } = readClientBuildAssets(root);
+			const { pages, isgManifest } = await prerenderApp({
+				app: serverMod.resolvedApp,
+				clientEntryUrl: clientEntryUrl ?? void 0,
+				cssManifest,
+				jsManifest,
+				registry: serverMod.registry,
+				withISGManifest: true
+			});
+			const headersManifest = Object.fromEntries(pages.map((page) => [page.path, page.headers ?? {}]));
+			if (pages.length > 0) {
+				console.log(`\n  Prerendering ${pages.length} SSG/ISG route(s)...\n`);
+				for (const page of pages) {
+					const filePath = page.path === "/" ? join(clientDir, "index.html") : join(clientDir, page.path, "index.html");
+					mkdirSync(dirname(filePath), { recursive: true });
+					writeFileSync(filePath, page.html, "utf-8");
+					console.log(`    ${page.path} → ${filePath.replace(root + "/", "")}`);
+				}
+			}
+			if (Object.keys(headersManifest).length > 0) {
+				const headersManifestJson = `${JSON.stringify(headersManifest, null, 2)}\n`;
+				writeFileSync(resolve(root, "dist/server/headers-manifest.json"), headersManifestJson, "utf-8");
+				mkdirSync(resolve(clientDir, "_pracht"), { recursive: true });
+				writeFileSync(resolve(clientDir, "_pracht/headers.json"), headersManifestJson, "utf-8");
+			}
+			if (Object.keys(isgManifest).length > 0) {
+				writeFileSync(resolve(root, "dist/server/isg-manifest.json"), JSON.stringify(isgManifest, null, 2), "utf-8");
+				console.log(`\n  ISG manifest → dist/server/isg-manifest.json (${Object.keys(isgManifest).length} route(s))\n`);
+			}
+			if (serverMod.buildTarget === "cloudflare") {
+				console.log("\n  Cloudflare worker → dist/server/server.js\n");
+				console.log("  Deploy with: wrangler deploy\n");
+			}
+			if (serverMod.buildTarget === "vercel") {
+				const outputPath = writeVercelBuildOutput({
+					functionName: serverMod.vercelFunctionName,
+					isgRoutes: Object.keys(isgManifest),
+					headersManifest,
+					regions: serverMod.vercelRegions,
+					root,
+					staticRoutes: pages.map((page) => page.path).filter((path) => !(path in isgManifest))
+				});
+				console.log(`\n  Vercel build output → ${outputPath}\n`);
+			}
+		}
+		console.log("\n  Build complete.\n");
+	}
+});
+//#endregion
+export { build_default as default };

package/dist/build-metadata-BOChHO8g.mjs

@@ -0,0 +1,58 @@
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+//#region src/build-metadata.ts
+const MANIFEST_PATHS = ["dist/client/.vite/manifest.json", "dist/.vite/manifest.json"];
+const PRACHT_CLIENT_MODULE_QUERY = "pracht-client";
+function readClientBuildAssets(root = process.cwd()) {
+	const manifestPath = MANIFEST_PATHS.map((candidate) => resolve(root, candidate)).find((path) => existsSync(path));
+	if (!manifestPath) return {
+		clientEntryUrl: null,
+		cssManifest: {},
+		jsManifest: {}
+	};
+	const rawManifest = readFileSync(manifestPath, "utf-8");
+	const manifest = JSON.parse(rawManifest);
+	const clientEntry = manifest["virtual:pracht/client"];
+	function collectTransitiveDeps(key) {
+		const css = /* @__PURE__ */ new Set();
+		const js = /* @__PURE__ */ new Set();
+		const visited = /* @__PURE__ */ new Set();
+		function collect(currentKey) {
+			if (visited.has(currentKey)) return;
+			visited.add(currentKey);
+			const entry = manifest[currentKey];
+			if (!entry) return;
+			for (const cssFile of entry.css ?? []) css.add(cssFile);
+			js.add(entry.file);
+			for (const importedKey of entry.imports ?? []) collect(importedKey);
+		}
+		collect(key);
+		return {
+			css: [...css],
+			js: [...js]
+		};
+	}
+	const cssManifest = {};
+	const jsManifest = {};
+	for (const [key, entry] of Object.entries(manifest)) {
+		if (!entry.src) continue;
+		const deps = collectTransitiveDeps(key);
+		const manifestKey = stripPrachtClientModuleQuery(entry.src);
+		if (deps.css.length > 0) cssManifest[manifestKey] = deps.css.map((file) => `/${file}`);
+		if (deps.js.length > 0) jsManifest[manifestKey] = deps.js.map((file) => `/${file}`);
+	}
+	return {
+		clientEntryUrl: clientEntry ? `/${clientEntry.file}` : null,
+		cssManifest,
+		jsManifest
+	};
+}
+function stripPrachtClientModuleQuery(id) {
+	const queryStart = id.indexOf("?");
+	if (queryStart === -1) return id;
+	const path = id.slice(0, queryStart);
+	const query = id.slice(queryStart + 1).split("&").filter((part) => part !== PRACHT_CLIENT_MODULE_QUERY);
+	return query.length > 0 ? `${path}?${query.join("&")}` : path;
+}
+//#endregion
+export { readClientBuildAssets as t };

package/dist/dev-BCFe3g38.mjs

@@ -0,0 +1,25 @@
+import { defineCommand } from "citty";
+import { createServer } from "vite";
+//#region src/commands/dev.ts
+var dev_default = defineCommand({
+	meta: {
+		name: "dev",
+		description: "Start development server with HMR"
+	},
+	args: { port: {
+		type: "positional",
+		description: "Port number",
+		required: false
+	} },
+	async run({ args }) {
+		const port = parseInt(process.env.PORT || args.port || "3000", 10);
+		const server = await createServer({
+			root: process.cwd(),
+			server: { port }
+		});
+		await server.listen();
+		server.printUrls();
+	}
+});
+//#endregion
+export { dev_default as default };

package/dist/doctor-CQq64tfW.mjs

@@ -0,0 +1,25 @@
+import { t as runDoctor } from "./verification-CId4crSF.mjs";
+import { defineCommand } from "citty";
+//#region src/commands/doctor.ts
+var doctor_default = defineCommand({
+	meta: {
+		name: "doctor",
+		description: "Validate app wiring"
+	},
+	args: { json: {
+		type: "boolean",
+		description: "Output as JSON"
+	} },
+	async run({ args }) {
+		const report = runDoctor(process.cwd());
+		if (args.json) console.log(JSON.stringify(report, null, 2));
+		else {
+			console.log(`Pracht doctor (${report.mode} mode)`);
+			for (const check of report.checks) console.log(`${check.status.toUpperCase().padEnd(5)} ${check.message}`);
+			console.log(report.ok ? "\nNo blocking issues found." : "\nBlocking issues found.");
+		}
+		if (!report.ok) process.exitCode = 1;
+	}
+});
+//#endregion
+export { doctor_default as default };