Update formatting settings (#4065)

* Format JSON files on save * Add prettier plugin for organizing imports * Reorganize imports * Fix 'routine' build issues * `yarn build` (GitHub Actions) --------- Co-authored-by: wch <[email protected]>
rstudio · May 24, 2024 · 3e0efd8 · 3e0efd8
1 parent 4a8400d
commit 3e0efd8
Show file tree

Hide file tree

Showing 64 changed files with 10,245 additions and 10,222 deletions.
diff --git a/.github/shiny-workflows/routine.sh b/.github/shiny-workflows/routine.sh
@@ -5,6 +5,7 @@ echo "Updating package.json version to match DESCRIPTION Version"
 Rscript ./tools/updatePackageJsonVersion.R
 if [ -n "$(git status --porcelain package.json)" ]
 then
+  echo "package.json has changed after running ./tools/updatePackageJsonVersion.R. Re-running 'yarn build'"
   yarn build
   git add ./inst package.json && git commit -m 'Sync package version (GitHub Actions)' || echo "No package version to commit"
 else

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,4 +15,10 @@
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,
   },
+  "[json]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
+},
 }