Merge pull request #69 from FloezeTv/fix-move-artifacts-overwrite

Fix #68: Make moveArtifacts merge directories

libs/qwikdev-astro/package.json

@@ -50,6 +50,7 @@
   "dependencies": {
     "astro-integration-kit": "^0.2.0",
     "fs-extra": "^11.1.1",
+    "fs-move": "^6.0.0",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "devDependencies": {

libs/qwikdev-astro/src/cutom_types/fs-move.d.ts

@@ -0,0 +1,18 @@
+declare module 'fs-move' {
+
+	type MoveOptions = {
+		overwrite?: bool,
+		merge?: bool,
+		purge?: bool,
+		filter?: (src: string, dest: string) => bool
+	};
+
+	type MoveCallback = (err: any) => unknown;
+
+	async function move(src: string, dest: string, callback: MoveCallback);
+	async function move(src: string, dest: string, options: MoveOptions = {});
+	async function move(src: string, dest: string, options: MoveOptions, callback: MoveCallback);
+
+	export default move;
+
+}

libs/qwikdev-astro/src/index.ts

@@ -20,6 +20,7 @@ import ts from "typescript";
 import fs from "node:fs";
 import { lstat, readdir, readlink } from "node:fs/promises";
 import fsExtra from "fs-extra";
+import move from "fs-move"
 
 /* similar to vite's FilterPattern */
 const FilternPatternSchema = z.union([
@@ -260,8 +261,12 @@ export async function moveArtifacts(srcDir: string, destDir: string) {
   await fsExtra.ensureDir(destDir);
   for (const file of await readdir(srcDir)) {
     // move files from source to destintation, overwrite if they exist
-    await fsExtra.move(join(srcDir, file), join(destDir, file), {
-      overwrite: true,
+    await move(join(srcDir, file), join(destDir, file), {
+      // Merge directories
+      merge: true,
+      // Don't overwrite any files, as this would overwrite astro-generated files with files from public.
+      // This matches astro's default behavior of replacing files in public with generated pages on naming-conflicts.
+      overwrite: false,
     });
   }
 }