Skip to content

fix(@angular-devkit/build-angular): ensure all configured assets can be served by dev server #26401

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
Nov 22, 2023
Merged

fix(@angular-devkit/build-angular): ensure all configured assets can be served by dev server #26401

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
15 changes: 14 additions & 1 deletion 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 @@ -215,6 +215,11 @@ export async function* serveWithVite(
}

if (server) {
// Update fs allow list to include any new assets from the build option.
server.config.server.fs.allow = [
...new Set(...server.config.server.fs.allow, ...assetFiles.values()),
];

handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
} else {
const projectName = context.target?.project;
Expand Down Expand Up @@ -430,10 +435,11 @@ export async function setupServer(
...externalMetadata.explicit,
];

const cacheDir = join(serverOptions.cacheOptions.path, 'vite');
const configuration: InlineConfig = {
configFile: false,
envFile: false,
cacheDir: join(serverOptions.cacheOptions.path, 'vite'),
cacheDir,
root: virtualProjectRoot,
publicDir: false,
esbuild: false,
Expand All @@ -456,6 +462,13 @@ export async function setupServer(
proxy,
// File watching is handled by the build directly. `null` disables file watching for Vite.
watch: null,
fs: {
// Ensure cache directory, node modules, and all assets are accessible by the client.
// The first two are required for Vite to function in prebundling mode (the default) and to load
// the Vite client-side code for browser reloading. These would be available by default but when
// the `allow` option is explicitly configured, they must be included manually.
allow: [cacheDir, join(serverOptions.workspaceRoot, 'node_modules'), ...assets.values()],
},
// This is needed when `externalDependencies` is used to prevent Vite load errors.
// NOTE: If Vite adds direct support for externals, this can be removed.
preTransformRequests: externalMetadata.explicit.length === 0,
Expand Down