task: resolve conflicts of prettier and eslint (#508)

PhotoboothProject · Dec 18, 2023 · d2cbbea · d2cbbea
1 parent 49ece7b
commit d2cbbea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,7 +1,6 @@
 {
   "trailingComma": "none",
   "singleQuote": true,
-  "bracketSpacing": false,
   "printWidth": 120,
   "useTabs": false
 }
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "clean:skipwelcome": "rimraf welcome/.skip_welcome",
     "eslint": "eslint assets/js/{,*/**/}*.js",
     "eslint:fix": "eslint assets/js/{,*/**/}*.js --fix",
-    "format": "npm-run-all --parallel eslint:fix format:*",
+    "format": "npm-run-all format:* eslint:fix",
     "format:js": "prettier assets/js/{,*/**/}*.js --write",
     "format:scss": "prettier assets/sass/{,*/**/}*.scss --write",
     "pack:build": "npm-run-all --serial eslint build pack:zip",