From 5bcf4df8323e9ffdeb7d6b2cbafcdb4405c3015b Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:00:25 +0200 Subject: [PATCH 1/8] adding prettier config --- .prettierignore | 14 ++++++++++++++ .prettierrc | 12 ++++++++++++ package-lock.json | 3 ++- package.json | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..bb2a761d --- /dev/null +++ b/.prettierignore @@ -0,0 +1,14 @@ +node_modules +**/dist +package-lock.json + +# Un-ignore top-level files │ +!/* + +# For now exclude all existing workloads +**/*.html +**/*.js + +!**/benchmark.js +!**/src/* +!**/build/* diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..b439a14c --- /dev/null +++ b/.prettierrc @@ -0,0 +1,12 @@ +{ + "arrowParens": "always", + "bracketSameLine": false, + "bracketSpacing": true, + "htmlWhitespaceSensitivity": "css", + "printWidth": 250, + "semi": true, + "singleQuote": false, + "tabWidth": 4, + "trailingComma": "es5", + "useTabs": false +} diff --git a/package-lock.json b/package-lock.json index 0d5639c3..49699a5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "http-server": "^14.1.1", "jsvu": "^2.5.1", "local-web-server": "^5.4.0", - "prettier": "^2.8.3", + "prettier": "^2.8.8", "selenium-webdriver": "^4.35.0" }, "engines": { @@ -4923,6 +4923,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin-prettier.js" }, diff --git a/package.json b/package.json index 7ce95718..b7beb87c 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "http-server": "^14.1.1", "jsvu": "^2.5.1", "local-web-server": "^5.4.0", - "prettier": "^2.8.3", + "prettier": "^2.8.8", "selenium-webdriver": "^4.35.0" } } From d4fb5e52da6ffd88c6edefed5072683f71bc0778 Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:06:50 +0200 Subject: [PATCH 2/8] more confi --- .prettierignore | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.prettierignore b/.prettierignore index bb2a761d..a08d9b0f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,9 +1,10 @@ +# Ignore all subdirs +*/* node_modules -**/dist -package-lock.json +packages.json -# Un-ignore top-level files │ -!/* +# Un-ignore top-level files +!/* # For now exclude all existing workloads **/*.html @@ -11,4 +12,7 @@ package-lock.json !**/benchmark.js !**/src/* -!**/build/* + +# Ignore generated and third-party files +*/**/build/ +*/third_party/ \ No newline at end of file From 79d082e796d3eb31265518541af5f0db54ea3554 Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:47:21 +0200 Subject: [PATCH 3/8] wip --- .prettierignore | 35 +++++++++++++++++------------ web-tooling-benchmark/src/acorn.mjs | 6 ++++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.prettierignore b/.prettierignore index a08d9b0f..73ee34a5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,18 +1,25 @@ -# Ignore all subdirs -*/* +.* node_modules -packages.json +package-lock.json +dist +build +*bundle*.js -# Un-ignore top-level files -!/* +/Octane/* +/ARES-6/* +/cdjs/* +/8bitbench/* +/class-fields/* +/code-load/* +/SunSpider +/SeaMonster +/WSL +/worker/bomb-subtests -# For now exclude all existing workloads -**/*.html -**/*.js +/RexBench/* +!/RexBench/benchmark.js +!/RexBench/*/benchmark.js -!**/benchmark.js -!**/src/* - -# Ignore generated and third-party files -*/**/build/ -*/third_party/ \ No newline at end of file +!benchmark.js +!*/benchmark.js +!/**/*.md \ No newline at end of file diff --git a/web-tooling-benchmark/src/acorn.mjs b/web-tooling-benchmark/src/acorn.mjs index d842e4f9..42005baf 100644 --- a/web-tooling-benchmark/src/acorn.mjs +++ b/web-tooling-benchmark/src/acorn.mjs @@ -40,7 +40,11 @@ const payloads = [ }, ]; -export function runTest(fileData) { +export function runTest( + fileData + + +) { const testData = payloads.map(({ name, options }) => ({ payload: fileData[name], name: name, From d23946c03d313cbc00cbd458f3b6bff2647fd78f Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:52:57 +0200 Subject: [PATCH 4/8] fix config --- .prettierignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 73ee34a5..90b12965 100644 --- a/.prettierignore +++ b/.prettierignore @@ -15,9 +15,12 @@ build /SeaMonster /WSL /worker/bomb-subtests +wasm/dotnet/build-* +# Ignore everything in RexBench, then selectively un-ignore. /RexBench/* -!/RexBench/benchmark.js +!/RexBench/*/ +/RexBench/*/* !/RexBench/*/benchmark.js !benchmark.js From 87e8a02a136ee61db6ab779902f31295bce98225 Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:57:00 +0200 Subject: [PATCH 5/8] more conservative confiq --- .prettierignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 90b12965..32007589 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,6 +4,7 @@ package-lock.json dist build *bundle*.js +third_party /Octane/* /ARES-6/* @@ -15,7 +16,11 @@ build /SeaMonster /WSL /worker/bomb-subtests -wasm/dotnet/build-* +/wasm/dotnet/build-* +/wasm/tfjs-model-* +/simple/* +/generators/* +/threejs/* # Ignore everything in RexBench, then selectively un-ignore. /RexBench/* From f3cf23432bb44e1e358986c2ef9f1ad6118eac1b Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 10:57:38 +0200 Subject: [PATCH 6/8] adding format script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b7beb87c..0223b9f4 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "compress": "node utils/compress.mjs", "lint:check": "eslint **/*.{js,mjs,jsx,ts,tsx}", "pretty:check": "prettier --check ./", + "pretty:format": "prettier --write ./", "format:check": "npm run pretty:check && npm run lint:check", "test:chrome": "node tests/run.mjs --browser chrome", "test:firefox": "node tests/run.mjs --browser firefox", From c02fd3187f48d3ec0862d12503ef964b14705c7c Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 11:09:07 +0200 Subject: [PATCH 7/8] update prettier --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index b439a14c..fc20cfc7 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,7 +3,7 @@ "bracketSameLine": false, "bracketSpacing": true, "htmlWhitespaceSensitivity": "css", - "printWidth": 250, + "printWidth": 100, "semi": true, "singleQuote": false, "tabWidth": 4, From 39875b44baeddd3284d844529ba866136dbd1f61 Mon Sep 17 00:00:00 2001 From: Camillo Bruni Date: Wed, 3 Sep 2025 11:55:01 +0200 Subject: [PATCH 8/8] revert test file --- web-tooling-benchmark/src/acorn.mjs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web-tooling-benchmark/src/acorn.mjs b/web-tooling-benchmark/src/acorn.mjs index 42005baf..d842e4f9 100644 --- a/web-tooling-benchmark/src/acorn.mjs +++ b/web-tooling-benchmark/src/acorn.mjs @@ -40,11 +40,7 @@ const payloads = [ }, ]; -export function runTest( - fileData - - -) { +export function runTest(fileData) { const testData = payloads.map(({ name, options }) => ({ payload: fileData[name], name: name,