Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
florian-lefebvre authored May 21, 2024
2 parents 5f7611a + bfe9c73 commit b782037
Show file tree
Hide file tree
Showing 502 changed files with 11,595 additions and 4,268 deletions.
7 changes: 7 additions & 0 deletions .changeset/brown-pens-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"astro": patch
---

Prevent cache content from being left in dist folder

When `contentCollectionsCache` is enabled temporary cached content is copied into the `outDir` for processing. This fixes it so that this content is cleaned out, along with the rest of the temporary build JS.
5 changes: 5 additions & 0 deletions .changeset/good-turtles-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/web-vitals": patch
---

Adds support for deprecating the web vitals DB table, so the integration can be removed if desired
5 changes: 5 additions & 0 deletions .changeset/gorgeous-dancers-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Respect error status when handling Actions with a progressive fallback.
5 changes: 0 additions & 5 deletions .changeset/lorem-ipsum-dolor

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/many-icons-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/web-vitals": minor
---

Upgrades the `web-vitals` dependency to v4 and stops collecting data for the deprecated FID (First Input Delay) metric.
5 changes: 5 additions & 0 deletions .changeset/new-mice-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Change `slot` attribute of `IntrinsicAttributes` to match the definition of `HTMLAttributes`'s own `slot` attribute of type `string | undefined | null`
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
FROM mcr.microsoft.com/devcontainers/javascript-node:1-18

# Install playwright
RUN npm install -g @playwright/test
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/examples.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
FROM mcr.microsoft.com/devcontainers/javascript-node:1-18

# Install latest pnpm
RUN npm install -g pnpm
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = false

[{.*,*.md,*.json,*.toml,*.yml,}]
[{.*,*.md,*.json,*.toml,*.yml,*.json5}]
indent_style = space
4 changes: 3 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"config:recommended",
"schedule:weekly",
"group:allNonMajor",
":disablePeerDependencies",
":disablePeerDependencies",
"regexManagers:biomeVersions",
],
"labels": ["dependencies"],
"rangeStrategy": "bump",
"ignorePaths": ["**/node_modules/**"],
"ignoreDeps": [
// manually bumping deps
"@biomejs/biome",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
issues: write
pull-requests: write
steps:
- name: "Check if user has admin access (only admins can publish snapshot releases)."
- name: "Check if user has write access"
uses: "lannonbr/[email protected]"
with:
permission: "admin"
permission: "write"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ scripts/smoke/*-main/
scripts/memory/project/src/pages/
benchmark/projects/
benchmark/results/
test-results/
*.log
package-lock.json
.turbo/
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

We welcome contributions of any size and skill level. As an open source project, we believe in giving back to our contributors and are happy to help with guidance on PRs, technical writing, and turning any feature idea into a reality.

> [!Tip] > **For new contributors:** Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing
> [!Tip]
>
> **For new contributors:** Take a look at [https://github.com/firstcontributions/first-contributions](https://github.com/firstcontributions/first-contributions) for helpful information on contributing
## Quick Guide

Expand Down
2 changes: 1 addition & 1 deletion benchmark/make-project/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

This `make-project` folder contains different files to programmatically create a new Astro project. They are created inside the `projects` folder and are gitignored. These projects are used by benchmarks for testing.

Each benchmark can specify the default project to run in its `defaultProject` export, but it can be overriden if `--project <project-name>` is passed through the CLI.
Each benchmark can specify the default project to run in its `defaultProject` export, but it can be overridden if `--project <project-name>` is passed through the CLI.

You can duplicate `_template.js` to start a new project script. All shared utilities are kept in `_util.js`.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.7.1/schema.json",
"files": {
"ignore": [
"vendor",
Expand Down
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.7.0"
"astro": "^4.8.6"
}
}
6 changes: 3 additions & 3 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^2.3.1",
"@astrojs/rss": "^4.0.5",
"@astrojs/mdx": "^3.0.0",
"@astrojs/rss": "^4.0.6",
"@astrojs/sitemap": "^3.1.4",
"astro": "^4.7.0"
"astro": "^4.8.6"
}
}
22 changes: 11 additions & 11 deletions examples/blog/src/content/blog/markdown-style-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sap

## Images

#### Syntax
### Syntax

```markdown
![Alt text](./full/or/relative/path/of/image)
```

#### Output
### Output

![blog placeholder](/blog-placeholder-about.jpg)

Expand Down Expand Up @@ -77,25 +77,25 @@ The blockquote element represents content that is quoted from another source, op

## Tables

#### Syntax
### Syntax

```markdown
| Italics | Bold | Code |
| --------- | -------- | ------ |
| _italics_ | **bold** | `code` |
```

#### Output
### Output

| Italics | Bold | Code |
| --------- | -------- | ------ |
| _italics_ | **bold** | `code` |

## Code Blocks

#### Syntax
### Syntax

we can use 3 backticks ``` in new line and write snippet and close with 3 backticks on new line and to highlight language specific syntac, write one word of language name after first 3 backticks, for eg. html, javascript, css, markdown, typescript, txt, bash
we can use 3 backticks ``` in new line and write snippet and close with 3 backticks on new line and to highlight language specific syntax, write one word of language name after first 3 backticks, for eg. html, javascript, css, markdown, typescript, txt, bash

````markdown
```html
Expand All @@ -112,7 +112,7 @@ we can use 3 backticks ``` in new line and write snippet and close with 3 backti
```
````

Output
### Output

```html
<!doctype html>
Expand Down Expand Up @@ -187,7 +187,7 @@ Output

## Other Elements — abbr, sub, sup, kbd, mark

#### Syntax
### Syntax

```markdown
<abbr title="Graphics Interchange Format">GIF</abbr> is a bitmap image format.
Expand All @@ -196,19 +196,19 @@ H<sub>2</sub>O

X<sup>n</sup> + Y<sup>n</sup> = Z<sup>n</sup>

Press <kbd><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>Delete</kbd></kbd> to end the session.
Press <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>Delete</kbd> to end the session.

Most <mark>salamanders</mark> are nocturnal, and hunt for insects, worms, and other small creatures.
```

#### Output
### Output

<abbr title="Graphics Interchange Format">GIF</abbr> is a bitmap image format.

H<sub>2</sub>O

X<sup>n</sup> + Y<sup>n</sup> = Z<sup>n</sup>

Press <kbd><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>Delete</kbd></kbd> to end the session.
Press <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>Delete</kbd> to end the session.

Most <mark>salamanders</mark> are nocturnal, and hunt for insects, worms, and other small creatures.
2 changes: 1 addition & 1 deletion examples/blog/src/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@ hr {
clip: rect(1px, 1px, 1px, 1px);
/* modern browsers, clip-path works inwards from each corner */
clip-path: inset(50%);
/* added line to stop words getting smushed together (as they go onto seperate lines and some screen readers do not understand line feeds as a space */
/* added line to stop words getting smushed together (as they go onto separate lines and some screen readers do not understand line feeds as a space */
white-space: nowrap;
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.7.0"
"astro": "^4.8.6"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
6 changes: 3 additions & 3 deletions examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"dependencies": {
"@astrojs/alpinejs": "^0.4.0",
"@types/alpinejs": "^3.13.5",
"alpinejs": "^3.13.3",
"astro": "^4.7.0"
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.13.10",
"astro": "^4.8.6"
}
}
4 changes: 2 additions & 2 deletions examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/lit": "^4.0.1",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "^4.7.0",
"lit": "^3.1.2"
"astro": "^4.8.6",
"lit": "^3.1.3"
}
}
26 changes: 13 additions & 13 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.2.0",
"@astrojs/react": "^3.3.1",
"@astrojs/solid-js": "^4.1.0",
"@astrojs/preact": "^3.3.0",
"@astrojs/react": "^3.3.4",
"@astrojs/solid-js": "^4.2.0",
"@astrojs/svelte": "^5.4.0",
"@astrojs/vue": "^4.1.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.7.0",
"preact": "^10.19.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
"@astrojs/vue": "^4.2.0",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0",
"astro": "^4.8.6",
"preact": "^10.21.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"svelte": "^4.2.16",
"vue": "^3.4.27"
}
}
8 changes: 4 additions & 4 deletions examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.2.0",
"@preact/signals": "^1.2.1",
"astro": "^4.7.0",
"preact": "^10.19.2"
"@astrojs/preact": "^3.3.0",
"@preact/signals": "^1.2.3",
"astro": "^4.8.6",
"preact": "^10.21.0"
}
}
12 changes: 6 additions & 6 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^3.3.1",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"@astrojs/react": "^3.3.4",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0",
"astro": "^4.8.6",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
}
6 changes: 3 additions & 3 deletions examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/solid-js": "^4.1.0",
"astro": "^4.7.0",
"solid-js": "^1.8.5"
"@astrojs/solid-js": "^4.2.0",
"astro": "^4.8.6",
"solid-js": "^1.8.17"
}
}
4 changes: 2 additions & 2 deletions examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/svelte": "^5.4.0",
"astro": "^4.7.0",
"svelte": "^4.2.5"
"astro": "^4.8.6",
"svelte": "^4.2.16"
}
}
6 changes: 3 additions & 3 deletions examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/vue": "^4.1.0",
"astro": "^4.7.0",
"vue": "^3.3.8"
"@astrojs/vue": "^4.2.0",
"astro": "^4.8.6",
"vue": "^3.4.27"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/node": "^8.2.5",
"astro": "^4.7.0"
"astro": "^4.8.6"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/src/lib/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default async function fetchAPI(path: string) {
}
return JSON.parse(text);
} catch (e) {
console.error(`Recevied from API: ${text}`);
console.error(`Received from API: ${text}`);
console.error(e);
return { error: e };
}
Expand Down
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.7.0"
"astro": "^4.8.6"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"@astrojs/node": "^8.2.5",
"astro": "^4.7.0",
"astro": "^4.8.6",
"html-minifier": "^4.0.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit b782037

Please sign in to comment.