diff options
Diffstat (limited to 'examples')
111 files changed, 373 insertions, 637 deletions
diff --git a/examples/basics/README.md b/examples/basics/README.md index 1db3fb399..ff19a3e7e 100644 --- a/examples/basics/README.md +++ b/examples/basics/README.md @@ -21,8 +21,6 @@ Inside of your Astro project, you'll see the following folders and files: ├── public/ │ └── favicon.svg ├── src/ -│ ├── components/ -│ │ └── Card.astro │ ├── layouts/ │ │ └── Layout.astro │ └── pages/ @@ -30,11 +28,7 @@ Inside of your Astro project, you'll see the following folders and files: └── package.json ``` -Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name. - -There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components. - -Any static assets, like images, can be placed in the `public/` directory. +To learn more about the folder structure of an Astro project, refer to [our guide on project structure](https://docs.astro.build/en/basics/project-structure/). ## 🧞 Commands diff --git a/examples/basics/astro.config.mjs b/examples/basics/astro.config.mjs index 882e6515a..e762ba5cf 100644 --- a/examples/basics/astro.config.mjs +++ b/examples/basics/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; // https://astro.build/config diff --git a/examples/basics/package.json b/examples/basics/package.json index bd14bb5bf..7ce572f52 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -5,12 +5,11 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/basics/src/assets/astro.svg b/examples/basics/src/assets/astro.svg new file mode 100644 index 000000000..8cf8fb0c7 --- /dev/null +++ b/examples/basics/src/assets/astro.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" fill="none" width="115" height="48"><path fill="#17191E" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="url(#a)" d="M7.77 36.35C6.4 35.11 6 32.51 6.57 30.62c.99 1.2 2.35 1.57 3.75 1.78 2.18.33 4.31.2 6.33-.78.23-.12.44-.27.7-.42.18.55.23 1.1.17 1.67a4.56 4.56 0 0 1-1.94 3.23c-.43.32-.9.61-1.34.91-1.38.94-1.76 2.03-1.24 3.62l.05.17a3.63 3.63 0 0 1-1.6-1.38 3.87 3.87 0 0 1-.63-2.1c0-.37 0-.74-.05-1.1-.13-.9-.55-1.3-1.33-1.32a1.56 1.56 0 0 0-1.63 1.26c0 .06-.03.12-.05.2Z"/><path fill="#17191E" d="M.02 30.31s4.02-1.95 8.05-1.95l3.04-9.4c.11-.45.44-.76.82-.76.37 0 .7.31.82.76l3.04 9.4c4.77 0 8.05 1.95 8.05 1.95L17 11.71c-.2-.56-.53-.91-.98-.91H7.83c-.44 0-.76.35-.97.9L.02 30.31Zm42.37-5.97c0 1.64-2.05 2.62-4.88 2.62-1.85 0-2.5-.45-2.5-1.41 0-1 .8-1.49 2.65-1.49 1.67 0 3.09.03 4.73.23v.05Zm.03-2.04a21.37 21.37 0 0 0-4.37-.36c-5.32 0-7.82 1.25-7.82 4.18 0 3.04 1.71 4.2 5.68 4.2 3.35 0 5.63-.84 6.46-2.92h.14c-.03.5-.05 1-.05 1.4 0 1.07.18 1.16 1.06 1.16h4.15a16.9 16.9 0 0 1-.36-4c0-1.67.06-2.93.06-4.62 0-3.45-2.07-5.64-8.56-5.64-2.8 0-5.9.48-8.26 1.19.22.93.54 2.83.7 4.06 2.04-.96 4.95-1.37 7.2-1.37 3.11 0 3.97.71 3.97 2.15v.57Zm11.37 3c-.56.07-1.33.07-2.12.07-.83 0-1.6-.03-2.12-.1l-.02.58c0 2.85 1.87 4.52 8.45 4.52 6.2 0 8.2-1.64 8.2-4.55 0-2.74-1.33-4.09-7.2-4.39-4.58-.2-4.99-.7-4.99-1.28 0-.66.59-1 3.65-1 3.18 0 4.03.43 4.03 1.35v.2a46.13 46.13 0 0 1 4.24.03l.02-.55c0-3.36-2.8-4.46-8.2-4.46-6.08 0-8.13 1.49-8.13 4.39 0 2.6 1.64 4.23 7.48 4.48 4.3.14 4.77.62 4.77 1.28 0 .7-.7 1.03-3.71 1.03-3.47 0-4.35-.48-4.35-1.47v-.13Zm19.82-12.05a17.5 17.5 0 0 1-6.24 3.48c.03.84.03 2.4.03 3.24l1.5.02c-.02 1.63-.04 3.6-.04 4.9 0 3.04 1.6 5.32 6.58 5.32 2.1 0 3.5-.23 5.23-.6a43.77 43.77 0 0 1-.46-4.13c-1.03.34-2.34.53-3.78.53-2 0-2.82-.55-2.82-2.13 0-1.37 0-2.65.03-3.84 2.57.02 5.13.07 6.64.11-.02-1.18.03-2.9.1-4.04-2.2.04-4.65.07-6.68.07l.07-2.93h-.16Zm13.46 6.04a767.33 767.33 0 0 1 .07-3.18H82.6c.07 1.96.07 3.98.07 6.92 0 2.95-.03 4.99-.07 6.93h5.18c-.09-1.37-.11-3.68-.11-5.65 0-3.1 1.26-4 4.12-4 1.33 0 2.28.16 3.1.46.03-1.16.26-3.43.4-4.43-.86-.25-1.81-.41-2.96-.41-2.46-.03-4.26.98-5.1 3.38l-.17-.02Zm22.55 3.65c0 2.5-1.8 3.66-4.64 3.66-2.81 0-4.61-1.1-4.61-3.66s1.82-3.52 4.61-3.52c2.82 0 4.64 1.03 4.64 3.52Zm4.71-.11c0-4.96-3.87-7.18-9.35-7.18-5.5 0-9.23 2.22-9.23 7.18 0 4.94 3.49 7.59 9.21 7.59 5.77 0 9.37-2.65 9.37-7.6Z"/><defs><linearGradient id="a" x1="6.33" x2="19.43" y1="40.8" y2="34.6" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient></defs></svg> diff --git a/examples/basics/src/assets/background.svg b/examples/basics/src/assets/background.svg new file mode 100644 index 000000000..4b2be0ac0 --- /dev/null +++ b/examples/basics/src/assets/background.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="1440" height="1024" fill="none"><path fill="url(#a)" fill-rule="evenodd" d="M-217.58 475.75c91.82-72.02 225.52-29.38 341.2-44.74C240 415.56 372.33 315.14 466.77 384.9c102.9 76.02 44.74 246.76 90.31 366.31 29.83 78.24 90.48 136.14 129.48 210.23 57.92 109.99 169.67 208.23 155.9 331.77-13.52 121.26-103.42 264.33-224.23 281.37-141.96 20.03-232.72-220.96-374.06-196.99-151.7 25.73-172.68 330.24-325.85 315.72-128.6-12.2-110.9-230.73-128.15-358.76-12.16-90.14 65.87-176.25 44.1-264.57-26.42-107.2-167.12-163.46-176.72-273.45-10.15-116.29 33.01-248.75 124.87-320.79Z" clip-rule="evenodd" style="opacity:.154"/><path fill="url(#b)" fill-rule="evenodd" d="M1103.43 115.43c146.42-19.45 275.33-155.84 413.5-103.59 188.09 71.13 409 212.64 407.06 413.88-1.94 201.25-259.28 278.6-414.96 405.96-130 106.35-240.24 294.39-405.6 265.3-163.7-28.8-161.93-274.12-284.34-386.66-134.95-124.06-436-101.46-445.82-284.6-9.68-180.38 247.41-246.3 413.54-316.9 101.01-42.93 207.83 21.06 316.62 6.61Z" clip-rule="evenodd" style="opacity:.154"/><defs><linearGradient id="b" x1="373" x2="1995.44" y1="1100" y2="118.03" gradientUnits="userSpaceOnUse"><stop stop-color="#D83333"/><stop offset="1" stop-color="#F041FF"/></linearGradient><linearGradient id="a" x1="107.37" x2="1130.66" y1="1993.35" y2="1026.31" gradientUnits="userSpaceOnUse"><stop stop-color="#3245FF"/><stop offset="1" stop-color="#BC52EE"/></linearGradient></defs></svg> diff --git a/examples/basics/src/components/Card.astro b/examples/basics/src/components/Card.astro deleted file mode 100644 index bd6d5971e..000000000 --- a/examples/basics/src/components/Card.astro +++ /dev/null @@ -1,61 +0,0 @@ ---- -interface Props { - title: string; - body: string; - href: string; -} - -const { href, title, body } = Astro.props; ---- - -<li class="link-card"> - <a href={href}> - <h2> - {title} - <span>→</span> - </h2> - <p> - {body} - </p> - </a> -</li> -<style> - .link-card { - list-style: none; - display: flex; - padding: 1px; - background-color: #23262d; - background-image: none; - background-size: 400%; - border-radius: 7px; - background-position: 100%; - transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1); - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1); - } - .link-card > a { - width: 100%; - text-decoration: none; - line-height: 1.4; - padding: calc(1.5rem - 1px); - border-radius: 8px; - color: white; - background-color: #23262d; - opacity: 0.8; - } - h2 { - margin: 0; - font-size: 1.25rem; - transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1); - } - p { - margin-top: 0.5rem; - margin-bottom: 0; - } - .link-card:is(:hover, :focus-within) { - background-position: 0; - background-image: var(--accent-gradient); - } - .link-card:is(:hover, :focus-within) h2 { - color: rgb(var(--accent-light)); - } -</style> diff --git a/examples/basics/src/components/Welcome.astro b/examples/basics/src/components/Welcome.astro new file mode 100644 index 000000000..d08955687 --- /dev/null +++ b/examples/basics/src/components/Welcome.astro @@ -0,0 +1,209 @@ +--- +import astroLogo from '../assets/astro.svg'; +import background from '../assets/background.svg'; +--- + +<div id="container"> + <img id="background" src={background.src} alt="" fetchpriority="high" /> + <main> + <section id="hero"> + <a href="https://astro.build" + ><img src={astroLogo.src} width="115" height="48" alt="Astro Homepage" /></a + > + <h1> + To get started, open the <code><pre>src/pages</pre></code> directory in your project. + </h1> + <section id="links"> + <a class="button" href="https://docs.astro.build">Read our docs</a> + <a href="https://astro.build/chat" + >Join our Discord <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127.14 96.36" + ><path + fill="currentColor" + d="M107.7 8.07A105.15 105.15 0 0 0 81.47 0a72.06 72.06 0 0 0-3.36 6.83 97.68 97.68 0 0 0-29.11 0A72.37 72.37 0 0 0 45.64 0a105.89 105.89 0 0 0-26.25 8.09C2.79 32.65-1.71 56.6.54 80.21a105.73 105.73 0 0 0 32.17 16.15 77.7 77.7 0 0 0 6.89-11.11 68.42 68.42 0 0 1-10.85-5.18c.91-.66 1.8-1.34 2.66-2a75.57 75.57 0 0 0 64.32 0c.87.71 1.76 1.39 2.66 2a68.68 68.68 0 0 1-10.87 5.19 77 77 0 0 0 6.89 11.1 105.25 105.25 0 0 0 32.19-16.14c2.64-27.38-4.51-51.11-18.9-72.15ZM42.45 65.69C36.18 65.69 31 60 31 53s5-12.74 11.43-12.74S54 46 53.89 53s-5.05 12.69-11.44 12.69Zm42.24 0C78.41 65.69 73.25 60 73.25 53s5-12.74 11.44-12.74S96.23 46 96.12 53s-5.04 12.69-11.43 12.69Z" + ></path></svg + > + </a> + </section> + </section> + </main> + + <a href="https://astro.build/blog/astro-5-beta/" id="news" class="box"> + <svg width="32" height="32" fill="none" xmlns="http://www.w3.org/2000/svg" + ><path + d="M24.667 12c1.333 1.414 2 3.192 2 5.334 0 4.62-4.934 5.7-7.334 12C18.444 28.567 18 27.456 18 26c0-4.642 6.667-7.053 6.667-14Zm-5.334-5.333c1.6 1.65 2.4 3.43 2.4 5.333 0 6.602-8.06 7.59-6.4 17.334C13.111 27.787 12 25.564 12 22.666c0-4.434 7.333-8 7.333-16Zm-6-5.333C15.111 3.555 16 5.556 16 7.333c0 8.333-11.333 10.962-5.333 22-3.488-.774-6-4-6-8 0-8.667 8.666-10 8.666-20Z" + fill="#111827"></path></svg + > + <h2>What's New in Astro 5.0?</h2> + <p> + From content layers to server islands, click to learn more about the new features and + improvements in Astro 5.0 + </p> + </a> +</div> + +<style> + #background { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: -1; + filter: blur(100px); + } + + #container { + font-family: Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif; + height: 100%; + } + + main { + height: 100%; + display: flex; + justify-content: center; + } + + #hero { + display: flex; + align-items: start; + flex-direction: column; + justify-content: center; + padding: 16px; + } + + h1 { + font-size: 22px; + margin-top: 0.25em; + } + + #links { + display: flex; + gap: 16px; + } + + #links a { + display: flex; + align-items: center; + padding: 10px 12px; + color: #111827; + text-decoration: none; + transition: color 0.2s; + } + + #links a:hover { + color: rgb(78, 80, 86); + } + + #links a svg { + height: 1em; + margin-left: 8px; + } + + #links a.button { + color: white; + background: linear-gradient(83.21deg, #3245ff 0%, #bc52ee 100%); + box-shadow: + inset 0 0 0 1px rgba(255, 255, 255, 0.12), + inset 0 -2px 0 rgba(0, 0, 0, 0.24); + border-radius: 10px; + } + + #links a.button:hover { + color: rgb(230, 230, 230); + box-shadow: none; + } + + pre { + font-family: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, + 'DejaVu Sans Mono', monospace; + font-weight: normal; + background: linear-gradient(14deg, #d83333 0%, #f041ff 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; + margin: 0; + } + + h2 { + margin: 0 0 1em; + font-weight: normal; + color: #111827; + font-size: 20px; + } + + p { + color: #4b5563; + font-size: 16px; + line-height: 24px; + letter-spacing: -0.006em; + margin: 0; + } + + code { + display: inline-block; + background: + linear-gradient(66.77deg, #f3cddd 0%, #f5cee7 100%) padding-box, + linear-gradient(155deg, #d83333 0%, #f041ff 18%, #f5cee7 45%) border-box; + border-radius: 8px; + border: 1px solid transparent; + padding: 6px 8px; + } + + .box { + padding: 16px; + background: rgba(255, 255, 255, 1); + border-radius: 16px; + border: 1px solid white; + } + + #news { + position: absolute; + bottom: 16px; + right: 16px; + max-width: 300px; + text-decoration: none; + transition: background 0.2s; + backdrop-filter: blur(50px); + } + + #news:hover { + background: rgba(255, 255, 255, 0.55); + } + + @media screen and (max-height: 368px) { + #news { + display: none; + } + } + + @media screen and (max-width: 768px) { + #container { + display: flex; + flex-direction: column; + } + + #hero { + display: block; + padding-top: 10%; + } + + #links { + flex-wrap: wrap; + } + + #links a.button { + padding: 14px 18px; + } + + #news { + right: 16px; + left: 16px; + bottom: 2.5rem; + max-width: 100%; + } + + h1 { + line-height: 1.5; + } + } +</style> diff --git a/examples/basics/src/env.d.ts b/examples/basics/src/env.d.ts deleted file mode 100644 index 9bc5cb41c..000000000 --- a/examples/basics/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" />
\ No newline at end of file diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro index 181097125..e455c6106 100644 --- a/examples/basics/src/layouts/Layout.astro +++ b/examples/basics/src/layouts/Layout.astro @@ -1,50 +1,22 @@ ---- -interface Props { - title: string; -} - -const { title } = Astro.props; ---- - <!doctype html> <html lang="en"> <head> <meta charset="UTF-8" /> - <meta name="description" content="Astro description" /> <meta name="viewport" content="width=device-width" /> <link rel="icon" type="image/svg+xml" href="/favicon.svg" /> <meta name="generator" content={Astro.generator} /> - <title>{title}</title> + <title>Astro Basics</title> </head> <body> <slot /> </body> </html> -<style is:global> - :root { - --accent: 136, 58, 234; - --accent-light: 224, 204, 250; - --accent-dark: 49, 10, 101; - --accent-gradient: linear-gradient( - 45deg, - rgb(var(--accent)), - rgb(var(--accent-light)) 30%, - white 60% - ); - } - html { - font-family: system-ui, sans-serif; - background: #13151a; - } - code { - font-family: - Menlo, - Monaco, - Lucida Console, - Liberation Mono, - DejaVu Sans Mono, - Bitstream Vera Sans Mono, - Courier New, - monospace; + +<style> + html, + body { + margin: 0; + width: 100%; + height: 100%; } </style> diff --git a/examples/basics/src/pages/index.astro b/examples/basics/src/pages/index.astro index fb6262872..c04f3602b 100644 --- a/examples/basics/src/pages/index.astro +++ b/examples/basics/src/pages/index.astro @@ -1,123 +1,11 @@ --- +import Welcome from '../components/Welcome.astro'; import Layout from '../layouts/Layout.astro'; -import Card from '../components/Card.astro'; + +// Welcome to Astro! Wondering what to do next? Check out the Astro documentation at https://docs.astro.build +// Don't want to use any of this? Delete everything in this file, the `assets`, `components`, and `layouts` directories, and start fresh. --- -<Layout title="Welcome to Astro."> - <main> - <svg - class="astro-a" - width="495" - height="623" - viewBox="0 0 495 623" - fill="none" - xmlns="http://www.w3.org/2000/svg" - aria-hidden="true" - > - <path - fill-rule="evenodd" - clip-rule="evenodd" - d="M167.19 364.254C83.4786 364.254 0 404.819 0 404.819C0 404.819 141.781 19.4876 142.087 18.7291C146.434 7.33701 153.027 0 162.289 0H332.441C341.703 0 348.574 7.33701 352.643 18.7291C352.92 19.5022 494.716 404.819 494.716 404.819C494.716 404.819 426.67 364.254 327.525 364.254L264.41 169.408C262.047 159.985 255.147 153.581 247.358 153.581C239.569 153.581 232.669 159.985 230.306 169.408L167.19 364.254ZM160.869 530.172C160.877 530.18 160.885 530.187 160.894 530.195L160.867 530.181C160.868 530.178 160.868 530.175 160.869 530.172ZM136.218 411.348C124.476 450.467 132.698 504.458 160.869 530.172C160.997 529.696 161.125 529.242 161.248 528.804C161.502 527.907 161.737 527.073 161.917 526.233C165.446 509.895 178.754 499.52 195.577 500.01C211.969 500.487 220.67 508.765 223.202 527.254C224.141 534.12 224.23 541.131 224.319 548.105C224.328 548.834 224.337 549.563 224.347 550.291C224.563 566.098 228.657 580.707 237.264 593.914C245.413 606.426 256.108 615.943 270.749 622.478C270.593 621.952 270.463 621.508 270.35 621.126C270.045 620.086 269.872 619.499 269.685 618.911C258.909 585.935 266.668 563.266 295.344 543.933C298.254 541.971 301.187 540.041 304.12 538.112C310.591 533.854 317.059 529.599 323.279 525.007C345.88 508.329 360.09 486.327 363.431 457.844C364.805 446.148 363.781 434.657 359.848 423.275C358.176 424.287 356.587 425.295 355.042 426.275C351.744 428.366 348.647 430.33 345.382 431.934C303.466 452.507 259.152 455.053 214.03 448.245C184.802 443.834 156.584 436.019 136.218 411.348Z" - fill="url(#paint0_linear_1805_24383)"></path> - <defs> - <linearGradient - id="paint0_linear_1805_24383" - x1="247.358" - y1="0" - x2="247.358" - y2="622.479" - gradientUnits="userSpaceOnUse" - > - <stop stop-opacity="0.9"></stop> - <stop offset="1" stop-opacity="0.2"></stop> - </linearGradient> - </defs> - </svg> - <h1>Welcome to <span class="text-gradient">Astro</span></h1> - <p class="instructions"> - To get started, open the directory <code>src/pages</code> in your project.<br /> - <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above. - </p> - <ul role="list" class="link-card-grid"> - <Card - href="https://docs.astro.build/" - title="Documentation" - body="Learn how Astro works and explore the official API docs." - /> - <Card - href="https://astro.build/integrations/" - title="Integrations" - body="Supercharge your project with new frameworks and libraries." - /> - <Card - href="https://astro.build/themes/" - title="Themes" - body="Explore a galaxy of community-built starter themes." - /> - <Card - href="https://astro.build/chat/" - title="Community" - body="Come say hi to our amazing Discord community. ❤️" - /> - </ul> - </main> +<Layout> + <Welcome /> </Layout> - -<style> - main { - margin: auto; - padding: 1rem; - width: 800px; - max-width: calc(100% - 2rem); - color: white; - font-size: 20px; - line-height: 1.6; - } - .astro-a { - position: absolute; - top: -32px; - left: 50%; - transform: translatex(-50%); - width: 220px; - height: auto; - z-index: -1; - } - h1 { - font-size: 4rem; - font-weight: 700; - line-height: 1; - text-align: center; - margin-bottom: 1em; - } - .text-gradient { - background-image: var(--accent-gradient); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-size: 400%; - background-position: 0%; - } - .instructions { - margin-bottom: 2rem; - border: 1px solid rgba(var(--accent-light), 25%); - background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%)); - padding: 1.5rem; - border-radius: 8px; - } - .instructions code { - font-size: 0.8em; - font-weight: bold; - background: rgba(var(--accent-light), 12%); - color: rgb(var(--accent-light)); - border-radius: 4px; - padding: 0.3em 0.4em; - } - .instructions strong { - color: rgb(var(--accent-light)); - } - .link-card-grid { - display: grid; - grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr)); - gap: 2rem; - padding: 0; - } -</style> diff --git a/examples/basics/tsconfig.json b/examples/basics/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/basics/tsconfig.json +++ b/examples/basics/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/blog/astro.config.mjs b/examples/blog/astro.config.mjs index 3b2f75c84..d45f3951e 100644 --- a/examples/blog/astro.config.mjs +++ b/examples/blog/astro.config.mjs @@ -1,6 +1,6 @@ +// @ts-check import { defineConfig } from 'astro/config'; import mdx from '@astrojs/mdx'; - import sitemap from '@astrojs/sitemap'; // https://astro.build/config diff --git a/examples/blog/package.json b/examples/blog/package.json index 6d2c2d060..c89bd737a 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -5,15 +5,14 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^3.1.9", + "@astrojs/mdx": "^4.0.0-beta.4", "@astrojs/rss": "^4.0.9", "@astrojs/sitemap": "^3.2.1", - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/blog/src/content/config.ts b/examples/blog/src/content.config.ts index 667a31cc7..667a31cc7 100644 --- a/examples/blog/src/content/config.ts +++ b/examples/blog/src/content.config.ts diff --git a/examples/blog/src/env.d.ts b/examples/blog/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/blog/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/blog/tsconfig.json b/examples/blog/tsconfig.json index e51e06270..0dc098dd7 100644 --- a/examples/blog/tsconfig.json +++ b/examples/blog/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { "strictNullChecks": true } diff --git a/examples/component/package.json b/examples/component/package.json index 47bc719b9..58bcfb174 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,9 +15,9 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" }, "peerDependencies": { - "astro": "^4.0.0" + "astro": "^4.0.0 || ^5.0.0" } } diff --git a/examples/component/tsconfig.json b/examples/component/tsconfig.json index 26f2fc53d..f85ec795b 100644 --- a/examples/component/tsconfig.json +++ b/examples/component/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { "jsx": "preserve" } diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index 0194d7c30..33fc30545 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -5,15 +5,14 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro", "test": "vitest run" }, "dependencies": { - "astro": "^4.16.16", - "@astrojs/react": "^3.6.3", + "@astrojs/react": "^3.7.0-beta.1", + "astro": "^5.0.0-beta.11", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^2.1.6" diff --git a/examples/container-with-vitest/tsconfig.json b/examples/container-with-vitest/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/container-with-vitest/tsconfig.json +++ b/examples/container-with-vitest/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/framework-alpine/astro.config.mjs b/examples/framework-alpine/astro.config.mjs index 60bfc7d45..5fddf7717 100644 --- a/examples/framework-alpine/astro.config.mjs +++ b/examples/framework-alpine/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import alpine from '@astrojs/alpinejs'; diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 386eee7ae..76306d93a 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -5,15 +5,14 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { "@astrojs/alpinejs": "^0.4.0", - "@types/alpinejs": "^3.13.11", + "@types/alpinejs": "^3.13.10", "alpinejs": "^3.14.3", - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/framework-alpine/src/env.d.ts b/examples/framework-alpine/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-alpine/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-alpine/tsconfig.json b/examples/framework-alpine/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/framework-alpine/tsconfig.json +++ b/examples/framework-alpine/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/framework-lit/.codesandbox/Dockerfile b/examples/framework-lit/.codesandbox/Dockerfile deleted file mode 100644 index c3b5c81a1..000000000 --- a/examples/framework-lit/.codesandbox/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM node:18-bullseye diff --git a/examples/framework-lit/.gitignore b/examples/framework-lit/.gitignore deleted file mode 100644 index 16d54bb13..000000000 --- a/examples/framework-lit/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# build output -dist/ -# generated types -.astro/ - -# dependencies -node_modules/ - -# logs -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - - -# environment variables -.env -.env.production - -# macOS-specific files -.DS_Store - -# jetbrains setting folder -.idea/ diff --git a/examples/framework-lit/.npmrc b/examples/framework-lit/.npmrc deleted file mode 100644 index b417e450e..000000000 --- a/examples/framework-lit/.npmrc +++ /dev/null @@ -1 +0,0 @@ -public-hoist-pattern[]=*lit* diff --git a/examples/framework-lit/.vscode/extensions.json b/examples/framework-lit/.vscode/extensions.json deleted file mode 100644 index 22a15055d..000000000 --- a/examples/framework-lit/.vscode/extensions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] -} diff --git a/examples/framework-lit/.vscode/launch.json b/examples/framework-lit/.vscode/launch.json deleted file mode 100644 index d64220976..000000000 --- a/examples/framework-lit/.vscode/launch.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] -} diff --git a/examples/framework-lit/README.md b/examples/framework-lit/README.md deleted file mode 100644 index 714d179da..000000000 --- a/examples/framework-lit/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Astro + Lit Example - -```sh -npm create astro@latest -- --template framework-lit -``` - -[](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-lit) -[](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/framework-lit) -[](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/framework-lit/devcontainer.json) - -This example showcases Astro working with [Lit](https://lit.dev/). diff --git a/examples/framework-lit/astro.config.mjs b/examples/framework-lit/astro.config.mjs deleted file mode 100644 index 99733e933..000000000 --- a/examples/framework-lit/astro.config.mjs +++ /dev/null @@ -1,8 +0,0 @@ -import { defineConfig } from 'astro/config'; -import lit from '@astrojs/lit'; - -// https://astro.build/config -export default defineConfig({ - // Enable Lit to support LitHTML components and templates. - integrations: [lit()], -}); diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json deleted file mode 100644 index 6e64bcac2..000000000 --- a/examples/framework-lit/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "@example/framework-lit", - "type": "module", - "version": "0.0.1", - "private": true, - "scripts": { - "dev": "astro dev", - "start": "astro dev", - "build": "astro build", - "preview": "astro preview", - "astro": "astro" - }, - "dependencies": { - "@astrojs/lit": "^4.3.0", - "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.16.16", - "lit": "^3.2.1" - } -} diff --git a/examples/framework-lit/public/assets/logo.svg b/examples/framework-lit/public/assets/logo.svg deleted file mode 100644 index d751556b2..000000000 --- a/examples/framework-lit/public/assets/logo.svg +++ /dev/null @@ -1,12 +0,0 @@ -<svg width="193" height="256" fill="none" xmlns="http://www.w3.org/2000/svg"> - <style> - #flame { fill: #FF5D01; } - #a { fill: #000014; } - @media (prefers-color-scheme: dark) { - #a { fill: #fff; } - } - </style> - - <path id="a" fill-rule="evenodd" clip-rule="evenodd" d="M131.496 18.929c1.943 2.413 2.935 5.67 4.917 12.181l43.309 142.27a180.277 180.277 0 00-51.778-17.53L99.746 60.56a3.67 3.67 0 00-7.042.01l-27.857 95.232a180.224 180.224 0 00-52.01 17.557l43.52-142.281c1.989-6.502 2.983-9.752 4.927-12.16a15.999 15.999 0 016.484-4.798c2.872-1.154 6.271-1.154 13.07-1.154h31.085c6.807 0 10.211 0 13.085 1.157a16 16 0 016.488 4.806z" fill="url(#paint0_linear)"/> - <path id="flame" fill-rule="evenodd" clip-rule="evenodd" d="M136.678 180.151c-7.14 6.105-21.39 10.268-37.804 10.268-20.147 0-37.033-6.272-41.513-14.707-1.602 4.835-1.962 10.367-1.962 13.902 0 0-1.055 17.355 11.016 29.426 0-6.268 5.081-11.349 11.349-11.349 10.743 0 10.731 9.373 10.721 16.977v.679c0 11.542 7.054 21.436 17.086 25.606a23.27 23.27 0 01-2.339-10.2c0-11.008 6.463-15.107 13.973-19.87 5.977-3.79 12.616-8.001 17.192-16.449a31.013 31.013 0 003.744-14.82c0-3.299-.513-6.479-1.463-9.463z" /> -</svg> diff --git a/examples/framework-lit/public/favicon.svg b/examples/framework-lit/public/favicon.svg deleted file mode 100644 index f157bd1c5..000000000 --- a/examples/framework-lit/public/favicon.svg +++ /dev/null @@ -1,9 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128"> - <path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" /> - <style> - path { fill: #000; } - @media (prefers-color-scheme: dark) { - path { fill: #FFF; } - } - </style> -</svg> diff --git a/examples/framework-lit/src/components/Lorem.astro b/examples/framework-lit/src/components/Lorem.astro deleted file mode 100644 index d742ef6a5..000000000 --- a/examples/framework-lit/src/components/Lorem.astro +++ /dev/null @@ -1,106 +0,0 @@ -<p> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi quam arcu, rhoncus et dui at, - volutpat viverra augue. Suspendisse placerat libero tellus, ut consequat ligula rutrum id. - Vestibulum lectus libero, viverra in lacus eget, porttitor tincidunt leo. Integer sit amet turpis - et felis fringilla lacinia in id nibh. Proin vitae dapibus odio. Mauris ornare eget urna id - volutpat. Duis tellus nisi, hendrerit id sodales in, rutrum a quam. Proin tempor velit turpis, et - tempor lacus sagittis in. Sed congue mauris quis nibh posuere, nec semper lacus auctor. Morbi sit - amet enim sit amet arcu ullamcorper sollicitudin. Donec dignissim posuere tincidunt. Donec - ultrices quam nec orci venenatis suscipit. Maecenas sapien quam, pretium sit amet ullamcorper at, - vulputate sit amet urna. Suspendisse potenti. Integer in sapien turpis. Nulla accumsan viverra - diam, quis convallis magna finibus eget. Integer sed eros bibendum, consequat velit sit amet, - tincidunt orci. Mauris varius id metus in fringilla. Vestibulum dignissim massa eget erat luctus, - ac congue mauris pellentesque. In et tempor dolor. Cras blandit congue lorem at facilisis. Aenean - vel lacinia quam. Pellentesque luctus metus ut scelerisque efficitur. Mauris laoreet sodales - libero eget luctus. Proin at congue dui, a cursus risus. Pellentesque lorem sem, rhoncus fermentum - arcu ut, euismod fermentum ligula. Nullam eu orci posuere, laoreet leo in, commodo dolor. Fusce at - felis elementum, commodo justo at, placerat justo. Nam feugiat scelerisque arcu, ut fermentum - tellus elementum in. Sed ut vulputate ante. Morbi cursus arcu quis odio convallis egestas. Donec - vulputate vestibulum dolor eget tristique. Nullam tempor semper augue, vitae lobortis neque tempor - ac. Pellentesque massa leo, congue id ligula auctor, sollicitudin pharetra lorem. Curabitur a - lacus porttitor, venenatis est quis, mattis velit. Fusce hendrerit lobortis mi ac efficitur. - Mauris ornare, lorem sed varius faucibus, nisi dui pretium urna, sit amet lacinia nibh ligula in - ipsum. Phasellus gravida, metus eget ornare ultrices, dolor ipsum consectetur erat, ac aliquet - eros metus sed lectus. Nullam eleifend posuere rhoncus. Curabitur semper ligula vel ante posuere, - at blandit orci accumsan. Vivamus accumsan metus in lorem laoreet, a luctus arcu tempus. Donec - posuere sollicitudin nulla at vulputate. Nulla condimentum imperdiet purus, et lobortis ligula - iaculis in. Donec suscipit viverra neque, ut elementum eros lacinia ut. Fusce at odio enim. Donec - rutrum lectus sit amet est auctor, ac rhoncus lorem imperdiet. Curabitur commodo ex est, non - tempus massa pulvinar nec. Sed fermentum, lectus eget ultricies luctus, enim sem sodales quam, sed - laoreet tortor sem feugiat nisi. Morbi molestie vehicula viverra. Integer accumsan mi in orci - ultrices posuere. Integer mi quam, faucibus et aliquet imperdiet, ornare ac ex. Nunc mattis - molestie nisi, eu venenatis nibh vehicula at. Aliquam ut elit consectetur, finibus lorem sed, - condimentum sapien. Praesent fermentum iaculis orci, vitae tincidunt est viverra nec. Morbi semper - turpis sed lectus ornare tristique. Sed congue dui ex. Maecenas orci ligula, imperdiet sit amet - accumsan et, finibus a velit. Ut vitae blandit eros. Nam gravida nec ipsum non volutpat. Integer - quam metus, porttitor id ante sed, rutrum porta quam. Aenean at mattis ante. Morbi id libero eget - risus sagittis gravida. Proin consequat sapien a dignissim posuere. Ut luctus sed metus ut - elementum. Mauris tincidunt condimentum risus at bibendum. Aenean a sapien justo. Morbi vel neque - in eros venenatis scelerisque vitae nec justo. Vestibulum lacinia, dui eu sollicitudin ornare, est - elit vestibulum arcu, nec ultrices augue turpis in massa. Duis commodo lectus sed est posuere, et - mollis nisi dapibus. Sed id ultrices arcu. Praesent tempor sodales aliquet. Donec suscipit ipsum - eu odio cursus, quis sodales metus sodales. Nunc vestibulum massa at felis ullamcorper cursus. - Pellentesque facilisis ante ut lectus vulputate vestibulum. Nullam pharetra felis ac lacus - sodales, vel suscipit metus faucibus. Donec facilisis imperdiet risus, in volutpat odio tincidunt - a. Aliquam vitae leo lorem. Proin scelerisque efficitur velit, vel cursus ipsum accumsan id. Morbi - nibh nulla, pretium quis venenatis et, pharetra et sapien. Cras lobortis, massa sit amet blandit - pulvinar, mi magna condimentum ex, quis commodo ipsum est quis metus. Maecenas pulvinar, leo sit - amet congue pulvinar, neque magna ultrices mi, et rhoncus massa sapien quis libero. Etiam a nunc - et ipsum faucibus pretium. Nulla facilisi. Nunc nec dolor velit. In semper semper mi non - condimentum. Pellentesque vehicula volutpat odio, a semper sem porta a. In sit amet lectus rutrum, - sollicitudin augue auctor, maximus quam. Mauris congue, nisl non fermentum iaculis, leo erat - interdum lorem, quis bibendum arcu eros et elit. Fusce tortor ante, gravida a arcu in, lacinia - finibus ante. Phasellus facilisis lectus vitae sapien feugiat laoreet. Curabitur ultricies libero - sit amet condimentum suscipit. Duis at vestibulum mi. Suspendisse at neque augue. Duis ornare a - mauris id efficitur. Suspendisse in dui nec dolor dignissim venenatis. Curabitur a magna turpis. - Aliquam at commodo tellus. In id sem interdum, suscipit felis at, mattis velit. Proin accumsan - sodales felis a lacinia. Curabitur at magna a massa varius maximus. Vestibulum in auctor ante. - Donec aliquam tortor sed nulla rutrum, et egestas mi efficitur. Sed viverra quam tellus, quis - vulputate felis ultrices sed. Mauris sagittis, neque quis laoreet gravida, nisi est ultrices mi, - at tempus nunc justo non dui. Suspendisse porttitor tortor nulla, eget luctus quam finibus id. - Proin sodales eros mollis tellus euismod luctus a eu mi. Quisque consectetur iaculis nibh, at - mollis tellus volutpat eu. Aenean a nulla vel lectus rhoncus aliquam. Donec vitae lacinia neque. - Donec non lectus eget sem finibus ultrices vel nec felis. Proin fringilla mi a leo rhoncus aliquam - sit amet quis augue. Duis congue ligula at est suscipit fringilla. Proin aliquam erat ut consequat - dapibus. Suspendisse non nisi orci. Donec ac erat vel libero egestas laoreet. Nullam felis odio, - tincidunt eget eleifend a, porttitor eu nisi. Suspendisse tristique eros at dolor scelerisque - hendrerit. Etiam id dignissim lectus. Fusce lacinia metus eu risus placerat, et eleifend nunc - ultrices. Ut gravida a dui sed volutpat. Sed semper quis erat sed ornare. Pellentesque sapien sem, - fermentum vel nunc at, auctor posuere nisl. Maecenas aliquet lobortis leo. Vivamus tellus urna, - dignissim consectetur sapien vitae, hendrerit varius sem. Nunc dictum tristique fermentum. Duis eu - suscipit odio. Curabitur quis egestas neque. Fusce eu fringilla orci, vitae euismod sapien. Donec - sit amet iaculis urna. Phasellus maximus nisl in libero bibendum volutpat. Nulla at vehicula - lorem. Phasellus varius, elit ac suscipit pretium, turpis ipsum porttitor lectus, vitae - ullamcorper orci velit ut ligula. Proin mollis, orci vel commodo auctor, sapien ipsum vulputate - enim, sit amet aliquam nulla sapien ut sapien. Proin tincidunt ex non massa aliquet, quis aliquam - nulla egestas. Maecenas mollis turpis dapibus, dignissim lectus tincidunt, egestas ligula. - Suspendisse in lobortis purus. Sed tellus tellus, mollis eget tempor sed, interdum ut lectus. - Nulla sed ex efficitur, porta dui cursus, tristique elit. Maecenas tincidunt tortor vitae massa - laoreet ultricies. Mauris ac elit vitae orci eleifend ornare non eu ligula. Curabitur venenatis - nulla ut neque tristique, non tincidunt justo pretium. Suspendisse mattis semper dui, eget - vestibulum risus elementum sed. In consequat nisi sit amet nulla euismod, at convallis tortor - tincidunt. Aliquam hendrerit venenatis risus in interdum. Duis ullamcorper imperdiet elit sit amet - blandit. Mauris placerat lacinia velit id pharetra. Nam nec iaculis dui. Etiam odio mi, fringilla - in rutrum in, viverra quis tellus. Aliquam egestas mauris id nisi facilisis, in laoreet nibh - malesuada. Ut eu dui laoreet, venenatis tellus ac, feugiat mauris. Nunc in velit laoreet, - venenatis tellus quis, blandit dolor. Nulla ultrices et neque id placerat. Nulla eu interdum - nulla. Aliquam molestie enim quis rutrum finibus. Nulla bibendum orci vel scelerisque posuere. - Praesent quis magna molestie, luctus tortor tincidunt, gravida neque. Quisque et ligula eget magna - viverra interdum at a sapien. Mauris ornare efficitur nunc sed vulputate. Praesent laoreet mollis - tincidunt. Vestibulum id arcu vulputate, eleifend enim vel, accumsan turpis. Morbi faucibus - convallis tellus, semper laoreet justo lacinia nec. Sed sodales ligula consectetur dui rhoncus, et - convallis metus accumsan. Sed ullamcorper non ex sit amet ultricies. Donec finibus nulla nec - blandit porttitor. Etiam aliquam quis leo a imperdiet. Cras at lobortis est. In convallis semper - enim, ac porta ligula fringilla at. Donec augue est, facilisis et odio sit amet, viverra - ullamcorper nisl. Ut porta velit nec sem lacinia, sit amet mollis magna auctor. Nulla lobortis - lacinia mauris nec sagittis. Suspendisse rutrum ex vel nisi interdum hendrerit et ut purus. Sed - consectetur sodales nibh eget tempus. Aenean egestas luctus viverra. Integer fermentum tincidunt - tellus, nec rhoncus velit hendrerit vitae. Proin quis neque porttitor, scelerisque risus gravida, - volutpat sem. Fusce nec ex rhoncus, tempor libero nec, pellentesque ex. Integer quis iaculis - purus. Nullam vitae imperdiet orci. Sed sit amet eros condimentum, scelerisque turpis facilisis, - dignissim ante. Proin quis tristique lacus, sed sagittis nisl. Cras pharetra ultrices purus, sed - ullamcorper nisi fringilla eu. Praesent risus turpis, auctor in fringilla a, fringilla eu dolor. - Phasellus auctor tristique enim, eleifend molestie diam venenatis ut. Mauris dapibus, enim eget - pharetra semper, nulla dui porttitor mi, auctor hendrerit augue nulla quis urna. Aliquam in cursus - justo. -</p> diff --git a/examples/framework-lit/src/components/calc-add.js b/examples/framework-lit/src/components/calc-add.js deleted file mode 100644 index b0b3978bf..000000000 --- a/examples/framework-lit/src/components/calc-add.js +++ /dev/null @@ -1,17 +0,0 @@ -import { LitElement, html } from 'lit'; - -export class CalcAdd extends LitElement { - static get properties() { - return { - num: { - type: Number, - }, - }; - } - - render() { - return html` <div>Number: ${this.num}</div> `; - } -} - -customElements.define('calc-add', CalcAdd); diff --git a/examples/framework-lit/src/components/my-counter.js b/examples/framework-lit/src/components/my-counter.js deleted file mode 100644 index adc9e4a3d..000000000 --- a/examples/framework-lit/src/components/my-counter.js +++ /dev/null @@ -1,32 +0,0 @@ -import { LitElement, html } from 'lit'; - -export class MyCounter extends LitElement { - static get properties() { - return { - count: { - type: Number, - }, - }; - } - - constructor() { - super(); - this.count = 0; - } - - increment() { - this.count++; - } - - render() { - return html` - <div> - <p>Count: ${this.count}</p> - - <button type="button" @click=${this.increment}>Increment</button> - </div> - `; - } -} - -customElements.define('my-counter', MyCounter); diff --git a/examples/framework-lit/src/env.d.ts b/examples/framework-lit/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-lit/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro deleted file mode 100644 index 5fa6fed67..000000000 --- a/examples/framework-lit/src/pages/index.astro +++ /dev/null @@ -1,35 +0,0 @@ ---- -import Lorem from '../components/Lorem.astro'; -import { CalcAdd } from '../components/calc-add.js'; -import { MyCounter } from '../components/my-counter.js'; - -// Full Astro Component Syntax: -// https://docs.astro.build/basics/astro-components/ ---- - -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width" /> - <link rel="icon" type="image/svg+xml" href="/favicon.svg" /> - <title>Demo</title> - </head> - <body> - <h1>Test app</h1> - <MyCounter client:load /> - <Lorem /> - - { - ( - /** - * Our editor tooling does not currently properly typecheck attributes on imported Lit components. As such, without a - * pragma directive telling TypeScript to ignore the error, the line below will result in an error in the editor. - * Nonetheless, this code works in Astro itself! - */ - // @ts-expect-error - <CalcAdd num={0} /> - ) - } - </body> -</html> diff --git a/examples/framework-lit/tsconfig.json b/examples/framework-lit/tsconfig.json deleted file mode 100644 index d78f81ec4..000000000 --- a/examples/framework-lit/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "astro/tsconfigs/base" -} diff --git a/examples/framework-multiple/astro.config.mjs b/examples/framework-multiple/astro.config.mjs index 36f75aec2..7609d3fc6 100644 --- a/examples/framework-multiple/astro.config.mjs +++ b/examples/framework-multiple/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import preact from '@astrojs/preact'; import react from '@astrojs/react'; diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index f5f4da91f..374489d27 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -5,25 +5,24 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.5.4", - "@astrojs/react": "^3.6.3", - "@astrojs/solid-js": "^4.4.4", - "@astrojs/svelte": "^6.0.2", - "@astrojs/vue": "^4.5.3", + "@astrojs/preact": "^3.5.4-beta.0", + "@astrojs/react": "^3.7.0-beta.1", + "@astrojs/solid-js": "^4.4.4-beta.0", + "@astrojs/svelte": "^6.0.2-beta.0", + "@astrojs/vue": "^5.0.0-beta.2", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^4.16.16", - "preact": "^10.25.0", + "astro": "^5.0.0-beta.11", + "preact": "^10.24.3", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.2.9", - "vue": "^3.5.13" + "svelte": "^5.1.16", + "vue": "^3.5.12" } } diff --git a/examples/framework-multiple/src/env.d.ts b/examples/framework-multiple/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-multiple/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-multiple/tsconfig.json b/examples/framework-multiple/tsconfig.json index 2d48ed5fd..a19c58a62 100644 --- a/examples/framework-multiple/tsconfig.json +++ b/examples/framework-multiple/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { // Needed for TypeScript intellisense in the template inside Vue files "jsx": "preserve" diff --git a/examples/framework-preact/astro.config.mjs b/examples/framework-preact/astro.config.mjs index b1c8d1150..1d726f9fe 100644 --- a/examples/framework-preact/astro.config.mjs +++ b/examples/framework-preact/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import preact from '@astrojs/preact'; diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index e7ee1c3c1..82da3f095 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -5,15 +5,14 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.5.4", + "@astrojs/preact": "^3.5.4-beta.0", "@preact/signals": "^1.3.0", - "astro": "^4.16.16", - "preact": "^10.25.0" + "astro": "^5.0.0-beta.11", + "preact": "^10.24.3" } } diff --git a/examples/framework-preact/src/env.d.ts b/examples/framework-preact/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-preact/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-preact/tsconfig.json b/examples/framework-preact/tsconfig.json index bdd1b5a88..c8983c2ef 100644 --- a/examples/framework-preact/tsconfig.json +++ b/examples/framework-preact/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { // Preact specific settings "jsx": "react-jsx", diff --git a/examples/framework-react/astro.config.mjs b/examples/framework-react/astro.config.mjs index 4b5a68ec0..36ed34a5e 100644 --- a/examples/framework-react/astro.config.mjs +++ b/examples/framework-react/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import react from '@astrojs/react'; diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 3abf9f8db..2e7bb73c4 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -5,16 +5,15 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/react": "^3.6.3", + "@astrojs/react": "^3.7.0-beta.1", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^4.16.16", + "astro": "^5.0.0-beta.11", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-react/src/env.d.ts b/examples/framework-react/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-react/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-react/tsconfig.json b/examples/framework-react/tsconfig.json index e726bd0b9..92a18df90 100644 --- a/examples/framework-react/tsconfig.json +++ b/examples/framework-react/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "react" diff --git a/examples/framework-solid/astro.config.mjs b/examples/framework-solid/astro.config.mjs index 623fb8ea5..8bdaa2679 100644 --- a/examples/framework-solid/astro.config.mjs +++ b/examples/framework-solid/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import solid from '@astrojs/solid-js'; diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index b81fe9ca1..a0d664b7d 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -5,14 +5,13 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/solid-js": "^4.4.4", - "astro": "^4.16.16", + "@astrojs/solid-js": "^4.4.4-beta.0", + "astro": "^5.0.0-beta.11", "solid-js": "^1.9.3" } } diff --git a/examples/framework-solid/src/env.d.ts b/examples/framework-solid/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-solid/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-solid/tsconfig.json b/examples/framework-solid/tsconfig.json index 6e107fd32..76e1efdba 100644 --- a/examples/framework-solid/tsconfig.json +++ b/examples/framework-solid/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { // Solid specific settings "jsx": "preserve", diff --git a/examples/framework-svelte/astro.config.mjs b/examples/framework-svelte/astro.config.mjs index 194e45917..5eeedb56e 100644 --- a/examples/framework-svelte/astro.config.mjs +++ b/examples/framework-svelte/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import svelte from '@astrojs/svelte'; diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 0fdc088f3..05da3c0ed 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -5,14 +5,13 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^6.0.2", - "astro": "^4.16.16", - "svelte": "^5.2.9" + "@astrojs/svelte": "^6.0.2-beta.0", + "astro": "^5.0.0-beta.11", + "svelte": "^5.1.16" } } diff --git a/examples/framework-svelte/src/env.d.ts b/examples/framework-svelte/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-svelte/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-svelte/tsconfig.json b/examples/framework-svelte/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/framework-svelte/tsconfig.json +++ b/examples/framework-svelte/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/framework-vue/astro.config.mjs b/examples/framework-vue/astro.config.mjs index f30130a95..5afe92269 100644 --- a/examples/framework-vue/astro.config.mjs +++ b/examples/framework-vue/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import vue from '@astrojs/vue'; diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index ea4b96d58..3d9686f09 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -5,14 +5,13 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/vue": "^4.5.3", - "astro": "^4.16.16", - "vue": "^3.5.13" + "@astrojs/vue": "^5.0.0-beta.2", + "astro": "^5.0.0-beta.11", + "vue": "^3.5.12" } } diff --git a/examples/framework-vue/src/env.d.ts b/examples/framework-vue/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/framework-vue/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/framework-vue/tsconfig.json b/examples/framework-vue/tsconfig.json index 2d48ed5fd..a19c58a62 100644 --- a/examples/framework-vue/tsconfig.json +++ b/examples/framework-vue/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { // Needed for TypeScript intellisense in the template inside Vue files "jsx": "preserve" diff --git a/examples/hackernews/astro.config.mjs b/examples/hackernews/astro.config.mjs index 68ba7fac5..bf6f1a022 100644 --- a/examples/hackernews/astro.config.mjs +++ b/examples/hackernews/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import node from '@astrojs/node'; diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 9922b58f7..b3e9361e3 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -5,13 +5,12 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/node": "^8.3.4", - "astro": "^4.16.16" + "@astrojs/node": "^9.0.0-alpha.1", + "astro": "^5.0.0-beta.11" } } diff --git a/examples/hackernews/src/env.d.ts b/examples/hackernews/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/hackernews/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/hackernews/tsconfig.json b/examples/hackernews/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/hackernews/tsconfig.json +++ b/examples/hackernews/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/integration/index.ts b/examples/integration/index.ts index 8b34afd23..1fafd4e15 100644 --- a/examples/integration/index.ts +++ b/examples/integration/index.ts @@ -11,8 +11,8 @@ export default function createIntegration(): AstroIntegration { // https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts }, 'astro:build:setup': () => { - // See the @astrojs/lit integration for an example - // https://github.com/withastro/astro/blob/main/packages/integrations/lit/src/index.ts + // See the @astrojs/react integration for an example + // https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts }, 'astro:build:done': () => { // See the @astrojs/partytown integration for an example diff --git a/examples/integration/package.json b/examples/integration/package.json index 88be398e5..87a97ea20 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/integration/tsconfig.json b/examples/integration/tsconfig.json index d78f81ec4..bcbf8b509 100644 --- a/examples/integration/tsconfig.json +++ b/examples/integration/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict" } diff --git a/examples/minimal/astro.config.mjs b/examples/minimal/astro.config.mjs index 882e6515a..e762ba5cf 100644 --- a/examples/minimal/astro.config.mjs +++ b/examples/minimal/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; // https://astro.build/config diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 3d09b9cc1..85769a34e 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -5,12 +5,11 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/minimal/src/env.d.ts b/examples/minimal/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/minimal/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/minimal/tsconfig.json b/examples/minimal/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/minimal/tsconfig.json +++ b/examples/minimal/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/portfolio/astro.config.mjs b/examples/portfolio/astro.config.mjs index 882e6515a..e762ba5cf 100644 --- a/examples/portfolio/astro.config.mjs +++ b/examples/portfolio/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; // https://astro.build/config diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 00f7ab5d5..14b179b12 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -5,12 +5,11 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "astro": "^4.16.16" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/portfolio/src/content/config.ts b/examples/portfolio/src/content.config.ts index 06c6bab51..06c6bab51 100644 --- a/examples/portfolio/src/content/config.ts +++ b/examples/portfolio/src/content.config.ts diff --git a/examples/portfolio/src/env.d.ts b/examples/portfolio/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/portfolio/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/portfolio/tsconfig.json b/examples/portfolio/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/portfolio/tsconfig.json +++ b/examples/portfolio/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/ssr/astro.config.mjs b/examples/ssr/astro.config.mjs index b79949397..78d88cb1a 100644 --- a/examples/ssr/astro.config.mjs +++ b/examples/ssr/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import svelte from '@astrojs/svelte'; import node from '@astrojs/node'; diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 617ee04e9..9f07cb77c 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -5,16 +5,15 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro", "server": "node dist/server/entry.mjs" }, "dependencies": { - "@astrojs/node": "^8.3.4", - "@astrojs/svelte": "^6.0.2", - "astro": "^4.16.16", - "svelte": "^5.2.9" + "@astrojs/node": "^9.0.0-alpha.1", + "@astrojs/svelte": "^6.0.2-beta.0", + "astro": "^5.0.0-beta.11", + "svelte": "^5.1.16" } } diff --git a/examples/ssr/src/env.d.ts b/examples/ssr/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/ssr/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/ssr/tsconfig.json b/examples/ssr/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/ssr/tsconfig.json +++ b/examples/ssr/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/starlog/astro.config.mjs b/examples/starlog/astro.config.mjs index b093ec0e0..759bb082c 100644 --- a/examples/starlog/astro.config.mjs +++ b/examples/starlog/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; // https://astro.build/config diff --git a/examples/starlog/package.json b/examples/starlog/package.json index 2372b7364..33ed4f685 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -4,14 +4,13 @@ "version": "0.0.1", "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "astro": "^4.16.16", - "sass": "^1.81.0", + "astro": "^5.0.0-beta.11", + "sass": "^1.80.6", "sharp": "^0.33.3" } } diff --git a/examples/starlog/src/components/BaseHead.astro b/examples/starlog/src/components/BaseHead.astro index bb2c64ee8..34aff98fb 100644 --- a/examples/starlog/src/components/BaseHead.astro +++ b/examples/starlog/src/components/BaseHead.astro @@ -1,5 +1,5 @@ --- -import { ViewTransitions } from 'astro:transitions'; +import { ClientRouter } from 'astro:transitions'; import SEO, { type Props as SEOProps } from './SEO.astro'; import { SiteTitle, SiteDescription } from '../consts'; @@ -17,4 +17,4 @@ const { title = SiteTitle, name = SiteTitle, description = SiteDescription, ...s rel="stylesheet" /> -<ViewTransitions /> +<ClientRouter /> diff --git a/examples/starlog/src/content/config.ts b/examples/starlog/src/content.config.ts index 5cc4c697f..5cc4c697f 100644 --- a/examples/starlog/src/content/config.ts +++ b/examples/starlog/src/content.config.ts diff --git a/examples/starlog/tsconfig.json b/examples/starlog/tsconfig.json index da42df94e..8bf91d3bb 100644 --- a/examples/starlog/tsconfig.json +++ b/examples/starlog/tsconfig.json @@ -1,4 +1,5 @@ { "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], "exclude": ["dist"] } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index 2f45baab5..e57b294aa 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,7 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^4.16.16", - "@types/node": "^18.17.8" + "astro": "^5.0.0-beta.11" } } diff --git a/examples/toolbar-app/tsconfig.json b/examples/toolbar-app/tsconfig.json index b3e754ea0..281fb7f92 100644 --- a/examples/toolbar-app/tsconfig.json +++ b/examples/toolbar-app/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", "compilerOptions": { "outDir": "dist", "rootDir": "src" diff --git a/examples/with-markdoc/astro.config.mjs b/examples/with-markdoc/astro.config.mjs index 29d846359..517f5a62e 100644 --- a/examples/with-markdoc/astro.config.mjs +++ b/examples/with-markdoc/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import markdoc from '@astrojs/markdoc'; diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 71e7cb04a..7db09ea88 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -5,13 +5,12 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/markdoc": "^0.11.5", - "astro": "^4.16.16" + "@astrojs/markdoc": "^0.12.0-beta.0", + "astro": "^5.0.0-beta.11" } } diff --git a/examples/with-markdoc/src/content.config.ts b/examples/with-markdoc/src/content.config.ts new file mode 100644 index 000000000..79743326e --- /dev/null +++ b/examples/with-markdoc/src/content.config.ts @@ -0,0 +1,5 @@ +import { defineCollection } from 'astro:content'; + +export const collections = { + docs: defineCollection({}) +}; diff --git a/examples/with-markdoc/src/env.d.ts b/examples/with-markdoc/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/with-markdoc/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/with-markdoc/tsconfig.json b/examples/with-markdoc/tsconfig.json index e51e06270..0dc098dd7 100644 --- a/examples/with-markdoc/tsconfig.json +++ b/examples/with-markdoc/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { "strictNullChecks": true } diff --git a/examples/with-mdx/astro.config.mjs b/examples/with-mdx/astro.config.mjs index d797941ec..93aeffbc5 100644 --- a/examples/with-mdx/astro.config.mjs +++ b/examples/with-mdx/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import mdx from '@astrojs/mdx'; import preact from '@astrojs/preact'; diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index eaa580dc8..a8da57dd8 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -5,15 +5,14 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^3.1.9", - "@astrojs/preact": "^3.5.4", - "astro": "^4.16.16", - "preact": "^10.25.0" + "@astrojs/mdx": "^4.0.0-beta.4", + "@astrojs/preact": "^3.5.4-beta.0", + "astro": "^5.0.0-beta.11", + "preact": "^10.24.3" } } diff --git a/examples/with-mdx/src/env.d.ts b/examples/with-mdx/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/with-mdx/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/with-mdx/tsconfig.json b/examples/with-mdx/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/with-mdx/tsconfig.json +++ b/examples/with-mdx/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/with-nanostores/astro.config.mjs b/examples/with-nanostores/astro.config.mjs index 3e161041b..9f7dbd219 100644 --- a/examples/with-nanostores/astro.config.mjs +++ b/examples/with-nanostores/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import preact from '@astrojs/preact'; diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 606bd52b4..2b1e1677a 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -5,16 +5,15 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/preact": "^3.5.4", + "@astrojs/preact": "^3.5.4-beta.0", "@nanostores/preact": "^0.5.2", - "astro": "^4.16.16", + "astro": "^5.0.0-beta.11", "nanostores": "^0.11.3", - "preact": "^10.25.0" + "preact": "^10.24.3" } } diff --git a/examples/with-nanostores/src/env.d.ts b/examples/with-nanostores/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/with-nanostores/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/with-nanostores/tsconfig.json b/examples/with-nanostores/tsconfig.json index bdd1b5a88..c8983c2ef 100644 --- a/examples/with-nanostores/tsconfig.json +++ b/examples/with-nanostores/tsconfig.json @@ -1,5 +1,7 @@ { - "extends": "astro/tsconfigs/base", + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"], "compilerOptions": { // Preact specific settings "jsx": "react-jsx", diff --git a/examples/with-tailwindcss/astro.config.mjs b/examples/with-tailwindcss/astro.config.mjs index 4ad396807..7c7ad346f 100644 --- a/examples/with-tailwindcss/astro.config.mjs +++ b/examples/with-tailwindcss/astro.config.mjs @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; import tailwind from '@astrojs/tailwind'; diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 45d9406da..fadcd6eb8 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -5,19 +5,18 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^3.1.9", + "@astrojs/mdx": "^4.0.0-beta.4", "@astrojs/tailwind": "^5.1.2", "@types/canvas-confetti": "^1.6.4", - "astro": "^4.16.16", + "astro": "^5.0.0-beta.11", "autoprefixer": "^10.4.20", "canvas-confetti": "^1.9.3", "postcss": "^8.4.49", - "tailwindcss": "^3.4.15" + "tailwindcss": "^3.4.14" } } diff --git a/examples/with-tailwindcss/src/env.d.ts b/examples/with-tailwindcss/src/env.d.ts deleted file mode 100644 index e16c13c69..000000000 --- a/examples/with-tailwindcss/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// <reference path="../.astro/types.d.ts" /> diff --git a/examples/with-tailwindcss/tsconfig.json b/examples/with-tailwindcss/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/with-tailwindcss/tsconfig.json +++ b/examples/with-tailwindcss/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } diff --git a/examples/with-vitest/astro.config.ts b/examples/with-vitest/astro.config.ts index 882e6515a..e762ba5cf 100644 --- a/examples/with-vitest/astro.config.ts +++ b/examples/with-vitest/astro.config.ts @@ -1,3 +1,4 @@ +// @ts-check import { defineConfig } from 'astro/config'; // https://astro.build/config diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 88bdb73a7..1bf63f4e2 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -5,14 +5,13 @@ "private": true, "scripts": { "dev": "astro dev", - "start": "astro dev", "build": "astro build", "preview": "astro preview", "astro": "astro", "test": "vitest" }, "dependencies": { - "astro": "^4.16.16", + "astro": "^5.0.0-beta.11", "vitest": "^2.1.6" } } diff --git a/examples/with-vitest/tsconfig.json b/examples/with-vitest/tsconfig.json index d78f81ec4..8bf91d3bb 100644 --- a/examples/with-vitest/tsconfig.json +++ b/examples/with-vitest/tsconfig.json @@ -1,3 +1,5 @@ { - "extends": "astro/tsconfigs/base" + "extends": "astro/tsconfigs/strict", + "include": [".astro/types.d.ts", "**/*"], + "exclude": ["dist"] } |
