Merge branch 'next' into current

This reverts commit 6d1eb71d8e.

docs/assets/scripts/search.js

@@ -373,12 +373,4 @@
       hide();
     }
   });
-
-  // We're using Turbo, so when a user searches for something, visits a result, and presses the back button, the search
-  // UI will still be visible but not interactive. This removes the search UI when Turbo renders a page so they don't
-  // get trapped.
-  window.addEventListener('turbo:render', () => {
-    document.body.classList.remove('search-visible');
-    document.querySelectorAll('.search__overlay, .search__dialog').forEach(el => el.remove());
-  });
 })();

docs/pages/resources/changelog.md

@@ -12,11 +12,6 @@ Components with the <sl-badge variant="warning" pill>Experimental</sl-badge> bad
 
 New versions of Shoelace are released as-needed and generally occur when a critical mass of changes have accumulated. At any time, you can see what's coming in the next release by visiting [next.shoelace.style](https://next.shoelace.style).
 
-## Next
-
-- Fixed a bug in `<sl-switch>` that resulted in improper spacing between the label and the required asterisk [#1540]
-- Updated `@ctrl/tinycolor` to 4.0.1 [#1542]
-
 ## 2.8.0
 
 - Added `--isolatedModules` and `--verbatimModuleSyntax` to `tsconfig.json`. For anyone directly importing event types, they no longer provide a default export due to these options being enabled. For people using the `events/event.js` file directly, there is no change.
@@ -28,7 +23,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 - Improved expand/collapse behavior of `<sl-tree>` to work more like users expect [#1521]
 - Improved `<sl-menu-item>` so labels truncate properly instead of getting chopped and overflowing
 - Removed the extra `React.Component` around `@lit-labs/react` wrapper. [#1531]
-- Updated `@lit-labs/react` to v2.0.1. [#1531]
+- Upgrade `@lit-labs/react` to v2.0.1. [#1531]
 
 ## 2.7.0
 

package-lock.json

@@ -9,7 +9,7 @@
       "version": "2.8.0",
       "license": "MIT",
       "dependencies": {
-        "@ctrl/tinycolor": "^4.0.1",
+        "@ctrl/tinycolor": "^3.5.0",
         "@floating-ui/dom": "^1.2.1",
         "@lit-labs/react": "^2.0.1",
         "@shoelace-style/animations": "^1.1.0",
@@ -833,11 +833,11 @@
       }
     },
     "node_modules/@ctrl/tinycolor": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.1.tgz",
-      "integrity": "sha512-dfimuE1mfaqL8P8jyQzdk9yFeFUWCyhjK5VyydXgDtQO0fezr6aWaGauHnlI07BZBIF45gahb0oxJjkUcylDwQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz",
+      "integrity": "sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg==",
       "engines": {
-        "node": ">=14"
+        "node": ">=10"
       }
     },
     "node_modules/@custom-elements-manifest/analyzer": {
@@ -17913,9 +17913,9 @@
       "dev": true
     },
     "@ctrl/tinycolor": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-4.0.1.tgz",
-      "integrity": "sha512-dfimuE1mfaqL8P8jyQzdk9yFeFUWCyhjK5VyydXgDtQO0fezr6aWaGauHnlI07BZBIF45gahb0oxJjkUcylDwQ=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz",
+      "integrity": "sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg=="
     },
     "@custom-elements-manifest/analyzer": {
       "version": "0.8.3",

package.json

@@ -25,8 +25,15 @@
     "./dist/react/*": "./dist/react/*",
     "./dist/translations/*": "./dist/translations/*"
   },
-  "files": ["dist", "cdn"],
-  "keywords": ["web components", "custom elements", "components"],
+  "files": [
+    "dist",
+    "cdn"
+  ],
+  "keywords": [
+    "web components",
+    "custom elements",
+    "components"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shoelace-style/shoelace.git"
@@ -60,7 +67,7 @@
     "node": ">=14.17.0"
   },
   "dependencies": {
-    "@ctrl/tinycolor": "^4.0.1",
+    "@ctrl/tinycolor": "^3.5.0",
     "@floating-ui/dom": "^1.2.1",
     "@lit-labs/react": "^2.0.1",
     "@shoelace-style/animations": "^1.1.0",
@@ -133,6 +140,9 @@
     "user-agent-data-types": "^0.3.0"
   },
   "lint-staged": {
-    "*.{ts,js}": ["eslint --max-warnings 0 --cache --fix", "prettier --write"]
+    "*.{ts,js}": [
+      "eslint --max-warnings 0 --cache --fix",
+      "prettier --write"
+    ]
   }
 }

scripts/build.js

@@ -53,10 +53,6 @@ async function buildTheDocs(watch = false) {
       output.push(data.toString());
     });
 
-    child.stderr.on('data', data => {
-      output.push(data.toString());
-    });
-
     if (watch) {
       // The process doesn't terminate in watch mode so, before resolving, we listen for a known signal in stdout that
       // tells us when the first build completes.

src/components/switch/switch.component.ts

@@ -215,9 +215,7 @@ export default class SlSwitch extends ShoelaceElement implements ShoelaceFormCon
           <span part="thumb" class="switch__thumb"></span>
         </span>
 
-        <div part="label" class="switch__label">
-          <slot></slot>
-        </div>
+        <slot part="label" class="switch__label"></slot>
       </label>
     `;
   }