Skip to content

Commit 2788508

Browse files
alan-agius4alan-agius4
committed
fix(@angular/build): redirect to path with trailing slash for asset directories
Prior to this commit, accessing a static asset directory without a trailing slash resulted in a 404 error. With this change, we now redirect to the path with a trailing slash, aligning with the behavior of express static. Closes #27949
1 parent 7982100 commit 2788508

File tree

2 files changed

+87
-33
lines changed

2 files changed

+87
-33
lines changed

‎packages/angular/build/src/builders/dev-server/tests/behavior/build-assets_spec.ts

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { executeOnceAndFetch } from '../execute-fetch';
1111
import { describeServeBuilder } from '../jasmine-helpers';
1212
import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO } from '../setup';
1313

14-
describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupTarget, isVite) => {
14+
describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupTarget) => {
1515
const javascriptFileContent =
1616
"import {foo} from 'unresolved'; /* a comment */const foo = `bar`;\n\n\n";
1717

@@ -95,31 +95,49 @@ describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupT
9595
expect(await response?.text()).toContain('<h1>Login page</h1>');
9696
});
9797

98-
(isVite ? it : xit)(
99-
`should return the asset that matches '.html' when path has no trailing '/'`,
100-
async () => {
101-
await harness.writeFile(
102-
'src/login/new.html',
103-
'<html><body><h1>Login page</h1></body><html>',
104-
);
105-
106-
setupTarget(harness, {
107-
assets: ['src/login'],
108-
optimization: {
109-
scripts: true,
110-
},
111-
});
112-
113-
harness.useTarget('serve', {
114-
...BASE_OPTIONS,
115-
});
116-
117-
const { result, response } = await executeOnceAndFetch(harness, 'login/new');
118-
119-
expect(result?.success).toBeTrue();
120-
expect(await response?.status).toBe(200);
121-
expect(await response?.text()).toContain('<h1>Login page</h1>');
122-
},
123-
);
98+
it(`should return the asset that matches '.html' when path has no trailing '/'`, async () => {
99+
await harness.writeFile('src/login/new.html', '<html><body><h1>Login page</h1></body><html>');
100+
101+
setupTarget(harness, {
102+
assets: ['src/login'],
103+
optimization: {
104+
scripts: true,
105+
},
106+
});
107+
108+
harness.useTarget('serve', {
109+
...BASE_OPTIONS,
110+
});
111+
112+
const { result, response } = await executeOnceAndFetch(harness, 'login/new');
113+
114+
expect(result?.success).toBeTrue();
115+
expect(await response?.status).toBe(200);
116+
expect(await response?.text()).toContain('<h1>Login page</h1>');
117+
});
118+
119+
it(`should return a redirect when an asset directory is accessed without a trailing '/'`, async () => {
120+
await harness.writeFile(
121+
'src/login/index.html',
122+
'<html><body><h1>Login page</h1></body><html>',
123+
);
124+
125+
setupTarget(harness, {
126+
assets: ['src/login'],
127+
optimization: {
128+
scripts: true,
129+
},
130+
});
131+
132+
harness.useTarget('serve', {
133+
...BASE_OPTIONS,
134+
});
135+
136+
const { result, response } = await executeOnceAndFetch(harness, 'login');
137+
138+
expect(result?.success).toBeTrue();
139+
expect(await response?.status).toBe(301);
140+
expect(await response?.headers.get('Location')).toBe('login/');
141+
});
124142
});
125143
});

‎packages/angular/build/src/tools/vite/angular-memory-plugin.ts

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ export function createAngularMemoryPlugin(options: AngularMemoryPluginOptions):
121121
// The base of the URL is unused but required to parse the URL.
122122
const pathname = pathnameWithoutBasePath(req.url, server.config.base);
123123
const extension = extname(pathname);
124+
const pathnameHasTrailingSlash = pathname[pathname.length - 1] === '/';
124125

125126
// Rewrite all build assets to a vite raw fs URL
126127
const assetSourcePath = assets.get(pathname);
@@ -141,12 +142,11 @@ export function createAngularMemoryPlugin(options: AngularMemoryPluginOptions):
141142
// HTML fallbacking
142143
// This matches what happens in the vite html fallback middleware.
143144
// ref: https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L9
144-
const htmlAssetSourcePath =
145-
pathname[pathname.length - 1] === '/'
146-
? // Trailing slash check for `index.html`.
147-
assets.get(pathname + 'index.html')
148-
: // Non-trailing slash check for fallback `.html`
149-
assets.get(pathname + '.html');
145+
const htmlAssetSourcePath = pathnameHasTrailingSlash
146+
? // Trailing slash check for `index.html`.
147+
assets.get(pathname + 'index.html')
148+
: // Non-trailing slash check for fallback `.html`
149+
assets.get(pathname + '.html');
150150

151151
if (htmlAssetSourcePath) {
152152
req.url = `${server.config.base}@fs/${encodeURI(htmlAssetSourcePath)}`;
@@ -175,6 +175,19 @@ export function createAngularMemoryPlugin(options: AngularMemoryPluginOptions):
175175
}
176176
}
177177

178+
// If the path has no trailing slash and it matches a servable directory redirect to the same path with slash.
179+
// This matches the default express static behaviour.
180+
// See: https://github.com/expressjs/serve-static/blob/89fc94567fae632718a2157206c52654680e9d01/index.js#L182
181+
if (!pathnameHasTrailingSlash) {
182+
for (const assetPath of assets.keys()) {
183+
if (pathname === assetPath.substring(0, assetPath.lastIndexOf('/'))) {
184+
redirect(res, req.url + '/');
185+
186+
return;
187+
}
188+
}
189+
}
190+
178191
next();
179192
});
180193

@@ -362,3 +375,26 @@ function lookupMimeTypeFromRequest(url: string): string | undefined {
362375

363376
return extension && lookupMimeType(extension);
364377
}
378+
379+
function redirect(res: ServerResponse, location: string): void {
380+
const htmlDocument = `
381+
<!DOCTYPE html>
382+
<html lang="en">
383+
<head>
384+
<meta charset="utf-8">
385+
<title>Redirecting</title>
386+
</head>
387+
<body>
388+
<pre>Redirecting to <a href="${location}">${location}</a></pre>
389+
</body>
390+
</html>`;
391+
392+
// send redirect response
393+
res.statusCode = 301;
394+
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
395+
res.setHeader('Content-Length', Buffer.byteLength(htmlDocument));
396+
res.setHeader('Content-Security-Policy', "default-src 'none'");
397+
res.setHeader('X-Content-Type-Options', 'nosniff');
398+
res.setHeader('Location', location);
399+
res.end(htmlDocument);
400+
}

0 commit comments

Comments
 (0)