Skip to content

Commit c57451c

Browse files
authored
Merge branch 'krausest:master' into master
2 parents c2da7f4 + c1a761f commit c57451c

Some content is hidden

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

66 files changed

+1878
-1267
lines changed

eslint.config.js

Lines changed: 26 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,7 @@ export default [
1313
ignores: ["**/dist", "**/results", "**/node_modules", "css", "**/csv_export.js"],
1414
},
1515
{
16-
files: ["**/*.{ts,tsx}"],
17-
plugins: { "@typescript-eslint": ts },
18-
languageOptions: { parser: tsParser },
19-
rules: ts.configs["recommended"].rules,
20-
},
21-
/**
22-
* Root
23-
*/
24-
{
25-
files: ["*.js", "utils/**/*", "cli/**/*.js"],
26-
languageOptions: { globals: { ...globals.node } },
27-
rules: {
28-
"no-unused-vars": "warn",
29-
},
30-
},
31-
/**
32-
* Server
33-
*/
34-
{
35-
files: ["server/**/*"],
36-
languageOptions: { globals: { ...globals.node } },
37-
},
38-
/**
39-
* Webdriver
40-
*/
41-
{
42-
files: ["webdriver-ts/**/*.ts"],
4316
plugins: { unicorn },
44-
languageOptions: {
45-
parserOptions: { project: ["./webdriver-ts/tsconfig.eslint.json"] },
46-
globals: { ...globals.node },
47-
},
4817
rules: {
4918
...unicorn.configs.recommended.rules,
5019
// no:
@@ -57,7 +26,7 @@ export default [
5726
"unicorn/prefer-ternary": "off",
5827
"unicorn/require-number-to-fixed-digits-argument": "off",
5928
"unicorn/prefer-set-has": "off",
60-
"unicorn/unicorn/no-array-reduce": "off",
29+
"unicorn/no-array-reduce": "off",
6130
// maybe not:
6231
"unicorn/consistent-function-scoping": "off",
6332
"unicorn/no-array-for-each": "off",
@@ -71,7 +40,24 @@ export default [
7140
"unicorn/prefer-dom-node-text-content": "off",
7241
"unicorn/prefer-optional-catch-binding": "off",
7342
"unicorn/prefer-logical-operator-over-ternary": "off",
74-
43+
},
44+
languageOptions: { globals: { ...globals.node } },
45+
},
46+
{
47+
files: ["**/*.{ts,tsx}"],
48+
plugins: { "@typescript-eslint": ts },
49+
languageOptions: { parser: tsParser },
50+
rules: ts.configs["recommended"].rules,
51+
},
52+
/**
53+
* Webdriver
54+
*/
55+
{
56+
files: ["webdriver-ts/**/*.ts"],
57+
languageOptions: {
58+
parserOptions: { project: ["./webdriver-ts/tsconfig.eslint.json"] },
59+
},
60+
rules: {
7561
"@typescript-eslint/no-explicit-any": "off",
7662
"require-await": "error",
7763
"@typescript-eslint/no-floating-promises": "error",
@@ -82,7 +68,13 @@ export default [
8268
* Web
8369
*/
8470
{
85-
files: ["webdriver-ts-results/**/*.tsx"],
71+
files: ["webdriver-ts-results/**/*"],
72+
rules: {
73+
"@typescript-eslint/no-loss-of-precision": "off",
74+
},
75+
},
76+
{
77+
files: ["webdriver-ts-results/src/**/*.{js,ts,jsx,tsx}"],
8678
plugins: {
8779
react,
8880
"react-refresh": reactRefresh,
@@ -99,12 +91,4 @@ export default [
9991
settings: { react: { version: "detect" } },
10092
languageOptions: { globals: { ...globals.browser } },
10193
},
102-
{
103-
files: ["webdriver-ts-results/**/*"],
104-
languageOptions: { globals: { ...globals.browser, ...globals.node } },
105-
rules: {
106-
"@typescript-eslint/no-loss-of-precision": "off",
107-
"no-debugger": "off",
108-
},
109-
},
11094
];

push_results.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
cp webdriver-ts-results/dist/index.html ../krausest.github.io/js-framework-benchmark/current.html
22
cp webdriver-ts-results/dist/BoxPlotTable*.js ../krausest.github.io/js-framework-benchmark/
3-
cp webdriver-ts-results/dist/plotly*.js ../krausest.github.io/js-framework-benchmark/
3+
cp webdriver-ts-results/dist/chartjs*.js ../krausest.github.io/js-framework-benchmark/
44
cp webdriver-ts-results/dist/index*.css ../krausest.github.io/js-framework-benchmark/
55
cp webdriver-ts-results/dist/index*.js ../krausest.github.io/js-framework-benchmark/
66
cd ../krausest.github.io
77
git add js-framework-benchmark/current.html
88
git add js-framework-benchmark/BoxPlotTable*.js
9-
git add js-framework-benchmark/plotly*.js
9+
git add js-framework-benchmark/chartjs*.js
1010
git add js-framework-benchmark/index*.css
1111
git add js-framework-benchmark/index*.js
1212
git commit -m "update results"

0 commit comments

Comments
 (0)