Skip to content
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

Jump to bottom

fix(@angular-devkit/build-angular): correct Windows paths in ivy i18n extract #18650

Merged
merged 1 commit into from Aug 31, 2020
Merged

fix(@angular-devkit/build-angular): correct Windows paths in ivy i18n extract #18650

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Expand Up @@ -313,7 +313,7 @@ jobs:
- custom_attach_workspace
- setup_windows
# Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
- run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
- run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob={tests/basic/**,tests/i18n/extract-ivy.ts}" }

e2e-cli-win:
executor: windows-executor
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/extract-i18n/ivy-extract-loader.ts
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ export default function localizeExtractLoader(
let filename = loaderContext.resourcePath;
if (map?.file) {
// The extractor's internal sourcemap handling expects the filenames to match
filename = nodePath.posix.join(loaderContext.context, map.file);
filename = nodePath.join(loaderContext.context, map.file);
}

// Setup a virtual file system instance for the extractor
Expand All @@ -64,13 +64,13 @@ export default function localizeExtractLoader(
}
},
resolve(...paths: string[]): string {
return nodePath.posix.resolve(...paths);
return nodePath.resolve(...paths);
},
exists(path: string): boolean {
return path === filename || path === filename + '.map';
},
dirname(path: string): string {
return nodePath.posix.dirname(path);
return nodePath.dirname(path);
},
};

Expand Down