Skip to content

Commit

Permalink
Merge branch 'main' into fix-renderer-internal-symbol
Browse files Browse the repository at this point in the history
  • Loading branch information
Xetera committed May 13, 2024
2 parents 6d0645d + 461cd42 commit 06f482a
Show file tree
Hide file tree
Showing 524 changed files with 12,707 additions and 5,620 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-ads-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Skips rendering script tags if it's inlined and empty when `experimental.directRenderScript` is enabled
5 changes: 0 additions & 5 deletions .changeset/lorem-ipsum-dolor

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/modern-donkeys-taste.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Actions: include validation error in thrown error message for debugging.
5 changes: 5 additions & 0 deletions .changeset/rich-melons-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Fixes CSS handling if imported in a script tag in an Astro file when `experimental.directRenderScript` is enabled
5 changes: 5 additions & 0 deletions .changeset/slimy-comics-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Actions: Fix missing message for custom Action errors.
5 changes: 5 additions & 0 deletions .changeset/tidy-cows-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---

Fix `isDbError()` returning `false` for remote database errors. Astro will now return a `LibsqlError` in development and production.
5 changes: 5 additions & 0 deletions .changeset/warm-schools-applaud.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Prevents unhandledrejection error when checking for latest Astro version
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
20 changes: 18 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base", "schedule:weekly", "group:allNonMajor"],
"extends": [
"config:recommended",
"schedule:weekly",
"group:allNonMajor",
":disablePeerDependencies",
"regexManagers:biomeVersions",
],
"labels": ["dependencies"],
"rangeStrategy": "bump",
"ignorePaths": ["**/node_modules/**"],
"ignoreDeps": [
// manually bumping
// manually bumping deps
"@biomejs/biome",
"@types/node",
"preact-render-to-string", // https://github.com/withastro/astro/pull/10200
"sharp",

// manually bumping workflow actions
"actions/labeler",

// ignore "engines" update
"node",
"npm",
"pnpm",

// follow vite deps version
"postcss-load-config",
],
Expand Down
6 changes: 3 additions & 3 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)."
uses: "lannonbr/[email protected].0"
- name: "Check if user has write access"
uses: "lannonbr/[email protected].2"
with:
permission: "admin"
permission: "write"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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 benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@astrojs/node": "workspace:*",
"@benchmark/timer": "workspace:*",
"astro": "workspace:*",
"autocannon": "^7.12.0",
"autocannon": "^7.15.0",
"execa": "^8.0.1",
"markdown-table": "^3.0.3",
"mri": "^1.2.0",
Expand Down
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
3 changes: 0 additions & 3 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { FlatCompat } from '@eslint/eslintrc';
import tseslint from 'typescript-eslint';

// plugins
import prettierEslint from 'eslint-plugin-prettier';
import noOnlyTestsEslint from 'eslint-plugin-no-only-tests';
import regexpEslint from 'eslint-plugin-regexp';
const typescriptEslint = tseslint.plugin;
Expand Down Expand Up @@ -45,7 +44,6 @@ export default [
...tseslint.configs.recommendedTypeChecked,
...tseslint.configs.stylisticTypeChecked,
// mimic ESLintRC-style extends
...compat.extends('prettier'),
...compat.extends('plugin:regexp/recommended'),
{
languageOptions: {
Expand All @@ -57,7 +55,6 @@ export default [
},
plugins: {
'@typescript-eslint': typescriptEslint,
prettier: prettierEslint,
'no-only-tests': noOnlyTestsEslint,
regexp: regexpEslint,
},
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.6.3"
"astro": "^4.8.3"
}
}
4 changes: 2 additions & 2 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/mdx": "^3.0.0",
"@astrojs/rss": "^4.0.5",
"@astrojs/sitemap": "^3.1.4",
"astro": "^4.6.3"
"astro": "^4.8.3"
}
}
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.6.3"
"astro": "^4.8.3"
},
"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.6.3"
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.13.10",
"astro": "^4.8.3"
}
}
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.6.3",
"lit": "^3.1.2"
"astro": "^4.8.3",
"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.0",
"@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.6.3",
"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.3",
"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.6.3",
"preact": "^10.19.2"
"@astrojs/preact": "^3.3.0",
"@preact/signals": "^1.2.3",
"astro": "^4.8.3",
"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.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.6.3",
"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.3",
"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.6.3",
"solid-js": "^1.8.5"
"@astrojs/solid-js": "^4.2.0",
"astro": "^4.8.3",
"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.6.3",
"svelte": "^4.2.5"
"astro": "^4.8.3",
"svelte": "^4.2.16"
}
}

0 comments on commit 06f482a

Please sign in to comment.