Allow specifying entryFileNames for client JS (#3676)

* Allow specifying entryFileNames for client JS * Adds a changeset
withastro · Jun 22, 2022 · 85c3375 · 85c3375
1 parent c97bdf1
commit 85c3375
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 1 deletion.
diff --git a/.changeset/spotty-rockets-grow.md b/.changeset/spotty-rockets-grow.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Allow specifying entryFileNames for client JS
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
@@ -116,10 +116,10 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
 				input: [],
 				output: {
 					format: 'esm',
-					entryFileNames: opts.buildConfig.serverEntry,
 					chunkFileNames: 'chunks/[name].[hash].mjs',
 					assetFileNames: 'assets/[name].[hash][extname]',
 					...viteConfig.build?.rollupOptions?.output,
+					entryFileNames: opts.buildConfig.serverEntry,
 				},
 			},
 			ssr: true,

diff --git a/packages/astro/test/entry-file-names.test.js b/packages/astro/test/entry-file-names.test.js
@@ -0,0 +1,26 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('vite.build.rollupOptions.entryFileNames', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/entry-file-names',
+		});
+		await fixture.build();
+	});
+
+	it('Renders correctly', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		expect($('#hello')).to.have.a.lengthOf(1);
+	});
+
+	it('Outputs a client module that was specified by the config', async () => {
+		const js = await fixture.readFile('/assets/js/Hello.js');
+		expect(js).to.be.a('string');
+		expect(js.length).to.be.greaterThan(0);
+	})
+});
diff --git a/packages/astro/test/fixtures/entry-file-names/astro.config.mjs b/packages/astro/test/fixtures/entry-file-names/astro.config.mjs
@@ -0,0 +1,16 @@
+import { defineConfig } from 'astro/config';
+import preact from '@astrojs/preact';
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [preact()],
+  vite: {
+    build: {
+      rollupOptions: {
+        output: {
+          entryFileNames: `assets/js/[name].js`,
+        },
+      },
+    },
+  },
+});
diff --git a/packages/astro/test/fixtures/entry-file-names/package.json b/packages/astro/test/fixtures/entry-file-names/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/entry-file-names",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/preact": "workspace:",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/entry-file-names/src/components/Hello.jsx b/packages/astro/test/fixtures/entry-file-names/src/components/Hello.jsx
@@ -0,0 +1,6 @@
+
+export default function() {
+	return (
+		<div id="hello">Hello world</div>
+	)
+}
diff --git a/packages/astro/test/fixtures/entry-file-names/src/pages/index.astro b/packages/astro/test/fixtures/entry-file-names/src/pages/index.astro
@@ -0,0 +1,10 @@
+---
+import Hello from '../components/Hello.jsx';
+---
+
+<html>
+	<head><title>Test</title></head>
+	<body>
+		<Hello client:load />
+	</body>
+</html>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml