@ahmedrowaihi/8n 6.0.26 → 6.0.28

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { Command, Option } from "commander";
 import pc from "picocolors";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, watch, writeFileSync } from "node:fs";
+import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
 import { x } from "tinyexec";
 import { loadConfig } from "c12";
 import { createInterface } from "node:readline/promises";
@@ -3674,7 +3674,7 @@ async function checkSelfUpdate() {
 		});
 		if (!res.ok) return;
 		const { version: latest } = await res.json();
-		const current = "6.0.26";
+		const current = "6.0.28";
 		if (latest !== current) console.log(pc.yellow("⚠") + pc.dim(` new version available: `) + pc.cyan(latest) + pc.dim(` (current: ${current}) — run `) + pc.cyan("npm i -g @ahmedrowaihi/8n") + pc.dim(" to update"));
 	} catch {}
 }
@@ -3732,44 +3732,6 @@ async function runNext(cmd, env, flags = []) {
 		env
 	} });
 }
-function getProjectBuildDir(projectDir) {
-	return join(projectDir, ".8n");
-}
-async function copyStarterToProject(projectDir) {
-	const starterDir = getStarterDir();
-	const buildDir = getProjectBuildDir(projectDir);
-	const spin = spinner("preparing build environment");
-	try {
-		cpSync(starterDir, buildDir, {
-			recursive: true,
-			force: true,
-			filter: (src) => {
-				const rel = src.slice(starterDir.length);
-				return !rel.startsWith(sep + "node_modules") && !rel.startsWith(sep + ".next") && !rel.startsWith(sep + "out");
-			}
-		});
-		await x("npm", [
-			"install",
-			"--legacy-peer-deps",
-			"--include=dev"
-		], { nodeOptions: {
-			cwd: buildDir,
-			stdio: process.env.DEBUG_8N ? "inherit" : "pipe"
-		} });
-		spin.succeed("build environment ready");
-	} catch (err) {
-		spin.fail(`setup failed: ${err.message}`);
-		throw err;
-	}
-}
-async function runNextIn(dir, cmd, env, flags = []) {
-	await x(join(dir, "node_modules", ".bin", "next"), [cmd, ...flags], { nodeOptions: {
-		cwd: dir,
-		stdio: "inherit",
-		env
-	} });
-}
-const adapterPath = join(dirname(fileURLToPath(import.meta.url)), "adapter.cjs");
 function buildEnv({ config, contentDir, staticExport = false }) {
 	const ghRepo = process.env.GITHUB_REPOSITORY;
 	const ghServer = process.env.GITHUB_SERVER_URL ?? "https://github.com";
@@ -3785,11 +3747,16 @@ function buildEnv({ config, contentDir, staticExport = false }) {
 		NEXT_PUBLIC_NAV_LINKS: JSON.stringify(config.nav?.links ?? []),
 		NEXT_PUBLIC_ANIMATIONS: config.animations === false ? "false" : "true",
 		NEXT_BASE_PATH: config.basePath ?? ghPagesBasePath ?? "",
-		NEXT_STATIC_EXPORT: staticExport ? "true" : "false",
-		NEXT_ADAPTER_PATH: adapterPath,
-		DOCS_PROJECT_DIR: process.cwd()
+		NEXT_STATIC_EXPORT: staticExport ? "true" : "false"
 	};
 }
+async function runNextFlat(projectDir, cmd, env) {
+	await x(join(projectDir, "node_modules", ".bin", "next"), [cmd], { nodeOptions: {
+		cwd: projectDir,
+		stdio: "inherit",
+		env
+	} });
+}
 
 //#endregion
 //#region src/commands/dev.ts
@@ -3811,28 +3778,41 @@ async function dev() {
 async function build({ server = false } = {}) {
 	const { config, contentDir } = await resolveProject();
 	const projectDir = process.cwd();
-	console.log(pc.cyan("8n") + pc.dim(` v6.0.26 build → ${contentDir}`));
-	syncPublicDir(projectDir);
-	if (server) {
-		await copyStarterToProject(projectDir);
-		await runNextIn(getProjectBuildDir(projectDir), "build", {
-			...buildEnv({
-				config,
-				contentDir,
-				staticExport: false
-			}),
-			NEXT_DIST_DIR: join("..", ".next")
-		});
-	} else {
+	console.log(pc.cyan("8n") + pc.dim(` v6.0.28 build → ${contentDir}`));
+	if (server) await runNextFlat(projectDir, "build", buildEnv({
+		config,
+		contentDir,
+		staticExport: false
+	}));
+	else {
 		await ensureDepsInstalled();
+		syncPublicDir(projectDir);
 		await runNext("build", buildEnv({
 			config,
 			contentDir,
 			staticExport: true
 		}));
+		moveOutput(join(getStarterDir(), "out"), join(projectDir, "out"));
 	}
 	console.log(pc.green("✓") + pc.dim(` build complete → ${server ? ".next/" : "out/"}`));
 }
+function moveOutput(src, dest) {
+	if (!existsSync(src)) return;
+	if (existsSync(dest)) rmSync(dest, {
+		recursive: true,
+		force: true
+	});
+	try {
+		renameSync(src, dest);
+	} catch (err) {
+		if (err.code !== "EXDEV") throw err;
+		cpSync(src, dest, { recursive: true });
+		rmSync(src, {
+			recursive: true,
+			force: true
+		});
+	}
+}
 
 //#endregion
 //#region src/commands/start.ts
@@ -4003,8 +3983,42 @@ async function init() {
 //#endregion
 //#region src/commands/install.ts
 async function install() {
+	const starterDir = getStarterDir();
+	const projectDir = process.cwd();
 	console.log(pc.cyan("8n") + pc.dim(" install"));
-	await ensureDepsInstalled();
+	process.stdout.write(pc.dim("  copying starter files...\n"));
+	cpSync(starterDir, projectDir, {
+		recursive: true,
+		force: true,
+		filter: (src) => {
+			const rel = src.slice(starterDir.length);
+			return !rel.startsWith(sep + "node_modules") && !rel.startsWith(sep + ".next") && !rel.startsWith(sep + "out") && !rel.startsWith(sep + "content") && rel !== sep + "package.json";
+		}
+	});
+	const starterPkg = JSON.parse(readFileSync(join(starterDir, "package.json"), "utf-8"));
+	const projectPkg = JSON.parse(readFileSync(join(projectDir, "package.json"), "utf-8"));
+	const merged = {
+		...projectPkg,
+		dependencies: {
+			...starterPkg.dependencies ?? {},
+			...projectPkg.dependencies ?? {}
+		},
+		devDependencies: {
+			...starterPkg.devDependencies ?? {},
+			...projectPkg.devDependencies ?? {}
+		}
+	};
+	writeFileSync(join(projectDir, "package.json"), JSON.stringify(merged, null, 2) + "\n");
+	process.stdout.write(pc.dim("  installing dependencies...\n"));
+	await x("npm", [
+		"install",
+		"--legacy-peer-deps",
+		"--include=dev"
+	], { nodeOptions: {
+		cwd: projectDir,
+		stdio: process.env.DEBUG_8N ? "inherit" : "pipe"
+	} });
+	process.stdout.write(pc.green("✓") + pc.dim(" project ready\n"));
 }
 
 //#endregion
@@ -4022,7 +4036,7 @@ async function mcp() {
 	const mcpDir = join(getStarterDir(), "content", "mcp", "en");
 	const server = new McpServer({
 		name: "8n",
-		version: "6.0.26"
+		version: "6.0.28"
 	});
 	server.registerTool("read_me", {
 		description: "Returns how to use the 8n MCP tools. Call this BEFORE documenting anything with 8n.",
@@ -4163,7 +4177,7 @@ Example: get_component({ name: "components" }) returns all available MDX compone
 
 //#endregion
 //#region src/index.ts
-const program = new Command().name("8n").description("Run your 8n docs site").version("6.0.26").addOption(new Option("--debug").hideHelp()).hook("preAction", (cmd) => {
+const program = new Command().name("8n").description("Run your 8n docs site").version("6.0.28").addOption(new Option("--debug").hideHelp()).hook("preAction", (cmd) => {
 	if (cmd.opts().debug) process.env.DEBUG_8N = "1";
 });
 program.command("init").description("Scaffold a new docs project in the current directory").action(init);

package/package.json

@@ -30,5 +30,5 @@
     "typescript": "^5.9.3",
     "zod": "^4.3.6"
   },
-  "version": "6.0.26"
+  "version": "6.0.28"
 }

package/starter/next.config.mjs

@@ -7,16 +7,10 @@ const config = {
     root: import.meta.dirname,
   },
   reactStrictMode: true,
-  adapterPath: process.env.NEXT_ADAPTER_PATH,
-
   serverExternalPackages: ["twoslash", "typescript", "gray-matter"],
-
   images: {
     unoptimized: true,
   },
-
-  distDir: process.env.NEXT_DIST_DIR || ".next",
-
   ...(staticExport ? { output: "export", trailingSlash: true } : {}),
   ...(basePath ? { basePath, assetPrefix: basePath } : {}),
 };

package/starter/package.json

@@ -106,5 +106,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "version": "6.0.26"
+  "version": "6.0.28"
 }

package/dist/adapter.cjs

@@ -1,33 +0,0 @@
-let node_fs = require("node:fs");
-let node_path = require("node:path");
-
-//#region src/adapter.ts
-const adapter = {
-	name: "8n",
-	async onBuildComplete({ projectDir }) {
-		const docsProjectDir = process.env.DOCS_PROJECT_DIR;
-		const staticExport = process.env.NEXT_STATIC_EXPORT === "true";
-		if (!docsProjectDir) return;
-		if (process.env.NEXT_DIST_DIR && !staticExport) return;
-		const folder = staticExport ? "out" : ".next";
-		const src = (0, node_path.join)(projectDir, folder);
-		const dest = (0, node_path.join)(docsProjectDir, folder);
-		if ((0, node_fs.existsSync)(dest)) (0, node_fs.rmSync)(dest, {
-			recursive: true,
-			force: true
-		});
-		try {
-			(0, node_fs.renameSync)(src, dest);
-		} catch (err) {
-			if (err.code !== "EXDEV") throw err;
-			(0, node_fs.cpSync)(src, dest, { recursive: true });
-			(0, node_fs.rmSync)(src, {
-				recursive: true,
-				force: true
-			});
-		}
-	}
-};
-module.exports = adapter;
-
-//#endregion