From 24a0451bdc541c5bad1a5b4aaa0b3fdf5a141688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Sat, 12 Aug 2023 12:28:20 +0200 Subject: [PATCH] Add TailwindCSS plugin for Prettier (#458) --- .prettierrc.js | 4 --- .eslintrc.js => eslint.config.js | 6 +++- package.json | 2 ++ pnpm-lock.yaml | 58 ++++++++++++++++++++++++++++++++ postcss.config.js | 6 +++- prettier.config.js | 8 +++++ src/community/index.html | 30 ++++++++--------- src/index.html | 12 +++---- src/partials/header.html | 22 ++++++------ src/partials/octocat.html | 2 +- src/resources/index.html | 22 ++++++------ src/style.css | 14 ++++---- src/themes/index.html | 28 +++++++-------- tailwind.config.js | 5 ++- vite.config.js | 10 ++++-- 15 files changed, 154 insertions(+), 75 deletions(-) delete mode 100644 .prettierrc.js rename .eslintrc.js => eslint.config.js (81%) create mode 100644 prettier.config.js diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index c204ada6..00000000 --- a/.prettierrc.js +++ /dev/null @@ -1,4 +0,0 @@ -// Prettier Config -module.exports = { - plugins: ["prettier-plugin-packagejson"], -}; diff --git a/.eslintrc.js b/eslint.config.js similarity index 81% rename from .eslintrc.js rename to eslint.config.js index 8f6ac18a..1706f01f 100644 --- a/.eslintrc.js +++ b/eslint.config.js @@ -1,4 +1,6 @@ -module.exports = { +// ESLint Config + +const config = { env: { browser: true, node: true, @@ -14,3 +16,5 @@ module.exports = { "no-unused-vars": "warn", }, }; + +export default config; diff --git a/package.json b/package.json index 9fa18df3..b12f1431 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "license": "MIT", "author": "Srcery Team", + "type": "module", "scripts": { "build": "vite build --emptyOutDir", "clean": "rm -f src/github.json", @@ -34,6 +35,7 @@ "postcss": "^8.4.27", "prettier": "^3.0.1", "prettier-plugin-packagejson": "^2.4.5", + "prettier-plugin-tailwindcss": "^0.5.2", "tailwindcss": "^3.3.3", "vite": "^4.3.4", "vite-plugin-handlebars": "^1.6.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1f35e13..5af6918a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,6 +49,9 @@ devDependencies: prettier-plugin-packagejson: specifier: ^2.4.5 version: 2.4.5(prettier@3.0.1) + prettier-plugin-tailwindcss: + specifier: ^0.5.2 + version: 0.5.2(prettier@3.0.1) tailwindcss: specifier: ^3.3.3 version: 3.3.3 @@ -2135,6 +2138,61 @@ packages: synckit: 0.8.5 dev: true + /prettier-plugin-tailwindcss@0.5.2(prettier@3.0.1): + resolution: {integrity: sha512-i4swJk4f8YWK99BRPX3DdDNwMr6U1X8y9rvxGeX5zf090+SsHpPSVjgOb041Hh6/nZJWPi/JYno9UgBDm+/RxA==} + engines: {node: '>=14.21.3'} + peerDependencies: + '@ianvs/prettier-plugin-sort-imports': '*' + '@prettier/plugin-pug': '*' + '@shopify/prettier-plugin-liquid': '*' + '@shufo/prettier-plugin-blade': '*' + '@trivago/prettier-plugin-sort-imports': '*' + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-css-order: '*' + prettier-plugin-import-sort: '*' + prettier-plugin-jsdoc: '*' + prettier-plugin-marko: '*' + prettier-plugin-organize-attributes: '*' + prettier-plugin-organize-imports: '*' + prettier-plugin-style-order: '*' + prettier-plugin-svelte: '*' + prettier-plugin-twig-melody: '*' + peerDependenciesMeta: + '@ianvs/prettier-plugin-sort-imports': + optional: true + '@prettier/plugin-pug': + optional: true + '@shopify/prettier-plugin-liquid': + optional: true + '@shufo/prettier-plugin-blade': + optional: true + '@trivago/prettier-plugin-sort-imports': + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-css-order: + optional: true + prettier-plugin-import-sort: + optional: true + prettier-plugin-jsdoc: + optional: true + prettier-plugin-marko: + optional: true + prettier-plugin-organize-attributes: + optional: true + prettier-plugin-organize-imports: + optional: true + prettier-plugin-style-order: + optional: true + prettier-plugin-svelte: + optional: true + prettier-plugin-twig-melody: + optional: true + dependencies: + prettier: 3.0.1 + dev: true + /prettier@3.0.1: resolution: {integrity: sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==} engines: {node: '>=14'} diff --git a/postcss.config.js b/postcss.config.js index 37b4d628..0bd271c1 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,7 +1,11 @@ // PostCSS Config -module.exports = { + +/** @type {import('postcss-load-config').Config} */ +const config = { plugins: { tailwindcss: {}, autoprefixer: {}, }, }; + +export default config; diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 00000000..3223b576 --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,8 @@ +// Prettier Config + +/** @type {import("prettier").Config} */ +const config = { + plugins: ["prettier-plugin-packagejson", "prettier-plugin-tailwindcss"], +}; + +export default config; diff --git a/src/community/index.html b/src/community/index.html index 4abac0f0..4016d005 100644 --- a/src/community/index.html +++ b/src/community/index.html @@ -11,21 +11,21 @@ Srcery Theme - Community activities and communications {{> octocat }}
{{> header community=true }}
-

+

Discord

-

+

We run a Discord server for those interested. You're welcome to join us there if you have any burning questions or just wanna say hi.

@@ -41,10 +41,10 @@

-

+

Merchandise

-

+

Get our brand new merchandise featuring the Srcery color scheme! We're not making any profit from the sales, so you are instead showing your support by wearing and using the merch. Thank you for @@ -57,7 +57,7 @@

-

+

Community

@@ -67,22 +67,22 @@

-

+

Core team