Skip to content

refactor(@angular/build): normalize source path for windows compatibility #29255

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 6, 2025
Merged

refactor(@angular/build): normalize source path for windows compatibility #29255

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
11 changes: 6 additions & 5 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 @@ -47,27 +47,28 @@ export async function createAngularMemoryPlugin(
}

if (importer) {
if (source[0] === '.' && normalizePath(importer).startsWith(virtualProjectRoot)) {
const normalizedImporter = normalizePath(importer);
if (source[0] === '.' && normalizedImporter.startsWith(virtualProjectRoot)) {
// Remove query if present
const [importerFile] = importer.split('?', 1);
const [importerFile] = normalizedImporter.split('?', 1);
source = '/' + join(dirname(relative(virtualProjectRoot, importerFile)), source);
} else if (
!ssr &&
source[0] === '/' &&
importer.endsWith('index.html') &&
normalizePath(importer).startsWith(virtualProjectRoot)
normalizedImporter.startsWith(virtualProjectRoot)
) {
// This is only needed when using SSR and `angularSsrMiddleware` (old style) to correctly resolve
// .js files when using lazy-loading.
// Remove query if present
const [importerFile] = importer.split('?', 1);
const [importerFile] = normalizedImporter.split('?', 1);
source =
'/' + join(dirname(relative(virtualProjectRoot, importerFile)), basename(source));
}
}

const [file] = source.split('?', 1);
if (outputFiles.has(file)) {
if (outputFiles.has(normalizePath(file))) {
return join(virtualProjectRoot, source);
}
},
Expand Down
Loading