Skip to content

fix(@angular-devkit/build-angular): properly set base dev-server path with esbuild #25133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2023
Merged

fix(@angular-devkit/build-angular): properly set base dev-server path with esbuild #25133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export async function* serveWithVite(
builderName,
)) as json.JsonObject & BrowserBuilderOptions;

if (serverOptions.servePath === undefined && browserOptions.baseHref !== undefined) {
serverOptions.servePath = browserOptions.baseHref;
}

let server: ViteDevServer | undefined;
let listeningAddress: AddressInfo | undefined;
const generatedFiles = new Map<string, OutputFileRecord>();
Expand Down Expand Up @@ -191,6 +195,7 @@ export async function setupServer(
css: {
devSourcemap: true,
},
base: serverOptions.servePath,
server: {
port: serverOptions.port,
strictPort: true,
Expand Down Expand Up @@ -247,10 +252,17 @@ export async function setupServer(
// Parse the incoming request.
// The base of the URL is unused but required to parse the URL.
const parsedUrl = new URL(req.url, 'http://localhost');
const extension = path.extname(parsedUrl.pathname);
let pathname = parsedUrl.pathname;
if (serverOptions.servePath && pathname.startsWith(serverOptions.servePath)) {
pathname = pathname.slice(serverOptions.servePath.length);
if (pathname[0] !== '/') {
pathname = '/' + pathname;
}
}
const extension = path.extname(pathname);

// Rewrite all build assets to a vite raw fs URL
const assetSourcePath = assets.get(parsedUrl.pathname);
const assetSourcePath = assets.get(pathname);
if (assetSourcePath !== undefined) {
req.url = `/@fs/${assetSourcePath}`;
next();
Expand All @@ -262,7 +274,7 @@ export async function setupServer(
// Global stylesheets (CSS files) are currently considered resources to workaround
// dev server sourcemap issues with stylesheets.
if (extension !== '.html') {
const outputFile = outputFiles.get(parsedUrl.pathname);
const outputFile = outputFiles.get(pathname);
if (outputFile) {
const mimeType = lookupMimeType(extension);
if (mimeType) {
Expand Down