fix(middleware): undo config's path to URL encoding (#8614)

* fix(middleware): undo config's path to URL encoding * add changeset * middleware-dev => "middleware space"
withastro · Sep 21, 2023 · 4398e92 · 4398e92
1 parent b4034aa
commit 4398e92
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 9 deletions.
diff --git a/.changeset/tidy-kiwis-lick.md b/.changeset/tidy-kiwis-lick.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixed an issue where spaces and unicode characters in project path prevented middleware from running.
diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts
@@ -25,7 +25,7 @@ export function vitePluginMiddleware(
 		async resolveId(id) {
 			if (id === MIDDLEWARE_MODULE_ID) {
 				const middlewareId = await this.resolve(
-					`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
+					`${decodeURI(opts.settings.config.srcDir.pathname)}${MIDDLEWARE_PATH_SEGMENT_NAME}`
 				);
 				if (middlewareId) {
 					resolvedMiddlewareId = middlewareId.id;

diff --git a/packages/astro/src/core/middleware/loadMiddleware.ts b/packages/astro/src/core/middleware/loadMiddleware.ts
@@ -12,7 +12,7 @@ export async function loadMiddleware(
 	srcDir: AstroSettings['config']['srcDir']
 ) {
 	// can't use node Node.js builtins
-	let middlewarePath = srcDir.pathname + '/' + MIDDLEWARE_PATH_SEGMENT_NAME;
+	let middlewarePath = `${decodeURI(srcDir.pathname)}${MIDDLEWARE_PATH_SEGMENT_NAME}`;
 	try {
 		const module = await moduleLoader.import(middlewarePath);
 		return module;

diff --git a/packages/astro/test/featuresSupport.test.js b/packages/astro/test/featuresSupport.test.js
@@ -8,7 +8,7 @@ describe('Adapter', () => {
 	it("should error if the adapter doesn't support edge middleware", async () => {
 		try {
 			fixture = await loadFixture({
-				root: './fixtures/middleware-dev/',
+				root: './fixtures/middleware space/',
 				output: 'server',
 				build: {
 					excludeMiddleware: true,
@@ -32,7 +32,7 @@ describe('Adapter', () => {
 	it("should error if the adapter doesn't support split build", async () => {
 		try {
 			fixture = await loadFixture({
-				root: './fixtures/middleware-dev/',
+				root: './fixtures/middleware space/',
 				output: 'server',
 				build: {
 					split: true,

diff --git a/...test/fixtures/middleware-dev/package.json → ...st/fixtures/middleware space/package.json b/...test/fixtures/middleware-dev/package.json → ...st/fixtures/middleware space/package.json
diff --git a/...fixtures/middleware-dev/src/middleware.js → ...xtures/middleware space/src/middleware.js b/...fixtures/middleware-dev/src/middleware.js → ...xtures/middleware space/src/middleware.js
diff --git a/...xtures/middleware-dev/src/pages/404.astro → ...ures/middleware space/src/pages/404.astro b/...xtures/middleware-dev/src/pages/404.astro → ...ures/middleware space/src/pages/404.astro
diff --git a/.../middleware-dev/src/pages/api/endpoint.js → ...iddleware space/src/pages/api/endpoint.js b/.../middleware-dev/src/pages/api/endpoint.js → ...iddleware space/src/pages/api/endpoint.js
diff --git a/...middleware-dev/src/pages/broken-500.astro → ...ddleware space/src/pages/broken-500.astro b/...middleware-dev/src/pages/broken-500.astro → ...ddleware space/src/pages/broken-500.astro
diff --git a/...dleware-dev/src/pages/broken-locals.astro → ...eware space/src/pages/broken-locals.astro b/...dleware-dev/src/pages/broken-locals.astro → ...eware space/src/pages/broken-locals.astro
diff --git a/...ures/middleware-dev/src/pages/clone.astro → ...es/middleware space/src/pages/clone.astro b/...ures/middleware-dev/src/pages/clone.astro → ...es/middleware space/src/pages/clone.astro
diff --git a/...ddleware-dev/src/pages/does-nothing.astro → ...leware space/src/pages/does-nothing.astro b/...ddleware-dev/src/pages/does-nothing.astro → ...leware space/src/pages/does-nothing.astro
diff --git a/...ures/middleware-dev/src/pages/index.astro → ...es/middleware space/src/pages/index.astro b/...ures/middleware-dev/src/pages/index.astro → ...es/middleware space/src/pages/index.astro
diff --git a/...ures/middleware-dev/src/pages/lorem.astro → ...es/middleware space/src/pages/lorem.astro b/...ures/middleware-dev/src/pages/lorem.astro → ...es/middleware space/src/pages/lorem.astro
diff --git a/...leware-dev/src/pages/not-interested.astro → ...ware space/src/pages/not-interested.astro b/...leware-dev/src/pages/not-interested.astro → ...ware space/src/pages/not-interested.astro
diff --git a/...s/middleware-dev/src/pages/redirect.astro → ...middleware space/src/pages/redirect.astro b/...s/middleware-dev/src/pages/redirect.astro → ...middleware space/src/pages/redirect.astro
diff --git a/...es/middleware-dev/src/pages/rewrite.astro → .../middleware space/src/pages/rewrite.astro b/...es/middleware-dev/src/pages/rewrite.astro → .../middleware space/src/pages/rewrite.astro
diff --git a/...res/middleware-dev/src/pages/second.astro → ...s/middleware space/src/pages/second.astro b/...res/middleware-dev/src/pages/second.astro → ...s/middleware space/src/pages/second.astro
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
@@ -12,7 +12,7 @@ describe('Middleware in DEV mode', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/middleware-dev/',
+			root: './fixtures/middleware space/',
 		});
 		devServer = await fixture.startDevServer();
 	});
@@ -116,7 +116,7 @@ describe('Middleware API in PROD mode, SSR', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/middleware-dev/',
+			root: './fixtures/middleware space/',
 			output: 'server',
 			adapter: testAdapter({}),
 		});
@@ -223,7 +223,7 @@ describe('Middleware API in PROD mode, SSR', () => {
 
 	it('the integration should receive the path to the middleware', async () => {
 		fixture = await loadFixture({
-			root: './fixtures/middleware-dev/',
+			root: './fixtures/middleware space/',
 			output: 'server',
 			build: {
 				excludeMiddleware: true,
@@ -275,7 +275,7 @@ describe('Middleware, split middleware option', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/middleware-dev/',
+			root: './fixtures/middleware space/',
 			output: 'server',
 			build: {
 				excludeMiddleware: true,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml