Fix for hoisted scripts in project with spaces in the file path (#5756)

matthewp · web-flow · commit 116d8835ca9e · 2023-01-04T15:36:44.000-05:00
* Fix for hoisted scripts in project with spaces in the file path

* Adding a changeset

* Use viteID instead
diff --git a/.changeset/pretty-planes-promise.md b/.changeset/pretty-planes-promise.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix for hoisted scripts in project with spaces in the file path
diff --git a/packages/astro/src/vite-plugin-utils/index.ts b/packages/astro/src/vite-plugin-utils/index.ts
@@ -5,6 +5,7 @@ import {
 	appendForwardSlash,
 	removeLeadingForwardSlashWindows,
 } from '../core/path.js';
+import { viteID } from '../core/util.js';
 
 /**
  * Converts the first dot in `import.meta.env` to its Unicode escape sequence,
@@ -47,7 +48,8 @@ export function normalizeFilename(filename: string, config: AstroConfig) {
 	if (filename.startsWith('/@fs')) {
 		filename = filename.slice('/@fs'.length);
 	} else if (filename.startsWith('/') && !ancestor(filename, config.root.pathname)) {
-		filename = new URL('.' + filename, config.root).pathname;
+		const url = new URL('.' + filename, config.root);
+		filename = viteID(url);
 	}
 	return removeLeadingForwardSlashWindows(filename);
 }
diff --git a/packages/astro/test/fixtures/space in folder name/app/package.json b/packages/astro/test/fixtures/space in folder name/app/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/space-in-folder-name",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/space in folder name/app/src/pages/index.astro b/packages/astro/test/fixtures/space in folder name/app/src/pages/index.astro
@@ -0,0 +1,11 @@
+<html>
+<head>
+<title>Project with spaces in the folder name</title>
+</head>
+<body>
+	<h1>Testing</h1>
+	<script>
+		console.log('hi');
+	</script>
+</body>
+</html>
diff --git a/packages/astro/test/space-in-folder-name.test.js b/packages/astro/test/space-in-folder-name.test.js
@@ -0,0 +1,33 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Projects with a space in the folder name', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/space in folder name/app/',
+		});
+	});
+
+	describe('dev', () => {
+		/** @type {import('./test-utils').Fixture} */
+		let devServer;
+
+		before(async () => {
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+		});
+
+		it('Work with hoisted scripts', async () => {
+			const html = await fixture.fetch('/').then(r => r.text());
+			const $ = cheerio.load(html);
+
+			expect($('script[src*="space in folder name"]')).to.have.a.lengthOf(1);
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'astro': patch
 +---
++
 +Fix for hoisted scripts in project with spaces in the file path