Skip to content

Commit ea89677

Browse files
devversiondylhunn
authored andcommitted
feat(compiler-cli): support more recent version of tsickle (angular#47018)
Updates the tsickle version in the repository and accounts for its changes in the `compiler-cli` package. Tsickle made a breaking change in the minor version segment bump that would break the use with `@angular/compiler-cli` Additionally the tsickle version for `@angular/bazel` is updated since we updated `@bazel/typescript` to also account for the breaking changes. See: bazel-contrib/rules_nodejs@78a0528 PR Close angular#47018
1 parent f42a7c5 commit ea89677

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
"tmp": "0.2.1",
170170
"todomvc-app-css": "^2.3.0",
171171
"todomvc-common": "^1.0.5",
172-
"tsickle": "0.38.1",
172+
"tsickle": "0.46.3",
173173
"tslib": "^2.3.0",
174174
"tslint": "6.1.3",
175175
"typescript": "~4.7.2",

packages/bazel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"dependencies": {
2525
"@microsoft/api-extractor": "^7.24.2",
2626
"shelljs": "^0.8.5",
27-
"tsickle": "^0.38.0",
27+
"tsickle": "^0.46.3",
2828
"tslib": "^2.3.0"
2929
},
3030
"peerDependencies": {

packages/compiler-cli/src/main.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ function createEmitCallback(
104104
TsickleHost,
105105
'shouldSkipTsickleProcessing'|'pathToModuleName'|'shouldIgnoreWarningsForPath'|
106106
'fileNameToModuleId'|'googmodule'|'untyped'|'convertIndexImportShorthand'|
107-
'transformDecorators'|'transformTypesToClosure'> = {
107+
'transformDecorators'|'transformTypesToClosure'|'generateExtraSuppressions'|
108+
'rootDirsRelative'> = {
108109
shouldSkipTsickleProcessing: (fileName) => /\.d\.ts$/.test(fileName) ||
109110
// View Engine's generated files were never intended to be processed with tsickle.
110111
(!options.enableIvy && GENERATED_FILES.test(fileName)),
@@ -118,6 +119,11 @@ function createEmitCallback(
118119
// conflicts, we disable decorator transformations for tsickle.
119120
transformDecorators: false,
120121
transformTypesToClosure: true,
122+
generateExtraSuppressions: true,
123+
// Only used by the http://go/tsjs-migration-independent-javascript-imports migration in
124+
// tsickle. This migration is not relevant externally and is only enabled when users
125+
// would explicitly invoke `goog.tsMigrationExportsShim` (which is internal-only).
126+
rootDirsRelative: (fileName) => fileName,
121127
};
122128

123129
return ({

yarn.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2717,7 +2717,7 @@
27172717
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
27182718
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
27192719

2720-
"@types/minimist@^1.2.0":
2720+
"@types/minimist@^1.2.0", "@types/minimist@^1.2.1":
27212721
version "1.2.2"
27222722
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
27232723
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
@@ -14633,10 +14633,12 @@ tsec@0.2.5:
1463314633
glob "^7.1.1"
1463414634
minimatch "^3.0.3"
1463514635

14636-
tsickle@0.38.1:
14637-
version "0.38.1"
14638-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.38.1.tgz#30762db759d40c435943093b6972c7f2efb384ef"
14639-
integrity sha512-4xZfvC6+etRu6ivKCNqMOd1FqcY/m6JY3Y+yr5+Xw+i751ciwrWINi6x/3l1ekcODH9GZhlf0ny2LpzWxnjWYA==
14636+
tsickle@0.46.3:
14637+
version "0.46.3"
14638+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.46.3.tgz#b74918a77e3ca1310a2ce4d019f5d6294360b56d"
14639+
integrity sha512-9PDXxOrtn2AdpvDin6FLGveXVGg8ec3ga8fh8mPR5lz9KtitW6riVgxgagicdfF1rgiBxDeH+5hVowPXhmZbYQ==
14640+
dependencies:
14641+
"@types/minimist" "^1.2.1"
1464014642

1464114643
tslib@1.9.0:
1464214644
version "1.9.0"

0 commit comments

Comments
 (0)