Skip to content

Commit a2916d3

Browse files
[TS] Upgrade deps (#8620)
1 parent 5a95b7b commit a2916d3

File tree

6 files changed

+1025
-877
lines changed

6 files changed

+1025
-877
lines changed

.eslintrc.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ jobs:
394394
# Force Xcode 14.3 since Xcode 15 doesnt support older versions of
395395
# kotlin. For Xcode 15, kotlin should be bumpped to 1.9.10
396396
# https://stackoverflow.com/a/77150623
397-
# For now, run with macos-13 which has this 14.3 installed:
397+
# For now, run with macos-13 which has this 14.3 installed:
398398
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode
399399
- name: Set up Xcode version
400400
run: sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
@@ -534,14 +534,15 @@ jobs:
534534
- name: flatc
535535
# FIXME: make test script not rely on flatc
536536
run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j
537+
- name: pnpm
538+
run: npm install -g pnpm esbuild
537539
- name: deps
538-
run: yarn
540+
run: pnpm i
539541
- name: compile
540-
run: yarn compile
542+
run: pnpm compile
541543
- name: test
542544
working-directory: tests/ts
543545
run: |
544-
yarn global add esbuild
545546
python3 TypeScriptTest.py
546547
547548
build-dart:
@@ -582,12 +583,12 @@ jobs:
582583
- uses: actions/checkout@v3
583584
- name: bazel build
584585
run: >
585-
bazel build
586+
bazel build
586587
//:flatc
587588
//:flatbuffers
588589
- name: bazel test
589590
run: >
590-
bazel test
591+
bazel test
591592
//tests:flatbuffers_test
592593
593594
release-digests:

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ bazel_dep(
1515
)
1616
bazel_dep(
1717
name = "aspect_rules_js",
18-
version = "2.1.3",
18+
version = "2.3.8",
1919
)
2020
bazel_dep(
2121
name = "aspect_rules_ts",
22-
version = "3.4.0",
22+
version = "3.6.0",
2323
)
2424
bazel_dep(
2525
name = "grpc",

eslint.config.mjs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import globals from "globals";
2+
import pluginJs from "@eslint/js";
3+
import tseslint from "typescript-eslint";
4+
5+
export default [
6+
{files: ["**/*.{js,mjs,cjs,ts}"]},
7+
{languageOptions: { globals: {...globals.browser, ...globals.node} }},
8+
pluginJs.configs.recommended,
9+
...tseslint.configs.recommended,
10+
];

package.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,19 @@
3535
},
3636
"homepage": "https://google.github.io/flatbuffers/",
3737
"devDependencies": {
38-
"@types/node": "^20.10.4",
39-
"@typescript-eslint/eslint-plugin": "^6.13.2",
40-
"@typescript-eslint/parser": "^6.13.2",
41-
"esbuild": "^0.19.8",
42-
"eslint": "^8.55.0",
43-
"typescript": "5.3.3"
38+
"@eslint/js": "^9.29.0",
39+
"@types/node": "^24.0.3",
40+
"@typescript-eslint/eslint-plugin": "^8.34.1",
41+
"@typescript-eslint/parser": "^8.34.1",
42+
"esbuild": "^0.25.5",
43+
"eslint": "^9.29.0",
44+
"typescript": "5.8.3",
45+
"typescript-eslint": "^8.34.1"
46+
},
47+
"pnpm": {
48+
"onlyBuiltDependencies": [],
49+
"ignoredBuiltDependencies": [
50+
"esbuild"
51+
]
4452
}
4553
}

0 commit comments

Comments
 (0)