@postxl/generator 1.3.0 → 1.3.2

package/dist/helpers/package-json.generator.js

@@ -17,6 +17,18 @@ function isPostXlWorkspacePackageName(packageName) {
     return !('version' in packageName) && packageName.packageName.startsWith('@postxl/');
 }
 function generatePackageJson({ dependencies, devDependencies, scripts, name, description, type: pType, isInPostXlWorkspace, }) {
+    const depsObject = dependencies.length > 0
+        ? dependencies
+            .map((dependency) => toDependency_Package({ dependency, isInPostXlWorkspace }))
+            .toSorted((a, b) => a.packageName.localeCompare(b.packageName))
+            .reduce((acc, dep) => ({ ...acc, [dep.packageName]: dep.version }), {})
+        : undefined;
+    const devDepsObject = devDependencies.length > 0
+        ? devDependencies
+            .map((dependency) => toDependency_Package({ dependency, isInPostXlWorkspace }))
+            .toSorted((a, b) => a.packageName.localeCompare(b.packageName))
+            .reduce((acc, dep) => ({ ...acc, [dep.packageName]: dep.version }), {})
+        : undefined;
     return JSON.stringify({
         name,
         version: '0.0.0',
@@ -29,14 +41,8 @@ function generatePackageJson({ dependencies, devDependencies, scripts, name, des
             .reduce((acc, script) => ({ ...acc, [script.name]: script.command }), {}),
         packageManager: `pnpm@${exports.PNPM_VERSION}`,
         devEngines: { runtime: { name: 'node', version: exports.NODE_VERSION, onFail: 'download' } },
-        dependencies: dependencies
-            .map((dependency) => toDependency_Package({ dependency, isInPostXlWorkspace }))
-            .toSorted((a, b) => a.packageName.localeCompare(b.packageName))
-            .reduce((acc, dep) => ({ ...acc, [dep.packageName]: dep.version }), {}),
-        devDependencies: devDependencies
-            .map((dependency) => toDependency_Package({ dependency, isInPostXlWorkspace }))
-            .toSorted((a, b) => a.packageName.localeCompare(b.packageName))
-            .reduce((acc, dep) => ({ ...acc, [dep.packageName]: dep.version }), {}),
+        ...(depsObject ? { dependencies: depsObject } : {}),
+        ...(devDepsObject ? { devDependencies: devDepsObject } : {}),
         license: 'UNLICENSED',
     });
 }

package/dist/utils/prettier.js

@@ -51,14 +51,26 @@ const parsers = {
     '.yml': 'yaml',
     '.css': 'css',
 };
+/**
+ * Prettier config override for package.json files.
+ *
+ * Uses a smaller printWidth to ensure nested objects like `devEngines` are expanded
+ * across multiple lines. This matches pnpm's package.json formatting, which prevents
+ * formatting conflicts when running `pnpm install` after generation.
+ */
+const packageJsonConfig = {
+    ...prettier_config_1.prettierConfig,
+    printWidth: 70,
+};
 async function format({ path, content }) {
     const ext = (0, path_1.extname)(path);
     const parser = parsers[ext];
     if (parser === undefined || typeof content !== 'string') {
         return content;
     }
+    const config = (0, path_1.basename)(path) === 'package.json' ? packageJsonConfig : prettier_config_1.prettierConfig;
     try {
-        return await prettier.format(content, { ...prettier_config_1.prettierConfig, parser });
+        return await prettier.format(content, { ...config, parser });
     }
     catch (err) {
         console.error(`${content}\n\nFailed to format ${path}\n\n`);

package/dist/utils/sync.js

@@ -154,6 +154,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
     await Promise.all(tasks);
     return { success: true, ...result };
 }
+const validFilesWithMergeConflictMarkers = new Set([
+    '/CLAUDE.md', // Contains instructions for resolving merge conflicts
+]);
 /**
  * Finds all files in the disk that contain unresolved merge conflict markers.
  *
@@ -163,7 +166,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
 function findFilesWithMergeConflicts(files) {
     const filesWithConflicts = [];
     for (const [filePath, { disk }] of files) {
-        if (disk.state === 'hash' && (0, merge_conflict_1.hasMergeConflictMarkers)(disk.content)) {
+        if (disk.state === 'hash' &&
+            (0, merge_conflict_1.hasMergeConflictMarkers)(disk.content) &&
+            !validFilesWithMergeConflictMarkers.has(filePath)) {
             filesWithConflicts.push(filePath);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Core package that orchestrates the code generation of a PXL project",
   "main": "./dist/index.js",
   "module": "./dist/index.js",