Merge branch 'main' into feat/squoosh-lib

This commit is contained in:
Tony Sullivan 2022-09-13 20:00:36 +00:00 committed by GitHub
commit 1eb03cb88d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 104 additions and 65 deletions

View file

@ -1,5 +0,0 @@
---
'@astrojs/netlify': patch
---
Fix route validation failures on Netlify Edge

View file

@ -1,5 +0,0 @@
---
'astro': patch
---
Use import order to sort CSS in the build

View file

@ -1,5 +1,6 @@
{
"name": "@example/basics",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/blog",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"@astrojs/mdx": "^0.11.1",
"@astrojs/rss": "^1.0.1",
"@astrojs/sitemap": "^1.0.0"

View file

@ -2,7 +2,7 @@
export interface Props extends astroHTML.JSX.AnchorHTMLAttributes {}
const { href, class: className, ...props } = Astro.props;
const isActive = href === Astro.url.pathname;
const isActive = href === Astro.url.pathname.replace(/\/$/, '');
---
<a href={href} class:list={[className, { active: isActive }]} {...props}>

View file

@ -0,0 +1,10 @@
import { defineConfig } from 'astro/config';
// https://astro.build/config
export default defineConfig({
vite: {
ssr: {
noExternal: ['@example/my-component'],
},
},
});

View file

@ -15,9 +15,9 @@
],
"scripts": {},
"devDependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
},
"peerDependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/docs",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -11,7 +12,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"preact": "^10.7.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-alpine",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"alpinejs": "^3.10.2",
"@astrojs/alpinejs": "^0.1.2",
"@types/alpinejs": "^3.7.0"

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-lit",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"lit": "^2.2.5",
"@astrojs/lit": "^1.0.0",
"@webcomponents/template-shadowroot": "^0.1.0"

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-multiple",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"preact": "^10.7.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-preact",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"preact": "^10.7.3",
"@astrojs/preact": "^1.1.0"
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-react",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"@astrojs/react": "^1.1.2",

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-solid",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"solid-js": "^1.4.3",
"@astrojs/solid-js": "^1.1.0"
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-svelte",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -12,6 +13,6 @@
"dependencies": {
"svelte": "^3.48.0",
"@astrojs/svelte": "^1.0.0",
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/framework-vue",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"vue": "^3.2.37",
"@astrojs/vue": "^1.0.2"
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/minimal",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/non-html-pages",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/portfolio",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/ssr",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -12,7 +13,7 @@
},
"devDependencies": {},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"svelte": "^3.48.0",
"@astrojs/svelte": "^1.0.0",
"@astrojs/node": "^1.0.1",

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-markdown-plugins",
"type": "module",
"version": "0.0.2",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"@astrojs/markdown-remark": "^1.1.0",
"hast-util-select": "5.0.1",
"rehype-autolink-headings": "^6.1.1",

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-markdown-shiki",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,6 +11,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2"
"astro": "^1.2.3"
}
}

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-mdx",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"preact": "^10.6.5",
"@astrojs/preact": "^1.1.0",
"@astrojs/mdx": "^0.11.1"

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-nanostores",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"preact": "^10.7.3",
"@astrojs/preact": "^1.1.0",
"nanostores": "^0.5.12",

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-tailwindcss",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,8 +11,8 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"@astrojs/tailwind": "^1.0.0",
"astro": "^1.2.3",
"@astrojs/tailwind": "^1.0.1",
"autoprefixer": "^10.4.7",
"canvas-confetti": "^1.5.1",
"postcss": "^8.4.14",

View file

@ -1,5 +1,6 @@
{
"name": "@example/with-vite-plugin-pwa",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
@ -10,7 +11,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"vite-plugin-pwa": "0.11.11",
"workbox-window": "^6.5.3"
}

View file

@ -1,7 +1,7 @@
{
"name": "@example/with-vitest",
"version": "0.0.1",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "astro dev",
@ -12,7 +12,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^1.2.2",
"astro": "^1.2.3",
"vitest": "^0.20.3"
}
}

View file

@ -1,5 +1,11 @@
# astro
## 1.2.3
### Patch Changes
- [#4724](https://github.com/withastro/astro/pull/4724) [`6efafa4b0`](https://github.com/withastro/astro/commit/6efafa4b0e392563d5375ec62ac6e3ac8372ec61) Thanks [@matthewp](https://github.com/matthewp)! - Use import order to sort CSS in the build
## 1.2.2
### Patch Changes

View file

@ -1,6 +1,6 @@
{
"name": "astro",
"version": "1.2.2",
"version": "1.2.3",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module",
"author": "withastro",

View file

@ -1,5 +1,11 @@
# @astrojs/netlify
## 1.0.3
### Patch Changes
- [#4722](https://github.com/withastro/astro/pull/4722) [`4bc70f354`](https://github.com/withastro/astro/commit/4bc70f3545ab950da306de9c5417a08a7532fa28) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix route validation failures on Netlify Edge
## 1.0.2
### Patch Changes

View file

@ -1,7 +1,7 @@
{
"name": "@astrojs/netlify",
"description": "Deploy your site to Netlify",
"version": "1.0.2",
"version": "1.0.3",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",

View file

@ -1,5 +1,11 @@
# @astrojs/tailwind
## 1.0.1
### Patch Changes
- [#4662](https://github.com/withastro/astro/pull/4662) [`8cfb3fb53`](https://github.com/withastro/astro/commit/8cfb3fb535a16ebb1c185de2609435fdd7954611) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Update README to reference a `.cjs` config file
## 1.0.0
### Major Changes

View file

@ -93,7 +93,7 @@ import tailwind from '@astrojs/tailwind';
export default {
integrations: [tailwind({
// Example: Provide a custom path to a Tailwind config file
config: { path: './custom-config.js' },
config: { path: './custom-config.cjs' },
})],
}
```

View file

@ -1,7 +1,7 @@
{
"name": "@astrojs/tailwind",
"description": "Tailwind + Astro Integrations",
"version": "1.0.0",
"version": "1.0.1",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",

View file

@ -56,7 +56,7 @@ importers:
examples/basics:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
dependencies:
astro: link:../../packages/astro
@ -65,7 +65,7 @@ importers:
'@astrojs/mdx': ^0.11.1
'@astrojs/rss': ^1.0.1
'@astrojs/sitemap': ^1.0.0
astro: ^1.2.2
astro: ^1.2.3
dependencies:
'@astrojs/mdx': link:../../packages/integrations/mdx
'@astrojs/rss': link:../../packages/astro-rss
@ -74,7 +74,7 @@ importers:
examples/component:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
devDependencies:
astro: link:../../packages/astro
@ -88,7 +88,7 @@ importers:
'@types/node': ^18.0.0
'@types/react': ^17.0.45
'@types/react-dom': ^18.0.0
astro: ^1.2.2
astro: ^1.2.3
preact: ^10.7.3
react: ^18.1.0
react-dom: ^18.1.0
@ -111,7 +111,7 @@ importers:
'@astrojs/alpinejs': ^0.1.2
'@types/alpinejs': ^3.7.0
alpinejs: ^3.10.2
astro: ^1.2.2
astro: ^1.2.3
dependencies:
'@astrojs/alpinejs': link:../../packages/integrations/alpinejs
'@types/alpinejs': 3.7.0
@ -122,7 +122,7 @@ importers:
specifiers:
'@astrojs/lit': ^1.0.0
'@webcomponents/template-shadowroot': ^0.1.0
astro: ^1.2.2
astro: ^1.2.3
lit: ^2.2.5
dependencies:
'@astrojs/lit': link:../../packages/integrations/lit
@ -137,7 +137,7 @@ importers:
'@astrojs/solid-js': ^1.1.0
'@astrojs/svelte': ^1.0.0
'@astrojs/vue': ^1.0.2
astro: ^1.2.2
astro: ^1.2.3
preact: ^10.7.3
react: ^18.1.0
react-dom: ^18.1.0
@ -161,7 +161,7 @@ importers:
examples/framework-preact:
specifiers:
'@astrojs/preact': ^1.1.0
astro: ^1.2.2
astro: ^1.2.3
preact: ^10.7.3
dependencies:
'@astrojs/preact': link:../../packages/integrations/preact
@ -173,7 +173,7 @@ importers:
'@astrojs/react': ^1.1.2
'@types/react': ^18.0.10
'@types/react-dom': ^18.0.5
astro: ^1.2.2
astro: ^1.2.3
react: ^18.1.0
react-dom: ^18.1.0
dependencies:
@ -187,7 +187,7 @@ importers:
examples/framework-solid:
specifiers:
'@astrojs/solid-js': ^1.1.0
astro: ^1.2.2
astro: ^1.2.3
solid-js: ^1.4.3
dependencies:
'@astrojs/solid-js': link:../../packages/integrations/solid
@ -197,7 +197,7 @@ importers:
examples/framework-svelte:
specifiers:
'@astrojs/svelte': ^1.0.0
astro: ^1.2.2
astro: ^1.2.3
svelte: ^3.48.0
dependencies:
'@astrojs/svelte': link:../../packages/integrations/svelte
@ -207,7 +207,7 @@ importers:
examples/framework-vue:
specifiers:
'@astrojs/vue': ^1.0.2
astro: ^1.2.2
astro: ^1.2.3
vue: ^3.2.37
dependencies:
'@astrojs/vue': link:../../packages/integrations/vue
@ -216,19 +216,19 @@ importers:
examples/minimal:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
dependencies:
astro: link:../../packages/astro
examples/non-html-pages:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
dependencies:
astro: link:../../packages/astro
examples/portfolio:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
dependencies:
astro: link:../../packages/astro
@ -236,7 +236,7 @@ importers:
specifiers:
'@astrojs/node': ^1.0.1
'@astrojs/svelte': ^1.0.0
astro: ^1.2.2
astro: ^1.2.3
concurrently: ^7.2.1
lightcookie: ^1.0.25
svelte: ^3.48.0
@ -255,7 +255,7 @@ importers:
examples/with-markdown-plugins:
specifiers:
'@astrojs/markdown-remark': ^1.1.0
astro: ^1.2.2
astro: ^1.2.3
hast-util-select: 5.0.1
rehype-autolink-headings: ^6.1.1
rehype-slug: ^5.0.1
@ -272,7 +272,7 @@ importers:
examples/with-markdown-shiki:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
dependencies:
astro: link:../../packages/astro
@ -280,7 +280,7 @@ importers:
specifiers:
'@astrojs/mdx': ^0.11.1
'@astrojs/preact': ^1.1.0
astro: ^1.2.2
astro: ^1.2.3
preact: ^10.6.5
dependencies:
'@astrojs/mdx': link:../../packages/integrations/mdx
@ -292,7 +292,7 @@ importers:
specifiers:
'@astrojs/preact': ^1.1.0
'@nanostores/preact': ^0.1.3
astro: ^1.2.2
astro: ^1.2.3
nanostores: ^0.5.12
preact: ^10.7.3
dependencies:
@ -304,8 +304,8 @@ importers:
examples/with-tailwindcss:
specifiers:
'@astrojs/tailwind': ^1.0.0
astro: ^1.2.2
'@astrojs/tailwind': ^1.0.1
astro: ^1.2.3
autoprefixer: ^10.4.7
canvas-confetti: ^1.5.1
postcss: ^8.4.14
@ -320,7 +320,7 @@ importers:
examples/with-vite-plugin-pwa:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
vite-plugin-pwa: 0.11.11
workbox-window: ^6.5.3
dependencies:
@ -330,7 +330,7 @@ importers:
examples/with-vitest:
specifiers:
astro: ^1.2.2
astro: ^1.2.3
vitest: ^0.20.3
dependencies:
astro: link:../../packages/astro