create-aerobuilt 0.2.8 → 0.2.10

package/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { cpSync, mkdirSync, existsSync, statSync, readdirSync, lstatSync } from 'fs'
+import { cpSync, mkdirSync, existsSync, statSync, readdirSync, readFileSync } from 'fs'
 import { dirname, join, basename } from 'path'
 import { fileURLToPath } from 'url'
 import { spawnSync } from 'child_process'
@@ -33,6 +33,7 @@ function copyTemplate(src, dest) {
 		if (name === 'dist' || name === '.output') return true
 		if (name.endsWith('.log') || name === '.DS_Store') return true
 		if (name === '.vite' || name === '.nitro') return true
+		if (name === 'package.json' || name === 'package-template.json') return true
 		return false
 	}
 	mkdirSync(dest, { recursive: true })
@@ -137,9 +138,18 @@ function main() {
 	}
 
 	const templatePath = resolveTemplatePath(template)
+	let aerobuiltVersion = null
+	if (!inMonorepo) {
+		try {
+			const cliPkg = JSON.parse(readFileSync(join(startPkgDir, 'package.json'), 'utf8'))
+			aerobuiltVersion = cliPkg.version || null
+		} catch {
+			// ignore; lib will fall back to *
+		}
+	}
 	console.log(`Creating Aero app in ${target} from template "${template}"...`)
 	copyTemplate(templatePath, targetDir)
-	rewritePackageJson(targetDir, target, inMonorepo)
+	rewritePackageJson(templatePath, targetDir, target, inMonorepo, aerobuiltVersion)
 	writeReadme(targetDir, target, template)
 	console.log('Installing dependencies...')
 	if (inMonorepo) {

package/lib.js

@@ -24,28 +24,31 @@ export function parseArgs(argv) {
 	return { target, template }
 }
 
+const PACKAGE_TEMPLATE = 'package-template.json'
+
 /**
- * Rewrite package.json in targetDir: set name to projectName; if !inMonorepo, replace workspace:* with *.
- * @param {string} targetDir
- * @param {string} projectName
- * @param {boolean} inMonorepo
+ * Write package.json in targetDir from the template's package-template.json, with name and aerobuilt version filled in.
+ * @param {string} templatePath - Path to the template directory (e.g. packages/templates/minimal)
+ * @param {string} targetDir - Path to the scaffolded project directory
+ * @param {string} projectName - Project name for package.json "name"
+ * @param {boolean} inMonorepo - If true, use workspace:* for aerobuilt; otherwise use aerobuiltVersion
+ * @param {string} [aerobuiltVersion] - When !inMonorepo, version range for aerobuilt (e.g. ^0.2.9). Omit to use '*'.
  */
-export function rewritePackageJson(targetDir, projectName, inMonorepo) {
-	const pkgPath = join(targetDir, 'package.json')
-	if (!existsSync(pkgPath)) return
-	const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
+export function rewritePackageJson(templatePath, targetDir, projectName, inMonorepo, aerobuiltVersion) {
+	const templatePkgPath = join(templatePath, PACKAGE_TEMPLATE)
+	if (!existsSync(templatePkgPath)) {
+		console.error(
+			`create-aerobuilt: template is missing ${PACKAGE_TEMPLATE}. Each template must provide this file.`,
+		)
+		process.exit(1)
+	}
+	const pkg = JSON.parse(readFileSync(templatePkgPath, 'utf8'))
 	pkg.name = projectName
-	if (!inMonorepo) {
-		const rewrite = deps => {
-			if (!deps) return
-			for (const key of Object.keys(deps)) {
-				if (deps[key] === 'workspace:*') deps[key] = '*'
-			}
-		}
-		rewrite(pkg.dependencies)
-		rewrite(pkg.devDependencies)
+	const depVersion = inMonorepo ? 'workspace:*' : (aerobuiltVersion ? `^${aerobuiltVersion}` : '*')
+	if (pkg.dependencies && pkg.dependencies.aerobuilt !== undefined) {
+		pkg.dependencies.aerobuilt = depVersion
 	}
-	writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
+	writeFileSync(join(targetDir, 'package.json'), JSON.stringify(pkg, null, 2) + '\n')
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aerobuilt",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "type": "module",
   "license": "MIT",
   "author": "Jamie Wilson",
@@ -19,7 +19,7 @@
     "create-aerobuilt": "index.js"
   },
   "dependencies": {
-    "@aerobuilt/template-minimal": "0.2.8"
+    "@aerobuilt/template-minimal": "0.2.10"
   },
   "scripts": {
     "create": "node .",