From 81445f0afd1ae11d4cd32897e12e36d4388462fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=CC=88=20Bijl?= Date: Thu, 9 Oct 2025 11:52:50 +0200 Subject: [PATCH] [build] upgrade to Prettier 3.6.2 (#86) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrades Prettier to 3.6.2 and pins it there. Prettier [recommends pinning the version](https://prettier.io/docs/install#summary): > Install an exact version of Prettier locally in your project. This makes sure that everyone in the project gets the exact same version of Prettier. Even a patch release of Prettier can result in slightly different formatting, so you wouldn’t want different team members using different versions and formatting each other’s changes back and forth. --- Should probably merge after #85. Co-authored-by: tobi Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/86 Co-authored-by: Zoë Bijl Co-committed-by: Zoë Bijl --- app/javascript/flavours/glitch/styles/variables.scss | 3 ++- app/javascript/styles/mastodon/variables.scss | 3 ++- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index 0b5d6f406..77c52d7b0 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -96,7 +96,8 @@ $dismiss-overlay-width: 4rem; :root { --dropdown-border-color: #{lighten($ui-base-color, 12%)}; --dropdown-background-color: #{lighten($ui-base-color, 4%)}; - --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, + --dropdown-shadow: + 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, 0 8px 10px -6px #{rgba($base-shadow-color, 0.25)}; --modal-background-color: #{darken($ui-base-color, 4%)}; --modal-border-color: #{lighten($ui-base-color, 4%)}; diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index 611c8bb5d..08460396f 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -96,7 +96,8 @@ $font-monospace: 'mastodon-font-monospace' !default; :root { --dropdown-border-color: #{lighten($ui-base-color, 12%)}; --dropdown-background-color: #{lighten($ui-base-color, 4%)}; - --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, + --dropdown-shadow: + 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)}, 0 8px 10px -6px #{rgba($base-shadow-color, 0.25)}; --modal-background-color: #{darken($ui-base-color, 4%)}; --modal-border-color: #{lighten($ui-base-color, 4%)}; diff --git a/package.json b/package.json index 3f73bd150..ae0dd283b 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "lint-staged": "^13.2.2", - "prettier": "^3.0.0", + "prettier": "3.6.2", "react-test-renderer": "^18.2.0", "stylelint": "^15.10.1", "stylelint-config-standard-scss": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 1cdd62e94..ae8d390b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9804,10 +9804,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.1.tgz#65271fc9320ce4913c57747a70ce635b30beaa40" - integrity sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ== +prettier@3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393" + integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0"