Skip to content

Commit

Permalink
Merge branch 'next' into mdx-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@bluwy
bluwy authored Aug 19, 2024
2 parents 0005001 + 7ffcae1 commit dc3175e
Show file tree
Hide file tree
Showing 101 changed files with 1,291 additions and 1,268 deletions.
5 changes: 5 additions & 0 deletions .changeset/new-pillows-kick.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Prints prerender dynamic value usage warning only if it's used
5 changes: 5 additions & 0 deletions .changeset/smart-comics-doubt.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'create-astro': patch
---

Fixes initial git commit when initializing git
20 changes: 20 additions & 0 deletions .changeset/weak-dancers-beam.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
'@astrojs/vercel': minor
---

Deprecates the `functionPerRoute` option

This option is now deprecated, and will be removed entirely in Astro v5.0. We suggest removing this option from your configuration as soon as you are able to:

```diff
import { defineConfig } from 'astro/config';
import vercel from '@astrojs/vercel/serverless';

export default defineConfig({
// ...
output: 'server',
adapter: vercel({
- functionPerRoute: true,
}),
});
```
6 changes: 3 additions & 3 deletions examples/framework-multiple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^4.14.2",
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/preact": "^3.5.1",
"@preact/signals": "^1.3.0",
"astro": "^4.14.2",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/solid-js": "^4.4.1",
"astro": "^4.14.2",
"solid-js": "^1.8.20"
"solid-js": "^1.8.21"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/vue": "^4.5.0",
"astro": "^4.14.2",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion examples/server-islands/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"postcss": "^8.4.41",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.9"
"tailwindcss": "^3.4.10"
}
}
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/mdx": "^3.1.3",
"@astrojs/preact": "^3.5.1",
"astro": "^4.14.2",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"@nanostores/preact": "^0.5.2",
"astro": "^4.14.2",
"nanostores": "^0.11.2",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"autoprefixer": "^10.4.20",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.41",
"tailwindcss": "^3.4.9"
"tailwindcss": "^3.4.10"
}
}
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"test:smoke:example": "turbo run build --concurrency=100% --filter=\"@example/*\"",
"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:vite-ci": "cd packages/astro && pnpm run test:node",
"test:e2e": "cd packages/astro && pnpm playwright install chromium firefox && pnpm run test:e2e",
"test:e2e:match": "cd packages/astro && pnpm playwright install chromium firefox && pnpm run test:e2e:match",
"test:e2e:hosts": "turbo run test:hosted",
Expand All @@ -52,22 +52,22 @@
"astro-benchmark": "workspace:*"
},
"devDependencies": {
"@astrojs/check": "^0.9.2",
"@astrojs/check": "^0.9.3",
"@biomejs/biome": "1.8.3",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.7",
"@types/node": "^18.17.8",
"esbuild": "^0.21.5",
"eslint": "^9.9.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-regexp": "^2.6.0",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"turbo": "^2.0.12",
"turbo": "^2.0.14",
"typescript": "~5.5.4",
"typescript-eslint": "^8.0.1"
"typescript-eslint": "^8.1.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.9.2",
"@astrojs/check": "^0.9.3",
"@astrojs/db": "workspace:*",
"@astrojs/node": "workspace:*",
"@astrojs/react": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-react-19/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.9.2",
"@astrojs/check": "^0.9.3",
"@astrojs/db": "workspace:*",
"@astrojs/node": "workspace:*",
"@astrojs/react": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-envs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/client-only/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/dev-toolbar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-cyclic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/errors/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.8",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hydration-race/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/multiple-frameworks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^3.2.0",
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/namespaced-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-recursive/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.23.1",
"preact": "^10.23.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.20",
"solid-js": "^1.8.21",
"svelte": "^4.2.18",
"vue": "^3.4.37"
"vue": "^3.4.38"
},
"scripts": {
"dev": "astro dev"
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-compat-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-lazy-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.23.1"
"preact": "^10.23.2"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-circular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.20"
"solid-js": "^1.8.21"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.8.20"
"solid-js": "^1.8.21"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-recurse/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.20"
"solid-js": "^1.8.21"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"astro": "workspace:*",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.41",
"tailwindcss": "^3.4.9"
"tailwindcss": "^3.4.10"
}
}
Loading

0 comments on commit dc3175e

Please sign in to comment.