@vexblocks/cli 1.1.1 → 1.1.3

package/dist/index.js

@@ -33,7 +33,12 @@ var PROTECTED_FILES = [
   "packages/backend/convex/cms/vexblocks.config.ts",
   "packages/backend/.env",
   "packages/backend/.env.local",
-  "packages/cms-shared/src/types/generated.ts"
+  "packages/backend/package.json",
+  "packages/cms-shared/src/types/generated.ts",
+  "packages/backend/emails/change-email-template.ts",
+  "packages/backend/emails/otp-email-template.ts",
+  "packages/backend/emails/delete-account-template.ts",
+  "packages/backend/emails/invite-email-template.ts"
 ];
 var PACKAGE_DEPENDENCIES = {
   cms: ["backend", "shared"],
@@ -88,6 +93,47 @@ async function getPackageManager(cwd) {
   }
   return "npm";
 }
+async function mergePackageJson(targetPath, sourcePackageJson) {
+  let existingPackageJson = {};
+  if (await fs.pathExists(targetPath)) {
+    existingPackageJson = await fs.readJson(targetPath);
+  }
+  const mergedPackageJson = {
+    // Preserve user's name and version if they exist
+    name: existingPackageJson.name || sourcePackageJson.name,
+    version: existingPackageJson.version || sourcePackageJson.version,
+    private: sourcePackageJson.private,
+    // Merge scripts (source scripts take precedence for VexBlocks-specific scripts)
+    scripts: {
+      ...existingPackageJson.scripts,
+      ...sourcePackageJson.scripts
+    },
+    // Merge dependencies (source versions take precedence)
+    dependencies: {
+      ...existingPackageJson.dependencies,
+      ...sourcePackageJson.dependencies
+    },
+    // Merge devDependencies (source versions take precedence)
+    devDependencies: {
+      ...existingPackageJson.devDependencies,
+      ...sourcePackageJson.devDependencies
+    },
+    // Preserve any other custom fields from existing package.json
+    ...Object.fromEntries(
+      Object.entries(existingPackageJson).filter(
+        ([key]) => ![
+          "name",
+          "version",
+          "private",
+          "scripts",
+          "dependencies",
+          "devDependencies"
+        ].includes(key)
+      )
+    )
+  };
+  await fs.writeJson(targetPath, mergedPackageJson, { spaces: 2 });
+}
 
 // src/utils/github.ts
 import path2 from "path";
@@ -474,7 +520,14 @@ async function installBackendPackage(targetPath, sourcePath, spinner) {
   const hasSchema = await fs4.pathExists(existingSchemaPath);
   if (hasSchema) {
     spinner.text = "Detected existing Convex schema, merging CMS tables...";
-    const cmsFiles = ["convex/cms", "convex/auth.ts", "convex/auth.config.ts", "convex/http.ts", "better-auth", "emails"];
+    const cmsFiles = [
+      "convex/cms",
+      "convex/auth.ts",
+      "convex/auth.config.ts",
+      "convex/http.ts",
+      "better-auth",
+      "emails"
+    ];
     for (const file of cmsFiles) {
       const fullSourcePath = `${sourcePath}/${file}`;
       const fullTargetPath = path4.join(targetPath, file);
@@ -497,6 +550,17 @@ async function installBackendPackage(targetPath, sourcePath, spinner) {
       spinner.text = `Installing backend... ${pc2.dim(file)}`;
     });
   }
+  spinner.text = "Merging package.json...";
+  try {
+    const sourcePackageJsonContent = await fetchFile(
+      `${sourcePath}/package.json`
+    );
+    const sourcePackageJson = JSON.parse(sourcePackageJsonContent);
+    const targetPackageJsonPath = path4.join(targetPath, "package.json");
+    await mergePackageJson(targetPackageJsonPath, sourcePackageJson);
+  } catch {
+    spinner.warn("Could not merge package.json, skipping");
+  }
 }
 function showNextSteps(packages) {
   const packageManager = "pnpm";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vexblocks/cli",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"description": "CLI for adding VexBlocks Headless CMS to your Turborepo project",
 	"keywords": [
 		"cms",