frontpl 0.4.0 → 0.4.1

package/README.md

@@ -27,6 +27,7 @@ frontpl init my-frontend
 Follow the prompts to choose:
 
 - Package manager (`npm`/`pnpm`/`yarn`/`bun`/`deno`)
+- Optional `pnpm workspace` mode (monorepo skeleton)
 - Optional tooling: `oxlint`, `oxfmt`, `vitest`, `tsdown`
 
 When `oxlint` is enabled, generated projects use `@kingsword/lint-config` via `oxlint.config.ts`.
@@ -53,6 +54,12 @@ Generated output includes (based on options):
 - Optional configs: `oxlint.config.ts`, `.oxfmtrc.json`, `tsdown.config.ts`
 - Optional GitHub Actions workflows in `.github/workflows/`
 
+When `pnpm workspace mode` is enabled:
+
+- Root contains `pnpm-workspace.yaml` and the workspace `package.json`
+- `oxlint`/`oxfmt` scripts, dependencies, and config files are generated at the workspace root
+- App/library package is scaffolded under `packages/<name>/` with its own `package.json`, `src`, and `tsconfig.json`
+
 ### `frontpl ci`
 
 Add or update CI/Release workflows for an existing project (run it in your repo root).
@@ -138,6 +145,7 @@ When CI workflows are enabled, frontpl can also generate `.github/dependabot.yml
 - Keeps `github-actions` updates enabled
 - Adds grouped dependencies updates (`groups.dependencies`)
 - Uses the selected `workingDirectory` (`.` -> `/`, monorepo package -> `/packages/<name>`)
+- In `frontpl init` + `pnpm workspace mode`, default `workingDirectory` is workspace root (`/`)
 - Maps JavaScript package managers (`npm`/`pnpm`/`yarn`/`bun`) to Dependabot `package-ecosystem: "npm"`
 
 ## Development

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as runCi, n as runOxlint, r as runInit, t as runOxfmt } from "./oxfmt-Bgtl3zwv.mjs";
+import { a as runCi, n as runOxlint, r as runInit, t as runOxfmt } from "./oxfmt-DlwbhnpJ.mjs";
 import bin from "tiny-bin";
 
 //#region src/cli.ts

package/dist/index.d.mts

@@ -46,6 +46,18 @@ declare function packageJsonTemplate(opts: {
   useTsdown: boolean;
   tsdownVersion?: string;
 }): string;
+declare function workspaceRootPackageJsonTemplate(opts: {
+  name: string;
+  packageManager: string;
+  useOxlint: boolean;
+  oxlintVersion?: string;
+  oxlintTsgolintVersion?: string;
+  kingswordLintConfigVersion?: string;
+  useOxfmt: boolean;
+  oxfmtVersion?: string;
+  useVitest: boolean;
+  useTsdown: boolean;
+}): string;
 declare function githubCliCiWorkflowTemplate(opts: {
   packageManager: "npm" | "pnpm" | "yarn" | "bun" | "deno";
   nodeVersion: number;
@@ -65,4 +77,4 @@ declare function githubDependabotTemplate(opts: {
   workingDirectory: string;
 }): string;
 //#endregion
-export { githubCliCiWorkflowTemplate, githubDependabotTemplate, oxlintConfigTemplate, packageJsonTemplate, runCi, runInit, runOxfmt, runOxlint, validateProjectName };
+export { githubCliCiWorkflowTemplate, githubDependabotTemplate, oxlintConfigTemplate, packageJsonTemplate, runCi, runInit, runOxfmt, runOxlint, validateProjectName, workspaceRootPackageJsonTemplate };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { a as runCi, c as oxlintConfigTemplate, i as validateProjectName, l as packageJsonTemplate, n as runOxlint, o as githubCliCiWorkflowTemplate, r as runInit, s as githubDependabotTemplate, t as runOxfmt } from "./oxfmt-Bgtl3zwv.mjs";
+import { a as runCi, c as oxlintConfigTemplate, i as validateProjectName, l as packageJsonTemplate, n as runOxlint, o as githubCliCiWorkflowTemplate, r as runInit, s as githubDependabotTemplate, t as runOxfmt, u as workspaceRootPackageJsonTemplate } from "./oxfmt-DlwbhnpJ.mjs";
 
-export { githubCliCiWorkflowTemplate, githubDependabotTemplate, oxlintConfigTemplate, packageJsonTemplate, runCi, runInit, runOxfmt, runOxlint, validateProjectName };
+export { githubCliCiWorkflowTemplate, githubDependabotTemplate, oxlintConfigTemplate, packageJsonTemplate, runCi, runInit, runOxfmt, runOxlint, validateProjectName, workspaceRootPackageJsonTemplate };

package/dist/{oxfmt-Bgtl3zwv.mjs → oxfmt-DlwbhnpJ.mjs}

@@ -152,28 +152,35 @@ function tsdownConfigTemplate() {
 		""
 	].join("\n");
 }
-function packageJsonTemplate(opts) {
-	const scripts = {};
+function applyLintAndFormatScripts(scripts, opts) {
 	if (opts.useOxlint) {
 		const oxlintCmd = "oxlint --type-aware --type-check";
 		scripts.lint = oxlintCmd;
 		scripts["lint:fix"] = `${oxlintCmd} --fix`;
-	} else scripts.typecheck = "tsc --noEmit";
+	}
 	if (opts.useOxfmt) {
 		scripts.format = "oxfmt";
 		scripts["format:check"] = "oxfmt --check";
 		scripts.fmt = "oxfmt";
 		scripts["fmt:check"] = "oxfmt --check";
 	}
-	if (opts.useVitest) scripts.test = "vitest";
-	if (opts.useTsdown) scripts.build = "tsdown";
-	const devDependencies = { typescript: opts.typescriptVersion };
+}
+function applyLintAndFormatDependencies(devDependencies, opts) {
 	if (opts.useOxlint) {
 		if (opts.oxlintVersion) devDependencies.oxlint = opts.oxlintVersion;
 		if (opts.oxlintTsgolintVersion) devDependencies["oxlint-tsgolint"] = opts.oxlintTsgolintVersion;
 		if (opts.kingswordLintConfigVersion) devDependencies["@kingsword/lint-config"] = opts.kingswordLintConfigVersion;
 	}
 	if (opts.useOxfmt && opts.oxfmtVersion) devDependencies.oxfmt = opts.oxfmtVersion;
+}
+function packageJsonTemplate(opts) {
+	const scripts = {};
+	if (!opts.useOxlint) scripts.typecheck = "tsc --noEmit";
+	applyLintAndFormatScripts(scripts, opts);
+	if (opts.useVitest) scripts.test = "vitest";
+	if (opts.useTsdown) scripts.build = "tsdown";
+	const devDependencies = { typescript: opts.typescriptVersion };
+	applyLintAndFormatDependencies(devDependencies, opts);
 	if (opts.useVitest && opts.vitestVersion) devDependencies.vitest = opts.vitestVersion;
 	if (opts.useTsdown && opts.tsdownVersion) devDependencies.tsdown = opts.tsdownVersion;
 	return JSON.stringify({
@@ -186,6 +193,22 @@ function packageJsonTemplate(opts) {
 		packageManager: opts.packageManager
 	}, null, 2) + "\n";
 }
+function workspaceRootPackageJsonTemplate(opts) {
+	const scripts = {};
+	applyLintAndFormatScripts(scripts, opts);
+	if (opts.useVitest) scripts.test = "pnpm -r --if-present run test";
+	if (opts.useTsdown) scripts.build = "pnpm -r --if-present run build";
+	const devDependencies = {};
+	applyLintAndFormatDependencies(devDependencies, opts);
+	const manifest = {
+		name: opts.name,
+		private: true,
+		packageManager: opts.packageManager
+	};
+	if (Object.keys(scripts).length > 0) manifest.scripts = scripts;
+	if (Object.keys(devDependencies).length > 0) manifest.devDependencies = devDependencies;
+	return JSON.stringify(manifest, null, 2) + "\n";
+}
 const DEFAULT_WORKFLOWS_REF = "7320d30bcd47cee17cc2d8d28250ba1ab1f742b8";
 const DEFAULT_WORKFLOWS_VERSION = "v1.0.3";
 function resolveWorkflowsPin(opts) {
@@ -833,6 +856,9 @@ async function runInit({ nameArg }) {
 		return;
 	}
 	const pkgDir = pnpmWorkspace ? path.join(rootDir, "packages", projectName) : rootDir;
+	const toolingDir = pnpmWorkspace ? rootDir : pkgDir;
+	const packageUseOxlint = pnpmWorkspace ? false : useOxlint;
+	const packageUseOxfmt = pnpmWorkspace ? false : useOxfmt;
 	const pmVersion = await detectPackageManagerVersion(packageManager);
 	const packageManagerField = pmVersion ? `${packageManager}@${pmVersion}` : `${packageManager}@latest`;
 	await mkdir(path.join(pkgDir, "src"), { recursive: true });
@@ -847,11 +873,18 @@ async function runInit({ nameArg }) {
 			"  - \"packages/*\"",
 			""
 		].join("\n"));
-		await writeText(path.join(rootDir, "package.json"), JSON.stringify({
+		await writeText(path.join(rootDir, "package.json"), workspaceRootPackageJsonTemplate({
 			name: projectName,
-			private: true,
-			packageManager: packageManagerField
-		}, null, 2) + "\n");
+			packageManager: packageManagerField,
+			useOxlint,
+			oxlintVersion: "latest",
+			oxlintTsgolintVersion: "latest",
+			kingswordLintConfigVersion: "latest",
+			useOxfmt,
+			oxfmtVersion: "latest",
+			useVitest,
+			useTsdown
+		}));
 	}
 	await Promise.all([
 		writeText(path.join(pkgDir, "README.md"), readmeTemplate(projectName)),
@@ -861,11 +894,11 @@ async function runInit({ nameArg }) {
 			name: projectName,
 			packageManager: packageManagerField,
 			typescriptVersion: "latest",
-			useOxlint,
+			useOxlint: packageUseOxlint,
 			oxlintVersion: "latest",
 			oxlintTsgolintVersion: "latest",
 			kingswordLintConfigVersion: "latest",
-			useOxfmt,
+			useOxfmt: packageUseOxfmt,
 			oxfmtVersion: "latest",
 			useVitest,
 			vitestVersion: "latest",
@@ -873,13 +906,13 @@ async function runInit({ nameArg }) {
 			tsdownVersion: "latest"
 		}))
 	]);
-	if (useOxlint) await writeText(path.join(pkgDir, "oxlint.config.ts"), oxlintConfigTemplate({ useVitest }));
-	if (useOxfmt) await writeText(path.join(pkgDir, ".oxfmtrc.json"), oxfmtConfigTemplate());
+	if (useOxlint) await writeText(path.join(toolingDir, "oxlint.config.ts"), oxlintConfigTemplate({ useVitest }));
+	if (useOxfmt) await writeText(path.join(toolingDir, ".oxfmtrc.json"), oxfmtConfigTemplate());
 	if (useVitest) await writeText(path.join(pkgDir, "src/index.test.ts"), srcVitestTemplate());
 	if (useTsdown) await writeText(path.join(pkgDir, "tsdown.config.ts"), tsdownConfigTemplate());
 	if (packageManager === "deno") await writeText(path.join(rootDir, "deno.json"), JSON.stringify({ nodeModulesDir: "auto" }, null, 2) + "\n");
 	if (githubActions !== "none") {
-		const workingDirectory = pnpmWorkspace ? path.posix.join("packages", projectName) : ".";
+		const workingDirectory = ".";
 		const lintCommand = useOxlint && packageManager !== "deno" ? pmRun(packageManager, "lint") : void 0;
 		const formatCheckCommand = useOxfmt && packageManager !== "deno" ? pmRun(packageManager, "format:check") : void 0;
 		const testCommand = useVitest && packageManager !== "deno" ? pmRun(packageManager, "test") : void 0;
@@ -1454,4 +1487,4 @@ function abort(opts = {}) {
 }
 
 //#endregion
-export { runCi as a, oxlintConfigTemplate as c, validateProjectName as i, packageJsonTemplate as l, runOxlint as n, githubCliCiWorkflowTemplate as o, runInit as r, githubDependabotTemplate as s, runOxfmt as t };
+export { runCi as a, oxlintConfigTemplate as c, validateProjectName as i, packageJsonTemplate as l, runOxlint as n, githubCliCiWorkflowTemplate as o, runInit as r, githubDependabotTemplate as s, runOxfmt as t, workspaceRootPackageJsonTemplate as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontpl",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Interactive CLI to scaffold standardized frontend project templates.",
   "keywords": [
     "cli",