everything-dev 1.26.0 → 1.27.0

package/dist/plugin.cjs

@@ -1,8 +1,8 @@
 const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_fastkv = require('./fastkv.cjs');
 const require_network = require('./network.cjs');
-require('./sdk.cjs');
 const require_config = require('./config.cjs');
+require('./sdk.cjs');
 const require_contract = require('./contract.cjs');
 const require_api_contract = require('./api-contract.cjs');
 const require_app = require('./app.cjs');
@@ -23,11 +23,13 @@ const require_run = require('./utils/run.cjs');
 const require_theme = require('./utils/theme.cjs');
 let node_fs = require("node:fs");
 let node_path = require("node:path");
+let node_process = require("node:process");
+node_process = require_runtime.__toESM(node_process, 1);
 let _clack_prompts = require("@clack/prompts");
 _clack_prompts = require_runtime.__toESM(_clack_prompts, 1);
 let effect = require("effect");
 let every_plugin = require("every-plugin");
-let every_plugin_zod = require("every-plugin/zod");
+let zod = require("zod");
 
 //#region src/plugin.ts
 async function loadDevSession() {
@@ -176,8 +178,8 @@ async function buildEveryPluginQuietly(cwd) {
 		console.log("[build:ssr] build succeeded");
 		return;
 	}
-	if (result.stdout.trim()) process.stdout.write(result.stdout);
-	if (result.stderr.trim()) process.stderr.write(result.stderr);
+	if (result.stdout.trim()) node_process.default.stdout.write(result.stdout);
+	if (result.stderr.trim()) node_process.default.stderr.write(result.stderr);
 	throw new Error(`bun run --cwd packages/every-plugin build failed with exit code ${result.exitCode}`);
 }
 async function buildEverythingDevQuietly(cwd) {
@@ -198,8 +200,8 @@ async function buildEverythingDevQuietly(cwd) {
 		console.log("[everything-dev] build succeeded");
 		return;
 	}
-	if (result.stdout.trim()) process.stdout.write(result.stdout);
-	if (result.stderr.trim()) process.stderr.write(result.stderr);
+	if (result.stdout.trim()) node_process.default.stdout.write(result.stdout);
+	if (result.stderr.trim()) node_process.default.stderr.write(result.stderr);
 	throw new Error(`bun run --cwd packages/everything-dev build failed with exit code ${result.exitCode}`);
 }
 async function fetchPublishedConfig(accountId, gatewayId) {
@@ -239,7 +241,7 @@ async function buildWorkspaceTargets(opts) {
 	if (existing.some((entry) => entry.key === "api")) await buildEveryPluginQuietly(opts.configDir);
 	await buildEverythingDevQuietly(opts.configDir);
 	const env = {
-		...process.env,
+		...node_process.default.env,
 		NODE_ENV: opts.deploy ? "production" : "development"
 	};
 	if (opts.deploy) env.DEPLOY = "true";
@@ -271,8 +273,8 @@ async function buildWorkspaceTargets(opts) {
 	};
 }
 var plugin_default = (0, every_plugin.createPlugin)({
-	variables: every_plugin_zod.z.object({ configPath: every_plugin_zod.z.string().optional() }),
-	secrets: every_plugin_zod.z.object({}),
+	variables: zod.z.object({ configPath: zod.z.string().optional() }),
+	secrets: zod.z.object({}),
 	contract: require_contract.bosContract,
 	initialize: (config) => effect.Effect.promise(async () => {
 		const configResult = await require_config.loadConfig({ path: config.variables.configPath });
@@ -389,16 +391,16 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				capture: true
 			});
 			if (exitCode !== 0) {
-				if (stdout.trim()) process.stdout.write(stdout);
-				if (stderr.trim()) process.stderr.write(stderr);
+				if (stdout.trim()) node_process.default.stdout.write(stdout);
+				if (stderr.trim()) node_process.default.stderr.write(stderr);
 				return {
 					status: "error",
 					key: input.key,
 					error: `Publish failed with exit code ${exitCode}`
 				};
 			}
-			if (stdout.trim()) process.stdout.write(stdout);
-			if (stderr.trim()) process.stderr.write(stderr);
+			if (stdout.trim()) node_process.default.stdout.write(stdout);
+			if (stderr.trim()) node_process.default.stderr.write(stderr);
 			let publishedUrl = extractPublishedUrl(`${stdout}\n${stderr}`);
 			let manifest = null;
 			if (publishedUrl) manifest = await require_fastkv.fetchRemotePluginManifest(publishedUrl);
@@ -510,8 +512,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 		}),
 		start: builder.start.handler(async ({ input }) => {
 			require_infra.ensureEnvFile(deps.configDir);
-			const account = input.account ?? process.env.BOS_ACCOUNT;
-			const domain = input.domain ?? process.env.BOS_GATEWAY;
+			const account = input.account ?? node_process.default.env.BOS_ACCOUNT;
+			const domain = input.domain ?? node_process.default.env.BOS_GATEWAY;
 			let config = null;
 			let remoteConfig = null;
 			if (account && domain) {
@@ -550,7 +552,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			});
 			const productionEnv = {};
 			const warnings = [];
-			if (!process.env.CORS_ORIGIN && config.domain) {
+			if (!node_process.default.env.CORS_ORIGIN && config.domain) {
 				const defaultOrigin = `https://${config.domain}`;
 				productionEnv.CORS_ORIGIN = defaultOrigin;
 				warnings.push(`CORS_ORIGIN defaulting to ${defaultOrigin}`);
@@ -561,7 +563,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			if (runtimeConfig.api?.secrets) for (const s of runtimeConfig.api.secrets) requiredSecrets.add(s);
 			for (const plugin of Object.values(runtimeConfig.plugins ?? {})) if (plugin.secrets) for (const s of plugin.secrets) requiredSecrets.add(s);
 			for (const secret of requiredSecrets) {
-				const value = process.env[secret];
+				const value = node_process.default.env[secret];
 				if (!value || value.length === 0) missingSecrets.push(secret);
 			}
 			if (missingSecrets.length > 0) warnings.push(`Missing ${missingSecrets.length} secret(s): ${missingSecrets.join(", ")}`);
@@ -692,7 +694,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) };
 			const payload = JSON.stringify(registryEntries);
 			const argsBase64 = Buffer.from(payload).toString("base64");
-			const privateKey = input.privateKey || process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
+			const privateKey = input.privateKey || node_process.default.env.NEAR_PRIVATE_KEY || node_process.default.env.BOS_NEAR_PRIVATE_KEY;
 			try {
 				await effect.Effect.runPromise(require_near_cli.ensureNearCli);
 				let txHash;
@@ -805,6 +807,8 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				} catch {}
 				if (!input.noInteractive) {
 					s.stop("Config fetched");
+					const initialExtendsAccount = extendsAccount;
+					const initialExtendsGateway = extendsGateway;
 					const prompted = await require_prompts.promptInitOptions({
 						extends: `bos://${extendsAccount}/${extendsGateway}`,
 						directory,
@@ -821,6 +825,35 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					domain = prompted.domain;
 					plugins = prompted.plugins;
 					overrides = prompted.overrides;
+					if (!parentConfig || prompted.extendsAccount !== initialExtendsAccount || prompted.extendsGateway !== initialExtendsGateway) {
+						try {
+							parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.fetchParentConfig(prompted.extendsAccount, prompted.extendsGateway), s);
+							if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
+							else parentPluginKeys = [];
+						} catch {
+							return {
+								status: "error",
+								directory,
+								extendsRef: `bos://${prompted.extendsAccount}/${prompted.extendsGateway}`,
+								account,
+								domain,
+								extends: `bos://${prompted.extendsAccount}/${prompted.extendsGateway}`,
+								plugins,
+								overrides,
+								filesCopied: 0,
+								timings,
+								error: `No config found at bos://${prompted.extendsAccount}/${prompted.extendsGateway} — are you sure this is the right parent?`
+							};
+						}
+						s.stop("Config fetched");
+					}
+					if (typeof parentConfig?.title === "string" && parentConfig.title.trim() && typeof parentConfig.description === "string" && parentConfig.description.trim()) {
+						const shouldContinue = await _clack_prompts.confirm({
+							message: `You will be extending ${parentConfig.title} - ${parentConfig.description}. Continue?`,
+							initialValue: true
+						});
+						if (_clack_prompts.isCancel(shouldContinue) || !shouldContinue) node_process.default.exit(0);
+					}
 					s.start("Setting up project");
 				}
 				overrides = overrides?.length ? overrides : ["ui", "api"];
@@ -830,7 +863,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				const targetDir = (0, node_path.resolve)(directory);
 				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
 				if (overrides.includes("plugins") && !plugins.length) {}
-				const repository = await require_cli_init.detectGitRemoteUrl(process.cwd()).catch(() => void 0) ?? parentConfig?.repository;
+				const repository = await require_cli_init.detectGitRemoteUrl(node_process.default.cwd()).catch(() => void 0) ?? parentConfig?.repository;
 				if (!parentConfig) try {
 					parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.fetchParentConfig(extendsAccount, extendsGateway), s);
 				} catch {
@@ -866,7 +899,9 @@ var plugin_default = (0, every_plugin.createPlugin)({
 							domain,
 							plugins,
 							overrides,
-							repository
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description
 						}), s);
 						await require_timing.timePhase(timings, "personalize config", () => require_cli_init.personalizeConfig(targetDir, {
 							extendsAccount,
@@ -876,34 +911,17 @@ var plugin_default = (0, every_plugin.createPlugin)({
 							plugins,
 							overrides,
 							mode: "init",
-							repository
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description,
+							testnet: parentConfig?.testnet,
+							staging: parentConfig?.staging
 						}), s);
 					} else {
-						const patterns = await require_cli_init.readTemplatekeep(sourceDir);
-						if (patterns.length === 0) {
-							s.stop("Failed");
-							return {
-								status: "error",
-								directory,
-								extendsRef,
-								account,
-								domain,
-								extends: extendsRef,
-								plugins,
-								overrides,
-								filesCopied: 0,
-								error: "No .templatekeep found in template source"
-							};
-						}
-						const pluginRoutes = {};
-						if (overrides.includes("plugins")) {
-							const parentRuntimePlugins = await require_config.buildRuntimePluginsForConfig(parentConfig, sourceDir, "production");
-							for (const [key, plugin] of Object.entries(parentRuntimePlugins ?? {})) if (plugin.routes && plugin.routes.length > 0) pluginRoutes[key] = plugin.routes;
-						}
+						const patterns = require_cli_init.buildInitPatterns(overrides, plugins);
 						filesCopied = await require_timing.timePhase(timings, "copy files", () => require_cli_init.copyFilteredFiles(sourceDir, targetDir, patterns, {
 							overrides,
-							plugins,
-							pluginRoutes
+							plugins
 						}), s);
 						await require_timing.timePhase(timings, "personalize config", () => require_cli_init.personalizeConfig(targetDir, {
 							extendsAccount,
@@ -912,17 +930,21 @@ var plugin_default = (0, every_plugin.createPlugin)({
 							domain: domain || extendsGateway,
 							plugins,
 							overrides,
-							pluginRoutes,
 							workspaceOpts: { sourceDir },
-							repository
+							repository,
+							title: parentConfig?.title,
+							description: parentConfig?.description,
+							testnet: parentConfig?.testnet,
+							staging: parentConfig?.staging
 						}), s);
 						await require_timing.timePhase(timings, "write snapshot", () => require_cli_init.writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
 							overrides,
-							plugins,
-							pluginRoutes
+							plugins
 						}), s);
 					}
-					require_cli_init.stripOrphanedWorkspacesFromLockfile((0, node_path.join)(targetDir, "bun.lock"), computeAllowedWorkspaces(overrides, plugins));
+					const lockfilePath = (0, node_path.join)(targetDir, "bun.lock");
+					require_cli_init.stripOrphanedWorkspacesFromLockfile(lockfilePath, computeAllowedWorkspaces(overrides, plugins));
+					require_cli_init.removeInitLockfile(lockfilePath);
 					const initConfig = await require_timing.timePhase(timings, "resolve config", () => require_config.loadConfig({ cwd: targetDir }), s);
 					if (initConfig?.runtime) await require_timing.timePhase(timings, "generate env/docker", async () => {
 						require_infra.writeGeneratedInfra(targetDir, initConfig.runtime);
@@ -1043,7 +1065,7 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				const projectDir = (0, node_path.resolve)((0, node_path.dirname)(configPath));
 				const refreshed = await require_config.loadConfig({
 					cwd: projectDir,
-					env: input.env ?? (process.env.NODE_ENV === "production" ? "production" : "development")
+					env: input.env ?? (node_process.default.env.NODE_ENV === "production" ? "production" : "development")
 				});
 				if (!refreshed) return {
 					status: "error",