Skip to content

Commit

Permalink
Merge branch 'main' into chore/remove-smoke-from-lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
natemoo-re authored Jun 28, 2022
2 parents 48006cd + 53bf0be commit 897df5f
Show file tree
Hide file tree
Showing 299 changed files with 4,684 additions and 1,827 deletions.
5 changes: 5 additions & 0 deletions .changeset/khaki-ligers-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/tailwind': patch
---

Marks the Tailwind integration config as optional to fix TypeScript validation warnings
19 changes: 19 additions & 0 deletions .changeset/lovely-radios-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
'@astrojs/prefetch': patch
---

Adds a new `@astrojs/prefetch` integration with the goal of adding near-instant page navigation for Astro projects. HTML and CSS for visible links marked with `rel="prefetch"` will be preloaded in the browser when the browser is idle.

__astro.config.mjs__
```js
import prefetch from '@astrojs/prefetch';
export default {
// ...
integrations: [prefetch()],
}
```

```html
<!-- Prefetch HTML and stylesheets for the /products page -->
<a href="/products" rel="prefetch">All Products</a>
```
5 changes: 5 additions & 0 deletions .changeset/lucky-apes-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Update "astro add" output to remove confusing multi-select prompt.
23 changes: 0 additions & 23 deletions .changeset/neat-seas-peel.md

This file was deleted.

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

Update the help output to improve formatting
6 changes: 6 additions & 0 deletions .changeset/spotty-islands-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@astrojs/deno': patch
'@astrojs/netlify': patch
---

Fix: append shim to top of built file to avoid "can't read process of undefined" issues
5 changes: 0 additions & 5 deletions .changeset/spotty-rockets-grow.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/strange-laws-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"astro": patch
"@astrojs/telemetry": minor
---

Update telemetry to support a more anonymized project id. `anonymousProjectId` is now hashed based on anonymous git data instead of your git remote URL.
5 changes: 5 additions & 0 deletions .changeset/tidy-dots-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/sitemap': patch
---

fix: if `serialize` function returns `undefined` for the passed entry, such entry will be excluded from sitemap
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1
Expand Down Expand Up @@ -283,7 +281,9 @@ jobs:
commit: '[ci] release'
title: '[ci] release'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Needs access to push to main
GITHUB_TOKEN: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
# Needs access to publish to npm
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Generate Notification
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}
# Needs access to push to main
token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
- name: Setup PNPM
uses: pnpm/action-setup@v2.2.1
- name: Setup Node
Expand All @@ -29,3 +31,5 @@ jobs:
with:
commit_message: '[ci] format'
branch: ${{ github.head_ref }}
commit_user_name: fredkbot
commit_user_email: fred+astrobot@astro.build
9 changes: 7 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@ jobs:
- name: Collect stats
run: node scripts/stats/index.js
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Needs access to collect stats from the GitHub API
GITHUB_TOKEN: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: '[ci] collect stats'
branch: ${{ github.head_ref }}
# Needs access to push to main
token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}

lockfile:
if: github.repository_owner == 'withastro'
Expand All @@ -61,7 +65,8 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
branch: ci/lockfile
token: ${{ secrets.NIGHTLY_PERSONAL_GITHUB_TOKEN }}
# Access token is needed to trigger CI on this PR
token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
commit-message: '[ci] update lockfile'
title: '[ci] update lockfile'
body: >
Expand Down
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
4 changes: 2 additions & 2 deletions examples/blog-multiple-authors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/preact": "^0.1.3",
"astro": "^1.0.0-beta.52",
"@astrojs/preact": "^0.2.0",
"astro": "^1.0.0-beta.57",
"sass": "^1.52.2"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/preact": "^0.1.3",
"astro": "^1.0.0-beta.52"
"@astrojs/preact": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"preact": "^10.7.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/component/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
},
"devDependencies": {
"@example/my-component": "workspace:*",
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"serve": "astro --root demo preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
6 changes: 3 additions & 3 deletions examples/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"react-dom": "^18.1.0"
},
"devDependencies": {
"@astrojs/preact": "^0.1.3",
"@astrojs/react": "^0.1.3",
"astro": "^1.0.0-beta.52"
"@astrojs/preact": "^0.2.0",
"@astrojs/react": "^0.2.0",
"astro": "^1.0.0-beta.57"
}
}
2 changes: 1 addition & 1 deletion examples/env-vars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"alpinejs": "^3.10.2"
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/lit": "^0.2.0",
"astro": "^1.0.0-beta.52"
"@astrojs/lit": "^0.3.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0",
Expand Down
16 changes: 8 additions & 8 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/lit": "^0.2.0",
"@astrojs/preact": "^0.1.3",
"@astrojs/react": "^0.1.3",
"@astrojs/solid-js": "^0.1.4",
"@astrojs/svelte": "^0.1.4",
"@astrojs/vue": "^0.1.5",
"astro": "^1.0.0-beta.52"
"@astrojs/lit": "^0.3.0",
"@astrojs/preact": "^0.2.0",
"@astrojs/react": "^0.2.0",
"@astrojs/solid-js": "^0.2.0",
"@astrojs/svelte": "^0.2.0",
"@astrojs/vue": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0",
Expand All @@ -25,6 +25,6 @@
"react-dom": "^18.1.0",
"solid-js": "^1.4.3",
"svelte": "^3.48.0",
"vue": "^3.2.36"
"vue": "^3.2.37"
}
}
4 changes: 2 additions & 2 deletions examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/preact": "^0.1.3",
"astro": "^1.0.0-beta.52"
"@astrojs/preact": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"preact": "^10.7.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/react": "^0.1.3",
"@astrojs/react": "^0.2.0",
"@types/react": "^18.0.10",
"@types/react-dom": "^18.0.5",
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"react": "^18.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/solid-js": "^0.1.4",
"astro": "^1.0.0-beta.52"
"@astrojs/solid-js": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"solid-js": "^1.4.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/svelte": "^0.1.4",
"astro": "^1.0.0-beta.52"
"@astrojs/svelte": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"svelte": "^3.48.0"
Expand Down
6 changes: 3 additions & 3 deletions examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/vue": "^0.1.5",
"astro": "^1.0.0-beta.52"
"@astrojs/vue": "^0.2.0",
"astro": "^1.0.0-beta.57"
},
"dependencies": {
"vue": "^3.2.36"
"vue": "^3.2.37"
}
}
14 changes: 7 additions & 7 deletions examples/integrations-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/lit": "^0.2.0",
"@astrojs/partytown": "^0.1.4",
"@astrojs/react": "^0.1.3",
"@astrojs/sitemap": "^0.2.1",
"@astrojs/solid-js": "0.1.4",
"@astrojs/lit": "^0.3.0",
"@astrojs/partytown": "^0.1.5",
"@astrojs/react": "^0.2.0",
"@astrojs/sitemap": "^0.2.2",
"@astrojs/solid-js": "0.2.0",
"@astrojs/tailwind": "^0.2.1",
"@astrojs/turbolinks": "^0.1.3",
"astro": "^1.0.0-beta.52",
"astro": "^1.0.0-beta.57",
"solid-js": "^1.4.3"
},
"dependencies": {
Expand All @@ -26,6 +26,6 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"svelte": "^3.48.0",
"vue": "^3.2.36"
"vue": "^3.2.37"
}
}
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.52"
"astro": "^1.0.0-beta.57"
}
}
4 changes: 2 additions & 2 deletions examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/preact": "^0.1.3",
"astro": "^1.0.0-beta.52",
"@astrojs/preact": "^0.2.0",
"astro": "^1.0.0-beta.57",
"sass": "^1.52.2"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"@astrojs/node": "^0.1.2",
"@astrojs/svelte": "^0.1.4",
"astro": "^1.0.0-beta.52",
"@astrojs/svelte": "^0.2.0",
"astro": "^1.0.0-beta.57",
"concurrently": "^7.2.1",
"lightcookie": "^1.0.25",
"unocss": "^0.15.6",
Expand Down
Loading

0 comments on commit 897df5f

Please sign in to comment.