updates

Author: abrulic

Dockerfile

@@ -18,8 +18,8 @@ RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3 && \
     rm -rf /var/lib/apt/lists/*
 
-COPY .npmrc package.json ./
-RUN pnpm install --prod=false
+COPY .npmrc package.json pnpm-lock.yaml ./
+RUN pnpm install --prod=false --frozen-lockfile
 
 
 COPY . .

app/components/code-block/code-block-syntax-highlighter.ts

@@ -10,7 +10,7 @@ const MASTER_REGEX = new RegExp(
 		// whitespace
 		"\\s+",
 		// single-line comment
-		"\\/\\/[^\\n\\r]*",
+		"\\/\\/[^\\n\\r]*(?=\\n|$)",
 		// multi-line comment
 		"\\/\\*[\\s\\S]*?\\*\\/",
 		// hash comment at start of line

app/ui/list-item.tsx

@@ -6,7 +6,7 @@ export const ListItem = (props: ComponentPropsWithoutRef<"li">) => {
 		<li
 			{...props}
 			className={cn(
-				"space-y-1 pl-1 text-[var(--color-text-normal)] text-base leading-7 md:text-lg md:leading-8 xl:leading-8 xl:leading-9 [&>li]:ml-2 [&>li]:marker:font-medium",
+				"space-y-1 pl-1 text-[var(--color-text-normal)] text-base leading-7 md:text-lg md:leading-8 xl:leading-8 [&>li]:ml-2 [&>li]:marker:font-medium",
 				props.className
 			)}
 		/>

scripts/generate-docs.ts

@@ -63,6 +63,15 @@ function resolveTagsFromSpec(spec: string) {
 	return matched.sort(semver.rcompare)
 }
 
+function hasLocalRef(ref: string) {
+	try {
+		run(`git show-ref --verify --quiet ${ref}`)
+		return true
+	} catch {
+		return false
+	}
+}
+
 function buildDocs(sourceDir: string, outDir: string) {
 	if (!existsSync(sourceDir)) {
 		throw new Error(
@@ -143,6 +152,16 @@ function buildRef(ref: string, labelForOutDir: string) {
 	}
 }
 
+function buildBranch(branch: string, labelForOutDir: string) {
+	run(`git fetch --tags --prune origin ${branch}`, {
+		cwd: workspaceRoot,
+		inherit: true,
+	})
+	const localRef = `refs/heads/${branch}`
+	const targetRef = hasLocalRef(localRef) ? localRef : `origin/${branch}`
+	return buildRef(targetRef, labelForOutDir)
+}
+
 function buildTag(tag: string) {
 	return buildRef(`refs/tags/${tag}`, tag)
 }
@@ -154,6 +173,31 @@ function getCurrentBranch(): string {
 		throw new Error("Failed to get current branch")
 	}
 }
+
+function isOnDefaultBranch(defaultBranch: string): boolean {
+	const currentBranch = getCurrentBranch()
+	return currentBranch === defaultBranch
+}
+
+/**
+ * Build the current workspace snapshot labelled `labelForOutDir`.
+ * If we're on the default branch, fetch and build that branch; otherwise
+ * build the working tree in-place (useful for PR/feature branches).
+ */
+function buildCurrentSnapshot(defaultBranch: string, onDefaultBranch: boolean, labelForOutDir = "current") {
+	if (onDefaultBranch) {
+		// build from the remote/default branch so the snapshot exactly matches the
+		// default branch state (not the local working tree)
+		// biome-ignore lint/suspicious/noConsole: keep for logging
+		console.log(chalk.cyan(`Building default branch '${defaultBranch}' → ${labelForOutDir}`))
+		buildBranch(defaultBranch, labelForOutDir)
+	} else {
+		// build the current workspace directly
+		// biome-ignore lint/suspicious/noConsole: keep for logging
+		console.log(chalk.cyan(`Building current workspace → ${labelForOutDir}`))
+		buildDocs(workspaceRoot, join(outputDir, labelForOutDir))
+	}
+}
 ;(async () => {
 	const { values } = parseArgs({
 		args: process.argv.slice(2),
@@ -163,12 +207,22 @@ function getCurrentBranch(): string {
 		},
 	})
 
+	const defaultBranch = (values.branch as string | undefined)?.trim()
+	if (!defaultBranch) {
+		throw new Error(
+			`❌ Missing required --branch flag.
+   Please specify the default branch name (e.g., --branch main)
+   Example: pnpm run generate:docs --branch main`
+		)
+	}
+
 	const rawVersions = (values.versions as string | undefined)?.trim() ?? ""
 	const hasVersionsArg = rawVersions.length > 0
 
 	let builtVersions: string[] = []
 
-	const currentBranchToBuild = getCurrentBranch()
+	const onDefaultBranch = isOnDefaultBranch(defaultBranch)
+	const currentBranchToBuild = onDefaultBranch ? defaultBranch : getCurrentBranch()
 
 	// biome-ignore lint/suspicious/noConsole: keep for logging
 	console.log(chalk.cyan(`Building from branch: ${currentBranchToBuild}`))
@@ -181,15 +235,11 @@ function getCurrentBranch(): string {
 		console.log(chalk.cyan(`Building tags: ${tags.join(", ")}`))
 		for (const t of tags) buildTag(t)
 
-		// biome-ignore lint/suspicious/noConsole: keep for logging
-		console.log(chalk.cyan("Building current workspace → current"))
-		buildDocs(workspaceRoot, join(outputDir, "current"))
+		buildCurrentSnapshot(defaultBranch, onDefaultBranch, "current")
 
 		builtVersions = ["current", ...tags]
 	} else {
-		// biome-ignore lint/suspicious/noConsole: keep for logging
-		console.log(chalk.cyan("Building current workspace → current"))
-		buildDocs(workspaceRoot, join(outputDir, "current"))
+		buildCurrentSnapshot(defaultBranch, onDefaultBranch, "current")
 
 		builtVersions = ["current"]
 	}