Merge branch '3.0' into 3.0-es-year

lit · Apr 12, 2023 · 4ef10ca · 4ef10ca
2 parents 1e2ee32 + 5e2195f
commit 4ef10ca
Show file tree

Hide file tree

Showing 75 changed files with 347 additions and 212 deletions.
diff --git a/.changeset/beige-baboons-promise.md b/.changeset/beige-baboons-promise.md
diff --git a/.changeset/chatty-bananas-dream.md b/.changeset/chatty-bananas-dream.md
diff --git a/.changeset/popular-shoes-carry.md b/.changeset/popular-shoes-carry.md
diff --git a/.changeset/rotten-worms-itch.md b/.changeset/rotten-worms-itch.md
@@ -0,0 +1,7 @@
+---
+'lit-element': major
+'lit-html': major
+'lit': major
+---
+
+Remove experimental hydrate modules. These are available from `@lit-labs/ssr-client`.
diff --git a/.changeset/selfish-countries-impress.md → .changeset/warm-camels-end.md b/.changeset/selfish-countries-impress.md → .changeset/warm-camels-end.md
diff --git a/.eslintignore b/.eslintignore
@@ -37,8 +37,6 @@ packages/lit/directive-helpers.*
 packages/lit/directive.*
 packages/lit/async-directive.*
 packages/lit/html.*
-packages/lit/experimental-hydrate-support.*
-packages/lit/experimental-hydrate.*
 packages/lit/index.*
 packages/lit/static-html.*
 
@@ -55,7 +53,6 @@ packages/lit-element/development/
 packages/lit-element/node_modules/
 packages/lit-element/test/
 packages/lit-element/decorators.*
-packages/lit-element/experimental-hydrate-support.*
 packages/lit-element/index.*
 packages/lit-element/lit-element.*
 packages/lit-element/lit.min.*
@@ -68,7 +65,6 @@ packages/lit-html/version-stability-build/
 packages/lit-html/directives/
 packages/lit-html/node_modules/
 packages/lit-html/test/
-packages/lit-html/experimental-hydrate.*
 packages/lit-html/lit-html.*
 packages/lit-html/directive.*
 packages/lit-html/directive-helpers.*
@@ -275,9 +271,11 @@ packages/labs/ssr/index.*
 
 packages/labs/ssr-client/development/
 packages/labs/ssr-client/directives/
-packages/labs/ssr-client/controllers/
+packages/labs/ssr-client/lib/
+packages/labs/ssr-client/node/
 packages/labs/ssr-client/node_modules/
 packages/labs/ssr-client/index.*
+packages/labs/ssr-client/lit-element-hydrate-support.*
 
 packages/labs/ssr-dom-shim/index.*
 packages/labs/ssr-dom-shim/lib/

diff --git a/.prettierignore b/.prettierignore
@@ -37,8 +37,6 @@ packages/lit/directive-helpers.*
 packages/lit/directive.*
 packages/lit/async-directive.*
 packages/lit/html.*
-packages/lit/experimental-hydrate-support.*
-packages/lit/experimental-hydrate.*
 packages/lit/index.*
 packages/lit/static-html.*
 
@@ -55,7 +53,6 @@ packages/lit-element/development/
 packages/lit-element/node_modules/
 packages/lit-element/test/
 packages/lit-element/decorators.*
-packages/lit-element/experimental-hydrate-support.*
 packages/lit-element/index.*
 packages/lit-element/lit-element.*
 packages/lit-element/lit.min.*
@@ -68,7 +65,6 @@ packages/lit-html/version-stability-build/
 packages/lit-html/directives/
 packages/lit-html/node_modules/
 packages/lit-html/test/
-packages/lit-html/experimental-hydrate.*
 packages/lit-html/lit-html.*
 packages/lit-html/directive.*
 packages/lit-html/directive-helpers.*
@@ -262,9 +258,11 @@ packages/labs/ssr/index.*
 
 packages/labs/ssr-client/development/
 packages/labs/ssr-client/directives/
-packages/labs/ssr-client/controllers/
+packages/labs/ssr-client/lib/
+packages/labs/ssr-client/node/
 packages/labs/ssr-client/node_modules/
 packages/labs/ssr-client/index.*
+packages/labs/ssr-client/lit-element-hydrate-support.*
 
 packages/labs/ssr-dom-shim/index.*
 packages/labs/ssr-dom-shim/lib/

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/labs/cli/src/lib/lit-version.ts b/packages/labs/cli/src/lib/lit-version.ts
@@ -1 +1 @@
-export const litVersion = '2.7.0';
+export const litVersion = '2.7.2';
diff --git a/packages/labs/cli/test-goldens/init/js-named/package.json b/packages/labs/cli/test-goldens/init/js-named/package.json
@@ -13,7 +13,7 @@
     "lit"
   ],
   "dependencies": {
-    "lit": "^2.7.0"
+    "lit": "^2.7.2"
   },
   "devDependencies": {
     "@web/dev-server": "^0.1.32"

diff --git a/packages/labs/cli/test-goldens/init/js/package.json b/packages/labs/cli/test-goldens/init/js/package.json
@@ -13,7 +13,7 @@
     "lit"
   ],
   "dependencies": {
-    "lit": "^2.7.0"
+    "lit": "^2.7.2"
   },
   "devDependencies": {
     "@web/dev-server": "^0.1.32"

diff --git a/packages/labs/cli/test-goldens/init/ts-named/package.json b/packages/labs/cli/test-goldens/init/ts-named/package.json
@@ -16,7 +16,7 @@
     "lit"
   ],
   "dependencies": {
-    "lit": "^2.7.0"
+    "lit": "^2.7.2"
   },
   "devDependencies": {
     "@web/dev-server": "^0.1.32",

diff --git a/packages/labs/eleventy-plugin-lit/CHANGELOG.md b/packages/labs/eleventy-plugin-lit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @lit-labs/eleventy-plugin-lit
 
+## 1.0.1
+
+### Patch Changes
+
+- [#3720](https://github.com/lit/lit/pull/3720) [`575fb578`](https://github.com/lit/lit/commit/575fb578473031859b59b9ed98634ba091b389f7) - Use hydration modules from `@lit-labs/ssr-client`
+
 ## 1.0.0
 
 ### Major Changes

diff --git a/packages/labs/eleventy-plugin-lit/README.md b/packages/labs/eleventy-plugin-lit/README.md
@@ -252,7 +252,7 @@ to their JavaScript implementations, becoming responsive and interactive.
 Lit components can automatically hydrate themselves when they detect that a
 Shadow Root has already been attached, as long as Lit's _experimental hydrate
 support_ module has been installed by importing
-[`lit/experimental-hydrate-support.js`](https://github.com/lit/lit/blob/main/packages/lit-element/src/experimental-hydrate-support.ts).
+[`@lit-labs/ssr-client/lit-element-hydrate-support.js`](https://github.com/lit/lit/blob/main/packages/labs/ssr-client/src/lit-element-hydrate-support.ts).
 
 > ⏱️ The Lit hydration support module **must be loaded before Lit or any
 > components that depend on Lit are imported**, because it modifies the initial
@@ -325,7 +325,7 @@ The file `_includes/default.html` would then contain the following:
         execute them yet, though. -->
     <link
       rel="modulepreload"
-      href="/node_modules/lit/experimental-hydrate-support.js"
+      href="/node_modules/@lit-labs/ssr-client/lit-element-hydrate-support.js"
     />
     <link rel="modulepreload" href="/_js/component1.js" />
     <link rel="modulepreload" href="/_js/component2.js" />
@@ -368,7 +368,7 @@ The file `_includes/default.html` would then contain the following:
         // Start fetching the Lit hydration support module (note the absence
         // of "await" -- we don't want to block yet).
         const litHydrateSupportInstalled = import(
-          '/node_modules/lit/experimental-hydrate-support.js'
+          '/node_modules/@lit-labs/ssr-client/lit-element-hydrate-support.js'
         );
 
         // Check if we require the declarative shadow DOM polyfill. As of

diff --git a/packages/labs/eleventy-plugin-lit/demo/_includes/default.html b/packages/labs/eleventy-plugin-lit/demo/_includes/default.html
@@ -44,7 +44,7 @@
         // Start fetching the Lit hydration support module (note the absence
         // of "await" -- we don't want to block yet).
         const litHydrateSupportInstalled = import(
-          'lit/experimental-hydrate-support.js'
+          '@lit-labs/ssr-client/lit-element-hydrate-support.js'
         );
 
         // Check if we require the declarative shadow DOM polyfill. As of

diff --git a/packages/labs/eleventy-plugin-lit/package.json b/packages/labs/eleventy-plugin-lit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lit-labs/eleventy-plugin-lit",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Eleventy plugin for rendering Lit components.",
   "author": "Google LLC",
   "license": "BSD-3-Clause",

diff --git a/packages/labs/nextjs/CHANGELOG.md b/packages/labs/nextjs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @lit-labs/nextjs
 
+## 0.1.1
+
+### Patch Changes
+
+- [#3748](https://github.com/lit/lit/pull/3748) [`3cea6b2d`](https://github.com/lit/lit/commit/3cea6b2d23f294d41c57f8e695575468cc068332) - Fix README title
+
+- [#3720](https://github.com/lit/lit/pull/3720) [`575fb578`](https://github.com/lit/lit/commit/575fb578473031859b59b9ed98634ba091b389f7) - Use hydration modules from `@lit-labs/ssr-client`
+
 ## 0.1.0
 
 ### Minor Changes

diff --git a/packages/labs/nextjs/package.json b/packages/labs/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lit-labs/nextjs",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/labs/nextjs/src/index.ts b/packages/labs/nextjs/src/index.ts
@@ -28,7 +28,7 @@ export = (_pluginOptions: LitSsrPluginOptions = {}) =>
           options: {
             // This adds a side-effectful import which monkey patches
             // `React.createElement` in the server and imports
-            // `lit/experimental-hydrate-support.js` in the client.
+            // `@lit-labs/ssr-client/lit-element-hydrate-support.js` in the client.
             imports: ['side-effects @lit-labs/ssr-react/enable-lit-ssr.js'],
           },
         });

diff --git a/packages/labs/observers/CHANGELOG.md b/packages/labs/observers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @lit-labs/observers
 
+## 2.0.0
+
+### Major Changes
+
+- [#3771](https://github.com/lit/lit/pull/3771) [`89da3d80`](https://github.com/lit/lit/commit/89da3d802e506a7400bc415ef77c2bfffce8ffa6) - Change filenames to match project convention: replace `_` with `-`.
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/labs/observers/package.json b/packages/labs/observers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lit-labs/observers",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "A set of reactive controllers that facilitate using the platform observer objects.",
   "license": "BSD-3-Clause",
   "homepage": "https://lit.dev/",

diff --git a/packages/labs/ssr-client/.gitignore b/packages/labs/ssr-client/.gitignore
@@ -1,5 +1,7 @@
 /development/
 /directives/
-/controllers/
+/lib/
+/node/
 /node_modules/
 /index.*
+/lit-element-hydrate-support.*