Skip to content

fix(@angular/build): handle relative @ng/components #29386

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
Jan 20, 2025
Merged

fix(@angular/build): handle relative @ng/components #29386

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions packages/angular/build/src/tools/vite/middlewares/component-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@
* found in the LICENSE file at https://angular.dev/license
*/

import type { Connect } from 'vite';
import type { Connect, ViteDevServer } from 'vite';
import { pathnameWithoutBasePath } from '../utils';

const ANGULAR_COMPONENT_PREFIX = '/@ng/component';

export function createAngularComponentMiddleware(
server: ViteDevServer,
templateUpdates: ReadonlyMap<string, string>,
): Connect.NextHandleFunction {
return function angularComponentMiddleware(req, res, next) {
if (req.url === undefined || res.writableEnded) {
return;
}

if (!req.url.startsWith(ANGULAR_COMPONENT_PREFIX)) {
const pathname = pathnameWithoutBasePath(req.url, server.config.base);
if (!pathname.includes(ANGULAR_COMPONENT_PREFIX)) {
next();

return;
Expand Down
7 changes: 5 additions & 2 deletions packages/angular/build/src/tools/vite/plugins/angular-memory-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ export async function createAngularMemoryPlugin(
// Vite will resolve these these files example:
// `file:///@ng/component?c=src%2Fapp%2Fapp.component.ts%40AppComponent&t=1737017253850`
const sourcePath = fileURLToPath(source);
const { root } = parse(sourcePath);
const sourceWithoutRoot = normalizePath('/' + sourcePath.slice(root.length));
const sourceWithoutRoot = sourcePath.startsWith(virtualProjectRoot)
? normalizePath('/' + relative(virtualProjectRoot, sourcePath))
: // TODO: remove once https://github.com/angular/angular/blob/4e6017a9f5cda389c5fbf4f2c1519ce1bba23e11/packages/compiler/src/render3/r3_hmr_compiler.ts#L57
// is changed from `/@ng` to `./@ng/`
normalizePath('/' + sourcePath.slice(parse(sourcePath).root.length));

if (sourceWithoutRoot.startsWith(ANGULAR_PREFIX)) {
const [, query] = source.split('?', 2);
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/tools/vite/plugins/setup-middlewares-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function createAngularSetupMiddlewaresPlugin(

// Headers, assets and resources get handled first
server.middlewares.use(createAngularHeadersMiddleware(server));
server.middlewares.use(createAngularComponentMiddleware(templateUpdates));
server.middlewares.use(createAngularComponentMiddleware(server, templateUpdates));
server.middlewares.use(
createAngularAssetsMiddleware(
server,
Expand Down
Loading