Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ssr-client] Move experimental hydrate modules #3720

Merged
merged 10 commits into from Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/sweet-lemons-brake.md
@@ -0,0 +1,10 @@
---
'@lit-labs/ssr-client': minor
'lit-element': patch
'lit-html': patch
'lit': patch
---

`lit-html/experimental-hydrate.js` and `lit-element/experimental-hydrate-support.js` have been moved to `@lit-labs/ssr-client`.

The modules in the original location have been marked deprecated and will be removed in a future version.
4 changes: 3 additions & 1 deletion .eslintignore
Expand Up @@ -273,9 +273,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/
Expand Down
4 changes: 3 additions & 1 deletion .prettierignore
Expand Up @@ -260,9 +260,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/
Expand Down
2 changes: 2 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/labs/ssr-client/.gitignore
@@ -1,5 +1,7 @@
/development/
/directives/
/controllers/
/lib/
/node/
/node_modules/
/index.*
/lit-element-hydrate-support.*
32 changes: 27 additions & 5 deletions packages/labs/ssr-client/package.json
Expand Up @@ -18,10 +18,25 @@
},
"exports": {
".": {
"types": "./development.index.d.ts",
augustjk marked this conversation as resolved.
Show resolved Hide resolved
"node": {
"development": "./node/development/index.js",
"default": "./node/index.js"
},
"development": "./development/index.js",
"default": "./index.js"
},
"./lit-element-hydrate-support.js": {
"types": "./development/lit-element-hydrate-support.d.ts",
"node": {
"development": "./node/development/lit-element-hydrate-support.js",
"default": "./node/lit-element-hydrate-support.js"
},
"development": "./development/lit-element-hydrate-support.js",
"default": "./lit-element-hydrate-support.js"
},
"./directives/render-light.js": {
"types": "./development/directives/render-light.d.ts",
"development": "./development/directives/render-light.js",
"default": "./directives/render-light.js"
}
Expand All @@ -30,7 +45,9 @@
"/development/",
"!/development/test/",
"/directives/",
"/index.{d.ts,d.ts.map,js,js.map}"
"/lib/",
"/index.{d.ts,d.ts.map,js,js.map}",
"/lit-element-hydrate-support.{d.ts,d.ts.map,js,js.map}"
],
"scripts": {
"build": "wireit",
Expand Down Expand Up @@ -72,7 +89,8 @@
"files": [],
"output": [
"*.d.ts{,.map}",
"directives/*.d.ts{,.map}"
"directives/*.d.ts{,.map}",
"lib/*.d.ts{,.map}"
]
},
"build:rollup": {
Expand All @@ -86,7 +104,10 @@
],
"output": [
"index.js{,.map}",
"directives/*.js{,.map}"
"lit-element-hydrate-support.js{,.map}",
"directives/*.js{,.map}",
"lib/*.js{,.map}",
"node/"
]
},
"checksize": {
Expand All @@ -106,9 +127,10 @@
"@lit-internal/scripts": "^1.0.0"
},
"dependencies": {
"@lit-labs/ssr-dom-shim": "^1.1.0",
augustjk marked this conversation as resolved.
Show resolved Hide resolved
"@lit/reactive-element": "^1.0.0",
"lit": "^2.0.0",
"lit-html": "^2.0.0",
"@lit/reactive-element": "^1.0.0"
"lit-html": "^2.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 5 additions & 1 deletion packages/labs/ssr-client/rollup.config.js
Expand Up @@ -9,6 +9,10 @@ import {createRequire} from 'module';

export default litProdConfig({
packageName: createRequire(import.meta.url)('./package.json').name,
entryPoints: ['index', 'directives/render-light'],
entryPoints: [
'index',
'lit-element-hydrate-support',
'directives/render-light',
],
external: ['lit/directive.js', 'lit/directive-helpers.js'],
});
11 changes: 11 additions & 0 deletions packages/labs/ssr-client/src/env.d.ts
@@ -0,0 +1,11 @@
/**
* @license
* Copyright 2020 Google LLC
* SPDX-License-Identifier: BSD-3-Clause
*/

// eslint-disable-next-line no-var
declare var litElementHydrateSupport:
| undefined
// eslint-disable-next-line @typescript-eslint/no-explicit-any
| ((options: {LitElement: any}) => void);
2 changes: 1 addition & 1 deletion packages/labs/ssr-client/src/index.ts
Expand Up @@ -3,4 +3,4 @@
* Copyright 2017 Google LLC
* SPDX-License-Identifier: BSD-3-Clause
*/
export {};
export {hydrate} from './lib/hydrate-lit-html.js';