Skip to content

Commit fe396c2

Browse files
devversionjelbourn
authored andcommitted
build: update to latest ts-node version (#19399)
The dev-infra package has an optional peer dependency on `ts-node` for supporting TypeScript-based configurations. This highlighted that we currently are behind the latest version by a good amount. We should update so that the peer dependency is satisified and generally for the sake of benefiting from the latest `ts-node` changes (like better diagnostic messaging). This commit additionally fixes compilation issues in the caretaker-resync script and in the breaking changes script. (cherry picked from commit d7d67e1)
1 parent 59ec4eb commit fe396c2

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
"lint": "yarn -s tslint && yarn -s stylelint && yarn -s bazel:format-lint && yarn -s ownerslint",
2525
"e2e": "bazel test //src/... --test_tag_filters=e2e",
2626
"deploy-dev-app": "node ./scripts/deploy-dev-app.js",
27-
"breaking-changes": "ts-node --project scripts scripts/breaking-changes.ts",
27+
"breaking-changes": "ts-node --project scripts/tsconfig.json scripts/breaking-changes.ts",
2828
"gulp": "gulp",
29-
"stage-release": "ts-node --project tools/release/ tools/release/stage-release.ts",
30-
"publish-release": "ts-node --project tools/release/ tools/release/publish-release.ts",
29+
"stage-release": "ts-node --project tools/release/tsconfig.json tools/release/stage-release.ts",
30+
"publish-release": "ts-node --project tools/release/tsconfig.json tools/release/publish-release.ts",
3131
"check-entry-point-setup": "node ./scripts/check-entry-point-setup.js",
32-
"check-release-output": "ts-node --project tools/release tools/release/check-release-output.ts",
33-
"check-rollup-globals": "ts-node --project scripts/ scripts/check-rollup-globals.ts",
34-
"changelog": "ts-node --project tools/release tools/release/changelog.ts",
32+
"check-release-output": "ts-node --project tools/release/tsconfig.json tools/release/check-release-output.ts",
33+
"check-rollup-globals": "ts-node --project scripts/tsconfig.json scripts/check-rollup-globals.ts",
34+
"changelog": "ts-node --project tools/release/tsconfig.json tools/release/changelog.ts",
3535
"preinstall": "node ./tools/npm/check-npm.js",
3636
"format:ts": "git-clang-format HEAD $(git diff HEAD --name-only | grep -v \"\\.d\\.ts\")",
3737
"format:bazel": "yarn -s bazel:buildifier --lint=fix --mode=fix",
3838
"format": "yarn -s format:ts && yarn -s format:bazel",
39-
"cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/ tools/cherry-pick-patch/cherry-pick-patch.ts",
40-
"ownerslint": "ts-node --project scripts/ scripts/ownerslint.ts",
39+
"cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/tsconfig.json tools/cherry-pick-patch/cherry-pick-patch.ts",
40+
"ownerslint": "ts-node --project scripts/tsconfig.json scripts/ownerslint.ts",
4141
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
4242
"stylelint": "stylelint \"src/**/*.+(css|scss)\" --config .stylelintrc.json --syntax scss",
43-
"resync-caretaker-app": "ts-node --project scripts scripts/caretaking/resync-caretaker-app-prs.ts",
43+
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
4444
"ts-circular-deps:check": "yarn -s ts-circular-deps check --config ./src/circular-deps-test.conf.js",
4545
"ts-circular-deps:approve": "yarn -s ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
46-
"merge": "ts-node --project scripts scripts/merge-script/cli.ts --config ./merge-config.js",
46+
"merge": "ts-node --project scripts/tsconfig.json scripts/merge-script/cli.ts --config ./merge-config.js",
4747
"approve-api": "node ./scripts/approve-api-golden.js"
4848
},
4949
"version": "9.2.4",
@@ -157,7 +157,7 @@
157157
"stylelint": "^13.3.1",
158158
"terser": "^4.3.9",
159159
"ts-api-guardian": "^0.5.0",
160-
"ts-node": "^3.0.4",
160+
"ts-node": "^8.10.1",
161161
"tsickle": "0.38.1",
162162
"tslint": "^6.1.0",
163163
"tsutils": "^3.0.0",

scripts/caretaking/resync-caretaker-app-prs.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Octokit} from '@octokit/rest';
1+
import * as Octokit from '@octokit/rest';
22
import * as fetch from 'node-fetch';
33

44
const github = new Octokit({auth: process.env.TOKEN});
@@ -9,11 +9,11 @@ async function resync() {
99
let hasNext = true;
1010
while (hasNext) {
1111
const response = await github.pulls.list({
12-
owner: 'angular',
12+
owner: 'angular',
1313
repo: 'components',
1414
per_page: 100,
1515
page
16-
});
16+
});
1717
pulls.push(...response.data);
1818
hasNext = !!response.data.length;
1919
page++;

yarn.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1917,6 +1917,11 @@ are-we-there-yet@~1.1.2:
19171917
delegates "^1.0.0"
19181918
readable-stream "^2.0.6"
19191919

1920+
arg@^4.1.0:
1921+
version "4.1.3"
1922+
resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
1923+
integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
1924+
19201925
argparse@^1.0.7, argparse@~1.0.9:
19211926
version "1.0.10"
19221927
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4053,7 +4058,7 @@ didyoumean@^1.2.1:
40534058
resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz#e92edfdada6537d484d73c0172fd1eba0c4976ff"
40544059
integrity sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=
40554060

4056-
diff@^3.1.0, diff@^3.2.0, diff@^3.5.0:
4061+
diff@^3.2.0, diff@^3.5.0:
40574062
version "3.5.0"
40584063
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
40594064
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -10646,13 +10651,21 @@ [email protected]:
1064610651
buffer-from "^1.0.0"
1064710652
source-map "^0.6.0"
1064810653

10649-
source-map-support@^0.4.0, source-map-support@^0.4.15, source-map-support@~0.4.0:
10654+
source-map-support@^0.4.15, source-map-support@~0.4.0:
1065010655
version "0.4.18"
1065110656
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
1065210657
integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
1065310658
dependencies:
1065410659
source-map "^0.5.6"
1065510660

10661+
source-map-support@^0.5.17:
10662+
version "0.5.19"
10663+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
10664+
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
10665+
dependencies:
10666+
buffer-from "^1.0.0"
10667+
source-map "^0.6.0"
10668+
1065610669
source-map-support@~0.5.12:
1065710670
version "0.5.16"
1065810671
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
@@ -11040,7 +11053,7 @@ strip-indent@^3.0.0:
1104011053
dependencies:
1104111054
min-indent "^1.0.0"
1104211055

11043-
strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
11056+
strip-json-comments@~2.0.1:
1104411057
version "2.0.1"
1104511058
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
1104611059
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -11561,29 +11574,16 @@ ts-api-guardian@^0.5.0:
1156111574
diff "^3.5.0"
1156211575
minimist "^1.2.0"
1156311576

11564-
ts-node@^3.0.4:
11565-
version "3.3.0"
11566-
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
11567-
integrity sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=
11577+
ts-node@^8.10.1:
11578+
version "8.10.1"
11579+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.1.tgz#77da0366ff8afbe733596361d2df9a60fc9c9bd3"
11580+
integrity sha512-bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==
1156811581
dependencies:
11569-
arrify "^1.0.0"
11570-
chalk "^2.0.0"
11571-
diff "^3.1.0"
11582+
arg "^4.1.0"
11583+
diff "^4.0.1"
1157211584
make-error "^1.1.1"
11573-
minimist "^1.2.0"
11574-
mkdirp "^0.5.1"
11575-
source-map-support "^0.4.0"
11576-
tsconfig "^6.0.0"
11577-
v8flags "^3.0.0"
11578-
yn "^2.0.0"
11579-
11580-
tsconfig@^6.0.0:
11581-
version "6.0.0"
11582-
resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032"
11583-
integrity sha1-aw6DdgA9evGGT434+J3QBZ/80DI=
11584-
dependencies:
11585-
strip-bom "^3.0.0"
11586-
strip-json-comments "^2.0.0"
11585+
source-map-support "^0.5.17"
11586+
yn "3.1.1"
1158711587

1158811588
[email protected], tsickle@^0.38.0:
1158911589
version "0.38.1"
@@ -12066,7 +12066,7 @@ v8flags@^2.0.2:
1206612066
dependencies:
1206712067
user-home "^1.1.1"
1206812068

12069-
v8flags@^3.0.0, v8flags@^3.0.1:
12069+
v8flags@^3.0.1:
1207012070
version "3.1.1"
1207112071
resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.1.tgz#42259a1461c08397e37fe1d4f1cfb59cad85a053"
1207212072
integrity sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==
@@ -12626,10 +12626,10 @@ [email protected]:
1262612626
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
1262712627
integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
1262812628

12629-
yn@^2.0.0:
12630-
version "2.0.0"
12631-
resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
12632-
integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
12629+
yn@3.1.1:
12630+
version "3.1.1"
12631+
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
12632+
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
1263312633

1263412634
z-schema@~3.18.3:
1263512635
version "3.18.4"

0 commit comments

Comments
 (0)