From 35443152c479e6cf28b339dd4e706e97caf574a3 Mon Sep 17 00:00:00 2001 From: Paul Robert Lloyd Date: Thu, 3 Aug 2023 16:48:17 +0100 Subject: [PATCH] Use Prettier to format code --- .prettierignore | 3 +++ package-lock.json | 16 ++++++++++++++++ package.json | 23 ++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..bd15fa5 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +# JavaScript (formatted with Standard) +**/*.js +**/*.mjs diff --git a/package-lock.json b/package-lock.json index f040c92..83d72ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "devDependencies": { "ava": "^5.0.0", "c8": "^8.0.0", + "prettier": "^3.0.1", "standard": "^17.0.0", "stylelint": "^15.0.0", "stylelint-config-gds": "^1.0.0" @@ -4146,6 +4147,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-ms": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz", diff --git a/package.json b/package.json index 32837be..601c55b 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "url": "https://github.com/x-govuk/marked-govspeak.git" }, "scripts": { - "lint": "standard && stylelint 'govspeak/**/*.scss'", + "lint": "prettier . --check && standard && stylelint 'govspeak/**/*.scss'", "test": "ava", "test:watch": "ava --watch", "coverage": "c8 ava" @@ -38,6 +38,7 @@ "devDependencies": { "ava": "^5.0.0", "c8": "^8.0.0", + "prettier": "^3.0.1", "standard": "^17.0.0", "stylelint": "^15.0.0", "stylelint-config-gds": "^1.0.0" @@ -51,6 +52,26 @@ "lcovonly" ] }, + "prettier": { + "semi": false, + "singleQuote": true, + "trailingComma": "none", + "overrides": [ + { + "files": "*.md", + "options": { + "embeddedLanguageFormatting": "off", + "singleQuote": false + } + }, + { + "files": "*.scss", + "options": { + "singleQuote": false + } + } + ] + }, "stylelint": { "extends": "stylelint-config-gds/scss" }