@podosoft/podokit 0.8.0 → 0.10.0

package/dist/update.js

@@ -9,6 +9,7 @@ const podokit_template_engine_1 = require("@podosoft/podokit-template-engine");
 const assemble_1 = require("./assemble");
 const lockfile_1 = require("./lockfile");
 const inspect_1 = require("./inspect");
+const add_1 = require("./add");
 function treeText(tree, path) {
     const file = tree.get(path);
     if (!file)
@@ -32,7 +33,8 @@ function planUpdate(projectRoot, templatesDir) {
         templatesDir,
         template: manifest.template,
         answers: manifest.answers,
-        modules: manifest.modules.map((m) => m.name),
+        modules: manifest.modules,
+        projectRoot,
     });
     const changes = [];
     const paths = new Set([...newTree.keys(), ...Object.keys(lock.files)]);
@@ -92,6 +94,40 @@ function writeFile(projectRoot, path, content) {
     (0, node_fs_1.mkdirSync)((0, node_path_1.dirname)(abs), { recursive: true });
     (0, node_fs_1.writeFileSync)(abs, content);
 }
+/**
+ * Refresh update metadata without teaching the lock that a clean 3-way merge is
+ * PodoKit's new baseline. Managed files keep the newly assembled template hash,
+ * so the user's merged lines are still recognised as edits on the next update.
+ * Files that are neither in the assembled tree nor explicitly owned stay out of
+ * the lock instead of being accidentally adopted as managed files.
+ */
+function updatedFilesLock(projectRoot, newTree, previous, ownedGlobs) {
+    const next = (0, lockfile_1.computeFilesLock)(projectRoot, ownedGlobs);
+    for (const [path, entry] of Object.entries(next.files)) {
+        const newText = treeText(newTree, path);
+        if (newText !== null) {
+            if (entry.tier !== "owned") {
+                entry.tier = previous.files[path]?.tier ?? entry.tier;
+                entry.outHash = (0, podokit_template_engine_1.hashContent)(newText);
+            }
+            continue;
+        }
+        if (entry.tier === "owned")
+            continue;
+        const oldEntry = previous.files[path];
+        if (oldEntry && oldEntry.tier !== "owned") {
+            // Removed upstream but kept on disk because it was edited: continue to
+            // report the removal conflict until the user deletes or ejects it.
+            entry.tier = oldEntry.tier;
+            entry.outHash = oldEntry.outHash;
+        }
+        else {
+            // A file created by the application is not implicitly PodoKit-managed.
+            delete next.files[path];
+        }
+    }
+    return next;
+}
 /**
  * Apply an update to the working copy. Clean updates and additions are written,
  * upstream removals deleted, and user-edited files 3-way merged against the old
@@ -101,13 +137,26 @@ function writeFile(projectRoot, path, content) {
  */
 function applyUpdate(projectRoot, templatesDir, options = {}) {
     const manifest = (0, lockfile_1.readManifest)(projectRoot);
-    if (!manifest)
+    const previousLock = (0, lockfile_1.readFilesLock)(projectRoot);
+    if (!manifest || !previousLock)
         throw new inspect_1.NotAProjectError();
     const plan = planUpdate(projectRoot, templatesDir);
-    const modules = manifest.modules.map((m) => m.name);
-    const newTree = (0, assemble_1.assembleProject)({ templatesDir, template: manifest.template, answers: manifest.answers, modules });
+    const modules = manifest.modules;
+    const newTree = (0, assemble_1.assembleProject)({
+        templatesDir,
+        template: manifest.template,
+        answers: manifest.answers,
+        modules,
+        projectRoot,
+    });
     const oldTree = options.oldTemplatesDir
-        ? (0, assemble_1.assembleProject)({ templatesDir: options.oldTemplatesDir, template: manifest.template, answers: manifest.answers, modules })
+        ? (0, assemble_1.assembleProject)({
+            templatesDir: options.oldTemplatesDir,
+            template: manifest.template,
+            answers: manifest.answers,
+            modules,
+            projectRoot,
+        })
         : null;
     const result = { written: [], removed: [], merged: [], conflicts: [] };
     for (const change of plan.changes) {
@@ -136,9 +185,26 @@ function applyUpdate(projectRoot, templatesDir, options = {}) {
                 result.merged.push(change.path);
         }
     }
-    // Refresh the lock to match what we just wrote and stamp the new version.
-    (0, lockfile_1.writeFilesLock)(projectRoot, (0, lockfile_1.computeFilesLock)(projectRoot, manifest.ownedGlobs));
-    (0, lockfile_1.writeManifest)(projectRoot, { ...manifest, podokitVersion: (0, lockfile_1.podokitVersion)() });
+    // Keep the assembled target as the managed baseline. A merged working file
+    // intentionally remains drifted so a future update performs another 3-way
+    // merge instead of treating the user's lines as clean generated output.
+    (0, lockfile_1.writeFilesLock)(projectRoot, updatedFilesLock(projectRoot, newTree, previousLock, manifest.ownedGlobs));
+    const modulesDir = (0, node_path_1.join)(templatesDir, "modules");
+    const refreshedModules = manifest.modules.map((module) => {
+        const resolved = (0, add_1.resolveModule)(module.packageName ?? module.name, modulesDir, projectRoot);
+        return resolved?.packageName
+            ? {
+                ...module,
+                packageName: resolved.packageName,
+                moduleVersion: resolved.moduleVersion,
+            }
+            : module;
+    });
+    (0, lockfile_1.writeManifest)(projectRoot, {
+        ...manifest,
+        modules: refreshedModules,
+        podokitVersion: (0, lockfile_1.podokitVersion)(),
+    });
     return result;
 }
 /** Count actions for a one-line summary. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podosoft/podokit",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "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": {

package/dist/templates/modules/admin-dashboard/files/apps/web/src/routes/+layout.svelte

@@ -1,61 +0,0 @@
-<script lang="ts">
-  import "../app.css";
-  import { ModeWatcher } from "mode-watcher";
-  import { setI18nContext } from "$lib/i18n";
-  import { messages, resolveLocale } from "$lib/i18n/messages";
-  import { site } from "$lib/site.svelte";
-
-  let { children, data } = $props();
-  const locale = $derived(resolveLocale(data.locale));
-  setI18nContext({
-    get t() {
-      return messages[locale];
-    },
-    get locale() {
-      return locale;
-    },
-  });
-
-  // Seed the reactive site branding; the general-settings form patches it live.
-  $effect.pre(() => site.init(data.site));
-  // Prefer live store values (patched after a save); fall back to the server load
-  // so SSR renders the saved branding too. Empty falls back to the app.html default.
-  const branding = $derived({
-    name: site.value.name ?? data.site?.name ?? "",
-    description: site.value.description ?? data.site?.description ?? "",
-    brandColor: site.value.brandColor ?? data.site?.brandColor ?? "",
-    hasFavicon: site.value.hasFavicon || Boolean(data.site?.hasFavicon),
-    faviconVersion: site.value.faviconVersion ?? data.site?.faviconVersion ?? "",
-  });
-  // Apply the site name to the browser tab live (avoids a duplicate <title> vs
-  // the app.html default; the default project name stays as the SSR fallback).
-  $effect(() => {
-    if (branding.name) document.title = branding.name;
-  });
-  // Apply the brand color as the theme's primary accent live. Clearing it in
-  // Settings restores the stylesheet default (remove the inline override).
-  $effect(() => {
-    const root = document.documentElement;
-    if (branding.brandColor) {
-      root.style.setProperty("--primary", branding.brandColor);
-      root.style.setProperty("--sidebar-primary", branding.brandColor);
-      root.style.setProperty("--ring", branding.brandColor);
-    } else {
-      root.style.removeProperty("--primary");
-      root.style.removeProperty("--sidebar-primary");
-      root.style.removeProperty("--ring");
-    }
-  });
-</script>
-
-<svelte:head>
-  {#if branding.description}
-    <meta name="description" content={branding.description} />
-  {/if}
-  {#if branding.hasFavicon}
-    <link rel="icon" href={`/api/site/favicon?v=${branding.faviconVersion}`} />
-  {/if}
-</svelte:head>
-
-<ModeWatcher />
-{@render children()}