Skip to content

Commit ffacd30

Browse files
sangmokhsangmokh
authored
Merge branch 'main' into issue-1783-remote-conn-csp-error
2 parents 7b0285b + 10f112c commit ffacd30

File tree

48 files changed

+3485
-3375
lines changed

Some content is hidden

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

48 files changed

+3485
-3375
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515
- uses: pnpm/action-setup@v4
16-
- uses: actions/setup-node@v5
16+
- uses: actions/setup-node@v6
1717
with:
1818
node-version: 'lts/*'
1919
cache: 'pnpm'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: pnpm/action-setup@v4
2222

2323
- name: Setup Node.js
24-
uses: actions/setup-node@v5
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: 'lts/*'
2727
cache: 'pnpm'

‎eslint.js.config.base.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { defineConfig } from 'eslint/config';
12
import eslint from '@eslint/js';
23
import eslintConfigPrettier from 'eslint-config-prettier';
34

4-
export default [eslint.configs.recommended, eslintConfigPrettier];
5+
export default defineConfig([eslint.configs.recommended, eslintConfigPrettier]);

‎eslint.js.react.jest.config.base.mjs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { defineConfig } from 'eslint/config';
12
import eslint from '@eslint/js';
23
import react from 'eslint-plugin-react';
3-
import { fixupPluginRules } from '@eslint/compat';
4-
import eslintPluginReactHooks from 'eslint-plugin-react-hooks';
4+
import reactHooks from 'eslint-plugin-react-hooks';
55
import jest from 'eslint-plugin-jest';
66
import eslintConfigPrettier from 'eslint-config-prettier';
77

8-
export default [
8+
export default defineConfig([
99
{
1010
files: ['test/**/*.js', 'test/**/*.jsx'],
1111
...eslint.configs.recommended,
@@ -24,9 +24,7 @@ export default [
2424
},
2525
{
2626
files: ['test/**/*.js', 'test/**/*.jsx'],
27-
plugins: {
28-
'react-hooks': fixupPluginRules(eslintPluginReactHooks),
29-
},
27+
...reactHooks.configs.flat.recommended,
3028
},
3129
{
3230
files: ['test/**/*.js', 'test/**/*.jsx'],
@@ -40,4 +38,4 @@ export default [
4038
files: ['test/**/*.js', 'test/**/*.jsx'],
4139
...eslintConfigPrettier,
4240
},
43-
];
41+
]);

‎eslint.ts.config.base.mjs‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,57 @@
1+
import { defineConfig } from 'eslint/config';
12
import eslint from '@eslint/js';
23
import tseslint from 'typescript-eslint';
34
import eslintConfigPrettier from 'eslint-config-prettier';
45

5-
export default (tsconfigRootDir, files = ['**/*.ts'], project = true) => [
6-
{
7-
files,
8-
...eslint.configs.recommended,
9-
},
10-
...tseslint.configs.recommendedTypeChecked.map((config) => ({
11-
files,
12-
...config,
13-
})),
14-
...tseslint.configs.stylisticTypeChecked.map((config) => ({
15-
files,
16-
...config,
17-
})),
18-
{
19-
files,
20-
languageOptions: {
21-
parserOptions: {
22-
project,
23-
tsconfigRootDir,
6+
export default (tsconfigRootDir, files = ['**/*.ts'], project = true) =>
7+
defineConfig([
8+
{
9+
files,
10+
...eslint.configs.recommended,
11+
},
12+
...tseslint.configs.recommendedTypeChecked.map((config) => ({
13+
files,
14+
...config,
15+
})),
16+
...tseslint.configs.stylisticTypeChecked.map((config) => ({
17+
files,
18+
...config,
19+
})),
20+
{
21+
files,
22+
languageOptions: {
23+
parserOptions: {
24+
project,
25+
tsconfigRootDir,
26+
},
2427
},
2528
},
26-
},
27-
{
28-
files,
29-
...eslintConfigPrettier,
30-
},
31-
{
32-
files,
33-
rules: {
34-
'@typescript-eslint/no-unsafe-return': 'off',
35-
'@typescript-eslint/no-unsafe-assignment': 'off',
36-
'@typescript-eslint/no-unsafe-call': 'off',
37-
'@typescript-eslint/no-unsafe-member-access': 'off',
38-
'@typescript-eslint/prefer-optional-chain': 'off',
39-
'@typescript-eslint/no-base-to-string': 'off',
40-
'@typescript-eslint/consistent-indexed-object-style': 'off',
41-
'@typescript-eslint/prefer-nullish-coalescing': 'off',
42-
'@typescript-eslint/consistent-type-definitions': 'off',
43-
'@typescript-eslint/no-unused-vars': 'off',
44-
'@typescript-eslint/no-explicit-any': 'off',
45-
'@typescript-eslint/prefer-for-of': 'off',
46-
'@typescript-eslint/non-nullable-type-assertion-style': 'off',
47-
'@typescript-eslint/class-literal-property-style': 'off',
48-
'@typescript-eslint/no-redundant-type-constituents': 'off',
49-
'@typescript-eslint/prefer-string-starts-ends-with': 'off',
50-
'@typescript-eslint/no-duplicate-type-constituents': 'off',
51-
'@typescript-eslint/array-type': 'off',
52-
'@typescript-eslint/prefer-function-type': 'off',
29+
{
30+
files,
31+
...eslintConfigPrettier,
32+
},
33+
{
34+
files,
35+
rules: {
36+
'@typescript-eslint/no-unsafe-return': 'off',
37+
'@typescript-eslint/no-unsafe-assignment': 'off',
38+
'@typescript-eslint/no-unsafe-call': 'off',
39+
'@typescript-eslint/no-unsafe-member-access': 'off',
40+
'@typescript-eslint/prefer-optional-chain': 'off',
41+
'@typescript-eslint/no-base-to-string': 'off',
42+
'@typescript-eslint/consistent-indexed-object-style': 'off',
43+
'@typescript-eslint/prefer-nullish-coalescing': 'off',
44+
'@typescript-eslint/consistent-type-definitions': 'off',
45+
'@typescript-eslint/no-unused-vars': 'off',
46+
'@typescript-eslint/no-explicit-any': 'off',
47+
'@typescript-eslint/prefer-for-of': 'off',
48+
'@typescript-eslint/non-nullable-type-assertion-style': 'off',
49+
'@typescript-eslint/class-literal-property-style': 'off',
50+
'@typescript-eslint/no-redundant-type-constituents': 'off',
51+
'@typescript-eslint/prefer-string-starts-ends-with': 'off',
52+
'@typescript-eslint/no-duplicate-type-constituents': 'off',
53+
'@typescript-eslint/array-type': 'off',
54+
'@typescript-eslint/prefer-function-type': 'off',
55+
},
5356
},
54-
},
55-
];
57+
]);

‎eslint.ts.jest.config.base.mjs‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,66 @@
1+
import { defineConfig } from 'eslint/config';
12
import eslint from '@eslint/js';
23
import tseslint from 'typescript-eslint';
34
import jest from 'eslint-plugin-jest';
45
import eslintConfigPrettier from 'eslint-config-prettier';
56

6-
export default (tsconfigRootDir) => [
7-
{
8-
files: ['test/**/*.ts'],
9-
...eslint.configs.recommended,
10-
},
11-
...tseslint.configs.recommendedTypeChecked.map((config) => ({
12-
files: ['test/**/*.ts'],
13-
...config,
14-
})),
15-
...tseslint.configs.stylisticTypeChecked.map((config) => ({
16-
files: ['test/**/*.ts'],
17-
...config,
18-
})),
19-
{
20-
files: ['test/**/*.ts'],
21-
languageOptions: {
22-
parserOptions: {
23-
project: ['./tsconfig.test.json'],
24-
tsconfigRootDir,
7+
export default (tsconfigRootDir) =>
8+
defineConfig([
9+
{
10+
files: ['test/**/*.ts'],
11+
...eslint.configs.recommended,
12+
},
13+
...tseslint.configs.recommendedTypeChecked.map((config) => ({
14+
files: ['test/**/*.ts'],
15+
...config,
16+
})),
17+
...tseslint.configs.stylisticTypeChecked.map((config) => ({
18+
files: ['test/**/*.ts'],
19+
...config,
20+
})),
21+
{
22+
files: ['test/**/*.ts'],
23+
languageOptions: {
24+
parserOptions: {
25+
project: ['./tsconfig.test.json'],
26+
tsconfigRootDir,
27+
},
2528
},
2629
},
27-
},
28-
{
29-
files: ['test/**/*.ts'],
30-
...jest.configs['flat/recommended'],
31-
},
32-
{
33-
files: ['test/**/*.ts'],
34-
...jest.configs['jest/style'],
35-
},
36-
{
37-
files: ['test/**/*.ts'],
38-
...eslintConfigPrettier,
39-
},
40-
{
41-
files: ['test/**/*.ts'],
42-
rules: {
43-
'@typescript-eslint/no-unsafe-return': 'off',
44-
'@typescript-eslint/no-unsafe-assignment': 'off',
45-
'@typescript-eslint/no-unsafe-call': 'off',
46-
'@typescript-eslint/no-unsafe-member-access': 'off',
47-
'@typescript-eslint/prefer-optional-chain': 'off',
48-
'@typescript-eslint/no-base-to-string': 'off',
49-
'@typescript-eslint/consistent-indexed-object-style': 'off',
50-
'@typescript-eslint/prefer-nullish-coalescing': 'off',
51-
'@typescript-eslint/consistent-type-definitions': 'off',
52-
'@typescript-eslint/no-unused-vars': 'off',
53-
'@typescript-eslint/no-explicit-any': 'off',
54-
'@typescript-eslint/prefer-for-of': 'off',
55-
'@typescript-eslint/non-nullable-type-assertion-style': 'off',
56-
'@typescript-eslint/class-literal-property-style': 'off',
57-
'@typescript-eslint/no-redundant-type-constituents': 'off',
58-
'@typescript-eslint/prefer-string-starts-ends-with': 'off',
59-
'@typescript-eslint/no-duplicate-type-constituents': 'off',
60-
'@typescript-eslint/array-type': 'off',
61-
'@typescript-eslint/prefer-function-type': 'off',
30+
{
31+
files: ['test/**/*.ts'],
32+
...jest.configs['flat/recommended'],
33+
},
34+
{
35+
files: ['test/**/*.ts'],
36+
...jest.configs['jest/style'],
37+
},
38+
{
39+
files: ['test/**/*.ts'],
40+
...eslintConfigPrettier,
41+
},
42+
{
43+
files: ['test/**/*.ts'],
44+
rules: {
45+
'@typescript-eslint/no-unsafe-return': 'off',
46+
'@typescript-eslint/no-unsafe-assignment': 'off',
47+
'@typescript-eslint/no-unsafe-call': 'off',
48+
'@typescript-eslint/no-unsafe-member-access': 'off',
49+
'@typescript-eslint/prefer-optional-chain': 'off',
50+
'@typescript-eslint/no-base-to-string': 'off',
51+
'@typescript-eslint/consistent-indexed-object-style': 'off',
52+
'@typescript-eslint/prefer-nullish-coalescing': 'off',
53+
'@typescript-eslint/consistent-type-definitions': 'off',
54+
'@typescript-eslint/no-unused-vars': 'off',
55+
'@typescript-eslint/no-explicit-any': 'off',
56+
'@typescript-eslint/prefer-for-of': 'off',
57+
'@typescript-eslint/non-nullable-type-assertion-style': 'off',
58+
'@typescript-eslint/class-literal-property-style': 'off',
59+
'@typescript-eslint/no-redundant-type-constituents': 'off',
60+
'@typescript-eslint/prefer-string-starts-ends-with': 'off',
61+
'@typescript-eslint/no-duplicate-type-constituents': 'off',
62+
'@typescript-eslint/array-type': 'off',
63+
'@typescript-eslint/prefer-function-type': 'off',
64+
},
6265
},
63-
},
64-
];
66+
]);

0 commit comments

Comments
 (0)