Skip to content

Commit 56db9c1

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/jose-4.15.5
2 parents d7378ea + 29374ec commit 56db9c1

File tree

5 files changed

+2307
-3385
lines changed

5 files changed

+2307
-3385
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
matrix:
1717
node-version:
18-
- 16.x
1918
- 18.x
19+
- 20.x
2020
steps:
2121
- uses: actions/checkout@v2
2222
- name: Use Node.js ${{ matrix.node-version }}
@@ -28,8 +28,8 @@ jobs:
2828
- run: npm test
2929
- run: npm run build --if-present
3030
- name: Save build
31-
if: matrix.node-version == '16.x'
32-
uses: actions/upload-artifact@v2
31+
if: matrix.node-version == '18.x'
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: build
3535
path: |
@@ -40,12 +40,12 @@ jobs:
4040
needs: build
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/download-artifact@v2
43+
- uses: actions/download-artifact@v4
4444
with:
4545
name: build
4646
- uses: actions/setup-node@v1
4747
with:
48-
node-version: 16.x
48+
node-version: 18.x
4949
- uses: rlespinasse/[email protected]
5050
- name: Append commit hash to package version
5151
run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
@@ -61,12 +61,12 @@ jobs:
6161
runs-on: ubuntu-latest
6262
if: github.ref == 'refs/heads/main'
6363
steps:
64-
- uses: actions/download-artifact@v2
64+
- uses: actions/download-artifact@v4
6565
with:
6666
name: build
6767
- uses: actions/setup-node@v1
6868
with:
69-
node-version: 16.x
69+
node-version: 18.x
7070
- name: Disable pre- and post-publish actions
7171
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
7272
- uses: JS-DevTools/npm-publish@v1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.14.0
1+
v18.19.0

eslint.config.mjs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import { fixupConfigRules } from "@eslint/compat";
2+
import globals from "globals";
3+
import path from "node:path";
4+
import { fileURLToPath } from "node:url";
5+
import js from "@eslint/js";
6+
import { FlatCompat } from "@eslint/eslintrc";
7+
8+
const __filename = fileURLToPath(import.meta.url);
9+
const __dirname = path.dirname(__filename);
10+
const compat = new FlatCompat({
11+
baseDirectory: __dirname,
12+
recommendedConfig: js.configs.recommended,
13+
allConfig: js.configs.all
14+
});
15+
16+
export default [
17+
...fixupConfigRules(compat.extends("eslint:recommended", "plugin:import/recommended")),
18+
{
19+
languageOptions: {
20+
globals: {
21+
...globals.browser,
22+
...globals.node,
23+
Atomics: "readonly",
24+
SharedArrayBuffer: "readonly",
25+
},
26+
},
27+
28+
rules: {
29+
"no-unused-vars": ["warn", {
30+
argsIgnorePattern: "^_",
31+
varsIgnorePattern: "^_",
32+
}],
33+
},
34+
},
35+
];

0 commit comments

Comments
 (0)