mirror of
https://github.com/withastro/astro.git
synced 2025-03-17 23:11:29 -05:00
Merge branch 'next' into astro-dot-session
This commit is contained in:
Matt Kane
commit
3e53f85c98
22 changed files with 291 additions and 231 deletions
5
.changeset/bright-keys-sell.md
Normal file
5
.changeset/bright-keys-sell.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
'astro': patch
|
||||
---
|
||||
|
||||
Fixes a bug where content config was ignored if it was outside of content dir and has a parent dir with an underscore
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
"commit": false,
|
||||
"linked": [],
|
||||
"access": "public",
|
||||
"baseBranch": "origin/next",
|
||||
"baseBranch": "next",
|
||||
"updateInternalDependencies": "patch",
|
||||
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
|
||||
"onlyUpdatePeerDependentsWhenOutOfRange": true
|
||||
|
|
|
|||
5
.changeset/red-paws-juggle.md
Normal file
5
.changeset/red-paws-juggle.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
'astro': patch
|
||||
---
|
||||
|
||||
Fix SVG Component sprite references
|
||||
6
.changeset/sixty-fishes-flow.md
Normal file
6
.changeset/sixty-fishes-flow.md
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
'@astrojs/react': minor
|
||||
'astro': minor
|
||||
---
|
||||
|
||||
Changes the generated URL query param from `_astroAction` to `_action` when submitting a form using Actions. This avoids leaking the framework name into the URL bar, which may be considered a security issue.
|
||||
2
.github/workflows/snapshot-release.yml
vendored
2
.github/workflows/snapshot-release.yml
vendored
|
|
@ -84,8 +84,6 @@ jobs:
|
|||
- name: Bump Package Versions
|
||||
id: changesets
|
||||
run: |
|
||||
# Snapshots don't work in pre mode. See https://github.com/changesets/changesets/issues/1195
|
||||
pnpm exec changeset pre exit || true
|
||||
pnpm exec changeset status --output status.output.json 2>&1
|
||||
# Snapshots don't work in pre mode. See https://github.com/changesets/changesets/issues/1195
|
||||
pnpm exec changeset pre exit || true
|
||||
|
|
|
|||
1
examples/basics/src/assets/astro.svg
Normal file
1
examples/basics/src/assets/astro.svg
Normal file
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
1
examples/basics/src/assets/background.svg
Normal file
1
examples/basics/src/assets/background.svg
Normal file
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
209
examples/basics/src/components/Welcome.astro
Normal file
209
examples/basics/src/components/Welcome.astro
Normal file
|
|
@ -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>
|
||||
|
|
@ -11,3 +11,12 @@
|
|||
<slot />
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<style>
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
---
|
||||
import { Welcome } from 'astro:components';
|
||||
import Welcome from '../components/Welcome.astro';
|
||||
import Layout from '../layouts/Layout.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>
|
||||
<Welcome title="Welcome to Astro" />
|
||||
<Welcome />
|
||||
</Layout>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"extends": "astro/tsconfigs/strict",
|
||||
"include": [".astro/types.d.ts", "**/*"],
|
||||
"exclude": ["dist"]
|
||||
}
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
---
|
||||
interface Props {
|
||||
title?: string;
|
||||
}
|
||||
|
||||
const cards = [
|
||||
{
|
||||
href: 'https://docs.astro.build/',
|
||||
title: 'Documentation',
|
||||
body: 'Learn how Astro works and explore the official API docs.',
|
||||
},
|
||||
{
|
||||
href: 'https://astro.build/integrations/',
|
||||
title: 'Integrations',
|
||||
body: 'Supercharge your project with new frameworks and libraries.',
|
||||
},
|
||||
{
|
||||
href: 'https://astro.build/themes/',
|
||||
title: 'Themes',
|
||||
body: 'Explore a galaxy of community-built starter themes.',
|
||||
},
|
||||
{
|
||||
href: 'https://astro.build/chat/',
|
||||
title: 'Community',
|
||||
body: 'Come say hi to our amazing Discord community. ❤️',
|
||||
},
|
||||
];
|
||||
|
||||
const { title = 'Welcome to Astro' } = Astro.props;
|
||||
---
|
||||
|
||||
<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>{title}</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">
|
||||
{
|
||||
cards.map((card) => (
|
||||
<li class="link-card">
|
||||
<a href={card.href}>
|
||||
<h2>
|
||||
{card.title}
|
||||
<span>→</span>
|
||||
</h2>
|
||||
<p>{card.body}</p>
|
||||
</a>
|
||||
</li>
|
||||
))
|
||||
}
|
||||
</ul>
|
||||
</main>
|
||||
|
||||
<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;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
|
||||
.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>
|
||||
|
|
@ -4,5 +4,3 @@
|
|||
export { default as Code } from './Code.astro';
|
||||
// @ts-ignore
|
||||
export { default as Debug } from './Debug.astro';
|
||||
// @ts-ignore
|
||||
export { default as Welcome } from './Welcome.astro';
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ test.describe('Astro Actions - Blog', () => {
|
|||
await page.goto(astro.resolveUrl('/sum'));
|
||||
const submitButton = page.getByTestId('submit');
|
||||
await submitButton.click();
|
||||
await expect(page).toHaveURL(astro.resolveUrl('/sum?_astroAction=sum'));
|
||||
await expect(page).toHaveURL(astro.resolveUrl('/sum?_action=sum'));
|
||||
const p = page.locator('p').nth(0);
|
||||
await expect(p).toContainText('Form result: {"data":3}');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ export const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = '\0astro:internal-actions';
|
|||
export const NOOP_ACTIONS = '\0noop-actions';
|
||||
|
||||
export const ACTION_QUERY_PARAMS = {
|
||||
actionName: '_astroAction',
|
||||
actionName: '_action',
|
||||
actionPayload: '_astroActionPayload',
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,21 +16,13 @@ export interface SvgComponentProps {
|
|||
/**
|
||||
* Make sure these IDs are kept on the module-level so they're incremented on a per-page basis
|
||||
*/
|
||||
const ids = new WeakMap<SSRResult, number>();
|
||||
let counter = 0;
|
||||
const countersByPage = new WeakMap<SSRResult, number>();
|
||||
|
||||
export function createSvgComponent({ meta, attributes, children }: SvgComponentProps) {
|
||||
const rendered = new WeakSet<Response>();
|
||||
const renderedIds = new WeakMap<SSRResult, string>();
|
||||
|
||||
const Component = createComponent((result, props) => {
|
||||
let id;
|
||||
if (ids.has(result)) {
|
||||
id = ids.get(result)!;
|
||||
} else {
|
||||
counter += 1;
|
||||
ids.set(result, counter);
|
||||
id = counter;
|
||||
}
|
||||
id = `a:${id}`;
|
||||
let counter = countersByPage.get(result) ?? 0;
|
||||
|
||||
const {
|
||||
title: titleProp,
|
||||
|
|
@ -41,12 +33,15 @@ export function createSvgComponent({ meta, attributes, children }: SvgComponentP
|
|||
const title = titleProp ? unescapeHTML(`<title>${titleProp}</title>`) : '';
|
||||
|
||||
if (mode === 'sprite') {
|
||||
// On the first render, include the symbol definition
|
||||
// On the first render, include the symbol definition and bump the counter
|
||||
let symbol: any = '';
|
||||
if (!rendered.has(result.response)) {
|
||||
let id = renderedIds.get(result);
|
||||
if (!id) {
|
||||
countersByPage.set(result, ++counter);
|
||||
id = `a:${counter}`;
|
||||
// We only need the viewBox on the symbol definition, we can drop it everywhere else
|
||||
symbol = unescapeHTML(`<symbol${spreadAttributes({ viewBox, id })}>${children}</symbol>`);
|
||||
rendered.add(result.response);
|
||||
renderedIds.set(result, id);
|
||||
}
|
||||
|
||||
return render`<svg${spreadAttributes(normalizedProps)}>${title}${symbol}<use href="#${id}" /></svg>`;
|
||||
|
|
|
|||
|
|
@ -421,14 +421,14 @@ export function getEntryType(
|
|||
const { ext } = path.parse(entryPath);
|
||||
const fileUrl = pathToFileURL(entryPath);
|
||||
|
||||
if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir)) {
|
||||
if (fileUrl.href === paths.config.url.href) {
|
||||
return 'config';
|
||||
} else if (hasUnderscoreBelowContentDirectoryPath(fileUrl, paths.contentDir)) {
|
||||
return 'ignored';
|
||||
} else if (contentFileExts.includes(ext)) {
|
||||
return 'content';
|
||||
} else if (dataFileExts.includes(ext)) {
|
||||
return 'data';
|
||||
} else if (fileUrl.href === paths.config.url.href) {
|
||||
return 'config';
|
||||
} else {
|
||||
return 'ignored';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
*
|
||||
* Deploy to your favorite server, serverless, or edge host with build adapters. Import one of our first-party adapters for [Netlify](https://docs.astro.build/en/guides/deploy/netlify/#adapter-for-ssr), [Vercel](https://docs.astro.build/en/guides/deploy/vercel/#adapter-for-ssr), and more to engage Astro SSR.
|
||||
*
|
||||
* [See our Server-side Rendering guide](https://docs.astro.build/en/guides/server-side-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
|
||||
* [See our On-demand Rendering guide](https://docs.astro.build/en/guides/on-demand-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
|
||||
*
|
||||
* ```js
|
||||
* import netlify from '@astrojs/netlify';
|
||||
|
|
@ -1710,7 +1710,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
};
|
||||
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @kind heading
|
||||
* @name Legacy Flags
|
||||
* @description
|
||||
|
|
@ -1720,7 +1720,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
*/
|
||||
legacy?: {
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @name legacy.collections
|
||||
* @type {boolean}
|
||||
* @default `false`
|
||||
|
|
@ -1757,13 +1757,12 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
* export const collections = { blog };
|
||||
* ```
|
||||
*
|
||||
|
||||
*/
|
||||
collections?: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @kind heading
|
||||
* @name Experimental Flags
|
||||
* @description
|
||||
|
|
@ -1772,7 +1771,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
*/
|
||||
experimental?: {
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @name experimental.clientPrerender
|
||||
* @type {boolean}
|
||||
* @default `false`
|
||||
|
|
@ -1808,7 +1807,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
clientPrerender?: boolean;
|
||||
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @name experimental.contentIntellisense
|
||||
* @type {boolean}
|
||||
* @default `false`
|
||||
|
|
@ -1832,7 +1831,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
contentIntellisense?: boolean;
|
||||
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @name experimental.responsiveImages
|
||||
* @type {boolean}
|
||||
* @default `undefined`
|
||||
|
|
@ -1950,6 +1949,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
responsiveImages?: boolean;
|
||||
|
||||
/**
|
||||
*
|
||||
* @docs
|
||||
* @name experimental.session
|
||||
* @type {SessionConfig}
|
||||
|
|
@ -1994,6 +1994,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
|
||||
session?: SessionConfig<TSession>;
|
||||
/**
|
||||
*
|
||||
* @name experimental.svg
|
||||
* @type {boolean|object}
|
||||
* @default `undefined`
|
||||
|
|
@ -2028,7 +2029,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
|
|||
*/
|
||||
svg?: {
|
||||
/**
|
||||
* @docs
|
||||
*
|
||||
* @name experimental.svg.mode
|
||||
* @type {string}
|
||||
* @default 'inline'
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ describe('Astro Actions', () => {
|
|||
});
|
||||
|
||||
it('Response middleware fallback - POST', async () => {
|
||||
const req = new Request('http://example.com/user?_astroAction=getUser', {
|
||||
const req = new Request('http://example.com/user?_action=getUser', {
|
||||
method: 'POST',
|
||||
body: new FormData(),
|
||||
headers: {
|
||||
|
|
@ -237,7 +237,7 @@ describe('Astro Actions', () => {
|
|||
|
||||
it('Response middleware fallback - cookie forwarding', async () => {
|
||||
const req = new Request(
|
||||
'http://example.com/user?_astroAction=getUser&actionCookieForwarding=true',
|
||||
'http://example.com/user?_action=getUser&actionCookieForwarding=true',
|
||||
{
|
||||
method: 'POST',
|
||||
body: new FormData(),
|
||||
|
|
@ -255,7 +255,7 @@ describe('Astro Actions', () => {
|
|||
});
|
||||
|
||||
it('Respects custom errors - POST', async () => {
|
||||
const req = new Request('http://example.com/user-or-throw?_astroAction=getUserOrThrow', {
|
||||
const req = new Request('http://example.com/user-or-throw?_action=getUserOrThrow', {
|
||||
method: 'POST',
|
||||
body: new FormData(),
|
||||
headers: {
|
||||
|
|
@ -273,7 +273,7 @@ describe('Astro Actions', () => {
|
|||
|
||||
it('Respects custom errors - cookie forwarding', async () => {
|
||||
const req = new Request(
|
||||
'http://example.com/user-or-throw?_astroAction=getUserOrThrow&actionCookieForwarding=true',
|
||||
'http://example.com/user-or-throw?_action=getUserOrThrow&actionCookieForwarding=true',
|
||||
{
|
||||
method: 'POST',
|
||||
body: new FormData(),
|
||||
|
|
@ -320,8 +320,8 @@ describe('Astro Actions', () => {
|
|||
assert.equal('safe' in data, true);
|
||||
});
|
||||
|
||||
it('Ignores `_astroAction` name for GET requests', async () => {
|
||||
const req = new Request('http://example.com/user-or-throw?_astroAction=getUserOrThrow', {
|
||||
it('Ignores action name for GET requests', async () => {
|
||||
const req = new Request('http://example.com/user-or-throw?_action=getUserOrThrow', {
|
||||
method: 'GET',
|
||||
});
|
||||
const res = await app.render(req);
|
||||
|
|
|
|||
|
|
@ -322,8 +322,9 @@ describe('astro:assets - SVG Components', () => {
|
|||
assert.equal($symbol.length, 1);
|
||||
let $use = $('.one svg > use');
|
||||
assert.equal($use.length, 2);
|
||||
let defId = $('.one.def svg > use').attr('id');
|
||||
let useId = $('.one.use svg > use').attr('id');
|
||||
const defId = $('.one.def svg > symbol').attr('id');
|
||||
const useId = $('.one.use svg > use').attr('href').replace('#', '');
|
||||
assert.ok(defId);
|
||||
assert.equal(defId, useId);
|
||||
|
||||
// Second SVG
|
||||
|
|
@ -333,9 +334,10 @@ describe('astro:assets - SVG Components', () => {
|
|||
assert.equal($symbol.length, 1);
|
||||
$use = $('.two svg > use');
|
||||
assert.equal($use.length, 2);
|
||||
defId = $('.two.def svg > use').attr('id');
|
||||
useId = $('.two.use svg > use').attr('id');
|
||||
assert.equal(defId, useId);
|
||||
const defId2 = $('.two.def svg > symbol').attr('id');
|
||||
const useId2 = $('.two.use svg > use').attr('href').replace('#', '');
|
||||
assert.ok(defId2);
|
||||
assert.equal(defId2, useId2);
|
||||
|
||||
// Third SVG
|
||||
$svg = $('.three svg');
|
||||
|
|
@ -344,6 +346,12 @@ describe('astro:assets - SVG Components', () => {
|
|||
assert.equal($symbol.length, 1);
|
||||
$use = $('.three svg > use');
|
||||
assert.equal($use.length, 1);
|
||||
const defId3 = $('.three.def svg > symbol').attr('id');
|
||||
assert.ok(defId3);
|
||||
|
||||
// Assert IDs are different
|
||||
assert.equal(new Set([defId, defId2, defId3]).size, 3);
|
||||
assert.equal(new Set([useId, useId2]).size, 2);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -126,11 +126,7 @@ async function getFormState({ result }) {
|
|||
* This matches the endpoint path.
|
||||
* @example "/_actions/blog.like"
|
||||
*/
|
||||
const actionName =
|
||||
searchParams.get('_astroAction') ??
|
||||
/* Legacy. TODO: remove for stable */ formData
|
||||
.get('_astroAction')
|
||||
?.toString();
|
||||
const actionName = searchParams.get('_action');
|
||||
|
||||
if (!actionKey || !actionName) return undefined;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export function experimental_withState<T>(action: FormFn<T>) {
|
|||
// Called by React when form state is passed from the server.
|
||||
// If the action names match, React returns this state from `useActionState()`.
|
||||
callback.$$IS_SIGNATURE_EQUAL = (incomingActionName: string) => {
|
||||
const actionName = new URLSearchParams(action.toString()).get('_astroAction');
|
||||
const actionName = new URLSearchParams(action.toString()).get('_action');
|
||||
return actionName === incomingActionName;
|
||||
};
|
||||
|
||||
|
|
@ -46,7 +46,9 @@ export function experimental_withState<T>(action: FormFn<T>) {
|
|||
*/
|
||||
export async function experimental_getActionState<T>({
|
||||
request,
|
||||
}: { request: Request }): Promise<T> {
|
||||
}: {
|
||||
request: Request;
|
||||
}): Promise<T> {
|
||||
const contentType = request.headers.get('Content-Type');
|
||||
if (!contentType || !isFormRequest(contentType)) {
|
||||
throw new AstroError(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue