diff options
author | 2024-11-15 19:37:28 +0800 | |
---|---|---|
committer | 2024-11-15 19:37:28 +0800 | |
commit | 671f50c7d3c02ab9d23d8d38ecb8934d080b6a40 (patch) | |
tree | 45af7931d284ee47857c9bc5c172f12eff779b2f /examples | |
parent | 4364bff27332e52f92da72392620a36110daee42 (diff) | |
parent | 55091174158a80f2e023571f6d10ffdbf17d274b (diff) | |
download | astro-671f50c7d3c02ab9d23d8d38ecb8934d080b6a40.tar.gz astro-671f50c7d3c02ab9d23d8d38ecb8934d080b6a40.tar.zst astro-671f50c7d3c02ab9d23d8d38ecb8934d080b6a40.zip |
Merge branch 'main' into next
Diffstat (limited to '')
-rw-r--r-- | examples/framework-multiple/package.json | 4 | ||||
-rw-r--r-- | examples/framework-multiple/src/components/svelte/SvelteCounter.svelte | 15 | ||||
-rw-r--r-- | examples/framework-solid/package.json | 2 | ||||
-rw-r--r-- | examples/framework-svelte/package.json | 4 | ||||
-rw-r--r-- | examples/framework-svelte/src/components/Counter.svelte | 15 | ||||
-rw-r--r-- | examples/ssr/package.json | 4 | ||||
-rw-r--r-- | examples/ssr/src/components/AddToCart.svelte | 5 | ||||
-rw-r--r-- | examples/ssr/src/components/Cart.svelte | 4 |
8 files changed, 33 insertions, 20 deletions
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 4bbb93465..bca343000 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^3.5.3", "@astrojs/react": "^3.6.2", - "@astrojs/solid-js": "^4.4.2", + "@astrojs/solid-js": "^4.4.3", "@astrojs/svelte": "^6.0.0-beta.2", "@astrojs/vue": "^5.0.0-beta.1", "@types/react": "^18.3.12", @@ -22,7 +22,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^4.2.19", + "svelte": "^5.1.16", "vue": "^3.5.12" } } diff --git a/examples/framework-multiple/src/components/svelte/SvelteCounter.svelte b/examples/framework-multiple/src/components/svelte/SvelteCounter.svelte index 01e58574a..641312ae1 100644 --- a/examples/framework-multiple/src/components/svelte/SvelteCounter.svelte +++ b/examples/framework-multiple/src/components/svelte/SvelteCounter.svelte @@ -2,7 +2,14 @@ A counter written with Svelte --> <script lang="ts"> - let count = 0; + import type { Snippet } from 'svelte'; + + interface Props { + children?: Snippet + } + + let { children }: Props = $props(); + let count = $state(0); function add() { count += 1; @@ -14,10 +21,10 @@ A counter written with Svelte </script> <div class="counter"> - <button on:click={subtract}>-</button> + <button onclick={subtract}>-</button> <pre>{count}</pre> - <button on:click={add}>+</button> + <button onclick={add}>+</button> </div> <div class="counter-message"> - <slot /> + {@render children?.()} </div> diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 31b0691ca..da283570d 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "@astrojs/solid-js": "^4.4.2", + "@astrojs/solid-js": "^4.4.3", "astro": "^5.0.0-beta.8", "solid-js": "^1.9.2" } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index c7308a1ab..56e22f6be 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^6.0.0-beta.2", + "@astrojs/svelte": "^6.0.0", "astro": "^5.0.0-beta.8", - "svelte": "^4.2.19" + "svelte": "^5.1.16" } } diff --git a/examples/framework-svelte/src/components/Counter.svelte b/examples/framework-svelte/src/components/Counter.svelte index 1353736aa..a11538645 100644 --- a/examples/framework-svelte/src/components/Counter.svelte +++ b/examples/framework-svelte/src/components/Counter.svelte @@ -1,5 +1,12 @@ <script lang="ts"> - let count = 0; + import type { Snippet } from 'svelte'; + + interface Props { + children?: Snippet + } + + let { children }: Props = $props(); + let count = $state(0); function add() { count += 1; @@ -11,12 +18,12 @@ </script> <div class="counter"> - <button on:click={subtract}>-</button> + <button onclick={subtract}>-</button> <pre>{count}</pre> - <button on:click={add}>+</button> + <button onclick={add}>+</button> </div> <div class="message"> - <slot /> + {@render children?.()} </div> <style> diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 63d27d3b2..1a468ec12 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@astrojs/node": "^9.0.0-alpha.1", - "@astrojs/svelte": "^6.0.0-beta.2", + "@astrojs/svelte": "^6.0.0", "astro": "^5.0.0-beta.8", - "svelte": "^4.2.19" + "svelte": "^5.1.16" } } diff --git a/examples/ssr/src/components/AddToCart.svelte b/examples/ssr/src/components/AddToCart.svelte index 0f7a97a93..bae888b6b 100644 --- a/examples/ssr/src/components/AddToCart.svelte +++ b/examples/ssr/src/components/AddToCart.svelte @@ -1,7 +1,6 @@ <script> import { addToUserCart } from '../api'; - export let id = 0; - export let name = ''; + let { id, name } = $props() function notifyCartItem(id) { window.dispatchEvent(new CustomEvent('add-to-cart', { @@ -49,6 +48,6 @@ button:hover { text-transform: uppercase; } </style> -<button on:click={addToCart}> +<button click={addToCart}> <span class="pretext">Add to cart</span> </button> diff --git a/examples/ssr/src/components/Cart.svelte b/examples/ssr/src/components/Cart.svelte index 74db0bc79..5d4b7d251 100644 --- a/examples/ssr/src/components/Cart.svelte +++ b/examples/ssr/src/components/Cart.svelte @@ -1,5 +1,5 @@ <script> - export let count = 0; + let { count } = $props() let items = new Set(); function onAddToCart(ev) { @@ -27,7 +27,7 @@ font-size: 24px; } </style> -<svelte:window on:add-to-cart={onAddToCart}/> +<svelte:window onadd-to-cart={onAddToCart}/> <a href="/cart" class="cart"> <span class="material-icons cart-icon">shopping_cart</span> <span class="count">{count}</span> |