Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswdmr committed Sep 12, 2023
2 parents 4441016 + 4105491 commit f34dcc9
Show file tree
Hide file tree
Showing 192 changed files with 1,712 additions and 799 deletions.
5 changes: 5 additions & 0 deletions .changeset/calm-houses-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

fix(astro): add support for `src/content/config.mts` files
5 changes: 0 additions & 5 deletions .changeset/chatty-walls-happen.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/empty-rings-bow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fair-countries-admire.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/friendly-clocks-act.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/gold-weeks-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Minify the HTML of the redicts emitted during the build.
5 changes: 5 additions & 0 deletions .changeset/gorgeous-dancers-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Do not add type="text/css" to inline style tag
5 changes: 5 additions & 0 deletions .changeset/grumpy-hotels-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Prevent client:only styles from being removed in dev (View Transitions)
5 changes: 0 additions & 5 deletions .changeset/hip-cats-jump.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/itchy-clouds-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

chore: correct description of `attribute` option in `scopedStyleStrategy`
5 changes: 0 additions & 5 deletions .changeset/modern-guests-float.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/poor-pears-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix lang unspecified code blocks (markdownlint MD040)
5 changes: 5 additions & 0 deletions .changeset/smart-dragons-taste.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/cloudflare': minor
---

Add support for Cloudflare Runtime (env vars, caches and req object), using `astro dev`
5 changes: 0 additions & 5 deletions .changeset/spotty-glasses-grin.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/spotty-tools-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

fix(types): make `image.service` optional
5 changes: 0 additions & 5 deletions .changeset/twelve-cars-tell.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/weak-kids-roll.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/witty-readers-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Bugfixes for back navigation in the view transition client-side router
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
strategy:
matrix:
OS: [ubuntu-latest]
NODE_VERSION: [18, 20]
NODE_VERSION: [18, 20.5.1]
include:
- os: macos-latest
NODE_VERSION: 18
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/cleanup-cache.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
name: Cleanup cache

on:
schedule:
- cron: "0 11 * * *"
pull_request:
types:
- closed

# Workflow copied from https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
jobs:
cleanup:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3

- name: Cleanup

- name: Cleanup caches older than 5 days
if: github.event_name == 'schedule'
uses: MyAlbum/purge-cache@v2
with:
max-age: 432000

# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
- name: Cleanup on PR close
if: github.event_name == 'pull_request'
run: |
gh extension install actions/gh-actions-cache
Expand Down
7 changes: 0 additions & 7 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Ignoring these files for now due to https://github.com/withastro/compiler/issues/585
examples/basics/src/layouts
examples/with-nanostores/src/layouts

# Ignoring this file for now due to https://github.com/withastro/compiler/issues/485
packages/markdown/component/Markdown.astro

# Benchmark artifacts
benchmark/projects/
benchmark/results/
Expand Down
24 changes: 0 additions & 24 deletions .prettierrc.cjs

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ Several official projects are maintained outside of this repo:

## Sponsors

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

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

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

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

Expand Down
6 changes: 3 additions & 3 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

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

```
```sh
npm create astro@latest -- --template [EXAMPLE_NAME]
```

## Community Examples

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:

```
```sh
npm create astro@latest -- --template [GITHUB_USER]/[REPO_NAME]
```

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

```
```sh
npm create astro@latest -- --template [GITHUB_USER]/[REPO_NAME]/path/to/example
```
4 changes: 2 additions & 2 deletions examples/basics/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Astro Starter Kit: Basics

```
```sh
npm create astro@latest -- --template basics
```

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

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

```
```text
/
├── public/
│ └── favicon.svg
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": "^3.0.8"
"astro": "^3.0.12"
}
}
26 changes: 19 additions & 7 deletions examples/basics/src/layouts/Layout.astro
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
---
interface Props {
title: string;
}
const { title } = Astro.props;
---

<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="description" content="Astro description">
<meta name="description" content="Astro description" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
Expand All @@ -25,15 +25,27 @@ const { title } = Astro.props;
--accent: 136, 58, 234;
--accent-light: 224, 204, 250;
--accent-dark: 49, 10, 101;
--accent-gradient: linear-gradient(45deg, rgb(var(--accent)), rgb(var(--accent-light)) 30%, white 60%);
--accent-gradient: linear-gradient(
45deg,
rgb(var(--accent)),
rgb(var(--accent-light)) 30%,
white 60%
);
}
html {
font-family: system-ui, sans-serif;
background: #13151A;
background: #13151a;
background-size: 224px;
}
code {
font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
Bitstream Vera Sans Mono, Courier New, monospace;
font-family:
Menlo,
Monaco,
Lucida Console,
Liberation Mono,
DejaVu Sans Mono,
Bitstream Vera Sans Mono,
Courier New,
monospace;
}
</style>
4 changes: 2 additions & 2 deletions examples/blog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Astro Starter Kit: Blog

```
```sh
npm create astro@latest -- --template blog
```

Expand All @@ -25,7 +25,7 @@ Features:

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

```
```text
├── public/
├── src/
│   ├── components/
Expand Down
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": "^1.0.0",
"@astrojs/mdx": "^1.0.3",
"@astrojs/rss": "^3.0.0",
"@astrojs/sitemap": "^3.0.0",
"astro": "^3.0.8"
"astro": "^3.0.12"
}
}
2 changes: 1 addition & 1 deletion examples/blog/src/pages/blog/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const posts = (await getCollection('blog')).sort(
);
---

<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
Expand Down
10 changes: 5 additions & 5 deletions examples/blog/src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Footer from '../components/Footer.astro';
import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
---

<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
Expand All @@ -16,14 +16,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
<h1>🧑‍🚀 Hello, Astronaut!</h1>
<p>
Welcome to the official <a href="https://astro.build/">Astro</a> blog starter template. This
template serves as a lightweight, minimally-styled starting point for anyone looking to build
a personal website, blog, or portfolio with Astro.
template serves as a lightweight, minimally-styled starting point for anyone looking to
build a personal website, blog, or portfolio with Astro.
</p>
<p>
This template comes with a few integrations already configured in your
<code>astro.config.mjs</code> file. You can customize your setup with
<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like Tailwind,
React, or Vue to your project.
<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like
Tailwind, React, or Vue to your project.
</p>
<p>Here are a few ideas on how to get started with the template:</p>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions examples/component/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

```
```sh
npm create astro@latest -- --template component
```

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

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

```
```text
/
├── index.ts
├── src
Expand Down
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": "^3.0.8"
"astro": "^3.0.12"
},
"peerDependencies": {
"astro": "^2.0.0-beta.0"
Expand Down
Loading

0 comments on commit f34dcc9

Please sign in to comment.