mirror of
https://github.com/withastro/astro.git
synced 2025-03-31 23:31:30 -05:00
Merge branch 'main' into fix-all-pages-key
This commit is contained in:
Goulven CLEC'H
GitHub
commit
8be75d4b02
168 changed files with 2747 additions and 2024 deletions
5
.changeset/curvy-humans-judge.md
Normal file
5
.changeset/curvy-humans-judge.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
"astro": patch
|
||||
---
|
||||
|
||||
Fixes an issue where `astro build` writes type declaration files to `outDir` when it's outside of root directory.
|
||||
5
.changeset/famous-mugs-grab.md
Normal file
5
.changeset/famous-mugs-grab.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
"astro": patch
|
||||
---
|
||||
|
||||
Update sharp to 0.33 to fix issue with Alpine Linux
|
||||
53
.changeset/khaki-pianos-burn.md
Normal file
53
.changeset/khaki-pianos-burn.md
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
---
|
||||
"astro": minor
|
||||
---
|
||||
|
||||
Adds new utilities to ease the creation of toolbar apps including `defineToolbarApp` to make it easier to define your toolbar app and `app` and `server` helpers for easier communication between the toolbar and the server. These new utilities abstract away some of the boilerplate code that is common in toolbar apps, and lower the barrier of entry for app authors.
|
||||
|
||||
For example, instead of creating an event listener for the `app-toggled` event and manually typing the value in the callback, you can now use the `onAppToggled` method. Additionally, communicating with the server does not require knowing any of the Vite APIs anymore, as a new `server` object is passed to the `init` function that contains easy to use methods for communicating with the server.
|
||||
|
||||
```diff
|
||||
import { defineToolbarApp } from "astro/toolbar";
|
||||
|
||||
export default defineToolbarApp({
|
||||
init(canvas, app, server) {
|
||||
|
||||
- app.addEventListener("app-toggled", (e) => {
|
||||
- console.log(`App is now ${state ? "enabled" : "disabled"}`);.
|
||||
- });
|
||||
|
||||
+ app.onToggled(({ state }) => {
|
||||
+ console.log(`App is now ${state ? "enabled" : "disabled"}`);
|
||||
+ });
|
||||
|
||||
- if (import.meta.hot) {
|
||||
- import.meta.hot.send("my-app:my-client-event", { message: "world" });
|
||||
- }
|
||||
|
||||
+ server.send("my-app:my-client-event", { message: "world" })
|
||||
|
||||
- if (import.meta.hot) {
|
||||
- import.meta.hot.on("my-server-event", (data: {message: string}) => {
|
||||
- console.log(data.message);
|
||||
- });
|
||||
- }
|
||||
|
||||
+ server.on<{ message: string }>("my-server-event", (data) => {
|
||||
+ console.log(data.message); // data is typed using the type parameter
|
||||
+ });
|
||||
},
|
||||
})
|
||||
```
|
||||
|
||||
Server helpers are also available on the server side, for use in your integrations, through the new `toolbar` object:
|
||||
|
||||
```ts
|
||||
"astro:server:setup": ({ toolbar }) => {
|
||||
toolbar.on<{ message: string }>("my-app:my-client-event", (data) => {
|
||||
console.log(data.message);
|
||||
toolbar.send("my-server-event", { message: "hello" });
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
This is a backwards compatible change and your your existing dev toolbar apps will continue to function. However, we encourage you to build your apps with the new helpers, following the [updated Dev Toolbar API documentation](https://docs.astro.build/en/reference/dev-toolbar-app-reference/).
|
||||
7
.changeset/pink-rivers-knock.md
Normal file
7
.changeset/pink-rivers-knock.md
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
"astro": minor
|
||||
---
|
||||
|
||||
Astro will now automatically check for updates when you run the dev server. If a new version is available, a message will appear in the terminal with instructions on how to update. Updates will be checked once per 10 days, and the message will only appear if the project is multiple versions behind the latest release.
|
||||
|
||||
This behavior can be disabled by running `astro preferences disable checkUpdates` or setting the `ASTRO_DISABLE_UPDATE_CHECK` environment variable to `false`.
|
||||
7
.changeset/thirty-poems-chew.md
Normal file
7
.changeset/thirty-poems-chew.md
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
"astro": minor
|
||||
---
|
||||
|
||||
Enables type checking for JavaScript files when using the `strictest` TS config. This ensures consistency with Astro's other TS configs, and fixes type checking for integrations like Astro DB when using an `astro.config.mjs`.
|
||||
|
||||
If you are currently using the `strictest` preset and would like to still disable `.js` files, set `allowJS: false` in your `tsconfig.json`.
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
"astro": patch
|
||||
---
|
||||
|
||||
Due to regression on mobile WebKit browsers, reverts a change made for JavaScript animations during view transitions.
|
||||
1
.github/renovate.json5
vendored
1
.github/renovate.json5
vendored
|
|
@ -12,6 +12,7 @@
|
|||
// manually bumping deps
|
||||
"@biomejs/biome",
|
||||
"@types/node",
|
||||
"preact-render-to-string", // https://github.com/withastro/astro/pull/10200
|
||||
"sharp",
|
||||
|
||||
// manually bumping workflow actions
|
||||
|
|
|
|||
2
.github/workflows/snapshot-release.yml
vendored
2
.github/workflows/snapshot-release.yml
vendored
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
pull-requests: write
|
||||
steps:
|
||||
- name: "Check if user has admin access (only admins can publish snapshot releases)."
|
||||
uses: "lannonbr/repo-permission-check-action@2.0.0"
|
||||
uses: "lannonbr/repo-permission-check-action@2.0.2"
|
||||
with:
|
||||
permission: "admin"
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"@astrojs/node": "workspace:*",
|
||||
"@benchmark/timer": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"autocannon": "^7.12.0",
|
||||
"autocannon": "^7.15.0",
|
||||
"execa": "^8.0.1",
|
||||
"markdown-table": "^3.0.3",
|
||||
"mri": "^1.2.0",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,6 @@
|
|||
"@astrojs/mdx": "^2.3.1",
|
||||
"@astrojs/rss": "^4.0.5",
|
||||
"@astrojs/sitemap": "^3.1.4",
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
],
|
||||
"scripts": {},
|
||||
"devDependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"astro": "^4.0.0"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,6 @@
|
|||
"@astrojs/alpinejs": "^0.4.0",
|
||||
"@types/alpinejs": "^3.13.5",
|
||||
"alpinejs": "^3.13.3",
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/lit": "^4.0.1",
|
||||
"@webcomponents/template-shadowroot": "^0.2.1",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"lit": "^3.1.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/preact": "^3.2.0",
|
||||
"@astrojs/react": "^3.3.0",
|
||||
"@astrojs/react": "^3.3.1",
|
||||
"@astrojs/solid-js": "^4.1.0",
|
||||
"@astrojs/svelte": "^5.4.0",
|
||||
"@astrojs/vue": "^4.1.0",
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "^3.2.0",
|
||||
"@preact/signals": "^1.2.1",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"preact": "^10.19.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astrojs/react": "^3.3.0",
|
||||
"@astrojs/react": "^3.3.1",
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/solid-js": "^4.1.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"solid-js": "^1.8.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/svelte": "^5.4.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"svelte": "^4.2.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/vue": "^4.1.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"vue": "^3.3.8"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/node": "^8.2.5",
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
],
|
||||
"scripts": {},
|
||||
"devDependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"astro": "^4.0.0"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/node": "^8.2.5",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"html-minifier": "^4.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/node": "^8.2.5",
|
||||
"@astrojs/svelte": "^5.4.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"svelte": "^4.2.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"sass": "^1.69.5",
|
||||
"sharp": "^0.32.6"
|
||||
"sharp": "^0.33.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1
examples/toolbar-app/.codesandbox/Dockerfile
Normal file
1
examples/toolbar-app/.codesandbox/Dockerfile
Normal file
|
|
@ -0,0 +1 @@
|
|||
FROM node:18-bullseye
|
||||
21
examples/toolbar-app/.gitignore
vendored
Normal file
21
examples/toolbar-app/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# dependencies
|
||||
node_modules/
|
||||
|
||||
# production build
|
||||
dist
|
||||
|
||||
# logs
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
|
||||
# environment variables
|
||||
.env
|
||||
.env.production
|
||||
|
||||
# macOS-specific files
|
||||
.DS_Store
|
||||
|
||||
# jetbrains setting folder
|
||||
.idea/
|
||||
40
examples/toolbar-app/README.md
Normal file
40
examples/toolbar-app/README.md
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
# Astro Starter Kit: Toolbar App
|
||||
|
||||
```sh
|
||||
npm create astro@latest -- --template toolbar-app
|
||||
```
|
||||
|
||||
[](https://stackblitz.com/github/withastro/astro/tree/latest/examples/toolbar-app)
|
||||
[](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/toolbar-app)
|
||||
[](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/toolbar-app/devcontainer.json)
|
||||
|
||||
> 🧑🚀 **Seasoned astronaut?** Delete this file. Have fun!
|
||||
|
||||
## 🚀 Project Structure
|
||||
|
||||
Inside of your Astro project, you'll see the following folders and files:
|
||||
|
||||
```text
|
||||
/
|
||||
├── app.ts
|
||||
├── integration.ts
|
||||
└── package.json
|
||||
```
|
||||
|
||||
The logic of your app is in the appropriately named `app.ts` file. This is where the vast majority of your toolbar app logic will live.
|
||||
|
||||
The `integration.ts` file is a simple Astro integration file that will be used to add your app into the toolbar.
|
||||
|
||||
## 🧞 Commands
|
||||
|
||||
All commands are run from the root of the project, from a terminal:
|
||||
|
||||
| Command | Action |
|
||||
| :-------------- | :------------------------------------------------- |
|
||||
| `npm install` | Installs dependencies |
|
||||
| `npm run dev` | Watch for changes and build your app automatically |
|
||||
| `npm run build` | Build your app to `./dist/` |
|
||||
|
||||
## 👀 Want to learn more?
|
||||
|
||||
Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
|
||||
20
examples/toolbar-app/package.json
Normal file
20
examples/toolbar-app/package.json
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"name": "@example/toolbar-app",
|
||||
"type": "module",
|
||||
"version": "0.0.1",
|
||||
"peerDependencies": {
|
||||
"astro": "^4.6.1"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsc",
|
||||
"dev": "tsc --watch",
|
||||
"prepublish": "npm run build"
|
||||
},
|
||||
"exports": {
|
||||
".": "./dist/integration.js",
|
||||
"./app": "./dist/app.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"astro": "^4.6.1"
|
||||
}
|
||||
}
|
||||
16
examples/toolbar-app/src/app.ts
Normal file
16
examples/toolbar-app/src/app.ts
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
import { defineToolbarApp } from 'astro/toolbar';
|
||||
|
||||
// Guide: https://docs.astro.build/en/recipes/making-toolbar-apps/
|
||||
// API Reference: https://docs.astro.build/en/reference/dev-toolbar-app-reference/
|
||||
export default defineToolbarApp({
|
||||
init(canvas) {
|
||||
const astroWindow = document.createElement('astro-dev-toolbar-window');
|
||||
|
||||
const text = document.createElement('p');
|
||||
text.textContent = 'Hello, Astro!';
|
||||
|
||||
astroWindow.append(text);
|
||||
|
||||
canvas.append(astroWindow);
|
||||
},
|
||||
});
|
||||
17
examples/toolbar-app/src/integration.ts
Normal file
17
examples/toolbar-app/src/integration.ts
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
import { fileURLToPath } from 'node:url';
|
||||
import type { AstroIntegration } from 'astro';
|
||||
|
||||
// API Reference: https://docs.astro.build/en/reference/integrations-reference/
|
||||
export default {
|
||||
name: 'my-astro-integration',
|
||||
hooks: {
|
||||
'astro:config:setup': ({ addDevToolbarApp }) => {
|
||||
addDevToolbarApp({
|
||||
id: "my-toolbar-app",
|
||||
name: "My Toolbar App",
|
||||
icon: "🚀",
|
||||
entrypoint: fileURLToPath(new URL('./app.js', import.meta.url))
|
||||
});
|
||||
},
|
||||
},
|
||||
} satisfies AstroIntegration;
|
||||
7
examples/toolbar-app/tsconfig.json
Normal file
7
examples/toolbar-app/tsconfig.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"extends": "astro/tsconfigs/base",
|
||||
"compilerOptions": {
|
||||
"outDir": "dist",
|
||||
"rootDir": "src"
|
||||
}
|
||||
}
|
||||
|
|
@ -12,6 +12,6 @@
|
|||
"devDependencies": {
|
||||
"@astrojs/tailwind": "^5.1.0",
|
||||
"@astrojs/node": "^8.2.5",
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astrojs/markdoc": "^0.10.0",
|
||||
"astro": "^4.6.3"
|
||||
"@astrojs/markdoc": "^0.11.0",
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@astrojs/markdown-remark": "^5.1.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"hast-util-select": "^6.0.2",
|
||||
"rehype-autolink-headings": "^7.1.0",
|
||||
"rehype-slug": "^6.0.0",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3"
|
||||
"astro": "^4.6.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/mdx": "^2.3.1",
|
||||
"@astrojs/preact": "^3.2.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"preact": "^10.19.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "^3.2.0",
|
||||
"@nanostores/preact": "^0.5.0",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"nanostores": "^0.9.5",
|
||||
"preact": "^10.19.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
"@astrojs/mdx": "^2.3.1",
|
||||
"@astrojs/tailwind": "^5.1.0",
|
||||
"@types/canvas-confetti": "^1.6.3",
|
||||
"astro": "^4.6.3",
|
||||
"astro": "^4.6.4",
|
||||
"autoprefixer": "^10.4.15",
|
||||
"canvas-confetti": "^1.9.1",
|
||||
"postcss": "^8.4.28",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"test": "vitest"
|
||||
},
|
||||
"dependencies": {
|
||||
"astro": "^4.6.3",
|
||||
"vitest": "^1.3.1"
|
||||
"astro": "^4.6.4",
|
||||
"vitest": "^1.5.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
34
package.json
34
package.json
|
|
@ -30,8 +30,8 @@
|
|||
"test:smoke:docs": "turbo run build --filter=docs",
|
||||
"test:check-examples": "node ./scripts/smoke/check.js",
|
||||
"test:vite-ci": "turbo run test --filter=astro",
|
||||
"test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e",
|
||||
"test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match",
|
||||
"test:e2e": "cd packages/astro && pnpm playwright install chromium && pnpm run test:e2e",
|
||||
"test:e2e:match": "cd packages/astro && pnpm playwright install chromium && pnpm run test:e2e:match",
|
||||
"test:e2e:hosts": "turbo run test:hosted",
|
||||
"benchmark": "astro-benchmark",
|
||||
"lint": "eslint . --report-unused-disable-directives",
|
||||
|
|
@ -52,27 +52,27 @@
|
|||
"astro-benchmark": "workspace:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/check": "^0.5.8",
|
||||
"@astrojs/check": "^0.5.10",
|
||||
"@biomejs/biome": "1.6.4",
|
||||
"@changesets/changelog-github": "^0.4.8",
|
||||
"@changesets/cli": "^2.26.2",
|
||||
"@changesets/changelog-github": "^0.5.0",
|
||||
"@changesets/cli": "^2.27.1",
|
||||
"@eslint/eslintrc": "^3.0.2",
|
||||
"@types/node": "^18.17.8",
|
||||
"esbuild": "^0.19.6",
|
||||
"eslint": "^9.0.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"esbuild": "^0.20.2",
|
||||
"eslint": "^9.1.0",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-plugin-no-only-tests": "^3.1.0",
|
||||
"eslint-plugin-prettier": "^5.0.0",
|
||||
"eslint-plugin-regexp": "^2.2.0",
|
||||
"globby": "^14.0.0",
|
||||
"only-allow": "^1.1.1",
|
||||
"eslint-plugin-prettier": "^5.1.3",
|
||||
"eslint-plugin-regexp": "^2.5.0",
|
||||
"globby": "^14.0.1",
|
||||
"only-allow": "^1.2.1",
|
||||
"organize-imports-cli": "^0.10.0",
|
||||
"prettier": "^3.1.0",
|
||||
"prettier-plugin-astro": "^0.12.2",
|
||||
"prettier": "^3.2.5",
|
||||
"prettier-plugin-astro": "^0.13.0",
|
||||
"tiny-glob": "^0.2.9",
|
||||
"turbo": "^1.12.4",
|
||||
"typescript": "~5.2.2",
|
||||
"typescript-eslint": "^7.6.0"
|
||||
"turbo": "^1.13.2",
|
||||
"typescript": "~5.4.5",
|
||||
"typescript-eslint": "^7.7.0"
|
||||
},
|
||||
"pnpm": {
|
||||
"packageExtensions": {
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
"xml2js": "0.6.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"fast-xml-parser": "^4.2.7",
|
||||
"fast-xml-parser": "^4.3.6",
|
||||
"kleur": "^4.1.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,29 @@
|
|||
# astro
|
||||
|
||||
## 4.6.4
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#10846](https://github.com/withastro/astro/pull/10846) [`3294f7a`](https://github.com/withastro/astro/commit/3294f7a343e036d2ad9ac8d5f792ad0d4f43a399) Thanks [@matthewp](https://github.com/matthewp)! - Prevent getCollection breaking in vitest
|
||||
|
||||
- [#10856](https://github.com/withastro/astro/pull/10856) [`30cf82a`](https://github.com/withastro/astro/commit/30cf82ac3e970a6a3c0f07db1340dd7152d1c35d) Thanks [@robertvanhoesel](https://github.com/robertvanhoesel)! - Prevents inputs with a name attribute of action or method to break ViewTransitions' form submission
|
||||
|
||||
- [#10833](https://github.com/withastro/astro/pull/10833) [`8d5f3e8`](https://github.com/withastro/astro/commit/8d5f3e8656027023f9fda51c66b0213ffe16d3a5) Thanks [@renovate](https://github.com/apps/renovate)! - Updates `esbuild` dependency to v0.20. This should not affect projects in most cases.
|
||||
|
||||
- [#10801](https://github.com/withastro/astro/pull/10801) [`204b782`](https://github.com/withastro/astro/commit/204b7820e6de22d97fa2a7b988180c42155c8387) Thanks [@rishi-raj-jain](https://github.com/rishi-raj-jain)! - Fixes an issue where images in MD required a relative specifier (e.g. `./`)
|
||||
|
||||
Now, you can use the standard `` syntax in MD files for images colocated in the same folder: no relative specifier required!
|
||||
|
||||
There is no need to update your project; your existing images will still continue to work. However, you may wish to remove any relative specifiers from these MD images as they are no longer necessary:
|
||||
|
||||
```diff
|
||||
- 
|
||||
+ 
|
||||
<!-- This dog lives in the same folder as my article! -->
|
||||
```
|
||||
|
||||
- [#10841](https://github.com/withastro/astro/pull/10841) [`a2df344`](https://github.com/withastro/astro/commit/a2df344bff15647c2bfb3f49e3f7b66aa069d6f4) Thanks [@martrapp](https://github.com/martrapp)! - Due to regression on mobile WebKit browsers, reverts a change made for JavaScript animations during view transitions.
|
||||
|
||||
## 4.6.3
|
||||
|
||||
### Patch Changes
|
||||
|
|
|
|||
|
|
@ -108,9 +108,16 @@ const { fallback = 'animate' } = Astro.props;
|
|||
const form = el as HTMLFormElement;
|
||||
const submitter = ev.submitter;
|
||||
const formData = new FormData(form, submitter);
|
||||
// form.action and form.method can point to an <input name="action"> or <input name="method">
|
||||
// in which case should fallback to the form attribute
|
||||
const formAction =
|
||||
typeof form.action === 'string' ? form.action : form.getAttribute('action');
|
||||
const formMethod =
|
||||
typeof form.method === 'string' ? form.method : form.getAttribute('method');
|
||||
// Use the form action, if defined, otherwise fallback to current path.
|
||||
let action = submitter?.getAttribute('formaction') ?? form.action ?? location.pathname;
|
||||
const method = submitter?.getAttribute('formmethod') ?? form.method;
|
||||
let action = submitter?.getAttribute('formaction') ?? formAction ?? location.pathname;
|
||||
// Use the form method, if defined, otherwise fallback to "get"
|
||||
const method = submitter?.getAttribute('formmethod') ?? formMethod ?? 'get';
|
||||
|
||||
// the "dialog" method is a special keyword used within <dialog> elements
|
||||
// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method
|
||||
|
|
|
|||
|
|
@ -6,6 +6,14 @@ const test = testFactory({
|
|||
devToolbar: {
|
||||
enabled: false,
|
||||
},
|
||||
vite: {
|
||||
optimizeDeps: {
|
||||
// Vite has a bug where if you close the server too quickly, while the optimized
|
||||
// dependencies are still held before serving, it will stall the server from closing.
|
||||
// This will workaround it for now.
|
||||
holdUntilCrawlEnd: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
let devServer;
|
||||
|
|
|
|||
|
|
@ -304,6 +304,8 @@ test.describe('Dev Toolbar', () => {
|
|||
await expect(myAppWindow).toHaveCount(1);
|
||||
await expect(myAppWindow).toBeVisible();
|
||||
|
||||
await expect(myAppWindow).toContainText('Hello from the server!');
|
||||
|
||||
// Toggle app off
|
||||
await appButton.click();
|
||||
await expect(myAppWindow).not.toBeVisible();
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/preact": "workspace:*",
|
||||
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
"dependencies": {
|
||||
"@astrojs/vue": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"vue": "^3.3.8"
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/react": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,18 @@ export function myIntegration() {
|
|||
const importPath = dirname(fileURLToPath(import.meta.url));
|
||||
const pluginPath = join(importPath, 'custom-plugin.js');
|
||||
|
||||
addDevToolbarApp(pluginPath);
|
||||
addDevToolbarApp({
|
||||
id: 'my-plugin',
|
||||
name: 'My Plugin',
|
||||
icon: 'astro:logo',
|
||||
entrypoint: pluginPath
|
||||
});
|
||||
},
|
||||
'astro:server:setup': ({ toolbar }) => {
|
||||
toolbar.onAppInitialized("my-plugin", () => {
|
||||
toolbar.send("super-server-event", { message: "Hello from the server!" })
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
export default {
|
||||
id: 'my-plugin',
|
||||
name: 'My Plugin',
|
||||
icon: 'astro:logo',
|
||||
init(canvas, eventTarget) {
|
||||
import { defineToolbarApp } from "astro/toolbar";
|
||||
|
||||
export default defineToolbarApp({
|
||||
init(canvas, app, server) {
|
||||
const astroWindow = document.createElement('astro-dev-toolbar-window');
|
||||
const myButton = document.createElement('astro-dev-toolbar-button');
|
||||
myButton.size = 'medium';
|
||||
|
|
@ -13,16 +12,17 @@ export default {
|
|||
console.log('Clicked!');
|
||||
});
|
||||
|
||||
eventTarget.dispatchEvent(
|
||||
new CustomEvent("toggle-notification", {
|
||||
detail: {
|
||||
level: "warning",
|
||||
},
|
||||
})
|
||||
);
|
||||
app.toggleNotification({
|
||||
state: true,
|
||||
level: 'warning'
|
||||
})
|
||||
|
||||
server.on("super-server-event", (data) => {
|
||||
astroWindow.appendChild(document.createTextNode(data.message));
|
||||
});
|
||||
|
||||
astroWindow.appendChild(myButton);
|
||||
|
||||
canvas.appendChild(astroWindow);
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
"private": true,
|
||||
"dependencies": {
|
||||
"astro": "workspace:*",
|
||||
"sass": "^1.69.5"
|
||||
"sass": "^1.75.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
"@astrojs/svelte": "workspace:*",
|
||||
"@astrojs/vue": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"sass": "^1.69.5",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"sass": "^1.75.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
"private": true,
|
||||
"devDependencies": {
|
||||
"astro": "workspace:*",
|
||||
"sass": "^1.69.5"
|
||||
"sass": "^1.75.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/lit": "workspace:*",
|
||||
"@webcomponents/template-shadowroot": "^0.2.1",
|
||||
"astro": "workspace:*",
|
||||
"lit": "^3.1.0"
|
||||
"lit": "^3.1.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,4 +31,8 @@ export default class Counter extends LitElement {
|
|||
}
|
||||
}
|
||||
|
||||
customElements.define('my-counter', Counter);
|
||||
// Since this fixture is ran in both dev and build, this could register twice. Wrap with a try..catch for now.
|
||||
try {
|
||||
customElements.define('my-counter', Counter);
|
||||
} catch {}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,4 +32,7 @@ export default class NonDeferredCounter extends LitElement {
|
|||
}
|
||||
}
|
||||
|
||||
customElements.define('non-deferred-counter', NonDeferredCounter);
|
||||
// Since this fixture is ran in both dev and build, this could register twice. Wrap with a try..catch for now.
|
||||
try {
|
||||
customElements.define('non-deferred-counter', NonDeferredCounter);
|
||||
} catch {}
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"@webcomponents/template-shadowroot": "^0.2.1",
|
||||
"lit": "^3.1.0",
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"lit": "^3.1.3",
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"preact": "^10.19.2",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"solid-js": "^1.8.5",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"preact": "^10.20.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"solid-js": "^1.8.16",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "astro dev"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
"dependencies": {
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.19.2"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/preact": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"preact": "^10.15.1"
|
||||
"preact": "^10.20.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"@astrojs/react": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"@astrojs/mdx": "workspace:*",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"solid-js": "^1.8.5"
|
||||
"solid-js": "^1.8.16"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/solid-js": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"solid-js": "^1.8.5"
|
||||
"solid-js": "^1.8.16"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@
|
|||
"astro": "workspace:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"solid-js": "^1.8.5"
|
||||
"solid-js": "^1.8.16"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/svelte": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"svelte": "^4.2.5"
|
||||
"svelte": "^4.2.15"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
"dependencies": {
|
||||
"@astrojs/tailwind": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"autoprefixer": "^10.4.15",
|
||||
"postcss": "^8.4.28",
|
||||
"tailwindcss": "^3.3.5"
|
||||
"autoprefixer": "^10.4.19",
|
||||
"postcss": "^8.4.38",
|
||||
"tailwindcss": "^3.4.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"dependencies": {
|
||||
"@astrojs/react": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
"@astrojs/svelte": "workspace:*",
|
||||
"@astrojs/vue": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"svelte": "^4.2.5",
|
||||
"vue": "^3.3.8"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"svelte": "^4.2.15",
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@ import Layout from '../components/Layout.astro';
|
|||
<Layout>
|
||||
<p id="FourOhFour">Page not found</p>
|
||||
</Layout>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
import Layout from '../components/Layout.astro';
|
||||
|
||||
---
|
||||
<Layout>
|
||||
<form>
|
||||
<p>This form has an no method defined, but input with `name=method`</p>
|
||||
<input type="text" name="method" value="POST" />
|
||||
<button id="submit">Submit</button>
|
||||
</form>
|
||||
</Layout>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
import Layout from '../components/Layout.astro';
|
||||
|
||||
---
|
||||
<Layout>
|
||||
<form method="POST" action="bar">
|
||||
<p>This form has an input with `name=action`</p>
|
||||
<input type="text" name="action" value="foo" />
|
||||
<button id="submit">Submit</button>
|
||||
</form>
|
||||
</Layout>
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/vue": "workspace:*",
|
||||
"astro": "workspace:*",
|
||||
"vue": "^3.3.8"
|
||||
"vue": "^3.4.23"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,17 +10,16 @@ const test = testFactory({
|
|||
test.describe('Lit components', () => {
|
||||
test.describe('Development', () => {
|
||||
let devServer;
|
||||
const t = test.extend({});
|
||||
|
||||
t.beforeAll(async ({ astro }) => {
|
||||
test.beforeAll(async ({ astro }) => {
|
||||
devServer = await astro.startDevServer();
|
||||
});
|
||||
|
||||
t.afterAll(async () => {
|
||||
test.afterAll(async () => {
|
||||
await devServer.stop();
|
||||
});
|
||||
|
||||
t('client:idle', async ({ page, astro }) => {
|
||||
test('client:idle', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
const counter = page.locator('#client-idle');
|
||||
|
|
@ -38,7 +37,7 @@ test.describe('Lit components', () => {
|
|||
await expect(count, 'count incremented by 1').toHaveText('Count: 11');
|
||||
});
|
||||
|
||||
t('non-deferred attribute serialization', async ({ page, astro }) => {
|
||||
test('non-deferred attribute serialization', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
const counter = page.locator('#non-deferred');
|
||||
|
|
@ -53,7 +52,7 @@ test.describe('Lit components', () => {
|
|||
await expect(count, 'count incremented by 1').toHaveText('Count: 11');
|
||||
});
|
||||
|
||||
t('client:load', async ({ page, astro }) => {
|
||||
test('client:load', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
const counter = page.locator('#client-load');
|
||||
|
|
@ -70,7 +69,7 @@ test.describe('Lit components', () => {
|
|||
await expect(count, 'count incremented by 1').toHaveText('Count: 11');
|
||||
});
|
||||
|
||||
t('client:visible', async ({ page, astro }) => {
|
||||
test('client:visible', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
// Make sure the component is on screen to trigger hydration
|
||||
|
|
@ -89,7 +88,7 @@ test.describe('Lit components', () => {
|
|||
await expect(count, 'count incremented by 1').toHaveText('Count: 11');
|
||||
});
|
||||
|
||||
t('client:media', async ({ page, astro }) => {
|
||||
test('client:media', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/media'));
|
||||
|
||||
const counter = page.locator('#client-media');
|
||||
|
|
@ -111,7 +110,7 @@ test.describe('Lit components', () => {
|
|||
await expect(count, 'count incremented by 1').toHaveText('Count: 11');
|
||||
});
|
||||
|
||||
t('client:only', async ({ page, astro }) => {
|
||||
test('client:only', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
const label = page.locator('#client-only');
|
||||
|
|
@ -143,7 +142,7 @@ test.describe('Lit components', () => {
|
|||
).toBeHidden();
|
||||
});
|
||||
|
||||
t.skip('HMR', async ({ page, astro }) => {
|
||||
test.skip('HMR', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/'));
|
||||
|
||||
const counter = page.locator('#client-idle');
|
||||
|
|
@ -160,32 +159,20 @@ test.describe('Lit components', () => {
|
|||
|
||||
test.describe('Production', () => {
|
||||
let previewServer;
|
||||
const t = test.extend({});
|
||||
|
||||
t.beforeAll(async ({ astro }) => {
|
||||
test.beforeAll(async ({ astro }) => {
|
||||
// Playwright's Node version doesn't have these functions, so stub them.
|
||||
process.stdout.clearLine = () => {};
|
||||
process.stdout.cursorTo = () => {};
|
||||
try {
|
||||
await astro.build();
|
||||
} catch (err) {
|
||||
// There's this strange error on build since the dev server already defined `my-counter`,
|
||||
// however the tests still pass with this error, so swallow it.
|
||||
if (!err.message.includes(`Failed to execute 'define' on 'CustomElementRegistry'`)) {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
t.beforeAll(async ({ astro }) => {
|
||||
await astro.build();
|
||||
previewServer = await astro.preview();
|
||||
});
|
||||
|
||||
t.afterAll(async () => {
|
||||
test.afterAll(async () => {
|
||||
await previewServer.stop();
|
||||
});
|
||||
|
||||
t('Only one component in prod', async ({ page, astro }) => {
|
||||
test('Only one component in prod', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/solo'));
|
||||
|
||||
const counter = page.locator('my-counter');
|
||||
|
|
|
|||
|
|
@ -1,7 +1,20 @@
|
|||
import { expect } from '@playwright/test';
|
||||
import { testFactory } from './test-utils.js';
|
||||
|
||||
const test = testFactory({ root: './fixtures/nested-styles/' });
|
||||
const test = testFactory({
|
||||
root: './fixtures/nested-styles/',
|
||||
devToolbar: {
|
||||
enabled: false,
|
||||
},
|
||||
vite: {
|
||||
optimizeDeps: {
|
||||
// Vite has a bug where if you close the server too quickly, while the optimized
|
||||
// dependencies are still held before serving, it will stall the server from closing.
|
||||
// This will workaround it for now.
|
||||
holdUntilCrawlEnd: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
let devServer;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,35 +24,31 @@ function runTest(it) {
|
|||
|
||||
test.describe('TypeScript resolution -', () => {
|
||||
test.describe('Development', () => {
|
||||
const t = test.extend({});
|
||||
|
||||
let devServer;
|
||||
|
||||
t.beforeAll(async ({ astro }) => {
|
||||
test.beforeAll(async ({ astro }) => {
|
||||
devServer = await astro.startDevServer();
|
||||
});
|
||||
|
||||
t.afterAll(async () => {
|
||||
test.afterAll(async () => {
|
||||
await devServer.stop();
|
||||
});
|
||||
|
||||
runTest(t);
|
||||
runTest(test);
|
||||
});
|
||||
|
||||
test.describe('Production', () => {
|
||||
const t = test.extend({});
|
||||
|
||||
let previewServer;
|
||||
|
||||
t.beforeAll(async ({ astro }) => {
|
||||
test.beforeAll(async ({ astro }) => {
|
||||
await astro.build();
|
||||
previewServer = await astro.preview();
|
||||
});
|
||||
|
||||
t.afterAll(async () => {
|
||||
test.afterAll(async () => {
|
||||
await previewServer.stop();
|
||||
});
|
||||
|
||||
runTest(t);
|
||||
runTest(test);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1168,6 +1168,30 @@ test.describe('View Transitions', () => {
|
|||
).toEqual(['application/x-www-form-urlencoded']);
|
||||
});
|
||||
|
||||
test('form POST that includes an input with name action should not override action', async ({
|
||||
page,
|
||||
astro,
|
||||
}) => {
|
||||
await page.goto(astro.resolveUrl('/form-six'));
|
||||
page.on('request', (request) => {
|
||||
expect(request.url()).toContain('/bar');
|
||||
});
|
||||
// Submit the form
|
||||
await page.click('#submit');
|
||||
});
|
||||
|
||||
test('form without method that includes an input with name method should not override default method', async ({
|
||||
page,
|
||||
astro,
|
||||
}) => {
|
||||
await page.goto(astro.resolveUrl('/form-seven'));
|
||||
page.on('request', (request) => {
|
||||
expect(request.method()).toBe('GET');
|
||||
});
|
||||
// Submit the form
|
||||
await page.click('#submit');
|
||||
});
|
||||
|
||||
test('Route announcer is invisible on page transition', async ({ page, astro }) => {
|
||||
await page.goto(astro.resolveUrl('/no-directive-one'));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "astro",
|
||||
"version": "4.6.3",
|
||||
"version": "4.6.4",
|
||||
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
|
||||
"type": "module",
|
||||
"author": "withastro",
|
||||
|
|
@ -53,6 +53,7 @@
|
|||
"./client/*": "./dist/runtime/client/*",
|
||||
"./components": "./components/index.ts",
|
||||
"./components/*": "./components/*",
|
||||
"./toolbar": "./dist/toolbar/index.js",
|
||||
"./assets": "./dist/assets/index.js",
|
||||
"./assets/utils": "./dist/assets/utils/index.js",
|
||||
"./assets/endpoint/*": "./dist/assets/endpoint/*.js",
|
||||
|
|
@ -118,106 +119,105 @@
|
|||
"@astrojs/internal-helpers": "workspace:*",
|
||||
"@astrojs/markdown-remark": "workspace:*",
|
||||
"@astrojs/telemetry": "workspace:*",
|
||||
"@babel/core": "^7.24.3",
|
||||
"@babel/generator": "^7.23.3",
|
||||
"@babel/parser": "^7.23.3",
|
||||
"@babel/plugin-transform-react-jsx": "^7.22.5",
|
||||
"@babel/traverse": "^7.23.3",
|
||||
"@babel/types": "^7.23.3",
|
||||
"@types/babel__core": "^7.20.4",
|
||||
"@types/cookie": "^0.5.4",
|
||||
"acorn": "^8.11.2",
|
||||
"@babel/core": "^7.24.4",
|
||||
"@babel/generator": "^7.24.4",
|
||||
"@babel/parser": "^7.24.4",
|
||||
"@babel/plugin-transform-react-jsx": "^7.23.4",
|
||||
"@babel/traverse": "^7.24.1",
|
||||
"@babel/types": "^7.24.0",
|
||||
"@types/babel__core": "^7.20.5",
|
||||
"@types/cookie": "^0.6.0",
|
||||
"acorn": "^8.11.3",
|
||||
"aria-query": "^5.3.0",
|
||||
"axobject-query": "^4.0.0",
|
||||
"boxen": "^7.1.1",
|
||||
"chokidar": "^3.5.3",
|
||||
"chokidar": "^3.6.0",
|
||||
"ci-info": "^4.0.0",
|
||||
"clsx": "^2.0.0",
|
||||
"clsx": "^2.1.0",
|
||||
"common-ancestor-path": "^1.0.1",
|
||||
"cookie": "^0.6.0",
|
||||
"cssesc": "^3.0.0",
|
||||
"debug": "^4.3.4",
|
||||
"deterministic-object-hash": "^2.0.1",
|
||||
"deterministic-object-hash": "^2.0.2",
|
||||
"devalue": "^5.0.0",
|
||||
"diff": "^5.1.0",
|
||||
"diff": "^5.2.0",
|
||||
"dlv": "^1.1.3",
|
||||
"dset": "^3.1.3",
|
||||
"es-module-lexer": "^1.4.1",
|
||||
"esbuild": "^0.19.6",
|
||||
"es-module-lexer": "^1.5.0",
|
||||
"esbuild": "^0.20.2",
|
||||
"estree-walker": "^3.0.3",
|
||||
"execa": "^8.0.1",
|
||||
"fast-glob": "^3.3.2",
|
||||
"flattie": "^1.1.0",
|
||||
"flattie": "^1.1.1",
|
||||
"github-slugger": "^2.0.0",
|
||||
"gray-matter": "^4.0.3",
|
||||
"html-escaper": "^3.0.3",
|
||||
"http-cache-semantics": "^4.1.1",
|
||||
"js-yaml": "^4.1.0",
|
||||
"kleur": "^4.1.4",
|
||||
"magic-string": "^0.30.3",
|
||||
"kleur": "^4.1.5",
|
||||
"magic-string": "^0.30.10",
|
||||
"mrmime": "^2.0.0",
|
||||
"ora": "^8.0.1",
|
||||
"p-limit": "^5.0.0",
|
||||
"p-queue": "^8.0.1",
|
||||
"path-to-regexp": "^6.2.1",
|
||||
"preferred-pm": "^3.1.2",
|
||||
"path-to-regexp": "^6.2.2",
|
||||
"preferred-pm": "^3.1.3",
|
||||
"prompts": "^2.4.2",
|
||||
"rehype": "^13.0.1",
|
||||
"resolve": "^1.22.4",
|
||||
"semver": "^7.5.4",
|
||||
"shiki": "^1.1.2",
|
||||
"string-width": "^7.0.0",
|
||||
"resolve": "^1.22.8",
|
||||
"semver": "^7.6.0",
|
||||
"shiki": "^1.3.0",
|
||||
"string-width": "^7.1.0",
|
||||
"strip-ansi": "^7.1.0",
|
||||
"tsconfck": "^3.0.0",
|
||||
"tsconfck": "^3.0.3",
|
||||
"unist-util-visit": "^5.0.0",
|
||||
"vfile": "^6.0.1",
|
||||
"vite": "^5.1.4",
|
||||
"vite": "^5.2.10",
|
||||
"vitefu": "^0.2.5",
|
||||
"which-pm": "^2.1.1",
|
||||
"yargs-parser": "^21.1.1",
|
||||
"zod": "^3.22.4",
|
||||
"zod-to-json-schema": "^3.22.4"
|
||||
"zod": "^3.23.0",
|
||||
"zod-to-json-schema": "^3.22.5"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"sharp": "^0.32.6"
|
||||
"sharp": "^0.33.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/check": "^0.5.8",
|
||||
"@playwright/test": "1.40.0",
|
||||
"@astrojs/check": "^0.5.10",
|
||||
"@playwright/test": "^1.43.1",
|
||||
"@types/aria-query": "^5.0.4",
|
||||
"@types/babel__generator": "^7.6.7",
|
||||
"@types/babel__traverse": "^7.20.4",
|
||||
"@types/babel__generator": "^7.6.8",
|
||||
"@types/babel__traverse": "^7.20.5",
|
||||
"@types/common-ancestor-path": "^1.0.2",
|
||||
"@types/connect": "^3.4.38",
|
||||
"@types/cssesc": "^3.0.2",
|
||||
"@types/debug": "^4.1.12",
|
||||
"@types/diff": "^5.0.8",
|
||||
"@types/diff": "^5.2.0",
|
||||
"@types/dlv": "^1.1.4",
|
||||
"@types/dom-view-transitions": "^1.0.4",
|
||||
"@types/hast": "^3.0.3",
|
||||
"@types/hast": "^3.0.4",
|
||||
"@types/html-escaper": "^3.0.2",
|
||||
"@types/http-cache-semantics": "^4.0.4",
|
||||
"@types/js-yaml": "^4.0.9",
|
||||
"@types/mocha": "^10.0.4",
|
||||
"@types/probe-image-size": "^7.2.3",
|
||||
"@types/prompts": "^2.4.8",
|
||||
"@types/resolve": "^1.20.5",
|
||||
"@types/semver": "^7.5.2",
|
||||
"@types/probe-image-size": "^7.2.4",
|
||||
"@types/prompts": "^2.4.9",
|
||||
"@types/resolve": "^1.20.6",
|
||||
"@types/semver": "^7.5.8",
|
||||
"@types/send": "^0.17.4",
|
||||
"@types/unist": "^3.0.2",
|
||||
"@types/yargs-parser": "^21.0.3",
|
||||
"astro-scripts": "workspace:*",
|
||||
"cheerio": "1.0.0-rc.12",
|
||||
"eol": "^0.9.1",
|
||||
"memfs": "^4.6.0",
|
||||
"node-mocks-http": "^1.13.0",
|
||||
"memfs": "^4.8.2",
|
||||
"node-mocks-http": "^1.14.1",
|
||||
"parse-srcset": "^1.0.2",
|
||||
"rehype-autolink-headings": "^7.1.0",
|
||||
"rehype-slug": "^6.0.0",
|
||||
"rehype-toc": "^3.0.2",
|
||||
"remark-code-titles": "^0.1.2",
|
||||
"rollup": "^4.5.0",
|
||||
"sass": "^1.69.5",
|
||||
"rollup": "^4.16.1",
|
||||
"sass": "^1.75.0",
|
||||
"srcset-parse": "^1.1.0",
|
||||
"unified": "^11.0.4"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@
|
|||
"dependencies": {
|
||||
"@astrojs/react": "workspace:*",
|
||||
"@performance/utils": "workspace:*",
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"@types/react": "^18.2.79",
|
||||
"@types/react-dom": "^18.2.25",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"@astrojs/markdoc": "workspace:*",
|
||||
"@astrojs/react": "workspace:*",
|
||||
"@performance/utils": "workspace:*",
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"@types/react": "^18.2.79",
|
||||
"@types/react-dom": "^18.2.25",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
"@astrojs/mdx": "workspace:*",
|
||||
"@astrojs/react": "workspace:*",
|
||||
"@performance/utils": "workspace:*",
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"@types/react": "^18.2.79",
|
||||
"@types/react-dom": "^18.2.25",
|
||||
"astro": "workspace:*",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0"
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,12 @@ import type { AstroTimer } from '../core/config/timer.js';
|
|||
import type { TSConfig } from '../core/config/tsconfig.js';
|
||||
import type { AstroCookies } from '../core/cookies/index.js';
|
||||
import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core.js';
|
||||
import type { getToolbarServerCommunicationHelpers } from '../integrations/index.js';
|
||||
import type { AstroPreferences } from '../preferences/index.js';
|
||||
import type {
|
||||
ToolbarAppEventTarget,
|
||||
ToolbarServerHelpers,
|
||||
} from '../runtime/client/dev-toolbar/helpers.js';
|
||||
import type { AstroDevToolbar, DevToolbarCanvas } from '../runtime/client/dev-toolbar/toolbar.js';
|
||||
import type { Icon } from '../runtime/client/dev-toolbar/ui-library/icons.js';
|
||||
import type {
|
||||
|
|
@ -38,10 +43,10 @@ import type {
|
|||
TransitionBeforePreparationEvent,
|
||||
TransitionBeforeSwapEvent,
|
||||
} from '../transitions/events.js';
|
||||
import type { DeepPartial, OmitIndexSignature, Simplify } from '../type-utils.js';
|
||||
import type { DeepPartial, OmitIndexSignature, Simplify, WithRequired } from '../type-utils.js';
|
||||
import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
|
||||
|
||||
export { type AstroIntegrationLogger };
|
||||
export type { AstroIntegrationLogger, ToolbarServerHelpers };
|
||||
|
||||
export type {
|
||||
MarkdownHeading,
|
||||
|
|
@ -1667,7 +1672,7 @@ export interface AstroUserConfig {
|
|||
* @version 4.5.0
|
||||
* @description
|
||||
* Enables a more reliable strategy to prevent scripts from being executed in pages where they are not used.
|
||||
*
|
||||
*
|
||||
* Scripts will directly render as declared in Astro files (including existing features like TypeScript, importing `node_modules`,
|
||||
* and deduplicating scripts). You can also now conditionally render scripts in your Astro file.
|
||||
|
||||
|
|
@ -1713,9 +1718,9 @@ export interface AstroUserConfig {
|
|||
* @version 4.5.0
|
||||
* @description
|
||||
* This feature will auto-generate a JSON schema for content collections of `type: 'data'` which can be used as the `$schema` value for TypeScript-style autocompletion/hints in tools like VSCode.
|
||||
*
|
||||
*
|
||||
* To enable this feature, add the experimental flag:
|
||||
*
|
||||
*
|
||||
* ```diff
|
||||
* import { defineConfig } from 'astro/config';
|
||||
|
||||
|
|
@ -1725,9 +1730,9 @@ export interface AstroUserConfig {
|
|||
* }
|
||||
* });
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* This experimental implementation requires you to manually reference the schema in each data entry file of the collection:
|
||||
*
|
||||
*
|
||||
* ```diff
|
||||
* // src/content/test/entry.json
|
||||
* {
|
||||
|
|
@ -1735,9 +1740,9 @@ export interface AstroUserConfig {
|
|||
* "test": "test"
|
||||
* }
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* Alternatively, you can set this in your [VSCode `json.schemas` settings](https://code.visualstudio.com/docs/languages/json#_json-schemas-and-settings):
|
||||
*
|
||||
*
|
||||
* ```diff
|
||||
* "json.schemas": [
|
||||
* {
|
||||
|
|
@ -1748,7 +1753,7 @@ export interface AstroUserConfig {
|
|||
* }
|
||||
* ]
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* Note that this initial implementation uses a library with [known issues for advanced Zod schemas](https://github.com/StefanTerdell/zod-to-json-schema#known-issues), so you may wish to consult these limitations before enabling the experimental flag.
|
||||
*/
|
||||
contentCollectionJsonSchema?: boolean;
|
||||
|
|
@ -2100,12 +2105,20 @@ export interface AstroSettings {
|
|||
* Map of directive name (e.g. `load`) to the directive script code
|
||||
*/
|
||||
clientDirectives: Map<string, string>;
|
||||
devToolbarApps: string[];
|
||||
devToolbarApps: (DevToolbarAppEntry | string)[];
|
||||
middlewares: { pre: string[]; post: string[] };
|
||||
tsConfig: TSConfig | undefined;
|
||||
tsConfigPath: string | undefined;
|
||||
watchFiles: string[];
|
||||
timer: AstroTimer;
|
||||
/**
|
||||
* Latest version of Astro, will be undefined if:
|
||||
* - unable to check
|
||||
* - the user has disabled the check
|
||||
* - the check has not completed yet
|
||||
* - the user is on the latest version already
|
||||
*/
|
||||
latestAstroVersion: string | undefined;
|
||||
}
|
||||
|
||||
export type AsyncRendererComponentFn<U> = (
|
||||
|
|
@ -2727,7 +2740,8 @@ export interface AstroIntegration {
|
|||
* TODO: Fully remove in Astro 5.0
|
||||
*/
|
||||
addDevOverlayPlugin: (entrypoint: string) => void;
|
||||
addDevToolbarApp: (entrypoint: string) => void;
|
||||
// TODO: Deprecate the `string` overload once a few apps have been migrated to the new API.
|
||||
addDevToolbarApp: (entrypoint: DevToolbarAppEntry | string) => void;
|
||||
addMiddleware: (mid: AstroIntegrationMiddleware) => void;
|
||||
logger: AstroIntegrationLogger;
|
||||
// TODO: Add support for `injectElement()` for full HTML element injection, not just scripts.
|
||||
|
|
@ -2743,6 +2757,7 @@ export interface AstroIntegration {
|
|||
'astro:server:setup'?: (options: {
|
||||
server: vite.ViteDevServer;
|
||||
logger: AstroIntegrationLogger;
|
||||
toolbar: ReturnType<typeof getToolbarServerCommunicationHelpers>;
|
||||
}) => void | Promise<void>;
|
||||
'astro:server:start'?: (options: {
|
||||
address: AddressInfo;
|
||||
|
|
@ -2998,13 +3013,53 @@ export interface ClientDirectiveConfig {
|
|||
entrypoint: string;
|
||||
}
|
||||
|
||||
export interface DevToolbarApp {
|
||||
type DevToolbarAppMeta = {
|
||||
id: string;
|
||||
name: string;
|
||||
icon?: Icon;
|
||||
init?(canvas: ShadowRoot, eventTarget: EventTarget): void | Promise<void>;
|
||||
};
|
||||
|
||||
// The param passed to `addDevToolbarApp` in the integration
|
||||
export type DevToolbarAppEntry = DevToolbarAppMeta & {
|
||||
entrypoint: string;
|
||||
};
|
||||
|
||||
// Public API for the dev toolbar
|
||||
export type DevToolbarApp = {
|
||||
/**
|
||||
* @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
|
||||
*
|
||||
* Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
|
||||
*
|
||||
* In the future, putting these properties directly on the app object will be removed.
|
||||
*/
|
||||
id?: string;
|
||||
/**
|
||||
* @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
|
||||
*
|
||||
* Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
|
||||
*
|
||||
* In the future, putting these properties directly on the app object will be removed.
|
||||
*/
|
||||
name?: string;
|
||||
/**
|
||||
* @deprecated The `id`, `name`, and `icon` properties should now be defined when using `addDevToolbarApp`.
|
||||
*
|
||||
* Ex: `addDevToolbarApp({ id: 'my-app', name: 'My App', icon: '🚀', entrypoint: '/path/to/app' })`
|
||||
*
|
||||
* In the future, putting these properties directly on the app object will be removed.
|
||||
*/
|
||||
icon?: Icon;
|
||||
init?(
|
||||
canvas: ShadowRoot,
|
||||
app: ToolbarAppEventTarget,
|
||||
server: ToolbarServerHelpers
|
||||
): void | Promise<void>;
|
||||
beforeTogglingOff?(canvas: ShadowRoot): boolean | Promise<boolean>;
|
||||
}
|
||||
};
|
||||
|
||||
// An app that has been loaded and as such contain all of its properties
|
||||
export type ResolvedDevToolbarApp = DevToolbarAppMeta & Omit<DevToolbarApp, 'id' | 'name' | 'icon'>;
|
||||
|
||||
// TODO: Remove in Astro 5.0
|
||||
export type DevOverlayPlugin = DevToolbarApp;
|
||||
|
|
@ -3014,6 +3069,7 @@ export type DevToolbarMetadata = Window &
|
|||
__astro_dev_toolbar__: {
|
||||
root: string;
|
||||
version: string;
|
||||
latestAstroVersion: AstroSettings['latestAstroVersion'];
|
||||
debugInfo: string;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
import fs from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath, pathToFileURL } from 'node:url';
|
||||
import type * as vite from 'vite';
|
||||
import { prependForwardSlash, slash } from '../../core/path.js';
|
||||
import type { ImageMetadata } from '../types.js';
|
||||
import { imageMetadata } from './metadata.js';
|
||||
|
||||
type FileEmitter = vite.Rollup.EmitFile;
|
||||
|
||||
export async function emitESMImage(
|
||||
id: string | undefined,
|
||||
watchMode: boolean,
|
||||
fileEmitter: any
|
||||
/** @deprecated */
|
||||
_watchMode: boolean,
|
||||
// FIX: in Astro 5, this function should not be passed in dev mode at all.
|
||||
// Or rethink the API so that a function that throws isn't passed through.
|
||||
fileEmitter?: FileEmitter
|
||||
): Promise<ImageMetadata | undefined> {
|
||||
if (!id) {
|
||||
return undefined;
|
||||
|
|
@ -37,18 +43,26 @@ export async function emitESMImage(
|
|||
});
|
||||
|
||||
// Build
|
||||
if (!watchMode) {
|
||||
let isBuild = typeof fileEmitter === 'function';
|
||||
if (isBuild) {
|
||||
const pathname = decodeURI(url.pathname);
|
||||
const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
|
||||
|
||||
const handle = fileEmitter({
|
||||
name: filename,
|
||||
source: await fs.readFile(url),
|
||||
type: 'asset',
|
||||
});
|
||||
try {
|
||||
// fileEmitter throws in dev
|
||||
const handle = fileEmitter!({
|
||||
name: filename,
|
||||
source: await fs.readFile(url),
|
||||
type: 'asset',
|
||||
});
|
||||
|
||||
emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
|
||||
} else {
|
||||
emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
|
||||
} catch {
|
||||
isBuild = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isBuild) {
|
||||
// Pass the original file information through query params so we don't have to load the file twice
|
||||
url.searchParams.append('origWidth', fileMetadata.width.toString());
|
||||
url.searchParams.append('origHeight', fileMetadata.height.toString());
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ export default function assets({
|
|||
mode,
|
||||
}: AstroPluginOptions & { mode: string }): vite.Plugin[] {
|
||||
let resolvedConfig: vite.ResolvedConfig;
|
||||
let shouldEmitFile = false;
|
||||
|
||||
globalThis.astroAsset = {
|
||||
referencedImages: new Set(),
|
||||
|
|
@ -194,6 +195,9 @@ export default function assets({
|
|||
{
|
||||
name: 'astro:assets:esm',
|
||||
enforce: 'pre',
|
||||
config(_, env) {
|
||||
shouldEmitFile = env.command === 'build';
|
||||
},
|
||||
configResolved(viteConfig) {
|
||||
resolvedConfig = viteConfig;
|
||||
},
|
||||
|
|
@ -214,7 +218,8 @@ export default function assets({
|
|||
return;
|
||||
}
|
||||
|
||||
const imageMetadata = await emitESMImage(id, this.meta.watchMode, this.emitFile);
|
||||
const emitFile = shouldEmitFile ? this.emitFile : undefined;
|
||||
const imageMetadata = await emitESMImage(id, this.meta.watchMode, emitFile);
|
||||
|
||||
if (!imageMetadata) {
|
||||
throw new AstroError({
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import { apply as applyPolyfill } from '../../core/polyfill.js';
|
|||
import { ensureProcessNodeEnv, parseNpmName } from '../../core/util.js';
|
||||
import { eventCliSession, telemetry } from '../../events/index.js';
|
||||
import { createLoggerFromFlags, flagsToAstroInlineConfig } from '../flags.js';
|
||||
import { fetchPackageJson, fetchPackageVersions } from '../install-package.js';
|
||||
import { generate, parse, t, visit } from './babel.js';
|
||||
import { ensureImport } from './imports.js';
|
||||
import { wrapDefaultExport } from './wrapper.js';
|
||||
|
|
@ -95,26 +96,6 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP: Record<string, string> = {
|
|||
node: '@astrojs/node',
|
||||
};
|
||||
|
||||
// Users might lack access to the global npm registry, this function
|
||||
// checks the user's project type and will return the proper npm registry
|
||||
//
|
||||
// A copy of this function also exists in the create-astro package
|
||||
let _registry: string;
|
||||
async function getRegistry(): Promise<string> {
|
||||
if (_registry) return _registry;
|
||||
const fallback = 'https://registry.npmjs.org';
|
||||
const packageManager = (await preferredPM(process.cwd()))?.name || 'npm';
|
||||
try {
|
||||
const { stdout } = await execa(packageManager, ['config', 'get', 'registry']);
|
||||
_registry = stdout?.trim()?.replace(/\/$/, '') || fallback;
|
||||
// Detect cases where the shell command returned a non-URL (e.g. a warning)
|
||||
if (!new URL(_registry).host) _registry = fallback;
|
||||
} catch (e) {
|
||||
_registry = fallback;
|
||||
}
|
||||
return _registry;
|
||||
}
|
||||
|
||||
export async function add(names: string[], { flags }: AddOptions) {
|
||||
ensureProcessNodeEnv('production');
|
||||
applyPolyfill();
|
||||
|
|
@ -805,39 +786,6 @@ async function tryToInstallIntegrations({
|
|||
}
|
||||
}
|
||||
|
||||
async function fetchPackageJson(
|
||||
scope: string | undefined,
|
||||
name: string,
|
||||
tag: string
|
||||
): Promise<Record<string, any> | Error> {
|
||||
const packageName = `${scope ? `${scope}/` : ''}${name}`;
|
||||
const registry = await getRegistry();
|
||||
const res = await fetch(`${registry}/${packageName}/${tag}`);
|
||||
if (res.status >= 200 && res.status < 300) {
|
||||
return await res.json();
|
||||
} else if (res.status === 404) {
|
||||
// 404 means the package doesn't exist, so we don't need an error message here
|
||||
return new Error();
|
||||
} else {
|
||||
return new Error(`Failed to fetch ${registry}/${packageName}/${tag} - GET ${res.status}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchPackageVersions(packageName: string): Promise<string[] | Error> {
|
||||
const registry = await getRegistry();
|
||||
const res = await fetch(`${registry}/${packageName}`, {
|
||||
headers: { accept: 'application/vnd.npm.install-v1+json' },
|
||||
});
|
||||
if (res.status >= 200 && res.status < 300) {
|
||||
return await res.json().then((data) => Object.keys(data.versions));
|
||||
} else if (res.status === 404) {
|
||||
// 404 means the package doesn't exist, so we don't need an error message here
|
||||
return new Error();
|
||||
} else {
|
||||
return new Error(`Failed to fetch ${registry}/${packageName} - GET ${res.status}`);
|
||||
}
|
||||
}
|
||||
|
||||
export async function validateIntegrations(integrations: string[]): Promise<IntegrationInfo[]> {
|
||||
const spinner = ora('Resolving packages...').start();
|
||||
try {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue