diff --git a/client/.prettierignore b/client/.prettierignore
new file mode 100644
index 00000000000..95fb6f29303
--- /dev/null
+++ b/client/.prettierignore
@@ -0,0 +1,16 @@
+# Standard ignores
+**/.git
+**/.svn
+**/.hg
+**/node_modules
+# Ignore the dist folder
+**/dist
+# We will always defer to package manager for formatting of package.json files.
+**/package.json
+# Skip formatting of explicitly included libs (to stay in sync with upstream, and they should go away eventually)
+src/libs
+# Don't reformat .json or .yml files included in the project
+*.json
+*.yml
+# Might be nice to add markdown formatting eventually?
+*.md
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
index ca7c9ee3630..6e3f76bfc7e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -123,8 +123,8 @@
     "webpack-production-maps": "GXY_BUILD_SOURCEMAPS=1 NODE_ENV=production webpack",
     "gulp": "gulp",
     "stage-build": "cpy 'dist/*' '../static/dist' && (git rev-parse HEAD 2>/dev/null || echo '') >../static/client_build_hash.txt",
-    "format": "prettier --write 'src/style/scss/**/*.scss' 'src/**/{*.ts,*.js,*.vue}' 'tests/jest/standalone/{*.ts,*.js}' '!src/libs/**'",
-    "format-check": "prettier --check 'src/style/scss/**/*.scss' 'src/**/{*.js,*.vue}' 'tests/jest/standalone/{*.ts,*.js}' '!src/libs/**'",
+    "format": "prettier --write .",
+    "format-check": "prettier --check .",
     "prettier": "yarn run format",
     "test": "yarn run qunit && yarn run jest",
     "jest": "jest --config tests/jest/jest.config.js",