Sync template

Author: mayank1513

.github/workflows/docs.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Exit early if lib/package.json was modified
         if: env.file_changed == 'true'
-        run: exit 1
+        run: exit 0
 
       - uses: actions/setup-node@v4
         with:

.gitignore

@@ -15,3 +15,4 @@ coverage
 # temporary files
 tsup.config.bundled*
 *.patch
+.merge-backups

.turborepo-template.lst

@@ -1 +1 @@
-efa6f56026cab3d74a4e8ff491279c5d68cc036c
+dd921f8f3ca60718cbc1b9b5d6617cd27bd9a499

examples/nextjs/package.json

@@ -13,7 +13,6 @@
   },
   "dependencies": {
     "@repo/shared": "workspace:*",
-    "git-json-resolver": "workspace:*",
     "next": "^15.5.2",
     "nextjs-darkmode-lite": "^1.0.10",
     "nextjs-themes": "^4.0.6",
@@ -31,4 +30,4 @@
     "@types/react-dom": "^19.1.9",
     "typescript": "^5.9.2"
   }
-}
+}

package.json

@@ -42,4 +42,4 @@
       "next@>=15.0.0 <15.2.3": ">=15.2.3"
     }
   }
-}
+}

pnpm-lock.yaml

@@ -2,6 +2,12 @@ const { execSync } = require("child_process");
 
 // Publish canonical packages
 ["json-merge-resolver", "json-conflict-resolver", "git-conflict-resolver"].forEach(pkg => {
-  execSync(`sed -i -e "s/name.*/name\\": \\"${pkg.replace(/\//g, "\\\\/")}\\",/" lib/package.json`);
-  execSync("cd lib && npm publish --provenance --access public");
+  try {
+    execSync(
+      `sed -i -e "s/name.*/name\\": \\"${pkg.replace(/\//g, "\\\\/")}\\",/" lib/package.json`,
+    );
+    execSync("cd lib && npm publish --provenance --access public");
+  } catch (err) {
+    console.error(`Error publishing ${pkg}: `, err);
+  }
 });