Skip to content

Commit 783e31f

Browse files
PrincesseuhPrincesseuh
authored
Merge branch 'main' into fix/mdx-image-component
2 parents fdd2b48 + c92e0ac commit 783e31f

File tree

346 files changed

+1628
-2072
lines changed

Some content is hidden

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

346 files changed

+1628
-2072
lines changed

‎.changeset/five-doors-love.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': minor
3+
---
4+
5+
Adds support for using AVIF (`.avif`) files with the Image component. Importing an AVIF file will now correctly return the same object shape as other image file types. See the [Image docs](https://docs.astro.build/en/guides/images/#update-existing-img-tags) for more information on the different properties available on the returned object.

‎.changeset/grumpy-seas-learn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/markdown-remark': minor
3+
---
4+
5+
feat(markdown): Add support for `imageReference` paths when collecting images

‎.changeset/long-trees-listen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': minor
3+
---
4+
5+
Add types for the object syntax for `style` (ex: `style={{color: 'red'}}`)

‎.changeset/slow-mirrors-provide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Improved error messages around `astro:assets`

‎.changeset/ten-kings-smash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-astro': minor
3+
---
4+
5+
Improve startup performance by removing dependencies, lazily initializing async contextual values

‎.eslintrc.cjs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const { builtinModules } = require('module');
2+
13
module.exports = {
24
extends: [
35
'plugin:@typescript-eslint/recommended-type-checked',
@@ -54,6 +56,19 @@ module.exports = {
5456
'prefer-const': 'off',
5557
},
5658
overrides: [
59+
{
60+
// Ensure Node builtins aren't included in Astro's server runtime
61+
files: ['packages/astro/src/runtime/**/*.ts'],
62+
rules: {
63+
'no-restricted-imports': [
64+
'error',
65+
{
66+
paths: [...builtinModules],
67+
patterns: ['node:*'],
68+
},
69+
],
70+
},
71+
},
5772
{
5873
files: ['packages/**/test/*.js', 'packages/**/*.js'],
5974
env: {

‎.github/workflows/cleanup-cache.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
name: Cleanup cache
22

33
on:
4+
schedule:
5+
- cron: "0 11 * * *"
46
pull_request:
57
types:
68
- closed
79

8-
# Workflow copied from https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
910
jobs:
1011
cleanup:
1112
runs-on: ubuntu-latest
1213
steps:
1314
- name: Check out code
1415
uses: actions/checkout@v3
15-
16-
- name: Cleanup
16+
17+
- name: Cleanup caches older than 5 days
18+
if: github.event_name == 'schedule'
19+
uses: MyAlbum/purge-cache@v2
20+
with:
21+
max-age: 432000
22+
23+
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
24+
- name: Cleanup on PR close
25+
if: github.event_name == 'pull_request'
1726
run: |
1827
gh extension install actions/gh-actions-cache
1928

‎benchmark/packages/timer/tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
"extends": "../../../tsconfig.base.json",
33
"include": ["src"],
44
"compilerOptions": {
5-
"allowJs": true,
6-
"module": "ES2022",
7-
"outDir": "./dist",
8-
"target": "ES2022"
5+
"outDir": "./dist"
96
}
107
}

‎examples/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
The easiest way to check out one of these examples on your machine is by running this command in an empty directory:
44

5-
```
5+
```sh
66
npm create astro@latest -- --template [EXAMPLE_NAME]
77
```
88

99
## Community Examples
1010

1111
Visit [awesome-astro](https://github.com/one-aalam/awesome-astro) for a full list of community examples. You can use `npm create astro@latest` to check out any community examples:
1212

13-
```
13+
```sh
1414
npm create astro@latest -- --template [GITHUB_USER]/[REPO_NAME]
1515
```
1616

1717
Paths to examples nested inside of a repo are also supported:
1818

19-
```
19+
```sh
2020
npm create astro@latest -- --template [GITHUB_USER]/[REPO_NAME]/path/to/example
2121
```

‎examples/basics/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro Starter Kit: Basics
22

3-
```
3+
```sh
44
npm create astro@latest -- --template basics
55
```
66

@@ -16,7 +16,7 @@ npm create astro@latest -- --template basics
1616

1717
Inside of your Astro project, you'll see the following folders and files:
1818

19-
```
19+
```text
2020
/
2121
├── public/
2222
│ └── favicon.svg

‎examples/basics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"astro": "^3.0.12"
14+
"astro": "^3.0.13"
1515
}
1616
}

‎examples/blog/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro Starter Kit: Blog
22

3-
```
3+
```sh
44
npm create astro@latest -- --template blog
55
```
66

@@ -25,7 +25,7 @@ Features:
2525

2626
Inside of your Astro project, you'll see the following folders and files:
2727

28-
```
28+
```text
2929
├── public/
3030
├── src/
3131
│   ├── components/

‎examples/blog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"@astrojs/mdx": "^1.0.3",
1515
"@astrojs/rss": "^3.0.0",
1616
"@astrojs/sitemap": "^3.0.0",
17-
"astro": "^3.0.12"
17+
"astro": "^3.0.13"
1818
}
1919
}

‎examples/component/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is a template for an Astro component library. Use this template for writing components to use in multiple projects or publish to NPM.
44

5-
```
5+
```sh
66
npm create astro@latest -- --template component
77
```
88

@@ -14,7 +14,7 @@ npm create astro@latest -- --template component
1414

1515
Inside of your Astro project, you'll see the following folders and files:
1616

17-
```
17+
```text
1818
/
1919
├── index.ts
2020
├── src

‎examples/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"scripts": {},
1717
"devDependencies": {
18-
"astro": "^3.0.12"
18+
"astro": "^3.0.13"
1919
},
2020
"peerDependencies": {
2121
"astro": "^2.0.0-beta.0"

‎examples/deno/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/deno)
55
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/deno/devcontainer.json)
66

7-
```
7+
```sh
88
npm create astro@latest -- --template deno
99
```
1010

@@ -16,7 +16,7 @@ npm create astro@latest -- --template deno
1616

1717
Inside of your Astro project, you'll see the following folders and files:
1818

19-
```
19+
```text
2020
/
2121
├── public/
2222
│ └── favicon.svg

‎examples/deno/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"astro": "^3.0.12"
13+
"astro": "^3.0.13"
1414
},
1515
"devDependencies": {
1616
"@astrojs/deno": "^5.0.0"

‎examples/framework-alpine/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + AlpineJS Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-alpine
55
```
66

‎examples/framework-alpine/package.json

Lines changed: 1 addition & 1 deletion
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.12"
17+
"astro": "^3.0.13"
1818
}
1919
}

‎examples/framework-lit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + Lit Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-lit
55
```
66

‎examples/framework-lit/package.json

Lines changed: 1 addition & 1 deletion
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.12",
16+
"astro": "^3.0.13",
1717
"lit": "^2.8.0"
1818
}
1919
}

‎examples/framework-multiple/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kitchen Sink: Microfrontends with Astro
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-multiple
55
```
66

‎examples/framework-multiple/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@astrojs/solid-js": "^3.0.1",
1717
"@astrojs/svelte": "^4.0.2",
1818
"@astrojs/vue": "^3.0.0",
19-
"astro": "^3.0.12",
19+
"astro": "^3.0.13",
2020
"preact": "^10.17.1",
2121
"react": "^18.2.0",
2222
"react-dom": "^18.2.0",

‎examples/framework-preact/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + Preact Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-preact
55
```
66

‎examples/framework-preact/package.json

Lines changed: 1 addition & 1 deletion
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.12",
16+
"astro": "^3.0.13",
1717
"preact": "^10.17.1"
1818
}
1919
}

‎examples/framework-react/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + React Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-react
55
```
66

‎examples/framework-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@astrojs/react": "^3.0.2",
1515
"@types/react": "^18.2.21",
1616
"@types/react-dom": "^18.2.7",
17-
"astro": "^3.0.12",
17+
"astro": "^3.0.13",
1818
"react": "^18.2.0",
1919
"react-dom": "^18.2.0"
2020
}

‎examples/framework-solid/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + Solid.js Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-solid
55
```
66

‎examples/framework-solid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/solid-js": "^3.0.1",
15-
"astro": "^3.0.12",
15+
"astro": "^3.0.13",
1616
"solid-js": "^1.7.11"
1717
}
1818
}

‎examples/framework-svelte/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + Svelte Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-svelte
55
```
66

‎examples/framework-svelte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/svelte": "^4.0.2",
15-
"astro": "^3.0.12",
15+
"astro": "^3.0.13",
1616
"svelte": "^4.2.0"
1717
}
1818
}

‎examples/framework-vue/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro + Vue Example
22

3-
```
3+
```sh
44
npm create astro@latest -- --template framework-vue
55
```
66

‎examples/framework-vue/package.json

Lines changed: 1 addition & 1 deletion
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.12",
15+
"astro": "^3.0.13",
1616
"vue": "^3.3.4"
1717
}
1818
}

‎examples/hackernews/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Astro Starter Kit: Hackernews
22

3-
```
3+
```sh
44
npm create astro@latest -- --template hackernews
55
```
66

@@ -14,7 +14,7 @@ npm create astro@latest -- --template hackernews
1414

1515
Inside of your Astro project, you'll see the following folders and files:
1616

17-
```
17+
```text
1818
/
1919
├── public/
2020
│ └── favicon.svg

‎examples/hackernews/package.json

Lines changed: 1 addition & 1 deletion
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.12"
15+
"astro": "^3.0.13"
1616
}
1717
}

0 commit comments

Comments
 (0)