Skip to content

Commit dd8b39a

Browse files
krausestkrausest
committed
Merge branch 'pr/nakrovati/1374'
2 parents 06abe38 + a23a9b3 commit dd8b39a

File tree

15 files changed

+3056
-7932
lines changed

15 files changed

+3056
-7932
lines changed

‎webdriver-ts-results/public/index.html renamed to ‎webdriver-ts-results/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
</head>
99
<body>
1010
<div id="root" class="container"></div>
11+
<script type="module" src="/src/index.tsx"></script>
1112
</body>
1213
</html>

‎webdriver-ts-results/package-lock.json

Lines changed: 2867 additions & 7684 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webdriver-ts-results/package.json

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,24 @@
1111
"zustand": "^4.4.1"
1212
},
1313
"scripts": {
14-
"start": "webpack serve --mode development -c webpack.config.dev.js",
15-
"build": "webpack --mode production",
14+
"dev": "vite",
15+
"build": "tsc && vite build",
16+
"build:prod": "tsc && SINGLEFILE=true vite build && mv dist/index.html table.html",
1617
"lint": "eslint src/",
17-
"build-prod": "cross-env NODE_ENV=\"production\" webpack --mode production && rimraf --glob table.html && rimraf --glob \"BoxPlotTable*.js\" && cpx dist/table.html . && cpx \"dist/BoxPlotTable*.js\" . && cpx \"dist/plotly*.js\" ."
18-
},
19-
"browserslist": {
20-
"production": [
21-
"last 1 chrome version",
22-
"last 1 firefox version",
23-
"last 1 safari version"
24-
],
25-
"development": [
26-
"last 1 chrome version",
27-
"last 1 firefox version",
28-
"last 1 safari version"
29-
]
18+
"preview": "vite preview"
3019
},
3120
"devDependencies": {
32-
"@types/node": "^20.5.3",
21+
"@types/node": "^20.6.2",
3322
"@types/react": "^18.2.21",
3423
"@types/react-dom": "^18.2.7",
35-
"@typescript-eslint/eslint-plugin": "^6.5.0",
36-
"@typescript-eslint/parser": "^6.5.0",
37-
"cpx": "1.5.0",
38-
"cross-env": "7.0.3",
39-
"css-loader": "^6.8.1",
40-
"eslint": "^8.47.0",
24+
"@typescript-eslint/eslint-plugin": "^6.7.0",
25+
"@typescript-eslint/parser": "^6.7.0",
26+
"@vitejs/plugin-react": "^4.0.4",
27+
"eslint": "^8.49.0",
4128
"eslint-plugin-react": "^7.33.2",
4229
"eslint-plugin-react-hooks": "^4.6.0",
43-
"html-webpack-plugin": "^5.5.3",
44-
"inline-chunk-html-plugin": "^1.1.1",
45-
"rimraf": "^4.3.1",
46-
"style-loader": "^3.3.3",
47-
"ts-loader": "^9.4.4",
4830
"typescript": "^5.2.2",
49-
"webpack": "^5.88.2",
50-
"webpack-bundle-analyzer": "^4.9.1",
51-
"webpack-cli": "^5.1.4",
52-
"webpack-dev-server": "^4.15.1"
31+
"vite": "^4.4.9",
32+
"vite-plugin-singlefile": "^0.13.5"
5333
}
5434
}

‎webdriver-ts-results/src/components/BoxPlotTable/index.tsx renamed to ‎webdriver-ts-results/src/components/BoxPlotTable/BoxPlotTable.tsx

File renamed without changes.

‎webdriver-ts-results/src/components/ResultTable.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import StartupResultsTable from "./tables/StartupResultsTable";
1111
import { benchmarks } from "../results";
1212
import { useRootStore } from "../reducer";
1313

14-
const BoxPlotTable = React.lazy(
15-
() => import(/* webpackChunkName: "BoxPlotTable" */ "./BoxPlotTable"),
16-
);
14+
const BoxPlotTable = React.lazy(() => import("./BoxPlotTable/BoxPlotTable"));
1715

1816
interface Props {
1917
type: FrameworkType;

‎webdriver-ts-results/src/results.ts

Lines changed: 136 additions & 100 deletions
Large diffs are not rendered by default.

‎webdriver-ts-results/src/vite-env.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference types="vite/client" />

‎webdriver-ts-results/table.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎webdriver-ts-results/tools/webpack/webpack.rules.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎webdriver-ts-results/tsconfig.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"compilerOptions": {
3-
"target": "ES5",
3+
"target": "ES2020",
44
"lib": ["DOM", "DOM.Iterable", "ESNext"],
55
"noFallthroughCasesInSwitch": true,
66
"skipLibCheck": true,
7+
"noEmit": true,
78
"esModuleInterop": true,
89
"strict": true,
910
"module": "ESNext",
@@ -12,5 +13,6 @@
1213
"isolatedModules": true,
1314
"jsx": "react-jsx"
1415
},
15-
"include": ["src"]
16+
"include": ["src"],
17+
"references": [{ "path": "./tsconfig.node.json" }]
1618
}

0 commit comments

Comments
 (0)