From 4389d4a66b3263af163a2101642e974c5160c647 Mon Sep 17 00:00:00 2001 From: SimonStnn Date: Sun, 16 Jun 2024 18:18:32 +0200 Subject: [PATCH 1/3] Install prettier dependencies --- package-lock.json | 27 ++++++++++++++++----------- package.json | 4 ++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1069ab69..ce21a9ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,8 +53,8 @@ "mini-css-extract-plugin": "^2.9.0", "mkdirp": "^3.0.1", "postcss": "^8.4.33", - "prettier": "^3.2.5", - "prettier-plugin-tailwindcss": "^0.5.11", + "prettier": "^3.3.2", + "prettier-plugin-tailwindcss": "^0.5.14", "rimraf": "^5.0.5", "style-loader": "^3.3.4", "tailwindcss": "^3.4.1", @@ -7671,9 +7671,9 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -7686,9 +7686,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.5.11", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz", - "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==", + "version": "0.5.14", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.14.tgz", + "integrity": "sha512-Puaz+wPUAhFp8Lo9HuciYKM2Y2XExESjeT+9NQoVFXZsPPnc9VYss2SpxdQ6vbatmt8/4+SN0oe0I1cPDABg9Q==", "dev": true, "engines": { "node": ">=14.21.3" @@ -7698,6 +7698,7 @@ "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", + "@zackad/prettier-plugin-twig-melody": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", @@ -7706,6 +7707,7 @@ "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", "prettier-plugin-style-order": "*", "prettier-plugin-svelte": "*" }, @@ -7722,6 +7724,9 @@ "@trivago/prettier-plugin-sort-imports": { "optional": true }, + "@zackad/prettier-plugin-twig-melody": { + "optional": true + }, "prettier-plugin-astro": { "optional": true }, @@ -7743,13 +7748,13 @@ "prettier-plugin-organize-imports": { "optional": true }, - "prettier-plugin-style-order": { + "prettier-plugin-sort-imports": { "optional": true }, - "prettier-plugin-svelte": { + "prettier-plugin-style-order": { "optional": true }, - "prettier-plugin-twig-melody": { + "prettier-plugin-svelte": { "optional": true } } diff --git a/package.json b/package.json index 6baf45f6..5308d96f 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "mini-css-extract-plugin": "^2.9.0", "mkdirp": "^3.0.1", "postcss": "^8.4.33", - "prettier": "^3.2.5", - "prettier-plugin-tailwindcss": "^0.5.11", + "prettier": "^3.3.2", + "prettier-plugin-tailwindcss": "^0.5.14", "rimraf": "^5.0.5", "style-loader": "^3.3.4", "tailwindcss": "^3.4.1", From 955b0d37f7993928be8e18504f5f87a8e93013a6 Mon Sep 17 00:00:00 2001 From: SimonStnn Date: Sun, 16 Jun 2024 18:21:37 +0200 Subject: [PATCH 2/3] Add prettier-plugin-tailwindcss to .prettierrc --- .prettierrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.prettierrc b/.prettierrc index b07e1bcf..02847ae9 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { + "plugins": ["prettier-plugin-tailwindcss"], "semi": true, "singleQuote": true, "printWidth": 80, @@ -6,5 +7,4 @@ "useTabs": false, "endOfLine": "lf", "trailingComma": "es5" - -} \ No newline at end of file +} From df93f1af46abf400c7675decc18d7aa456eeb90f Mon Sep 17 00:00:00 2001 From: SimonStnn Date: Sun, 16 Jun 2024 18:21:48 +0200 Subject: [PATCH 3/3] Remove prettier.config.js file --- prettier.config.js | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 prettier.config.js diff --git a/prettier.config.js b/prettier.config.js deleted file mode 100644 index 26a6d0bd..00000000 --- a/prettier.config.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @type {import('prettier').Config} */ -module.exports = { - plugins: ["prettier-plugin-tailwindcss"], - tailwindConfig: "./tailwind.config.js", -};