Skip to content

Commit ae4ef71

Browse files
natemoo-renatemoo-re
authored
Merge branch 'main' into fix-solid-hydration
2 parents c2ce09c + 88c76a9 commit ae4ef71

File tree

149 files changed

+1002
-411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1002
-411
lines changed

‎.changeset/polite-scissors-invent.md

-6
This file was deleted.

‎.changeset/quiet-sheep-refuse.md

-6
This file was deleted.

‎.eslintrc.cjs

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ module.exports = {
1313
rules: {
1414
// These off/configured-differently-by-default rules fit well for us
1515
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
16-
'@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
16+
'@typescript-eslint/no-unused-vars': [
17+
'error',
18+
{ argsIgnorePattern: '^_', ignoreRestSiblings: true },
19+
],
1720
'no-only-tests/no-only-tests': 'error',
1821
'@typescript-eslint/no-shadow': ['error'],
1922
'no-console': 'warn',

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
strategy:
109109
matrix:
110110
OS: [ubuntu-latest]
111-
NODE_VERSION: [18, 20]
111+
NODE_VERSION: [18, 20.5.1]
112112
include:
113113
- os: macos-latest
114114
NODE_VERSION: 18

‎.prettierignore

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# Ignoring these files for now due to https://github.com/withastro/compiler/issues/585
2-
examples/basics/src/layouts
3-
examples/with-nanostores/src/layouts
4-
5-
# Ignoring this file for now due to https://github.com/withastro/compiler/issues/485
6-
packages/markdown/component/Markdown.astro
7-
81
# Benchmark artifacts
92
benchmark/projects/
103
benchmark/results/

‎.prettierrc.cjs

-24
This file was deleted.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ Several official projects are maintained outside of this repo:
8383

8484
## Sponsors
8585

86-
Astro is generously supported by Netlify, Storyblok, and several other amazing organizations.
86+
Astro is free, open source software made possible by these wonderful sponsors.
8787

8888
[❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md)
8989

9090
<p align="center">
9191
<a target="_blank" href="https://github.com/sponsors/withastro">
9292

9393
[![Astro's sponsors.](https://astro.build/sponsors.png "Astro's sponsors.
94-
Platinum sponsors: Netlify, storyblok, Vercel, Ship Shape, Google Chrome
94+
Platinum sponsors: Vercel, storyblok, Netlify, Ship Shape, Google Chrome
9595
Gold sponsors: ‹div›RIOTS, DEEPGRAM, Transloadit, CloudCannon
9696
Sponsors: Monogram, Qoddi, Dimension")](https://github.com/sponsors/withastro)
9797

‎benchmark/bench/render.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import http from 'node:http';
55
import path from 'node:path';
66
import { fileURLToPath } from 'node:url';
77
import { waitUntilBusy } from 'port-authority';
8-
import { calculateStat } from '../make-project/_util.js';
8+
import { calculateStat, astroBin } from './_util.js';
99
import { renderFiles } from '../make-project/render-default.js';
10-
import { astroBin } from './_util.js';
1110

1211
const port = 4322;
1312

‎examples/basics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"astro": "^3.0.6"
14+
"astro": "^3.0.10"
1515
}
1616
}

‎examples/basics/src/layouts/Layout.astro

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
---
1+
---
22
interface Props {
33
title: string;
44
}
55
66
const { title } = Astro.props;
77
---
88

9-
<!DOCTYPE html>
9+
<!doctype html>
1010
<html lang="en">
1111
<head>
1212
<meta charset="UTF-8" />
13-
<meta name="description" content="Astro description">
13+
<meta name="description" content="Astro description" />
1414
<meta name="viewport" content="width=device-width" />
1515
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
1616
<meta name="generator" content={Astro.generator} />
@@ -25,15 +25,27 @@ const { title } = Astro.props;
2525
--accent: 136, 58, 234;
2626
--accent-light: 224, 204, 250;
2727
--accent-dark: 49, 10, 101;
28-
--accent-gradient: linear-gradient(45deg, rgb(var(--accent)), rgb(var(--accent-light)) 30%, white 60%);
28+
--accent-gradient: linear-gradient(
29+
45deg,
30+
rgb(var(--accent)),
31+
rgb(var(--accent-light)) 30%,
32+
white 60%
33+
);
2934
}
3035
html {
3136
font-family: system-ui, sans-serif;
32-
background: #13151A;
37+
background: #13151a;
3338
background-size: 224px;
3439
}
3540
code {
36-
font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
37-
Bitstream Vera Sans Mono, Courier New, monospace;
41+
font-family:
42+
Menlo,
43+
Monaco,
44+
Lucida Console,
45+
Liberation Mono,
46+
DejaVu Sans Mono,
47+
Bitstream Vera Sans Mono,
48+
Courier New,
49+
monospace;
3850
}
3951
</style>

‎examples/blog/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"@astrojs/mdx": "^1.0.0",
14+
"@astrojs/mdx": "^1.0.2",
1515
"@astrojs/rss": "^3.0.0",
1616
"@astrojs/sitemap": "^3.0.0",
17-
"astro": "^3.0.6"
17+
"astro": "^3.0.10"
1818
}
1919
}

‎examples/blog/src/content/config.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ const blog = defineCollection({
66
title: z.string(),
77
description: z.string(),
88
// Transform string to Date object
9-
pubDate: z
10-
.string()
11-
.or(z.date())
12-
.transform((val) => new Date(val)),
13-
updatedDate: z
14-
.string()
15-
.optional()
16-
.transform((str) => (str ? new Date(str) : undefined)),
9+
pubDate: z.coerce.date(),
10+
updatedDate: z.coerce.date().optional(),
1711
heroImage: z.string().optional(),
1812
}),
1913
});

‎examples/blog/src/pages/blog/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const posts = (await getCollection('blog')).sort(
1111
);
1212
---
1313

14-
<!DOCTYPE html>
14+
<!doctype html>
1515
<html lang="en">
1616
<head>
1717
<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />

‎examples/blog/src/pages/index.astro

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Footer from '../components/Footer.astro';
55
import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
66
---
77

8-
<!DOCTYPE html>
8+
<!doctype html>
99
<html lang="en">
1010
<head>
1111
<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
@@ -16,14 +16,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
1616
<h1>🧑‍🚀 Hello, Astronaut!</h1>
1717
<p>
1818
Welcome to the official <a href="https://astro.build/">Astro</a> blog starter template. This
19-
template serves as a lightweight, minimally-styled starting point for anyone looking to build
20-
a personal website, blog, or portfolio with Astro.
19+
template serves as a lightweight, minimally-styled starting point for anyone looking to
20+
build a personal website, blog, or portfolio with Astro.
2121
</p>
2222
<p>
2323
This template comes with a few integrations already configured in your
2424
<code>astro.config.mjs</code> file. You can customize your setup with
25-
<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like Tailwind,
26-
React, or Vue to your project.
25+
<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like
26+
Tailwind, React, or Vue to your project.
2727
</p>
2828
<p>Here are a few ideas on how to get started with the template:</p>
2929
<ul>

‎examples/blog/src/pages/rss.xml.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import rss from '@astrojs/rss';
22
import { getCollection } from 'astro:content';
33
import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
44

5-
export async function get(context) {
5+
export async function GET(context) {
66
const posts = await getCollection('blog');
77
return rss({
88
title: SITE_TITLE,

‎examples/component/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"scripts": {},
1717
"devDependencies": {
18-
"astro": "^3.0.6"
18+
"astro": "^3.0.10"
1919
},
2020
"peerDependencies": {
2121
"astro": "^2.0.0-beta.0"

‎examples/deno/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"astro": "^3.0.6"
13+
"astro": "^3.0.10"
1414
},
1515
"devDependencies": {
1616
"@astrojs/deno": "^5.0.0"

‎examples/deno/src/components/Layout.astro

+10-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface Props {
66
const { title } = Astro.props as Props;
77
---
88

9-
<!DOCTYPE html>
9+
<!doctype html>
1010
<html lang="en">
1111
<head>
1212
<meta charset="UTF-8" />
@@ -46,8 +46,15 @@ const { title } = Astro.props as Props;
4646
}
4747

4848
:global(code) {
49-
font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
50-
Bitstream Vera Sans Mono, Courier New, monospace;
49+
font-family:
50+
Menlo,
51+
Monaco,
52+
Lucida Console,
53+
Liberation Mono,
54+
DejaVu Sans Mono,
55+
Bitstream Vera Sans Mono,
56+
Courier New,
57+
monospace;
5158
}
5259
</style>
5360
</body>

‎examples/framework-alpine/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"@astrojs/alpinejs": "^0.3.0",
1515
"@types/alpinejs": "^3.7.2",
1616
"alpinejs": "^3.12.3",
17-
"astro": "^3.0.6"
17+
"astro": "^3.0.10"
1818
}
1919
}

‎examples/framework-lit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@astrojs/lit": "^3.0.0",
1515
"@webcomponents/template-shadowroot": "^0.2.1",
16-
"astro": "^3.0.6",
16+
"astro": "^3.0.10",
1717
"lit": "^2.8.0"
1818
}
1919
}

‎examples/framework-lit/src/pages/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { MyCounter } from '../components/my-counter.js';
77
// https://docs.astro.build/core-concepts/astro-components/
88
---
99

10-
<!DOCTYPE html>
10+
<!doctype html>
1111
<html lang="en">
1212
<head>
1313
<meta charset="utf-8" />

‎examples/framework-multiple/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/preact": "^3.0.0",
15-
"@astrojs/react": "^3.0.0",
15+
"@astrojs/react": "^3.0.1",
1616
"@astrojs/solid-js": "^3.0.0",
17-
"@astrojs/svelte": "^4.0.0",
17+
"@astrojs/svelte": "^4.0.1",
1818
"@astrojs/vue": "^3.0.0",
19-
"astro": "^3.0.6",
19+
"astro": "^3.0.10",
2020
"preact": "^10.17.1",
2121
"react": "^18.2.0",
2222
"react-dom": "^18.2.0",

‎examples/framework-preact/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@astrojs/preact": "^3.0.0",
1515
"@preact/signals": "^1.2.1",
16-
"astro": "^3.0.6",
16+
"astro": "^3.0.10",
1717
"preact": "^10.17.1"
1818
}
1919
}

‎examples/framework-react/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"@astrojs/react": "^3.0.0",
14+
"@astrojs/react": "^3.0.1",
1515
"@types/react": "^18.2.21",
1616
"@types/react-dom": "^18.2.7",
17-
"astro": "^3.0.6",
17+
"astro": "^3.0.10",
1818
"react": "^18.2.0",
1919
"react-dom": "^18.2.0"
2020
}

‎examples/framework-solid/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/solid-js": "^3.0.0",
15-
"astro": "^3.0.6",
15+
"astro": "^3.0.10",
1616
"solid-js": "^1.7.11"
1717
}
1818
}

‎examples/framework-svelte/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"@astrojs/svelte": "^4.0.0",
15-
"astro": "^3.0.6",
14+
"@astrojs/svelte": "^4.0.1",
15+
"astro": "^3.0.10",
1616
"svelte": "^4.2.0"
1717
}
1818
}

‎examples/framework-vue/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/vue": "^3.0.0",
15-
"astro": "^3.0.6",
15+
"astro": "^3.0.10",
1616
"vue": "^3.3.4"
1717
}
1818
}

‎examples/hackernews/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/node": "^6.0.0",
15-
"astro": "^3.0.6"
15+
"astro": "^3.0.10"
1616
}
1717
}

‎examples/hackernews/src/pages/stories/[id].astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const story = (await fetchAPI(`item/${id}`)) as IStory;
2525
<a href={`/users/${story.user}`}>
2626
{story.user}
2727
</a>
28-
&nbsp;{story.time_ago}
28+
&nbsp;{story.time_ago}
2929
</p>
3030
</header>
3131
<main>

‎examples/integration/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"scripts": {},
1717
"devDependencies": {
18-
"astro": "^3.0.6"
18+
"astro": "^3.0.10"
1919
},
2020
"peerDependencies": {
2121
"astro": "^2.0.0-beta.0"

0 commit comments

Comments
 (0)