Skip to content

Commit

Permalink
Merge branch 'next' into logging-rewrite-3
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewp authored Nov 29, 2023
2 parents 1a4e0bd + 4a5f2cd commit a3f2214
Show file tree
Hide file tree
Showing 386 changed files with 8,379 additions and 5,109 deletions.
5 changes: 5 additions & 0 deletions .changeset/angry-swans-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Redesign Dev Overlay main screen to show more information, such as the coolest integrations, your current Astro version and more.
9 changes: 9 additions & 0 deletions .changeset/beige-jokes-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@astrojs/mdx': major
'@astrojs/markdown-remark': major
'astro': major
---

Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.

**Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
6 changes: 6 additions & 0 deletions .changeset/big-cooks-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@astrojs/vercel': major
'@astrojs/node': major
---

The internals of the integration have been updated to support Astro 4.0. Make sure to upgrade your Astro version as Astro 3.0 is no longer supported.
5 changes: 5 additions & 0 deletions .changeset/brown-jars-lick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue where links with the same pathname as the current page, but different search params, were not prefetched.
9 changes: 9 additions & 0 deletions .changeset/clever-beds-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'astro': major
---

Removes support for returning simple objects from endpoints (deprecated since Astro 3.0). You should return a `Response` instead.

`ResponseWithEncoding` is also removed. You can refactor the code to return a response with an array buffer instead, which is encoding agnostic.

The types for middlewares have also been revised. To type a middleware function, you should now use `MiddlewareHandler` instead of `MiddlewareResponseHandler`. If you used `defineMiddleware()` to type the function, no changes are needed.
5 changes: 5 additions & 0 deletions .changeset/famous-eels-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Ensure the dev-overlay-window is anchored to the bottom
5 changes: 5 additions & 0 deletions .changeset/giant-snails-perform.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/vercel': major
---

Removes deprecated `analytics` option. Use the `webAnalytics` option instead.
5 changes: 5 additions & 0 deletions .changeset/grumpy-seas-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Improve high contrast mode with the Dev Overlay
5 changes: 5 additions & 0 deletions .changeset/khaki-fans-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/markdown-remark': patch
---

Fixes `RemarkRehype` type's `handler` and `handlers` properties
5 changes: 5 additions & 0 deletions .changeset/odd-rivers-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': major
---

Removes the opt-in `handleForms` property for `<ViewTransitions />`. Form submissions are now handled by default and can be disabled by setting `data-astro-reload` on relevant `<form />` elements.
21 changes: 21 additions & 0 deletions .changeset/plenty-candles-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
'astro': major
---

Removes support for Shiki custom language's `path` property. The language JSON file should be imported and passed to the option instead.

```diff
// astro.config.js
+ import customLang from './custom.tmLanguage.json'

export default defineConfig({
markdown: {
shikiConfig: {
langs: [
- { path: './custom.tmLanguage.json' },
+ customLang,
],
},
},
})
```
24 changes: 22 additions & 2 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,27 @@
"@astrojs/internal-helpers": "0.2.1",
"@astrojs/markdown-remark": "3.5.0",
"@astrojs/telemetry": "3.0.4",
"@astrojs/underscore-redirects": "0.3.3"
"@astrojs/underscore-redirects": "0.3.3",
"@astrojs/upgrade": "0.0.1"
},
"changesets": []
"changesets": [
"angry-swans-fry",
"beige-jokes-report",
"brown-jars-lick",
"calm-baboons-watch",
"clever-beds-notice",
"giant-snails-perform",
"khaki-fans-sell",
"light-ties-poke",
"modern-candles-sip",
"plenty-candles-help",
"rude-hairs-whisper",
"shiny-trees-sip",
"short-deers-whisper",
"slow-hornets-try",
"sour-games-burn",
"tasty-dryers-bathe",
"wicked-sloths-develop",
"wild-apricots-rescue"
]
}
5 changes: 5 additions & 0 deletions .changeset/rude-hairs-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': minor
---

Renames the `entryPoint` property of the `injectRoute` integrations API to `entrypoint` for consistency. A warning will be shown prompting you to update your code when using the old name.
20 changes: 20 additions & 0 deletions .changeset/sharp-starfishes-compete.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
'astro': major
---

This change only affects maintainers of third-party adapters. In the Integration API, the `app.render()` method of the `App` class has been simplified.

Instead of two optional arguments, it now takes a single optional argument that is an object with two optional properties: `routeData` and `locals`.
```diff
app.render(request)

- app.render(request, routeData)
+ app.render(request, { routeData })

- app.render(request, routeData, locals)
+ app.render(request, { routeData, locals })

- app.render(request, undefined, locals)
+ app.render(request, { locals })
```
The current signature is deprecated but will continue to function until next major version.
5 changes: 5 additions & 0 deletions .changeset/shiny-trees-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/markdown-remark': major
---

Removes deprecated APIs. All Astro packages had been refactored to not use these APIs.
5 changes: 5 additions & 0 deletions .changeset/short-deers-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Removes vendored Vite's `importMeta.d.ts` file in favour of Vite 5's new `vite/types/import-meta.d.ts` export
5 changes: 5 additions & 0 deletions .changeset/slow-hornets-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/rss': major
---

Removes the `drafts` option as the feature is deprecated in Astro 3.0
13 changes: 13 additions & 0 deletions .changeset/sour-games-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"astro": patch
---

Refactors virtual modules exports. This should not break your project unless you import Astro's internal modules, including:

- `astro/middleware/namespace`
- `astro/transitions`
- `astro/transitions/router`
- `astro/transitions/events`
- `astro/transitions/types`
- `astro/prefetch`
- `astro/i18n`
5 changes: 5 additions & 0 deletions .changeset/spicy-starfishes-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Ensure overlay x-ray z-index is higher than the island
27 changes: 27 additions & 0 deletions .changeset/tasty-dryers-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
'@astrojs/upgrade': minor
---

Initial release!

`@astrojs/upgrade` is an automated command-line tool for upgrading Astro and your official Astro integrations together.

Inside of your existing `astro` project, run the following command to install the `latest` version of your integrations.

**With NPM:**

```bash
npx @astrojs/upgrade
```

**With Yarn:**

```bash
yarn dlx @astrojs/upgrade
```

**With PNPM:**

```bash
pnpm dlx @astrojs/upgrade
```
5 changes: 5 additions & 0 deletions .changeset/tricky-dragons-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a number of small user experience bugs with the dev overlay
5 changes: 5 additions & 0 deletions .changeset/weak-wolves-bow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': major
---

Removes deprecated `app.match()` option, `matchNotFound`
11 changes: 11 additions & 0 deletions .changeset/wicked-sloths-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'astro': major
---

Removes deprecated features from Astro 3.0

- Adapters are now required to pass `supportedAstroFeatures` to specify a list of features they support.
- The `build.split` and `build.excludeMiddleware` options are removed. Use `functionPerRoute` and `edgeMiddleware` from adapters instead.
- The `markdown.drafts` option and draft feature is removed. Use content collections instead.
- Lowercase endpoint names are no longer supported. Use uppercase endpoint names instead.
- `getHeaders()` exported from markdown files is removed. Use `getHeadings()` instead.
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

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 Expand Up @@ -46,7 +45,8 @@ To get started, create a codespace for this repository by clicking this 👇

Your new codespace will open in a web-based version of Visual Studio Code. All development dependencies will be preinstalled, and the tests will run automatically ensuring you've got a green base from which to start working.

**Note**: Dev containers is now an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other supporting tools](https://containers.dev/supporting).
> [!Note]
> Dev containers is now an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other supporting tools](https://containers.dev/supporting).
### Development

Expand Down Expand Up @@ -187,7 +187,7 @@ Understanding in which environment code runs, and at which stage in the process,

Active Astro development happens on the [`main`](https://github.com/withastro/astro/tree/main) branch. `main` always reflects the latest code.

> **Note:**
> [!Note]
> During certain periods, we put `main` into a [**prerelease**](https://github.com/changesets/changesets/blob/main/docs/prereleases.md#prereleases) state. Read more about [Releasing Astro](#releasing-astro).
### `latest`
Expand All @@ -198,7 +198,8 @@ By default, `create-astro` and [astro.new](https://astro.new) point to this bran

## Releasing Astro

_Note: Only [core maintainers (L3+)](https://github.com/withastro/.github/blob/main/GOVERNANCE.md#level-3-l3---core) can release new versions of Astro._
> [!Note]
> Only [core maintainers (L3+)](https://github.com/withastro/.github/blob/main/GOVERNANCE.md#level-3-l3---core) can release new versions of Astro.
The repo is set up with automatic releases, using the changeset GitHub action & bot.

Expand Down
2 changes: 1 addition & 1 deletion benchmark/packages/timer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"astro": "workspace:*"
},
"devDependencies": {
"@types/server-destroy": "^1.0.1",
"@types/server-destroy": "^1.0.3",
"astro": "workspace:*",
"astro-scripts": "workspace:*"
}
Expand Down
1 change: 1 addition & 0 deletions benchmark/packages/timer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export function getAdapter(): AstroAdapter {
serverEntrypoint: '@benchmark/timer/server.js',
previewEntrypoint: '@benchmark/timer/preview.js',
exports: ['handler'],
supportedAstroFeatures: {},
};
}

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.5.5"
"astro": "^4.0.0-beta.1"
}
}
6 changes: 3 additions & 3 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.1.5",
"@astrojs/rss": "^3.0.0",
"@astrojs/mdx": "^2.0.0-beta.0",
"@astrojs/rss": "^4.0.0-beta.0",
"@astrojs/sitemap": "^3.0.3",
"astro": "^3.5.5"
"astro": "^4.0.0-beta.1"
}
}
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.5.5"
"astro": "^4.0.0-beta.1"
},
"peerDependencies": {
"astro": "^3.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.3.1",
"@types/alpinejs": "^3.7.2",
"alpinejs": "^3.12.3",
"astro": "^3.5.5"
"@types/alpinejs": "^3.13.5",
"alpinejs": "^3.13.3",
"astro": "^4.0.0-beta.1"
}
}
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/lit": "^3.0.3",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "^3.5.5",
"astro": "^4.0.0-beta.1",
"lit": "^2.8.0"
}
}
16 changes: 8 additions & 8 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
},
"dependencies": {
"@astrojs/preact": "^3.0.1",
"@astrojs/react": "^3.0.5",
"@astrojs/react": "^3.0.7-beta.0",
"@astrojs/solid-js": "^3.0.2",
"@astrojs/svelte": "^4.0.4",
"@astrojs/vue": "^3.0.4",
"astro": "^3.5.5",
"preact": "^10.17.1",
"@astrojs/svelte": "^5.0.0-beta.0",
"@astrojs/vue": "^4.0.0-beta.0",
"astro": "^4.0.0-beta.1",
"preact": "^10.19.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"solid-js": "^1.7.11",
"svelte": "^4.2.0",
"vue": "^3.3.4"
"solid-js": "^1.8.5",
"svelte": "^4.2.5",
"vue": "^3.3.8"
}
}
4 changes: 2 additions & 2 deletions examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/preact": "^3.0.1",
"@preact/signals": "^1.2.1",
"astro": "^3.5.5",
"preact": "^10.17.1"
"astro": "^4.0.0-beta.1",
"preact": "^10.19.2"
}
}
8 changes: 4 additions & 4 deletions examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^3.0.5",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"astro": "^3.5.5",
"@astrojs/react": "^3.0.7-beta.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"astro": "^4.0.0-beta.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
Loading

0 comments on commit a3f2214

Please sign in to comment.