Skip to content

Commit c149d09

Browse files
authored
Merge pull request #399 from on-keyday/env/typescript-7-support
env: adopt TypeScript 7 where tsc runs, keep web/dev on 6 (supersedes #387)
2 parents 0b08887 + 6a00d3a commit c149d09

9 files changed

Lines changed: 761 additions & 22 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ jobs:
265265
- name: Set up Ninja
266266
uses: seanmiddleditch/gha-setup-ninja@7e868db0f3406270dd46e1dac26c65f621456723 # master
267267
- name: Set up Go
268-
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
268+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
269269
with:
270270
go-version: ">=1.20"
271271
- name: Install Homebrew Clang
@@ -413,7 +413,7 @@ jobs:
413413
- name: Checkout repository
414414
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
415415
- name: Set up Node.js
416-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
416+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
417417
- name: Setup ast2ts
418418
run: |
419419
cd astlib/ast2ts
@@ -647,7 +647,7 @@ jobs:
647647
uses: ./.github/actions/setup-emsdk
648648
- name: Set up Ninja
649649
uses: seanmiddleditch/gha-setup-ninja@7e868db0f3406270dd46e1dac26c65f621456723 # master
650-
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
650+
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
651651
with:
652652
go-version: "1.26"
653653
- name: Setup ccache

.licensed.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ cache_path: "./license_cache" # source_pathからの相対パス。デフォル
99
sources: # 今回はnpmを使います
1010
npm: true
1111

12+
ignored:
13+
npm:
14+
# TypeScript 7 は Go 移植版で、ネイティブバイナリを
15+
# @typescript/typescript-<os>-<arch> という optionalDependencies として配布する。
16+
# lockfile には全プラットフォーム分 (aix / darwin / freebsd / linux / netbsd /
17+
# openbsd / sunos / win32 の約20個) が記録されるが、node_modules に実際に展開
18+
# されるのはホストの1つだけなので、残りを licensed cache が
19+
# "dependency path not found" として扱い exit 1 する。
20+
# typescript 本体 (Apache-2.0) は引き続き監査対象に残る。
21+
- "@typescript/typescript-*"
22+
1223
allowed: # 以下のライセンスならOKとします
1324
- mit
1425
- blueoak-1.0.0 # permissive (MIT 相当); minimatch v10 が ISC から移行

astlib/ast2rust/Cargo.lock

Lines changed: 13 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

astlib/ast2rust/macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
syn = "2.0"
9+
syn = "3.0"
1010
quote = "1.0"
1111
proc-macro2 = "1.0.86"
1212

0 commit comments

Comments
 (0)