merge main and resolve conflicts

.stylelintrc.json

@@ -1,3 +1,12 @@
 {
-  "extends": ["stylelint-config-standard"]
+  "extends": ["stylelint-config-standard"],
+  "rules": {
+    "media-feature-range-notation": "prefix",
+    "selector-class-pattern": [
+      "^[a-z]([-]?[a-z0-9]+)*(__[a-z0-9]([-]?[a-z0-9]+)*)?(--[a-z0-9]([-|_]?[a-z0-9]+)*)?$",
+      {
+        "message": "Expected class \"%s\" to be in kebab-case or BEM-style naming."
+      }
+    ]
+  }
 }

blocks/hero/hero.css

@@ -1,4 +1,4 @@
-/* stylelint-disable */
+/* stylelint-disable no-descending-specificity */
 
 /* auto and non-auto block shared styles */
 :root {

blocks/hotspots/hotspots.css

@@ -407,7 +407,6 @@
   right: 30px;
 }
 
-/* stylelint-disable-next-line max-line-length */
 .hotspots-container .hotspot-layover .hotspot-layover-box .hotspot-layover-controls .hotspot-layover-button:first-child {
   border-right: 1px solid #222;
 }

blocks/v2-hero/v2-hero.css

@@ -1,4 +1,3 @@
-/* stylelint-disable selector-class-pattern */
 .v2-hero {
   /* height of the hero block is set in main style to prevent CLS */
   position: relative;

common/modal/modal-component.css

@@ -152,7 +152,6 @@
 }
 
 .modal-content.modal-form .eloqua-form .elq-form input[type="checkbox"],
-/* stylelint-disable-next-line max-line-length */
 .modal-content.modal-form .eloqua-form .single-checkbox-row input ~ label.checkbox-aligned.elq-item-label::before {
   background-color: transparent;
 }

package.json

@@ -25,19 +25,19 @@
   },
   "homepage": "https://github.com/adobe/helix-project-boilerplate#readme",
   "devDependencies": {
-    "@babel/core": "7.21.0",
-    "@babel/eslint-parser": "7.19.1",
+    "@babel/core": "7.22.10",
+    "@babel/eslint-parser": "7.22.10",
     "@esm-bundle/chai": "4.3.4-fix.0",
     "@web/test-runner": "0.15.1",
     "@web/test-runner-commands": "0.6.5",
     "chai": "4.3.7",
-    "eslint": "8.35.0",
+    "eslint": "8.47.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.28.0",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.0",
     "sinon": "15.0.1",
-    "stylelint": "15.7.0",
-    "stylelint-config-standard": "30.0.1"
+    "stylelint": "15.10.2",
+    "stylelint-config-standard": "34.0.0"
   }
 }

styles/lazy-styles.css

@@ -1,4 +1,3 @@
-/* stylelint-disable */
 /* below the fold CSS goes here */
 
 /* Headings */

styles/styles.css

@@ -5,9 +5,7 @@
   src: local("Arial");
   ascent-override: 93.75%;
   descent-override: 6.25%;
-  /* stylelint-disable-next-line number-no-trailing-zeros */
   line-gap-override: 0.00%;
-  /* stylelint-disable-next-line number-no-trailing-zeros */
   size-adjust: 100.00%;
 }
 

templates/body-builder-news/body-builder-news.css

@@ -1,5 +1,3 @@
-/* stylelint-disable indentation */
-/* stylelint-disable-next-line comment-empty-line-before */
 /* body builder news styling */
 .body-builder-news main {
     background-color: var(--color-white);