Skip to content

fix(@angular-devkit/build-angular): support custom index option paths in Vite-based dev server #25808

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
Sep 11, 2023
Merged

fix(@angular-devkit/build-angular): support custom index option paths in Vite-based dev server #25808

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: 16 additions & 2 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 @@ -19,6 +19,7 @@ import path, { posix } from 'node:path';
import type { Connect, InlineConfig, ViteDevServer } from 'vite';
import { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
import { RenderOptions, renderPage } from '../../utils/server-rendering/render-page';
import { getIndexOutputFile } from '../../utils/webpack-browser-config';
import { buildEsbuildBrowser } from '../browser-esbuild';
import { Schema as BrowserBuilderOptions } from '../browser-esbuild/schema';
import { loadProxyConfiguration } from './load-proxy-config';
Expand Down Expand Up @@ -74,6 +75,11 @@ export async function* serveWithVite(
1,
);

// Extract output index from options
// TODO: Provide this info from the build results
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const htmlIndexPath = getIndexOutputFile(browserOptions.index as any);

// dynamically import Vite for ESM compatibility
const { createServer, normalizePath } = await import('vite');

Expand All @@ -88,7 +94,7 @@ export async function* serveWithVite(
assert(result.outputFiles, 'Builder did not provide result files.');

// Analyze result files for changes
analyzeResultFiles(normalizePath, result.outputFiles, generatedFiles);
analyzeResultFiles(normalizePath, htmlIndexPath, result.outputFiles, generatedFiles);

assetFiles.clear();
if (result.assetFiles) {
Expand Down Expand Up @@ -191,12 +197,20 @@ function handleUpdate(

function analyzeResultFiles(
normalizePath: (id: string) => string,
htmlIndexPath: string,
resultFiles: OutputFile[],
generatedFiles: Map<string, OutputFileRecord>,
) {
const seen = new Set<string>(['/index.html']);
for (const file of resultFiles) {
const filePath = '/' + normalizePath(file.path);
let filePath;
if (file.path === htmlIndexPath) {
// Convert custom index output path to standard index path for dev-server usage.
// This mimics the Webpack dev-server behavior.
filePath = '/index.html';
} else {
filePath = '/' + normalizePath(file.path);
}
seen.add(filePath);

// Skip analysis of sourcemaps
Expand Down