Merge branch 'master' into snyk-upgrade-1199942e9362d7ffded5479c54c4082a

# Conflicts: # package-lock.json
parallax · Sep 17, 2024 · 1520b5e · 1520b5e
2 parents ee18f4d + 3e44dfa
commit 1520b5e
Show file tree

Hide file tree

Showing 4 changed files with 6,364 additions and 3,852 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 20
           cache: npm
       - name: npm install
         run: npm ci
@@ -29,9 +29,8 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 10 # minimum supported version
-          - 14 # current LTS
-          - 16 # latest
+          - 20 # current LTS
+          - 22 # latest
     name: Node.js ${{ matrix.node-version }} test
     steps:
       - name: Checkout
@@ -53,22 +52,23 @@ jobs:
     strategy:
       matrix:
         ts-version:
-          - '3.0'
-          - '4.0'
-          - 'latest'
-    name: Typings tests (typescript@${{ matrix.ts-version }})
+          - { ts: '4.0', types-node: '17' }
+          - { ts: 'latest', types-node: '20' }
+    name: Typings tests (typescript@${{ matrix.ts-version.ts }})
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 20
           cache: npm
       - name: npm install
         run: npm ci
-      - name: Install typescript@${{ matrix.ts-version }}
-        run: npm install typescript@${{ matrix.ts-version }}
+      - name: Install typescript@${{ matrix.ts-version.ts }}
+        run: npm install typescript@${{ matrix.ts-version.ts }}
+      - name: Install @types/node@${{ matrix.ts-version.types-node }}
+        run: npm install @types/node@${{ matrix.ts-version.types-node }}
       - name: Run tests
         run: npm run test-typings
 
@@ -81,7 +81,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 20
           cache: npm
       - name: npm install
         run: npm ci

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish