Skip to content

Commit

Permalink
Merge branch 'main' into feat/db-libsql-remote
Browse files Browse the repository at this point in the history
  • Loading branch information
Fryuni committed Jul 25, 2024
2 parents 073d507 + 02c85b5 commit a50fc28
Show file tree
Hide file tree
Showing 360 changed files with 8,312 additions and 2,969 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-pillows-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Excludes hoisted scripts and styles from Astro components imported with `?url` or `?raw`
5 changes: 0 additions & 5 deletions .changeset/curvy-elephants-fry.md

This file was deleted.

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

Remove "SSR Only" mention in `Astro.redirect` inline documentation and update reference link.
5 changes: 5 additions & 0 deletions .changeset/new-melons-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a case where the build was failing when `experimental.actions` was enabled, an adapter was in use, and there were not actions inside the user code base.
5 changes: 5 additions & 0 deletions .changeset/tidy-needles-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue in content collection caching, where two documents with the same contents were generating an error during the build.
5 changes: 5 additions & 0 deletions .changeset/violet-coats-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes `astro add` for packages with only prerelease versions
3 changes: 2 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@biomejs/biome",
"@types/node",
"@preact/preset-vite", // v2.8.3 starts to use Vite's esbuild for perf, but this conflicts with the react plugin
"preact-render-to-string", // https://github.com/withastro/astro/pull/10200
"drizzle-orm", // TODO: investigate upgrade (has type issues)
"sharp",

// manually bumping workflow actions
Expand All @@ -29,5 +29,6 @@

// follow vite deps version
"postcss-load-config",
"esbuild",
],
}
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default [
// These off/configured-differently-by-default rules fit well for us
'@typescript-eslint/switch-exhaustiveness-check': 'error',
'@typescript-eslint/no-unused-vars': [
'warn',
'error',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
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": "^4.11.3"
"astro": "^4.12.2"
}
}
4 changes: 2 additions & 2 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": "^3.1.2",
"@astrojs/mdx": "^3.1.3",
"@astrojs/rss": "^4.0.7",
"@astrojs/sitemap": "^3.1.6",
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
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": "^4.11.3"
"astro": "^4.12.2"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"test": "vitest run"
},
"dependencies": {
"astro": "^4.11.3",
"astro": "^4.12.2",
"@astrojs/react": "^3.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^1.6.0"
"vitest": "^2.0.3"
},
"devDependencies": {
"@types/react-dom": "^18.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/alpinejs": "^0.4.0",
"@types/alpinejs": "^3.13.10",
"alpinejs": "^3.14.1",
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
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": "^4.3.0",
"@webcomponents/template-shadowroot": "^0.2.1",
"astro": "^4.11.3",
"astro": "^4.12.2",
"lit": "^3.1.4"
}
}
12 changes: 6 additions & 6 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.5.0",
"@astrojs/preact": "^3.5.1",
"@astrojs/react": "^3.6.0",
"@astrojs/solid-js": "^4.4.0",
"@astrojs/svelte": "^5.6.0",
"@astrojs/svelte": "^5.7.0",
"@astrojs/vue": "^4.5.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^4.11.3",
"preact": "^10.22.0",
"astro": "^4.12.2",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.33"
}
}
8 changes: 4 additions & 4 deletions examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/preact": "^3.5.0",
"@preact/signals": "^1.2.3",
"astro": "^4.11.3",
"preact": "^10.22.0"
"@astrojs/preact": "^3.5.1",
"@preact/signals": "^1.3.0",
"astro": "^4.12.2",
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@astrojs/react": "^3.6.0",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^4.11.3",
"astro": "^4.12.2",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^4.4.0",
"astro": "^4.11.3",
"solid-js": "^1.8.17"
"astro": "^4.12.2",
"solid-js": "^1.8.18"
}
}
4 changes: 2 additions & 2 deletions examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/svelte": "^5.6.0",
"astro": "^4.11.3",
"@astrojs/svelte": "^5.7.0",
"astro": "^4.12.2",
"svelte": "^4.2.18"
}
}
4 changes: 2 additions & 2 deletions examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@astrojs/vue": "^4.5.0",
"astro": "^4.11.3",
"vue": "^3.4.30"
"astro": "^4.12.2",
"vue": "^3.4.33"
}
}
2 changes: 1 addition & 1 deletion examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"dependencies": {
"@astrojs/node": "^8.3.2",
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^4.11.3"
"astro": "^4.12.2"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/middleware/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"@astrojs/node": "^8.3.2",
"astro": "^4.11.3",
"astro": "^4.12.2",
"html-minifier": "^4.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.11.3"
"astro": "^4.12.2"
}
}
18 changes: 18 additions & 0 deletions examples/server-islands/astro.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineConfig } from 'astro/config';
import nodejs from '@astrojs/node';
import react from '@astrojs/react';
import tailwind from '@astrojs/tailwind';

// https://astro.build/config
export default defineConfig({
output: 'server',
adapter: nodejs({ mode: 'standalone' }),
integrations: [
react(),
tailwind({ applyBaseStyles: false })
],
devToolbar: { enabled: false },
experimental: {
serverIslands: true,
}
});
26 changes: 26 additions & 0 deletions examples/server-islands/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "@example/server-islands",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro build",
"preview": "astro preview",
"astro": "astro"
},
"devDependencies": {
"@astrojs/node": "^8.3.2",
"@astrojs/react": "^3.6.0",
"@astrojs/tailwind": "^5.1.0",
"@fortawesome/fontawesome-free": "^6.6.0",
"@tailwindcss/forms": "^0.5.7",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^4.12.2",
"postcss": "^8.4.39",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.6"
}
}
Loading

0 comments on commit a50fc28

Please sign in to comment.