Skip to content

Commit ca3002c

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/prettier-3.4.2
2 parents dec59c5 + b5de99c commit ca3002c

File tree

260 files changed

+2303
-3657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+2303
-3657
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
5-
schedule:
6-
interval: "weekly"
7-
open-pull-requests-limit: 1
3+
- package-ecosystem: "npm"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 1

.github/workflows/nodejs.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ jobs:
44
test:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v4
8-
- uses: actions/setup-node@v4
9-
with:
10-
node-version-file: '.nvmrc'
11-
- run: npm ci
12-
- run: npm run lint
13-
- run: npm test
14-
env:
15-
CI: true
16-
NODE_OPTIONS: '--experimental-vm-modules'
7+
- uses: actions/checkout@v4
8+
- uses: actions/setup-node@v4
9+
with:
10+
node-version-file: ".nvmrc"
11+
- run: npm ci
12+
- run: npm run lint
13+
- run: npm test
14+
env:
15+
CI: true

.vscode/launch.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,15 @@
77
"request": "launch",
88
"cwd": "${workspaceRoot}",
99
"program": "${workspaceRoot}/src/index.js",
10-
"args": [
11-
"${relativeFile}"
12-
]
10+
"args": ["${relativeFile}"]
1311
},
1412
{
1513
"name": "Launch Tests",
1614
"type": "node",
1715
"request": "launch",
1816
"cwd": "${workspaceRoot}",
19-
"program": "${workspaceFolder}/node_modules/.bin/jest",
20-
"args": [
21-
"--runInBand",
22-
"--findRelatedTests",
23-
"${relativeFile}"
24-
],
25-
"env": {
26-
"NODE_OPTIONS": "--experimental-vm-modules",
27-
}
17+
"program": "${workspaceRoot}/node_modules/vitest/vitest.mjs",
18+
"args": ["related", "${relativeFile}"]
2819
}
2920
]
3021
}

eslint.config.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
import globals from 'globals';
2-
import eslint from '@eslint/js';
3-
import jest from 'eslint-plugin-jest';
4-
import typescript from 'typescript-eslint';
5-
import prettier from 'eslint-plugin-prettier/recommended';
1+
import globals from "globals";
2+
import eslint from "@eslint/js";
3+
import vitest from "eslint-plugin-vitest";
4+
import typescript from "typescript-eslint";
5+
import prettier from "eslint-plugin-prettier/recommended";
66

77
export default [
88
eslint.configs.recommended,
9-
jest.configs['flat/recommended'],
9+
vitest.configs.recommended,
1010
...typescript.configs.recommended,
1111
prettier,
1212
{ languageOptions: { globals: globals.browser } },
13-
{
14-
rules: {
15-
'prefer-template': 'error',
16-
},
17-
},
13+
{ rules: { "prefer-template": "error" } },
1814
];

0 commit comments

Comments
 (0)