From a509d49ec63027fc6017065a39fed49c27f0aaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <2887858+deivid-rodriguez@users.noreply.github.com> Date: Fri, 21 Nov 2025 12:49:06 +0100 Subject: [PATCH 1/2] Bump prettier to 3.6.2 And fix new style issues. --- app/webpacker/css/admin/products_v3.scss | 5 +++-- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/webpacker/css/admin/products_v3.scss b/app/webpacker/css/admin/products_v3.scss index 9944f515af..4dd6331775 100644 --- a/app/webpacker/css/admin/products_v3.scss +++ b/app/webpacker/css/admin/products_v3.scss @@ -184,8 +184,9 @@ } // Hide columns - $columns: "image", "name", "sku", "unit_scale", "unit", "price", "on_hand", "producer", - "category", "tax_category", "tags", "inherits_properties"; + $columns: + "image", "name", "sku", "unit_scale", "unit", "price", "on_hand", "producer", "category", + "tax_category", "tags", "inherits_properties"; @each $col in $columns { &.hide-#{$col} { .col-#{$col} { diff --git a/package.json b/package.json index 558c9363dd..1383f92e33 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "karma-chrome-launcher": "~3.2.0", "karma-coffee-preprocessor": "~1.0.1", "karma-jasmine": "~0.3.8", - "prettier": "3.2.4", + "prettier": "3.6.2", "webpack-dev-server": "~3" } } diff --git a/yarn.lock b/yarn.lock index 42fa1ebea2..16fe4b1b99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8158,10 +8158,10 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" - integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== +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-format@30.2.0: version "30.2.0" From 6d0d91c56a6a1dcaf2fe0f71adde406165169fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <2887858+deivid-rodriguez@users.noreply.github.com> Date: Fri, 21 Nov 2025 12:49:44 +0100 Subject: [PATCH 2/2] Let prettier updates be handled by Dependabot --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1383f92e33..d6d8b3e3e3 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "karma-chrome-launcher": "~3.2.0", "karma-coffee-preprocessor": "~1.0.1", "karma-jasmine": "~0.3.8", - "prettier": "3.6.2", + "prettier": "*", "webpack-dev-server": "~3" } } diff --git a/yarn.lock b/yarn.lock index 16fe4b1b99..df21689482 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8158,7 +8158,7 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@3.6.2: +prettier@*: version "3.6.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393" integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==