@theholocron/cli 3.32.0 → 3.33.1

package/dist/cli.mjs

@@ -260,6 +260,7 @@ function resolveConfig(raw) {
 		description: raw.description,
 		homepage,
 		org: raw.org,
+		domain: raw.domain,
 		repo: raw.repo,
 		workflows: raw.workflows,
 		providers,
@@ -2844,7 +2845,7 @@ function extractPreviewConfig(raw, ctx = {}) {
 	if (!preview) return null;
 	if (preview === true) {
 		const project = ctx.org ? `${ctx.org}-preview` : null;
-		const domain = ctx.docsDomain ? `preview.${ctx.docsDomain}` : void 0;
+		const domain = ctx.domain ? `preview.${ctx.domain}` : void 0;
 		if (!project) return null;
 		return {
 			project,
@@ -2855,7 +2856,7 @@ function extractPreviewConfig(raw, ctx = {}) {
 	const p = preview;
 	const project = typeof p["project"] === "string" && p["project"] ? p["project"] : ctx.org ? `${ctx.org}-preview` : null;
 	if (!project) return null;
-	const domain = typeof p["domain"] === "string" && p["domain"] ? p["domain"] : ctx.docsDomain ? `preview.${ctx.docsDomain}` : void 0;
+	const domain = typeof p["domain"] === "string" && p["domain"] ? p["domain"] : ctx.domain ? `preview.${ctx.domain}` : void 0;
 	return {
 		project,
 		...domain ? { domain } : {}
@@ -2935,7 +2936,7 @@ function generateCombinedDeployContent(deployWith, paths, preview) {
 *
 * Used by both `holocron setup` and `sync-workflow-templates`.
 */
-function normalizeWorkflowWith(raw) {
+function normalizeWorkflowWith(raw, repoName) {
 	const result = { ...raw };
 	delete result["preview"];
 	const hasDocs = raw["docs"] === true || raw["docs"] !== null && typeof raw["docs"] === "object";
@@ -2943,6 +2944,7 @@ function normalizeWorkflowWith(raw) {
 	if (hasDocs) {
 		result["type"] = "docs";
 		delete result["docs"];
+		if (!result["name"] && repoName) result["name"] = repoName;
 	}
 	if (Array.isArray(storybookProjects)) {
 		if (!hasDocs) result["type"] = "storybook";
@@ -3488,7 +3490,7 @@ async function runSetup(input) {
 		for (const entry of workflows) {
 			const name = typeof entry === "string" ? entry : entry.name;
 			const rawWith = typeof entry === "object" ? entry.with : void 0;
-			const withOverrides = rawWith ? normalizeWorkflowWith(rawWith) : void 0;
+			const withOverrides = rawWith ? normalizeWorkflowWith(rawWith, config.name) : void 0;
 			const additionalPaths = (typeof entry === "object" ? entry.paths : void 0) ?? (name === "deploy" && rawWith ? deriveDeployPaths(rawWith) : void 0);
 			if (name === "test" && withOverrides) {
 				const runUnit = withOverrides["run-unit"];
@@ -3508,7 +3510,7 @@ async function runSetup(input) {
 			if (name === "deploy" && rawWith) {
 				const previewCfg = extractPreviewConfig(rawWith, {
 					org: config.org,
-					docsDomain: config.docs?.domain
+					domain: config.domain
 				});
 				if (previewCfg) {
 					const paths = additionalPaths;
@@ -3691,7 +3693,16 @@ async function runSetup(input) {
 		}));
 		print(formatStep(steps[steps.length - 1]));
 		const deployEntry = (config.workflows ?? []).map((e) => typeof e === "string" ? { name: e } : e).find((e) => e.name === "deploy");
-		const previewCfg = deployEntry?.with ? extractPreviewConfig(deployEntry.with) : null;
+		const previewCfg = deployEntry?.with ? extractPreviewConfig(deployEntry.with, {
+			org: config.org,
+			domain: config.domain
+		}) : null;
+		if (previewCfg) {
+			steps.push(await runStep("deployment", `ensureProject ${previewCfg.project}`, dryRun, async () => {
+				await deploy.ensureProject({ name: previewCfg.project });
+			}));
+			print(formatStep(steps[steps.length - 1]));
+		}
 		if (previewCfg?.domain && deploy.ensureCustomDomain) {
 			const wildcardDomain = `*.${previewCfg.domain}`;
 			steps.push(await runStep("deployment", `ensureCustomDomain ${wildcardDomain}`, dryRun, async () => {
@@ -4779,10 +4790,12 @@ function parseWorkflowsFromTs(source) {
 */
 function parseOrgContextFromTs(source) {
 	const orgMatch = source.match(/\borg\s*:\s*["']([^"']+)["']/);
-	const domainMatch = source.match(/\bdocs\s*:[^}]*?domain\s*:\s*["']([^"']+)["']/s);
+	const domainMatch = source.match(/\bdomain\s*:\s*["']([^"']+)["']/);
+	const nameMatch = source.split(/\bworkflows\s*:/)[0].match(/\bname\s*:\s*["']([^"']+)["']/);
 	return {
 		org: orgMatch?.[1],
-		docsDomain: domainMatch?.[1]
+		domain: domainMatch?.[1],
+		repoName: nameMatch?.[1]
 	};
 }
 function reusableHeader(source) {
@@ -4822,7 +4835,7 @@ function buildBatch(repo, allowedWorkflows, withOverrides, orgContext) {
 		if (name === "deploy-preview") continue;
 		if (allowedWorkflows && !allowedWorkflows.has(name)) continue;
 		const rawWith = withOverrides?.get(name);
-		const normalizedWith = rawWith ? normalizeWorkflowWith(rawWith) : void 0;
+		const normalizedWith = rawWith ? normalizeWorkflowWith(rawWith, orgContext?.repoName) : void 0;
 		const additionalPaths = name === "deploy" && rawWith ? deriveDeployPaths(rawWith) : void 0;
 		if (name === "deploy" && rawWith) {
 			const previewCfg = extractPreviewConfig(rawWith, orgContext);