backport PR 1615

2026-01-12 04:09:12 +00:00 · 2023-10-13 13:53:41 -04:00
parent 3277284473
commit fdede79155
5 changed files with 35 additions and 31 deletions
--- a/docs/pages/resources/changelog.md
+++ b/docs/pages/resources/changelog.md
@@ -28,6 +28,7 @@ New versions of Web Awesome are released as-needed and generally occur when a cr
 - Fixed a bug in `<sl-copy-button>` that prevented exported tooltip parts from being styled [#1586]
 - Fixed a bug in `<sl-menu>` that caused it not to fire the `sl-select` event if you clicked an element inside of a `<sl-menu-item>` [#1599]
 - Updated `@shoelace-style/localize` to 3.1.0
+- Updated `@lib-labs/react` to stable `@lit/react`
 - Updated Bootstrap Icons to 1.11.1
 - Updated Lit to 3.0.0
 - Updated TypeScript to 5.2.2
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,6 @@
      "dependencies": {
        "@ctrl/tinycolor": "^4.0.2",
        "@floating-ui/dom": "^1.5.3",
-        "@lit-labs/react": "^2.1.1",
        "@shoelace-style/animations": "^1.1.0",
        "@shoelace-style/localize": "^3.1.2",
        "composed-offset-position": "^0.0.4",
@@ -21,6 +20,7 @@
      "devDependencies": {
        "@11ty/eleventy": "^2.0.1",
        "@custom-elements-manifest/analyzer": "^0.8.4",
+        "@lit/react": "^1.0.0",
        "@open-wc/testing": "^3.2.0",
        "@types/mocha": "^10.0.2",
        "@types/react": "^18.2.28",
@@ -1565,14 +1565,6 @@
        "@jridgewell/sourcemap-codec": "1.4.14"
      }
    },
-    "node_modules/@lit-labs/react": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-2.1.1.tgz",
-      "integrity": "sha512-wr15ZOCZ7t2yB8UEfQ6oSRCmfxpIjhzDkN8DlgSOwsbJzWQTk8hxHRLy7Rra6mxrIajqvrMWQB2VskUU2uuoRA==",
-      "dependencies": {
-        "@lit/react": "1.0.0"
-      }
-    },
    "node_modules/@lit-labs/ssr-dom-shim": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz",
@@ -1582,6 +1574,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.0.tgz",
      "integrity": "sha512-uTuU6vpxtZvCWxcu3GNosckP2JpFWZpMKjhwQ42Bzu/OU9kjStJspA04o7RadecQfx0YiFIImX3qek15BXhaWQ==",
+      "dev": true,
      "peerDependencies": {
        "@types/react": "17 || 18"
      }
@@ -2746,7 +2739,8 @@
    "node_modules/@types/prop-types": {
      "version": "15.7.8",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz",
-      "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ=="
+      "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==",
+      "dev": true
    },
    "node_modules/@types/qs": {
      "version": "6.9.7",
@@ -2764,6 +2758,7 @@
      "version": "18.2.28",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.28.tgz",
      "integrity": "sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==",
+      "dev": true,
      "dependencies": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -2791,7 +2786,8 @@
    "node_modules/@types/scheduler": {
      "version": "0.16.4",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz",
-      "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ=="
+      "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==",
+      "dev": true
    },
    "node_modules/@types/semver": {
      "version": "7.5.3",
@@ -6714,7 +6710,8 @@
    "node_modules/csstype": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+      "dev": true
    },
    "node_modules/custom-element-jet-brains-integration": {
      "version": "1.2.1",
@@ -19692,14 +19689,6 @@
        "@jridgewell/sourcemap-codec": "1.4.14"
      }
    },
-    "@lit-labs/react": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-2.1.1.tgz",
-      "integrity": "sha512-wr15ZOCZ7t2yB8UEfQ6oSRCmfxpIjhzDkN8DlgSOwsbJzWQTk8hxHRLy7Rra6mxrIajqvrMWQB2VskUU2uuoRA==",
-      "requires": {
-        "@lit/react": "1.0.0"
-      }
-    },
    "@lit-labs/ssr-dom-shim": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz",
@@ -19709,6 +19698,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/@lit/react/-/react-1.0.0.tgz",
      "integrity": "sha512-uTuU6vpxtZvCWxcu3GNosckP2JpFWZpMKjhwQ42Bzu/OU9kjStJspA04o7RadecQfx0YiFIImX3qek15BXhaWQ==",
+      "dev": true,
      "requires": {}
    },
    "@lit/reactive-element": {
@@ -20708,7 +20698,8 @@
    "@types/prop-types": {
      "version": "15.7.8",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz",
-      "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ=="
+      "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==",
+      "dev": true
    },
    "@types/qs": {
      "version": "6.9.7",
@@ -20726,6 +20717,7 @@
      "version": "18.2.28",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.28.tgz",
      "integrity": "sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==",
+      "dev": true,
      "requires": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -20753,7 +20745,8 @@
    "@types/scheduler": {
      "version": "0.16.4",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz",
-      "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ=="
+      "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==",
+      "dev": true
    },
    "@types/semver": {
      "version": "7.5.3",
@@ -23673,7 +23666,8 @@
    "csstype": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+      "dev": true
    },
    "custom-element-jet-brains-integration": {
      "version": "1.2.1",
--- a/package.json
+++ b/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"
@@ -58,7 +65,6 @@
  "dependencies": {
    "@ctrl/tinycolor": "^4.0.2",
    "@floating-ui/dom": "^1.5.3",
-    "@lit-labs/react": "^2.1.1",
    "@shoelace-style/animations": "^1.1.0",
    "@shoelace-style/localize": "^3.1.2",
    "composed-offset-position": "^0.0.4",
@@ -68,6 +74,7 @@
  "devDependencies": {
    "@11ty/eleventy": "^2.0.1",
    "@custom-elements-manifest/analyzer": "^0.8.4",
+    "@lit/react": "^1.0.0",
    "@open-wc/testing": "^3.2.0",
    "@types/mocha": "^10.0.2",
    "@types/react": "^18.2.28",
@@ -129,6 +136,9 @@
    "user-agent-data-types": "^0.3.1"
  },
  "lint-staged": {
-    "*.{ts,js}": ["eslint --max-warnings 0 --cache --fix", "prettier --write"]
+    "*.{ts,js}": [
+      "eslint --max-warnings 0 --cache --fix",
+      "prettier --write"
+    ]
  }
 }
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -87,7 +87,7 @@ async function buildTheDocs(watch = false) {
 // Builds the source with esbuild.
 //
 async function buildTheSource() {
-  const alwaysExternal = ['@lit-labs/react', 'react'];
+  const alwaysExternal = ['@lit/react', 'react'];

  const cdnConfig = {
    format: 'esm',
@@ -122,7 +122,7 @@ async function buildTheSource() {
    // We don't bundle certain dependencies in the unbundled build. This ensures we ship bare module specifiers,
    // allowing end users to better optimize when using a bundler. (Only packages that ship ESM can be external.)
    //
-    // We never bundle React or @lit-labs/react though!
+    // We never bundle React or @lit/react though!
    //
    external: alwaysExternal,
    splitting: true,
--- a/scripts/make-react.js
+++ b/scripts/make-react.js
@@ -31,8 +31,7 @@ components.forEach(async component => {
  const eventExports = (component.events || [])
    .map(event => `export type { ${event.eventName} } from '../../../src/events/events';`)
    .join('\n');
-  const eventNameImport =
-    (component.events || []).length > 0 ? `import { type EventName  } from '@lit-labs/react';` : ``;
+  const eventNameImport = (component.events || []).length > 0 ? `import { type EventName } from '@lit/react';` : ``;
  const events = (component.events || [])
    .map(event => `${event.reactName}: '${event.name}' as EventName<${event.eventName}>`)
    .join(',\n');