summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2021-11-21 00:50:42 +0000
committerLinus Groh <mail@linusgroh.de>2021-11-21 01:18:23 +0000
commitf538df75729f0fee932c5c2791e48efc5fcaa801 (patch)
treec5706f701e575b33a62bc20e7871535e1fa6d338
parent66c06e8efb7c5e2abbf81fdfccaa80f24a4edbe0 (diff)
downloadserenity-f538df75729f0fee932c5c2791e48efc5fcaa801.zip
CI: Bump prettier to latest version (2.4.1)
We didn't initially upgrade because it started to (incorrectly) see files as strict mode and chokes on things that then would be syntax errors - but we're starting to fall behind a bit, so I'd rather put these files on the ignore list instead.
-rw-r--r--.github/workflows/cmake.yml2
-rw-r--r--.prettierignore5
-rw-r--r--Base/res/js/Spreadsheet/runtime.js6
3 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c8f8714f68..ac2a36149d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -49,7 +49,7 @@ jobs:
sudo apt-get update
sudo apt-get install libmpfr-dev libmpc-dev ninja-build e2fsprogs qemu-utils qemu-system-i386 ccache unzip
- name: Install JS dependencies
- run: sudo npm install -g prettier@2.2.1
+ run: sudo npm install -g prettier@2.4.1
- name: Install Python dependencies
# The setup-python action set default python to python3.x. Note that we are not using system python here.
run: |
diff --git a/.prettierignore b/.prettierignore
index ad481c8ac4..1f03a3f0a1 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,8 @@
Base/home/anon/Source/js
+Userland/Libraries/LibJS/Tests/builtins/Object/Object.prototype.toString.js
Userland/Libraries/LibJS/Tests/eval-aliasing.js
+Userland/Libraries/LibJS/Tests/if-statement-function-declaration.js
+Userland/Libraries/LibJS/Tests/invalid-lhs-in-assignment.js
+Userland/Libraries/LibJS/Tests/operators/delete-global-variable.js
+Userland/Libraries/LibJS/Tests/operators/delete-local-variable.js
Userland/Libraries/LibJS/Tests/unicode-identifier-escape.js
diff --git a/Base/res/js/Spreadsheet/runtime.js b/Base/res/js/Spreadsheet/runtime.js
index 9712eb2680..73a9e2fb74 100644
--- a/Base/res/js/Spreadsheet/runtime.js
+++ b/Base/res/js/Spreadsheet/runtime.js
@@ -479,8 +479,7 @@ sumIf.__documentation = JSON.stringify({
name: "sumIf",
argc: 2,
argnames: ["condition", "cell names"],
- doc:
- "Calculates the sum of cells the value of which evaluates to true when passed to `condition`",
+ doc: "Calculates the sum of cells the value of which evaluates to true when passed to `condition`",
examples: {
'sumIf(x => x instanceof Number, range("A1", "C4"))':
"Calculates the sum of all numbers within A1:C4",
@@ -524,8 +523,7 @@ averageIf.__documentation = JSON.stringify({
name: "averageIf",
argc: 2,
argnames: ["condition", "cell names"],
- doc:
- "Calculates the average of cells the value of which evaluates to true when passed to `condition`",
+ doc: "Calculates the average of cells the value of which evaluates to true when passed to `condition`",
examples: {
'averageIf(x => x > 4, range("A1", "C4"))':
"Calculate the sum of all numbers larger then 4 within A1:C4",