@podosoft/podokit 0.12.0 → 0.12.1

package/dist/update.js

@@ -124,6 +124,20 @@ function planUpdate(projectRoot, templatesDir) {
         changes,
     };
 }
+function assertPreviousExternalModulesInstalled(projectRoot, templatesDir, modules) {
+    const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
+    for (const module of modules) {
+        if (!module.packageName || !module.moduleVersion)
+            continue;
+        const resolved = (0, add_1.resolveModule)(module.packageName, modulesDir, projectRoot);
+        if (!resolved?.moduleVersion || resolved.moduleVersion === module.moduleVersion)
+            continue;
+        throw new Error(`Cannot use --from while external module "${module.packageName}" is installed at ` +
+            `${resolved.moduleVersion} but the project records ${module.moduleVersion}. Restore ` +
+            `${module.packageName}@${module.moduleVersion}, update PodoKit with --from, then upgrade ` +
+            "external modules separately.");
+    }
+}
 function writeFile(projectRoot, path, content) {
     const abs = (0, node_path_1.join)(projectRoot, path);
     (0, node_fs_1.mkdirSync)((0, node_path_1.dirname)(abs), { recursive: true });
@@ -188,7 +202,11 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
     });
     const managedOverrides = targetManagedOverrides(projectRoot, templatesDir, modules, manifest.managedOverrides);
     const ownedGlobs = targetOwnedGlobs(projectRoot, templatesDir, modules, manifest.ownedGlobs);
-    const oldTree = options.oldTemplatesDir
+    const needsMergeBase = plan.changes.some((change) => change.action === "conflict");
+    if (options.oldTemplatesDir && needsMergeBase) {
+        assertPreviousExternalModulesInstalled(projectRoot, templatesDir, modules);
+    }
+    const oldTree = options.oldTemplatesDir && needsMergeBase
         ? (0, assemble_1.assembleProject)({
             templatesDir: options.oldTemplatesDir,
             template: manifest.template,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podosoft/podokit",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "An opinionated but extensible starter toolkit and CLI for full-stack TypeScript apps with NestJS, SvelteKit, TailwindCSS, shadcn-svelte, Docker, and k3s.",
   "license": "Apache-2.0",
   "repository": {