diff --git a/package.json b/package.json index c30a9b9..b321ace 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@changesets/changelog-github": "^0.4.8", "@changesets/cli": "^2.26.0", "@lshay/eslint-config": "^0.2.2", - "@lshay/prettier-config": "^0.5.3", + "@lshay/prettier-config": "^0.6.0", "@rushstack/eslint-patch": "^1.2.0", "eslint": "^8.34.0", "eslint-import-resolver-typescript": "^3.5.3", diff --git a/yarn.lock b/yarn.lock index 587297e..1435bac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,6 +134,13 @@ __metadata: languageName: node linkType: hard +"@astrojs/compiler@npm:^1.5.5": + version: 1.8.2 + resolution: "@astrojs/compiler@npm:1.8.2" + checksum: 1d55879f8f7aadcad02f19353c085d4e74d5f9cd0d873c600e31ad58928e80d6ab7d6e80b997e2fecabd697f69b0ae166acac58178b833d2d8051a2e35800dc2 + languageName: node + linkType: hard + "@astrojs/language-server@npm:^0.28.3": version: 0.28.3 resolution: "@astrojs/language-server@npm:0.28.3" @@ -1385,20 +1392,20 @@ __metadata: languageName: node linkType: hard -"@lshay/prettier-config@npm:^0.5.3": - version: 0.5.3 - resolution: "@lshay/prettier-config@npm:0.5.3" +"@lshay/prettier-config@npm:^0.6.0": + version: 0.6.0 + resolution: "@lshay/prettier-config@npm:0.6.0" dependencies: - merge-anything: ^5.1.4 - prettier-plugin-astro: ^0.7.2 + merge-anything: ^5.1.7 + prettier-plugin-astro: ^0.11.0 prettier-plugin-jsdoc: ^0.4.2 - prettier-plugin-packagejson: ^2.3.0 - prettier-plugin-sh: ^0.12.8 + prettier-plugin-packagejson: ^2.4.5 + prettier-plugin-sh: ^0.13.1 prettier-plugin-sort-json: ^1.0.0 - prettier-plugin-tailwindcss: ^0.2.1 + prettier-plugin-tailwindcss: ^0.4.1 peerDependencies: - prettier: 2.x - checksum: 2c32cb83eef045d291d3976cbe950c0da3ac81588dd420254d49430978219867bc231fe719a8451e83e80164fc76587b6db25662cd70657df44ffea88da70581 + prettier: 2.x || 3.x + checksum: 54f191e8c05a015b4b75e3caf56986d5ae72ad68bec26fc7e0d41ee7004b19b3acaff5391511b35074fbb55d1f9f8b48951e907bfccc46b677439873ecff251f languageName: node linkType: hard @@ -5106,6 +5113,13 @@ __metadata: languageName: node linkType: hard +"get-stdin@npm:^9.0.0": + version: 9.0.0 + resolution: "get-stdin@npm:9.0.0" + checksum: 5972bc34d05932b45512c8e2d67b040f1c1ca8afb95c56cbc480985f2d761b7e37fe90dc8abd22527f062cc5639a6930ff346e9952ae4c11a2d4275869459594 + languageName: node + linkType: hard + "get-stream@npm:^6.0.1": version: 6.0.1 resolution: "get-stream@npm:6.0.1" @@ -6851,6 +6865,15 @@ __metadata: languageName: node linkType: hard +"merge-anything@npm:^5.1.7": + version: 5.1.7 + resolution: "merge-anything@npm:5.1.7" + dependencies: + is-what: ^4.1.8 + checksum: 5b9d2bcec2dd7c0a748a84b2aabc5baeee535a8ea86af9a0154c2446298c1bf7c1746dd67757df5d4138553b8f24d46730263464fbc115fe6ef9056be9f51b04 + languageName: node + linkType: hard + "merge-stream@npm:^2.0.0": version: 2.0.0 resolution: "merge-stream@npm:2.0.0" @@ -8212,7 +8235,18 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-astro@npm:^0.7.0, prettier-plugin-astro@npm:^0.7.2": +"prettier-plugin-astro@npm:^0.11.0": + version: 0.11.1 + resolution: "prettier-plugin-astro@npm:0.11.1" + dependencies: + "@astrojs/compiler": ^1.5.5 + prettier: ^3.0.0 + sass-formatter: ^0.7.6 + checksum: 387ab72accdbbaad0e0da37fab2f3de91a94ea512caff5a4b8c51aecd61a217ef655a648fd5e4f4f2d1b1bea8d8ed34e6e9d4654b14287cdd26946fb77c51aa2 + languageName: node + linkType: hard + +"prettier-plugin-astro@npm:^0.7.0": version: 0.7.2 resolution: "prettier-plugin-astro@npm:0.7.2" dependencies: @@ -8237,31 +8271,30 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-packagejson@npm:^2.3.0": - version: 2.4.2 - resolution: "prettier-plugin-packagejson@npm:2.4.2" +"prettier-plugin-packagejson@npm:^2.4.5": + version: 2.4.5 + resolution: "prettier-plugin-packagejson@npm:2.4.5" dependencies: - sort-package-json: 2.2.0 + sort-package-json: 2.5.1 synckit: 0.8.5 peerDependencies: prettier: ">= 1.16.0" peerDependenciesMeta: prettier: optional: true - checksum: 8637e61831de0a8e28ac0872b59144cf7bdbb49c473d57b66c06dc8e7ee8e39cdb8b14a08ff75484633c19f69593f7024f7637d04c75e2b70681f1217619fb8a + checksum: 9d7529e42546c157194c5d490890852c7e97d2c3ae529f83e3caec61ec97b5bc63b28b25836d7de579accde09b6e161cc9145b2d4105822586b589eedb1f2d14 languageName: node linkType: hard -"prettier-plugin-sh@npm:^0.12.8": - version: 0.12.8 - resolution: "prettier-plugin-sh@npm:0.12.8" +"prettier-plugin-sh@npm:^0.13.1": + version: 0.13.1 + resolution: "prettier-plugin-sh@npm:0.13.1" dependencies: mvdan-sh: ^0.10.1 - sh-syntax: ^0.3.6 - synckit: ^0.8.1 + sh-syntax: ^0.4.1 peerDependencies: - prettier: ^2.0.0 - checksum: a610fa5fdbf4918d2d3e4a2be04665e1e89c5ae50e2f646f9167484666c6653adc73386955ceb42cc7d54d14145111438c43faf157498c4b4842dfd48cc4aabf + prettier: ^3.0.0 + checksum: c0e383ff2691b1440e0751222a4ab9ae82228fd7f4a368ec35e2d44e88dd5cdba1c0ce7bf541c1ea4538c6852ef8304793113c4e9e2425084b08fbef2b27532f languageName: node linkType: hard @@ -8276,27 +8309,28 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-tailwindcss@npm:^0.2.1": - version: 0.2.2 - resolution: "prettier-plugin-tailwindcss@npm:0.2.2" +"prettier-plugin-tailwindcss@npm:^0.4.1": + version: 0.4.1 + resolution: "prettier-plugin-tailwindcss@npm:0.4.1" peerDependencies: - "@prettier/plugin-php": "*" + "@ianvs/prettier-plugin-sort-imports": "*" "@prettier/plugin-pug": "*" "@shopify/prettier-plugin-liquid": "*" "@shufo/prettier-plugin-blade": "*" "@trivago/prettier-plugin-sort-imports": "*" - prettier: ">=2.2.0" + prettier: ^2.2 || ^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: - "@prettier/plugin-php": + "@ianvs/prettier-plugin-sort-imports": optional: true "@prettier/plugin-pug": optional: true @@ -8314,6 +8348,8 @@ __metadata: optional: true prettier-plugin-jsdoc: optional: true + prettier-plugin-marko: + optional: true prettier-plugin-organize-attributes: optional: true prettier-plugin-organize-imports: @@ -8324,7 +8360,7 @@ __metadata: optional: true prettier-plugin-twig-melody: optional: true - checksum: dd4baa7b60d0cef36309a97bf884ec7beb61e29d7bf0c88036647985243535048968252f2f7159d88142695ae21fe305a6a1f96cceec36d41085cab63dbc4b25 + checksum: 9bdf3b7c270cc544f6bc38bbb869d3a97afc93de5005eee7272a36f374488731349c9362d2bbe4c83bd2a14b8a7c96cd25b9b682d1bea6dccc5bf08b2d02096c languageName: node linkType: hard @@ -8346,6 +8382,15 @@ __metadata: languageName: node linkType: hard +"prettier@npm:^3.0.0": + version: 3.0.3 + resolution: "prettier@npm:3.0.3" + bin: + prettier: bin/prettier.cjs + checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0 + languageName: node + linkType: hard + "pretty-format@npm:^27.5.1": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" @@ -8927,7 +8972,7 @@ __metadata: "@changesets/changelog-github": ^0.4.8 "@changesets/cli": ^2.26.0 "@lshay/eslint-config": ^0.2.2 - "@lshay/prettier-config": ^0.5.3 + "@lshay/prettier-config": ^0.6.0 "@rushstack/eslint-patch": ^1.2.0 eslint: ^8.34.0 eslint-import-resolver-typescript: ^3.5.3 @@ -9015,6 +9060,15 @@ __metadata: languageName: node linkType: hard +"sass-formatter@npm:^0.7.6": + version: 0.7.8 + resolution: "sass-formatter@npm:0.7.8" + dependencies: + suf-log: ^2.5.3 + checksum: 8fe8be934878b486a7ad6bcb103e78e26b7dad5d44ad322bbe8a72c9823e90e98acb578a97917cd44d558ef51da50fbb6d59664be40e5062cb86db46c7df93a1 + languageName: node + linkType: hard + "sass@npm:^1.58.2": version: 1.58.2 resolution: "sass@npm:1.58.2" @@ -9106,12 +9160,12 @@ __metadata: languageName: node linkType: hard -"sh-syntax@npm:^0.3.6": - version: 0.3.7 - resolution: "sh-syntax@npm:0.3.7" +"sh-syntax@npm:^0.4.1": + version: 0.4.1 + resolution: "sh-syntax@npm:0.4.1" dependencies: - tslib: ^2.4.0 - checksum: cc2e7733b4d62b82760e8a8948ab3fe4c1cb1725aa27e89d65d8fefce7548d3beaa88121cad129c853618d3b4edea07992204f0647e528cbd00a1998c03415ad + tslib: ^2.6.0 + checksum: 9bc0fc93163735d15d11d8f865e63382d66eea54b8483f82ac37698e3edd4ffb1b5efaf7de06cdbe9a202387d57a5437dc032e49cae32c3a30608d71a38a5258 languageName: node linkType: hard @@ -9288,19 +9342,20 @@ __metadata: languageName: node linkType: hard -"sort-package-json@npm:2.2.0": - version: 2.2.0 - resolution: "sort-package-json@npm:2.2.0" +"sort-package-json@npm:2.5.1": + version: 2.5.1 + resolution: "sort-package-json@npm:2.5.1" dependencies: detect-indent: ^7.0.1 detect-newline: ^4.0.0 + get-stdin: ^9.0.0 git-hooks-list: ^3.0.0 globby: ^13.1.2 is-plain-obj: ^4.1.0 sort-object-keys: ^1.1.3 bin: sort-package-json: cli.js - checksum: 981a272e8561e811e94f79183351129e9c147e2039c58179a98cf745443afc2bbf9a66a44794948045d67d83467fa4ec00e2bf7a2f2a5b6270a29ec48ca2dfe9 + checksum: 69ec7a6275fa518e3fa883558b77d14cb19e57115b458581aba9ef38eb629ab5836c6a2158ad124a0c9419b819e132fbd2a2df5a4fb8448f91339c470dba5101 languageName: node linkType: hard @@ -9658,7 +9713,7 @@ __metadata: languageName: node linkType: hard -"synckit@npm:0.8.5, synckit@npm:^0.8.1, synckit@npm:^0.8.4": +"synckit@npm:0.8.5, synckit@npm:^0.8.4": version: 0.8.5 resolution: "synckit@npm:0.8.5" dependencies: @@ -9944,6 +9999,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2.6.0": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad + languageName: node + linkType: hard + "tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0"