Skip to content

fix(localize): avoid imports into compiler-cli package #45180

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

Closed
JoostK wants to merge 1 commit into from
Closed

fix(localize): avoid imports into compiler-cli package #45180

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
2 changes: 2 additions & 0 deletions integration/typings_test_ts44/include-all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import * as core from '@angular/core';
import * as coreTesting from '@angular/core/testing';
import * as elements from '@angular/elements';
import * as forms from '@angular/forms';
import * as localize from '@angular/localize';
import * as platformBrowser from '@angular/platform-browser';
import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
import * as platformBrowserDynamicTesting from '@angular/platform-browser-dynamic/testing';
Expand Down Expand Up @@ -51,6 +52,7 @@ export default {
coreTesting,
elements,
forms,
localize,
platformBrowser,
platformBrowserTesting,
platformBrowserDynamic,
Expand Down
1 change: 1 addition & 0 deletions integration/typings_test_ts44/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/elements": "file:../../dist/packages-dist/elements",
"@angular/forms": "file:../../dist/packages-dist/forms",
"@angular/localize": "file:../../dist/packages-dist/localize",
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
Expand Down
2 changes: 2 additions & 0 deletions integration/typings_test_ts45/include-all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import * as core from '@angular/core';
import * as coreTesting from '@angular/core/testing';
import * as elements from '@angular/elements';
import * as forms from '@angular/forms';
import * as localize from '@angular/localize';
import * as platformBrowser from '@angular/platform-browser';
import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
import * as platformBrowserDynamicTesting from '@angular/platform-browser-dynamic/testing';
Expand Down Expand Up @@ -51,6 +52,7 @@ export default {
coreTesting,
elements,
forms,
localize,
platformBrowser,
platformBrowserTesting,
platformBrowserDynamic,
Expand Down
1 change: 1 addition & 0 deletions integration/typings_test_ts45/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@angular/core": "file:../../dist/packages-dist/core",
"@angular/elements": "file:../../dist/packages-dist/elements",
"@angular/forms": "file:../../dist/packages-dist/forms",
"@angular/localize": "file:../../dist/packages-dist/localize",
"@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
"@angular/platform-server": "file:../../dist/packages-dist/platform-server",
Expand Down
1 change: 0 additions & 1 deletion packages/localize/src/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ ts_library(
module_name = "@angular/localize/src/utils",
deps = [
"//packages/compiler",
"//packages/compiler-cli/private",
],
)
15 changes: 13 additions & 2 deletions packages/localize/src/utils/src/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/
import {computeMsgId} from '@angular/compiler';
import {AbsoluteFsPath} from '@angular/compiler-cli/private/localize';

import {BLOCK_MARKER, ID_SEPARATOR, LEGACY_ID_INDICATOR, MEANING_SEPARATOR} from './constants';

Expand Down Expand Up @@ -39,6 +38,18 @@ export type TargetMessage = string;
*/
export type MessageId = string;

/**
* Declares a copy of the `AbsoluteFsPath` branded type in `@angular/compiler-cli` to avoid an
* import into `@angular/compiler-cli`. The compiler-cli's declaration files are not necessarily
* compatible with web environments that use `@angular/localize`, and would inadvertently include
* `typescript` declaration files in any compilation unit that uses `@angular/localize` (which
* increases parsing time and memory usage during builds) using a default import that only
* type-checks when `allowSyntheticDefaultImports` is enabled.
*
* @see https://github.com/angular/angular/issues/45179
*/
type AbsoluteFsPathLocalizeCopy = string&{_brand: 'AbsoluteFsPath'};

/**
* The location of the message in the source file.
*
Expand All @@ -47,7 +58,7 @@ export type MessageId = string;
export interface SourceLocation {
start: {line: number, column: number};
end: {line: number, column: number};
file: AbsoluteFsPath;
file: AbsoluteFsPathLocalizeCopy;
text?: string;
}

Expand Down