Skip to content

Commit b109fce

Browse files
committed
Merge branch 'master' of github.com:krausest/js-framework-benchmark
2 parents 4dc4089 + 07dfb31 commit b109fce

File tree

10 files changed

+3971
-3797
lines changed

10 files changed

+3971
-3797
lines changed

webdriver-ts-results/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const App = (): JSX.Element => {
1515
return (
1616
<div>
1717
{disclaimer}
18-
<p>The benchmark was run on a MaBook Pro 14 (32 GB RAM, 8/14 Cores, OSX 12.6), Chrome 106.0.5249.61 (arm64))
18+
<p>The benchmark was run on a MaBook Pro 14 (32 GB RAM, 8/14 Cores, OSX 12.6), Chrome 107.0.5304.62 (arm64))
1919
using the puppeteer benchmark driver with reduced tracing.
2020
</p>
2121
<SelectionBar/>

webdriver-ts-results/src/reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const removeKeyedSuffix = (value: string) => {
2121
else if (value.endsWith('-keyed')) return value.substring(0, value.length - 6)
2222
return value;
2323
}
24-
const mappedFrameworks = frameworks.map(f => ({ name: f.name, dir: f.dir, displayname: removeKeyedSuffix(f.name), issues: f.issues ?? [], type: f.keyed ? FrameworkType.KEYED : FrameworkType.NON_KEYED }));
24+
const mappedFrameworks = frameworks.map((f:any) => ({ name: f.name, dir: f.dir, displayname: removeKeyedSuffix(f.name), issues: f.issues ?? [], type: f.keyed ? FrameworkType.KEYED : FrameworkType.NON_KEYED }));
2525

2626
const allBenchmarks = benchmarks.reduce((set, b) => set.add(b), new Set<Benchmark>());
2727
const allFrameworks = mappedFrameworks.reduce((set, f) => set.add(f), new Set<Framework>());

webdriver-ts-results/src/results.ts

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

webdriver-ts-results/table.html

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

webdriver-ts/package-lock.json

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

webdriver-ts/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,37 @@
1717
"author": "",
1818
"license": "Apache-2.0",
1919
"devDependencies": {
20-
"@types/lodash": "4.14.185",
21-
"@types/node": "18.7.23",
22-
"@types/ramda": "^0.28.15",
23-
"@types/selenium-webdriver": "4.1.5",
20+
"@types/lodash": "4.14.186",
21+
"@types/node": "18.11.6",
22+
"@types/ramda": "^0.28.18",
23+
"@types/selenium-webdriver": "4.1.6",
2424
"@types/semver": "7.3.12",
2525
"@types/underscore": "^1.11.4",
2626
"@types/yargs": "17.0.13",
27-
"@typescript-eslint/eslint-plugin": "^5.38.1",
28-
"@typescript-eslint/parser": "^5.38.1",
27+
"@typescript-eslint/eslint-plugin": "^5.41.0",
28+
"@typescript-eslint/parser": "^5.41.0",
2929
"dockerode": "^3.3.4",
30-
"eslint": "^8.24.0",
30+
"eslint": "^8.26.0",
3131
"rimraf": "^3.0.2",
3232
"ts-node": "10.9.1",
3333
"typescript": "4.8.4"
3434
},
3535
"dependencies": {
36-
"axios": "^0.27.2",
37-
"chromedriver": "^105.0.1",
36+
"axios": "^1.1.3",
37+
"chromedriver": "^107.0.0",
3838
"cross-env": "7.0.3",
3939
"dot": "1.1.3",
4040
"jstat": "1.9.5",
4141
"lighthouse": "9.6.7",
4242
"lodash": "4.17.21",
4343
"marky": "^1.2.5",
44-
"npm-check-updates": "16.3.3",
45-
"playwright": "^1.26.1",
46-
"puppeteer-core": "^18.0.5",
44+
"npm-check-updates": "16.3.15",
45+
"playwright": "^1.27.1",
46+
"puppeteer-core": "^19.2.0",
4747
"ramda": "^0.28.0",
48-
"selenium-webdriver": "4.4.0",
49-
"semver": "7.3.7",
48+
"selenium-webdriver": "4.5.0",
49+
"semver": "7.3.8",
5050
"underscore": "^1.13.6",
51-
"yargs": "17.5.1"
51+
"yargs": "17.6.0"
5252
}
5353
}

webdriver-ts/results.json

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

webdriver-ts/src/common.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import * as fs from "fs";
22
import * as path from "path";
3-
import axios from "axios";
3+
import * as axios from "axios";
44
import { StartupBenchmarkResult } from "./benchmarksLighthouse";
55
import { string } from "yargs";
66

7+
78
export interface JSONResult {
89
framework: string;
910
keyed: boolean;
@@ -121,9 +122,11 @@ export async function initializeFrameworks(matchPredicate: IMatchPredicate = mat
121122
let lsResult ;
122123
try {
123124
lsResult = (
124-
await axios.get(`http://${config.HOST}:${config.PORT}/ls`)
125+
// FIXME https://github.com/axios/axios/issues/5008
126+
await (axios as any).get(`http://${config.HOST}:${config.PORT}/ls`)
125127
).data;
126128
} catch (err) {
129+
console.log(err);
127130
console.log(`ERROR loading frameworks from http://${config.HOST}:${config.PORT}/ls. Is the server running?`);
128131
throw new Error(`ERROR loading frameworks from http://${config.HOST}:${config.PORT}/ls. Is the server running?`);
129132
}

webdriver-ts/src/playwrightAccess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function browserPath(benchmarkOptions: BenchmarkDriverOptions) {
8787
} else if (process.platform == "linux") {
8888
return "/usr/bin/google-chrome";
8989
} else if(/^win/i.test(process.platform)) {
90-
return 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe';
90+
return 'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe';
9191
} else {
9292
throw new Error("Path to Google Chrome executable must be specified");
9393
}

webdriver-ts/src/puppeteerAccess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function browserPath(benchmarkOptions: BenchmarkDriverOptions) {
8686
} else if (process.platform == "linux") {
8787
return "google-chrome";
8888
} else if(/^win/i.test(process.platform)) {
89-
return 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe';
89+
return 'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe';
9090
} else {
9191
throw new Error("Path to Google Chrome executable must be specified");
9292
}

0 commit comments

Comments
 (0)