cli: fix incorrect target package for app and backend build

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/cli/src/commands/build/buildBackend.ts

@@ -49,19 +49,20 @@ export async function buildBackend(options: BuildBackendOptions) {
 
     // We built the target backend package using the regular build process, but the result of
     // that has now been packed into the dist workspace, so clean up the dist dir.
-    await fs.remove(targetDir);
-    await fs.mkdir(targetDir);
+    const distDir = resolvePath(targetDir, 'dist');
+    await fs.remove(distDir);
+    await fs.mkdir(distDir);
 
     // Move out skeleton.tar.gz before we create the main bundle, no point having that included up twice.
     await fs.move(
       resolvePath(tmpDir, SKELETON_FILE),
-      resolvePath(targetDir, SKELETON_FILE),
+      resolvePath(distDir, SKELETON_FILE),
     );
 
     // Create main bundle.tar.gz, with some tweaks to make it more likely hit Docker build cache.
     await tar.create(
       {
-        file: resolvePath(targetDir, BUNDLE_FILE),
+        file: resolvePath(distDir, BUNDLE_FILE),
         cwd: tmpDir,
         portable: true,
         noMtime: true,

packages/cli/src/commands/build/command.ts

@@ -26,14 +26,14 @@ export async function command(cmd: Command): Promise<void> {
 
   if (role === 'app') {
     return buildApp({
-      targetDir: paths.resolveTarget('dist'),
+      targetDir: paths.targetDir,
       configPaths: cmd.config as string[],
       writeStats: Boolean(cmd.stats),
     });
   }
   if (role === 'backend') {
     return buildBackend({
-      targetDir: paths.resolveTarget('dist'),
+      targetDir: paths.targetDir,
       skipBuildDependencies: Boolean(cmd.skipBuildDependencies),
     });
   }