Skip to content

Commit 6ac9575

Browse files
committed
Merge remote-tracking branch 'origin/main' into v2
# Conflicts: # .github/workflows/CI.yml # package-lock.json # package.json # tests/format/ImportDirective/__snapshots__/jsfmt.spec.js.snap
2 parents defddda + 03b224d commit 6ac9575

File tree

10 files changed

+428
-143
lines changed

10 files changed

+428
-143
lines changed

.github/workflows/CI.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Lint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
17-
- uses: actions/setup-node@v3
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: 18
2020
cache: 'npm'
@@ -27,10 +27,10 @@ jobs:
2727
name: Test production
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
31-
- uses: actions/setup-node@v3
30+
- uses: actions/checkout@v4
31+
- uses: actions/setup-node@v4
3232
with:
33-
node-version: 16
33+
node-version: 18
3434
cache: 'npm'
3535
- name: Install
3636
run: npm install
@@ -46,10 +46,10 @@ jobs:
4646
runs-on: ubuntu-latest
4747
strategy:
4848
matrix:
49-
node: [16, 18, 20]
49+
node: [18, 20, 22]
5050
steps:
51-
- uses: actions/checkout@v3
52-
- uses: actions/setup-node@v3
51+
- uses: actions/checkout@v4
52+
- uses: actions/setup-node@v4
5353
with:
5454
node-version: ${{ matrix.node }}
5555
cache: 'npm'
@@ -59,27 +59,27 @@ jobs:
5959
run: npm run test:all -- --runInBand
6060

6161
test_macos:
62-
name: Test on MacOS with Node 16
62+
name: Test on MacOS with Node 18
6363
runs-on: macos-latest
6464
steps:
65-
- uses: actions/checkout@v3
66-
- uses: actions/setup-node@v3
65+
- uses: actions/checkout@v4
66+
- uses: actions/setup-node@v4
6767
with:
68-
node-version: 16
68+
node-version: 18
6969
cache: 'npm'
7070
- name: Install
7171
run: npm install
7272
- name: Run tests
7373
run: npm run test:all -- --runInBand
7474

7575
test_windows:
76-
name: Test on Windows with Node 16
76+
name: Test on Windows with Node 18
7777
runs-on: windows-latest
7878
steps:
79-
- uses: actions/checkout@v3
80-
- uses: actions/setup-node@v3
79+
- uses: actions/checkout@v4
80+
- uses: actions/setup-node@v4
8181
with:
82-
node-version: 16
82+
node-version: 18
8383
cache: 'npm'
8484
- name: Install
8585
run: npm install

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
18

0 commit comments

Comments
 (0)