about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Schonning <nschonni@gmail.com>2023-02-18 06:44:45 -0500
committerGitHub <noreply@github.com>2023-02-18 12:44:45 +0100
commitb4df632ca187ff9fe136e47134b36a16f724b0df (patch)
tree018e77730db02e051d5ef1abc149eadd7f347082
parentc38bd17657483013ed189eccf8262557e4d0c465 (diff)
Run prettier on full repo with ignored extensions (#23538)
-rw-r--r--.prettierignore20
-rw-r--r--package.json4
2 files changed, 13 insertions, 11 deletions
diff --git a/.prettierignore b/.prettierignore
index 8279ac1a4..b3b5f06ed 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -51,15 +51,8 @@
 *~
 *.swp
 
-# Ignore npm debug log
-npm-debug.log
-
-# Ignore yarn log files
-yarn-error.log
-yarn-debug.log
-
-# Ignore vagrant log files
-*-cloudimg-console.log
+# Ignore log files
+*.log
 
 # Ignore Docker option files
 docker-compose.override.yml
@@ -73,3 +66,12 @@ docker-compose.override.yml
 
 # Ignore vendored CSS reset
 app/javascript/styles/mastodon/reset.scss
+
+# Ignore Javascript pending https://github.com/mastodon/mastodon/pull/23631
+*.js
+
+# Ignore Markdownlint pending https://github.com/mastodon/mastodon/pull/21972
+*.md
+
+# Ignore HTML till cleaned and included in CI
+*.html
diff --git a/package.json b/package.json
index 8641c197c..57ee85b71 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "test:lint:js": "eslint --ext=js . --cache --report-unused-disable-directives",
     "test:lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
     "test:jest": "cross-env NODE_ENV=test jest",
-    "format": "prettier --write \"**/*.{json,yml}\"",
-    "format-check": "prettier --check \"**/*.{json,yml}\""
+    "format": "prettier --write .",
+    "format-check": "prettier --check ."
   },
   "repository": {
     "type": "git",