Skip to content

Commit b6d0e4d

Browse files
authored
Merge branch 'main' into pl-update-islands.mdx
2 parents 3f59cb8 + 09a5611 commit b6d0e4d

Some content is hidden

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

42 files changed

+1156
-107
lines changed

.gitpod.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ Our Docs are translated into several languages and we rely on automation to noti
101101

102102
**Pages generated from outside sources**
103103

104-
Some of our English-language pages are generated from outside sources and maintained in another repo. Currently, these files are `configuration-reference.md` and all those under the `integrations-guide/` directory as well as our error messages.
105-
104+
Some of our English-language pages are generated from outside sources and maintained in another repo. Currently, these files are configuration-reference.md and all our error messages.
106105
The page's **Edit this page** button should redirect you to the file that should be changed. Alternatively, you can get the correct URL from the file's `githubURL` frontmatter property.
107106

108107
> **Note**
@@ -123,15 +122,15 @@ Every pull request needs to be reviewed by our contributors and approved by a ma
123122

124123
You can find more information about submitting your pull requests in our [contributor guides](https://contribute.docs.astro.build)
125124

126-
### Contribute PRs using an online code editor (e.g. StackBlitz, Codeflow, CodeSandbox, Gitpod)
125+
### Contribute PRs using an online code editor (e.g. StackBlitz, Codeflow, CodeSandbox)
127126

128127
Editing a local fork on GitHub.com is convenient for small text changes, but does not allow you to see a live preview of the site.
129128

130129
You can instead open your fork in an online IDE (integrated development environment) for a code editor and live preview without needing to set up any local development environment. Each online IDE has its own shortcut URL for opening an existing repository, and will allow you to create pull requests after you have made changes.
131130

132-
See specific instructions for opening an existing repository in [CodeSandbox](https://codesandbox.io/docs/importing#import-from-github), [StackBlitz](https://developer.stackblitz.com/docs/platform/importing-projects/#import-from-github), [Codeflow IDE](https://developer.stackblitz.com/codeflow/working-in-codeflow-ide) and [Gitpod](https://www.gitpod.io/docs/getting-started#start-your-first-workspace) on their respective websites.
131+
See specific instructions for opening an existing repository in [CodeSandbox](https://codesandbox.io/docs/importing#import-from-github), [StackBlitz](https://developer.stackblitz.com/docs/platform/importing-projects/#import-from-github) and [Codeflow IDE](https://developer.stackblitz.com/codeflow/working-in-codeflow-ide) on their respective websites.
133132

134-
Note that CodeSandbox and StackBlitz provide Astro syntax highlighting in their custom code editors, while Gitpod and Codeflow support the full [Astro VSCode extension](https://docs.astro.build/en/editor-setup/#vs-code).
133+
Note that CodeSandbox and StackBlitz provide Astro syntax highlighting in their custom code editors, while Codeflow supports the full [Astro VSCode extension](https://docs.astro.build/en/editor-setup/#vs-code).
135134

136135
### Contribute PRs by Developing Locally
137136

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ To all who come to this happy place: welcome.
66
This is the repo for [docs.astro.build](https://docs.astro.build/).
77
This repo contains all the source code we use to build our docs site.
88

9-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/withastro/docs)
109
[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/github/withastro/docs)
1110
[![Open in Codeflow](https://developer.stackblitz.com/img/open_in_codeflow.svg)](https://pr.new/github.com/withastro/docs)
1211

public/logos/deployhq.svg

Lines changed: 5 additions & 0 deletions
Loading

public/logos/zephyr.svg

Lines changed: 1 addition & 0 deletions
Loading

src/components/DeployGuidesNav.astro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const services: Service[] = [
3434
{ title: 'Heroku', slug: 'heroku', supports: ['static'] },
3535
{ title: 'Microsoft Azure', slug: 'microsoft-azure', supports: ['static'] },
3636
{ title: 'Buddy', slug: 'buddy', supports: ['static'] },
37+
{ title: 'DeployHQ', slug: 'deployhq', supports: ['static'] },
3738
{ title: 'Fleek', slug: 'fleek', supports: ['static'] },
3839
{ title: 'Fly.io', slug: 'flyio', supports: ['ssr', 'static'] },
3940
{ title: 'Railway', slug: 'railway', supports: ['ssr', 'static'] },
@@ -46,6 +47,7 @@ const services: Service[] = [
4647
{ title: 'Zerops', slug: 'zerops', supports: ['ssr', 'static'] },
4748
{ title: 'CloudRay', slug: 'cloudray', supports: ['static'] },
4849
{ title: 'Seenode', slug: 'seenode', supports: ['ssr'] },
50+
{ title: 'Zephyr', slug: 'zephyr', supports: ['static'] },
4951
];
5052
---
5153

src/content/docs/en/editor-setup.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Installation instructions, editor integration, and additional information can be
7373

7474
### Biome
7575

76-
[Biome](https://biomejs.dev/) is an all-in-one linter and formatter for the web. [Biome currently has partial support for `.astro` files](https://biomejs.dev/internals/language-support/#html-super-languages-support), and can be used to lint and format the frontmatter in `.astro` files.
76+
[Biome](https://biomejs.dev/) is an all-in-one linter and formatter for the web. [Biome currently has experimental support for `.astro` files](https://biomejs.dev/internals/language-support/#html-super-languages-support), and can be used to lint and format the frontmatter in `.astro` files.
7777

7878
### Prettier
7979

src/content/docs/en/guides/backend/xata.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const { records } = await xata.db.Posts.getPaginated({
104104
))}
105105
</ul>
106106
```
107-
It's important to note the SDK needs to be regenerated everytime your schema changes. So, avoid making changes to the generated files the Xata CLI creates because once schema updates, your changes will be overwritten.
107+
It's important to note the SDK needs to be regenerated every time your schema changes. So, avoid making changes to the generated files the Xata CLI creates because once schema updates, your changes will be overwritten.
108108

109109

110110
## Official Resources
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
title: Deploy your Astro Site with DeployHQ
3+
description: How to deploy your Astro site to the web using DeployHQ.
4+
sidebar:
5+
label: DeployHQ
6+
type: deploy
7+
i18nReady: true
8+
---
9+
import ReadMore from '~/components/ReadMore.astro';
10+
import { Steps } from '@astrojs/starlight/components';
11+
12+
You can deploy your Astro project to your own servers using [DeployHQ](https://www.deployhq.com/), a deployment automation platform that builds your code and pushes it to SSH/SFTP servers, FTP servers, cloud storage (e.g. Amazon S3, Cloudflare R2), and modern hosting platforms (e.g. Netlify, Heroku).
13+
14+
:::note
15+
DeployHQ does not host your site. It automates building your Astro project and deploying the built files to your chosen hosting provider or server.
16+
:::
17+
18+
## How to deploy
19+
20+
<Steps>
21+
1. If you do not already have one, sign up for a [DeployHQ account](https://www.deployhq.com/).
22+
23+
2. From the DeployHQ web interface, create a new project and connect the Git repository for your Astro project (GitHub, GitLab, Bitbucket, or any private repository). You will also need to authorize DeployHQ to access your repository.
24+
25+
3. Add a server and enter your server details:
26+
27+
- Give your server a name.
28+
- Select your protocol (SSH/SFTP, FTP, or cloud platform).
29+
- Enter your server hostname, username, and password/SSH key.
30+
- Set **Deployment Path** to your web root (e.g. `public_html/`).
31+
32+
4. In your project settings, navigate to **Build Pipeline** and add your build commands:
33+
34+
```bash
35+
npm install
36+
npm run build
37+
```
38+
39+
5. Click **Deploy Project**, then select your server and click **Deploy** to start your first deployment.
40+
</Steps>
41+
42+
Your Astro site will be built and deployed to your server. You can enable automatic deployments to deploy on every Git push, or schedule deployments for specific times.
43+
44+
<ReadMore>
45+
See [DeployHQ's documentation](https://www.deployhq.com/support) for more info on advanced deployment features.
46+
</ReadMore>

src/content/docs/en/guides/deploy/github.mdx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ Follow the instructions below to use the GitHub Action to deploy your Astro site
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Checkout your repository using git
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545
- name: Install, build, and upload your site
46-
uses: withastro/action@v3
46+
uses: withastro/action@v5
4747
# with:
4848
# path: . # The root location of your Astro project inside the repository. (optional)
49-
# node-version: 20 # The specific version of Node that should be used to build your site. Defaults to 20. (optional)
49+
# node-version: 24 # The specific version of Node that should be used to build your site. Defaults to 22. (optional)
5050
# package-manager: pnpm@latest # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
51+
# build-cmd: pnpm run build # The command to run to build your site. Runs the package build script/task by default. (optional)
5152
# env:
5253
# PUBLIC_POKEAPI: 'https://pokeapi.co/api/v2' # Use single quotation marks for the variable value. (optional)
5354

0 commit comments

Comments
 (0)