From b0a71946f4320d4e76f31e990fe5821f823f0e12 Mon Sep 17 00:00:00 2001 From: Geoffrey-Pliez Date: Tue, 12 Dec 2023 20:35:40 +0100 Subject: [PATCH] [@astrojs/lit] lit 3.0 compatibility (#8822) * updates packages * [Fix] pnpm-lock * [Fix] updates * revert dev dependencies * Update lockfile * Update lit version in the e2e tests * Adding changeset --------- Co-authored-by: Matthew Phillips --- .changeset/big-comics-work.md | 5 ++ .../e2e/fixtures/lit-component/package.json | 2 +- packages/integrations/lit/package.json | 10 +-- packages/integrations/lit/src/index.ts | 2 +- pnpm-lock.yaml | 70 +++++++++++++------ 5 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 .changeset/big-comics-work.md diff --git a/.changeset/big-comics-work.md b/.changeset/big-comics-work.md new file mode 100644 index 000000000000..43085c774311 --- /dev/null +++ b/.changeset/big-comics-work.md @@ -0,0 +1,5 @@ +--- +'@astrojs/lit': major +--- + +Upgrade to Lit 3.0 diff --git a/packages/astro/e2e/fixtures/lit-component/package.json b/packages/astro/e2e/fixtures/lit-component/package.json index c221e81c97d0..ca278c082afa 100644 --- a/packages/astro/e2e/fixtures/lit-component/package.json +++ b/packages/astro/e2e/fixtures/lit-component/package.json @@ -6,6 +6,6 @@ "@astrojs/lit": "workspace:*", "@webcomponents/template-shadowroot": "^0.2.1", "astro": "workspace:*", - "lit": "^2.8.0" + "lit": "^3.1.0" } } diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index dd29cde62b44..e0bee4760a78 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -42,9 +42,9 @@ "test": "mocha" }, "dependencies": { - "@lit-labs/ssr": "3.1.7", - "@lit-labs/ssr-client": "1.1.3", - "@lit-labs/ssr-dom-shim": "^1.1.1", + "@lit-labs/ssr": "^3.2.0", + "@lit-labs/ssr-client": "^1.1.5", + "@lit-labs/ssr-dom-shim": "^1.1.2", "parse5": "^7.1.2" }, "overrides": { @@ -57,13 +57,13 @@ "astro-scripts": "workspace:*", "chai": "^4.3.7", "cheerio": "1.0.0-rc.12", - "lit": "^2.8.0", + "lit": "^3.1.0", "mocha": "^10.2.0", "sass": "^1.69.5" }, "peerDependencies": { "@webcomponents/template-shadowroot": "^0.2.1", - "lit": "^2.7.0" + "lit": "^3.1.0" }, "publishConfig": { "provenance": true diff --git a/packages/integrations/lit/src/index.ts b/packages/integrations/lit/src/index.ts index de6d5b0f91c3..c2a73e2aff1e 100644 --- a/packages/integrations/lit/src/index.ts +++ b/packages/integrations/lit/src/index.ts @@ -9,7 +9,7 @@ function getViteConfiguration() { '@astrojs/lit/client-shim.js', '@astrojs/lit/hydration-support.js', '@webcomponents/template-shadowroot/template-shadowroot.js', - 'lit/experimental-hydrate-support.js', + "@lit-labs/ssr-client/lit-element-hydrate-support.js", ], exclude: ['@astrojs/lit/server.js'], }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f9aaa4dc184..8533a3b6a8e5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1042,8 +1042,8 @@ importers: specifier: workspace:* version: link:../../.. lit: - specifier: ^2.8.0 - version: 2.8.0 + specifier: ^3.1.0 + version: 3.1.0 packages/astro/e2e/fixtures/multiple-frameworks: dependencies: @@ -3744,13 +3744,13 @@ importers: packages/integrations/lit: dependencies: '@lit-labs/ssr': - specifier: 3.1.7 - version: 3.1.7 + specifier: ^3.2.0 + version: 3.2.0 '@lit-labs/ssr-client': - specifier: 1.1.3 - version: 1.1.3 + specifier: ^1.1.5 + version: 1.1.5 '@lit-labs/ssr-dom-shim': - specifier: ^1.1.1 + specifier: ^1.1.2 version: 1.1.2 parse5: specifier: ^7.1.2 @@ -3769,8 +3769,8 @@ importers: specifier: 1.0.0-rc.12 version: 1.0.0-rc.12 lit: - specifier: ^2.8.0 - version: 2.8.0 + specifier: ^3.1.0 + version: 3.1.0 mocha: specifier: ^10.2.0 version: 10.2.0 @@ -6745,30 +6745,30 @@ packages: resolution: {integrity: sha512-n5JEf16Wr4mdkRMZ8wMP/wN9/sHmTjRPbouXjJH371mZ2LEGDl72t8tEsMRNFerQN/QJtivOxqK1frdGa4QK5Q==} engines: {node: '>=10'} - /@lit-labs/ssr-client@1.1.3: - resolution: {integrity: sha512-JIvpvfCEJGTIKH1L/kZYN68jiXuTBbHI6JG3H4HQI0Ko/8Z0qtlSP9G35IVDzNdMt+xVE4WYKsY9Vk6N2S55kQ==} + /@lit-labs/ssr-client@1.1.5: + resolution: {integrity: sha512-rAXd2OsuxfGA579RiDS2YQSm1HreE8knQHj+fcMhGIPYenBoW4M70Yl8K3a35MSLlpQnnF//s2TPfkHFmy2RhA==} dependencies: - '@lit/reactive-element': 1.6.3 - lit: 2.8.0 - lit-html: 2.8.0 + '@lit/reactive-element': 2.0.2 + lit: 3.1.0 + lit-html: 3.1.0 dev: false /@lit-labs/ssr-dom-shim@1.1.2: resolution: {integrity: sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==} - /@lit-labs/ssr@3.1.7: - resolution: {integrity: sha512-eoH2Ech9lvk3VCMbG6d0yRqCJOD1Zs+ZKBRuGIxOG2OQoNYtQg8JV5JPeRhlx9OKy/wVAGPtIaWDL25n4mVjYQ==} + /@lit-labs/ssr@3.2.0: + resolution: {integrity: sha512-5ZwVMEpYCHI5MF7+5ER3IvOyDjJimq/nzKtV4momqSKr3a/9gEFouHzTDogwaYoOwIBBtO8jl5SX2Vsb0kfZgA==} engines: {node: '>=13.9.0'} dependencies: - '@lit-labs/ssr-client': 1.1.3 + '@lit-labs/ssr-client': 1.1.5 '@lit-labs/ssr-dom-shim': 1.1.2 - '@lit/reactive-element': 1.6.3 + '@lit/reactive-element': 2.0.2 '@parse5/tools': 0.3.0 '@types/node': 16.18.61 enhanced-resolve: 5.15.0 - lit: 2.8.0 - lit-element: 3.3.3 - lit-html: 2.8.0 + lit: 3.1.0 + lit-element: 4.0.2 + lit-html: 3.1.0 node-fetch: 3.3.2 parse5: 7.1.2 dev: false @@ -6777,6 +6777,12 @@ packages: resolution: {integrity: sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==} dependencies: '@lit-labs/ssr-dom-shim': 1.1.2 + dev: false + + /@lit/reactive-element@2.0.2: + resolution: {integrity: sha512-SVOwLAWUQg3Ji1egtOt1UiFe4zdDpnWHyc5qctSceJ5XIu0Uc76YmGpIjZgx9YJ0XtdW0Jm507sDvjOu+HnB8w==} + dependencies: + '@lit-labs/ssr-dom-shim': 1.1.2 /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -11536,11 +11542,25 @@ packages: '@lit-labs/ssr-dom-shim': 1.1.2 '@lit/reactive-element': 1.6.3 lit-html: 2.8.0 + dev: false + + /lit-element@4.0.2: + resolution: {integrity: sha512-/W6WQZUa5VEXwC7H9tbtDMdSs9aWil3Ou8hU6z2cOKWbsm/tXPAcsoaHVEtrDo0zcOIE5GF6QgU55tlGL2Nihg==} + dependencies: + '@lit-labs/ssr-dom-shim': 1.1.2 + '@lit/reactive-element': 2.0.2 + lit-html: 3.1.0 /lit-html@2.8.0: resolution: {integrity: sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==} dependencies: '@types/trusted-types': 2.0.5 + dev: false + + /lit-html@3.1.0: + resolution: {integrity: sha512-FwAjq3iNsaO6SOZXEIpeROlJLUlrbyMkn4iuv4f4u1H40Jw8wkeR/OUXZUHUoiYabGk8Y4Y0F/rgq+R4MrOLmA==} + dependencies: + '@types/trusted-types': 2.0.5 /lit@2.8.0: resolution: {integrity: sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==} @@ -11548,6 +11568,14 @@ packages: '@lit/reactive-element': 1.6.3 lit-element: 3.3.3 lit-html: 2.8.0 + dev: false + + /lit@3.1.0: + resolution: {integrity: sha512-rzo/hmUqX8zmOdamDAeydfjsGXbbdtAFqMhmocnh2j9aDYqbu0fjXygjCa0T99Od9VQ/2itwaGrjZz/ZELVl7w==} + dependencies: + '@lit/reactive-element': 2.0.2 + lit-element: 4.0.2 + lit-html: 3.1.0 /lite-youtube-embed@0.2.0: resolution: {integrity: sha512-XXXAk5sbvtjjwbie3XG+6HppgTm1HTGL/Uk9z9NkJH53o7puZLur434heHzAjkS60hZB3vT4ls25zl5rMiX4EA==}