Fix SSR static build public file copying. fixes #3016 (#3037)

* Fix SSR static build public file copying

* chore: update lockfile

* remove dirname and use URL constructor

* Cleanup test and actually test what it says it tests

Co-authored-by: Nate Moore <nate@skypack.dev>

.changeset/metal-grapes-tickle.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix SSR static build public files copying

packages/astro/src/core/build/static-build.ts

@@ -253,15 +253,14 @@ async function copyFiles(fromFolder: URL, toFolder: URL) {
 		cwd: fileURLToPath(fromFolder),
 	});
 
-	// Make the directory
-	await fs.promises.mkdir(toFolder, { recursive: true });
-
 	await Promise.all(
 		files.map(async (filename) => {
 			const from = new URL(filename, fromFolder);
 			const to = new URL(filename, toFolder);
-			return fs.promises.copyFile(from, to);
+			const lastFolder = new URL('./', to)
-		})
+			return fs.promises.mkdir(lastFolder, {recursive: true})
+							.then(()=>fs.promises.copyFile(from, to) )
+			})
 	);
 }
 

packages/astro/test/fixtures/static build SSR/astro.config.mjs

@@ -0,0 +1,6 @@
+import { defineConfig } from 'astro/config';
+import nodejs from '@astrojs/node';
+
+export default defineConfig({
+	adapter: nodejs(),
+});

packages/astro/test/fixtures/static build SSR/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@test/static-build",
+  "version": "0.0.0",
+  "dependencies": {
+    "@astrojs/node": "workspace:*",
+    "@test/static-build-pkg": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

packages/astro/test/fixtures/static build SSR/public/asset.txt

@@ -0,0 +1 @@
+test asset

packages/astro/test/fixtures/static build SSR/public/nested/asset2.txt

@@ -0,0 +1 @@
+test asset

packages/astro/test/static-build.test.js

@@ -168,3 +168,15 @@ describe('Static build', () => {
 		expect(found).to.equal(true, 'Found the log message');
 	});
 });
+
+describe('Static build SSR', () => {
+
+	it('Copies public files', async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/static build SSR/',
+		});
+		await fixture.build()
+			const asset = await fixture.readFile('/client/nested/asset2.txt');
+	});
+
+});

pnpm-lock.yaml

@@ -1102,6 +1102,16 @@ importers:
       '@test/static-build-pkg': link:pkg
       astro: link:../../..
 
+  packages/astro/test/fixtures/static build SSR:
+    specifiers:
+      '@astrojs/node': workspace:*
+      '@test/static-build-pkg': workspace:*
+      astro: workspace:*
+    dependencies:
+      '@astrojs/node': link:../../../../integrations/node
+      '@test/static-build-pkg': link:../static build/pkg
+      astro: link:../../..
+
   packages/astro/test/fixtures/static build/pkg:
     specifiers: {}