Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 03:23:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/build): correct path for /@ng/components on Windows

Browse Source 
The `virtualProjectRoot` is normalized, but `sourcePath` is not, leading to mismatched path slashes and related issues.

Closes #29424
This commit is contained in:
Alan Agius 2025-01-21 07:25:05 +00:00 committed by Alan Agius
parent 14584f0bfd
commit abb186ac33
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/angular/build/src/tools/vite/plugins/angular-memory-plugin.ts
View File

@ -8,7 +8,7 @@
import assert from 'node:assert'; import assert from 'node:assert';
import { readFile } from 'node:fs/promises'; import { readFile } from 'node:fs/promises';
import { basename, dirname, join, parse, relative } from 'node:path'; import { basename, dirname, join, relative } from 'node:path';
import { fileURLToPath } from 'node:url'; import { fileURLToPath } from 'node:url';
import type { Plugin } from 'vite'; import type { Plugin } from 'vite';
import { loadEsmModule } from '../../../utils/load-esm'; import { loadEsmModule } from '../../../utils/load-esm';
@ -46,11 +46,7 @@ export async function createAngularMemoryPlugin(
// Vite will resolve these these files example: // Vite will resolve these these files example:
// `file:///@ng/component?c=src%2Fapp%2Fapp.component.ts%40AppComponent&t=1737017253850` // `file:///@ng/component?c=src%2Fapp%2Fapp.component.ts%40AppComponent&t=1737017253850`
const sourcePath = fileURLToPath(source); const sourcePath = fileURLToPath(source);
const sourceWithoutRoot = sourcePath.startsWith(virtualProjectRoot) const sourceWithoutRoot = normalizePath('/' + relative(virtualProjectRoot, sourcePath));
? 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)) { if (sourceWithoutRoot.startsWith(ANGULAR_PREFIX)) {
const [, query] = source.split('?', 2); const [, query] = source.split('?', 2);