@noego/app 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noego/app",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Production build tool for Dinner/Forge apps.",
   "type": "module",
   "bin": {

package/src/build/server.js

@@ -64,10 +64,26 @@ async function reorganizeServerOutputs(context) {
   await fs.mkdir(serverOutDir, { recursive: true });
   await fs.cp(tsOutDir, serverOutDir, { recursive: true });
 
-  const nestedServerDir = path.join(serverOutDir, 'server');
+  // Flatten the server directory from the tsc output structure.
+  // When source is under src/server/, tsc produces src/server/ in the output.
+  // Compute the actual relative path to the server root directory and flatten it.
+  const serverRootRel = path.relative(config.rootDir, config.server.rootDir);
+  const nestedServerDir = serverRootRel
+    ? path.join(serverOutDir, serverRootRel)
+    : path.join(serverOutDir, 'server');
   if (await pathExists(nestedServerDir)) {
     await fs.cp(nestedServerDir, serverOutDir, { recursive: true, force: true });
+    // Remove only the nested server directory, preserving sibling dirs (middleware, ui, etc.)
     await fs.rm(nestedServerDir, { recursive: true, force: true });
+    // If the prefix dir (e.g. 'src') is now empty, clean it up
+    if (serverRootRel && serverRootRel.includes(path.sep)) {
+      const topLevelDir = serverRootRel.split(path.sep)[0];
+      const topLevelPath = path.join(serverOutDir, topLevelDir);
+      const remaining = await fs.readdir(topLevelPath).catch(() => []);
+      if (remaining.length === 0) {
+        await fs.rm(topLevelPath, { recursive: true, force: true });
+      }
+    }
   }
 
   const compiledEntryRel = replaceExtension(
@@ -109,9 +125,10 @@ async function copyServerAssets(context) {
       dot: true
     });
     for (const absoluteSrc of matches) {
+      const serverRel = path.relative(config.rootDir, config.server.rootDir);
       await copyRelativeTo(absoluteSrc, config.layout.serverOutDir, config, logger, {
         seen: copiedSql,
-        stripSegments: ['server']
+        stripSegments: serverRel.split(path.sep)
       });
     }
   }