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
prettier-solidity · Jan 6, 2025 · 6ac9575 · 6ac9575
2 parents defddda + 03b224d
commit 6ac9575
Show file tree

Hide file tree

Showing 10 changed files with 428 additions and 143 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,8 +13,8 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'npm'
@@ -27,10 +27,10 @@ jobs:
     name: Test production
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
       - name: Install
         run: npm install
@@ -46,10 +46,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16, 18, 20]
+        node: [18, 20, 22]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -59,27 +59,27 @@ jobs:
         run: npm run test:all -- --runInBand
 
   test_macos:
-    name: Test on MacOS with Node 16
+    name: Test on MacOS with Node 18
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
       - name: Install
         run: npm install
       - name: Run tests
         run: npm run test:all -- --runInBand
 
   test_windows:
-    name: Test on Windows with Node 16
+    name: Test on Windows with Node 18
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
       - name: Install
         run: npm install

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+18