diff --git a/.changeset/pretty-planes-promise.md b/.changeset/pretty-planes-promise.md
new file mode 100644
index 000000000000..668be49b294d
--- /dev/null
+++ 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
index 17882e602095..557c7bb7b3d6 100644
--- 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
new file mode 100644
index 000000000000..daf3a1963d7a
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..ada8acc288a6
--- /dev/null
+++ b/packages/astro/test/fixtures/space in folder name/app/src/pages/index.astro
@@ -0,0 +1,11 @@
+
+
+Project with spaces in the folder name
+
+
+ Testing
+
+
+
diff --git a/packages/astro/test/space-in-folder-name.test.js b/packages/astro/test/space-in-folder-name.test.js
new file mode 100644
index 000000000000..3920e195715e
--- /dev/null
+++ 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
index 126fc2a6a4de..57c8856558be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2275,6 +2275,12 @@ importers:
react: 18.2.0
react-dom: 18.2.0_react@18.2.0
+ packages/astro/test/fixtures/space in folder name/app:
+ specifiers:
+ astro: workspace:*
+ dependencies:
+ astro: link:../../../..
+
packages/astro/test/fixtures/special-chars-in-component-imports:
specifiers:
'@astrojs/mdx': workspace:*