From 8115f5a0e4b7ba1e2603a554bd6c1e7a5c96df47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Sun, 4 Oct 2020 19:43:23 +0200 Subject: [PATCH] chore(workflows): run prettier on microsite changes too --- .github/workflows/microsite-build-check.yml | 4 ++++ .prettierignore | 2 +- microsite/.prettierignore | 1 + microsite/package.json | 8 ++++++-- microsite/static/css/plugins.css | 10 +++++----- microsite/yarn.lock | 10 ++++++++++ 6 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 microsite/.prettierignore diff --git a/.github/workflows/microsite-build-check.yml b/.github/workflows/microsite-build-check.yml index 0b614509f2..8a2fa99ed2 100644 --- a/.github/workflows/microsite-build-check.yml +++ b/.github/workflows/microsite-build-check.yml @@ -33,6 +33,10 @@ jobs: run: yarn install --frozen-lockfile working-directory: microsite + - name: prettier + run: yarn prettier:check + working-directory: microsite + - name: build microsite run: yarn build working-directory: microsite diff --git a/.prettierignore b/.prettierignore index 9e75b74eee..4b1acbb594 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,6 @@ .yarn dist -microsite/build +microsite coverage *.hbs templates diff --git a/microsite/.prettierignore b/microsite/.prettierignore new file mode 100644 index 0000000000..378eac25d3 --- /dev/null +++ b/microsite/.prettierignore @@ -0,0 +1 @@ +build diff --git a/microsite/package.json b/microsite/package.json index 734f1e4d49..a44fc2c63e 100644 --- a/microsite/package.json +++ b/microsite/package.json @@ -7,13 +7,17 @@ "examples": "docusaurus-examples", "start": "docusaurus-start", "build": "docusaurus-build", + "prettier:check": "prettier --check .", "publish-gh-pages": "docusaurus-publish", "write-translations": "docusaurus-write-translations", "version": "docusaurus-version", "rename-version": "docusaurus-rename-version" }, "devDependencies": { + "@spotify/prettier-config": "^8.0.0", "docusaurus": "^2.0.0-alpha.64", - "js-yaml": "^3.14.0" - } + "js-yaml": "^3.14.0", + "prettier": "^2.0.5" + }, + "prettier": "@spotify/prettier-config" } diff --git a/microsite/static/css/plugins.css b/microsite/static/css/plugins.css index ac234097ca..9a8bbafa46 100644 --- a/microsite/static/css/plugins.css +++ b/microsite/static/css/plugins.css @@ -53,12 +53,12 @@ .ButtonFilled { padding: 4px 8px; border-radius: 4px; - color: #69DDC7; + color: #69ddc7; margin-top: 36px; } .ButtonFilled:hover { - border: 1px solid #69DDC7; + border: 1px solid #69ddc7; background-color: transparent; } @@ -66,8 +66,8 @@ font-size: small; border-radius: 16px; padding: 2px 8px; - border: 1px solid #69DDC7; - color: #69DDC7; + border: 1px solid #69ddc7; + color: #69ddc7; } .PluginCardLink { @@ -111,5 +111,5 @@ } #add-plugin-card { - border: 1px solid #69DDC7; + border: 1px solid #69ddc7; } diff --git a/microsite/yarn.lock b/microsite/yarn.lock index 84b5d50d60..dd410d2d2e 100644 --- a/microsite/yarn.lock +++ b/microsite/yarn.lock @@ -959,6 +959,11 @@ resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== +"@spotify/prettier-config@^8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@spotify/prettier-config/-/prettier-config-8.0.0.tgz#8b6c2bd579ddc54887155a0721fe04e96c89f7f2" + integrity sha512-so8w32ZV42CHWxOEXcBtbNO/hLXFrQNXVmhfzhUI6dVB9cq2xjRaiqu8GjFj8LvKbWpPj+S+KwTIS4aDVWqrFQ== + "@types/cheerio@^0.22.8": version "0.22.21" resolved "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.21.tgz#5e37887de309ba11b2e19a6e14cad7874b31a8a3" @@ -5199,6 +5204,11 @@ prepend-http@^2.0.0: resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +prettier@^2.0.5: + version "2.1.2" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" + integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== + prismjs@^1.17.1: version "1.21.0" resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"