Merge branch 'main' into prefetch-styles

withastro · Sep 7, 2022 · c52979f · c52979f
2 parents 5d019fc + 98f242c
commit c52979f
Show file tree

Hide file tree

Showing 221 changed files with 4,251 additions and 3,622 deletions.
diff --git a/.changeset/chatty-foxes-bow.md b/.changeset/chatty-foxes-bow.md
diff --git a/.changeset/eleven-baboons-try.md b/.changeset/eleven-baboons-try.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/image': minor
+---
+
+Added a `background` option to specify a background color to replace transparent pixels (alpha layer).
diff --git a/.changeset/giant-beds-beam.md b/.changeset/giant-beds-beam.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Add cyclic ref detection when serializing props
diff --git a/.changeset/lucky-mirrors-type.md b/.changeset/lucky-mirrors-type.md
diff --git a/.changeset/nice-cameras-hug.md b/.changeset/nice-cameras-hug.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix bug with using `assert` as import identifier
diff --git a/.changeset/sharp-brooms-drum.md b/.changeset/sharp-brooms-drum.md
diff --git a/.changeset/swift-wolves-argue.md b/.changeset/swift-wolves-argue.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/image': patch
+---
+
+Fixes a bug related to filenames for remote images in SSG builds
diff --git a/.changeset/ten-walls-listen.md b/.changeset/ten-walls-listen.md
diff --git a/.changeset/tough-pandas-sneeze.md b/.changeset/tough-pandas-sneeze.md
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,2 @@
-* @snowpackjs/maintainers
+README.md @withastro/maintainers-docs
+packages/astro/src/@types/astro.ts @withastro/maintainers-docs
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,9 @@
 
 ## Docs
 
-<!-- Is this a visible change? You probably need to update docs! -->
+<!-- Could this affect a user’s behavior? We probably need to update docs! -->
+<!-- If docs will be needed or you’re not sure, uncomment the next line: -->
+<!-- /cc @withastro/maintainers-docs for feedback! -->
+
 <!-- DON'T DELETE THIS SECTION! If no docs added, explain why.-->
-<!-- https://github.com/withastro/docs -->
+<!-- https://github.com/withastro/docs -->
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "devDependencies": {
-    "astro": "^1.1.2"
+  "dependencies": {
+    "astro": "^1.1.6"
   }
 }
diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro
@@ -41,15 +41,19 @@ const { title } = Astro.props;
 		margin: 0;
 	}
 
-	:global(h1) {
+
+</style>
+
+<style is:global>
+	h1 {
 		font-size: var(--font-size-xl);
 	}
 
-	:global(h2) {
+	h2 {
 		font-size: var(--font-size-lg);
 	}
 
-	:global(code) {
+	code {
 		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
 			Bitstream Vera Sans Mono, Courier New, monospace;
 	}

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -9,10 +9,10 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "devDependencies": {
-    "@astrojs/mdx": "^0.10.3",
+  "dependencies": {
+    "astro": "^1.1.6",
+    "@astrojs/mdx": "^0.11.1",
     "@astrojs/rss": "^1.0.0",
-    "@astrojs/sitemap": "^1.0.0",
-    "astro": "^1.1.2"
+    "@astrojs/sitemap": "^1.0.0"
   }
 }
diff --git a/examples/blog/src/layouts/BlogPost.astro b/examples/blog/src/layouts/BlogPost.astro
@@ -18,7 +18,7 @@ const {
 } = Astro.props;
 ---
 
-<html>
+<html lang="en">
 	<head>
 		<BaseHead title={title} description={description} />
 		<style>

diff --git a/examples/blog/src/pages/blog.astro b/examples/blog/src/pages/blog.astro
@@ -11,7 +11,7 @@ const posts = (await Astro.glob('./blog/*.{md,mdx}')).sort(
 ---
 
 <!DOCTYPE html>
-<html lang="en-us">
+<html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
 		<style>
@@ -51,7 +51,7 @@ const posts = (await Astro.glob('./blog/*.{md,mdx}')).sort(
 					))}
 				</ul>
 			</section>
-			<Footer />
 		</main>
+		<Footer />
 	</body>
 </html>
diff --git a/examples/blog/src/pages/index.astro b/examples/blog/src/pages/index.astro
@@ -6,7 +6,7 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../config';
 ---
 
 <!DOCTYPE html>
-<html lang="en-us">
+<html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
 	</head>

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -11,6 +11,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.1.2"
+    "astro": "^1.1.6"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -7,7 +7,7 @@
     "build": "astro --root demo build",
     "serve": "astro --root demo preview"
   },
-  "devDependencies": {
-    "astro": "^1.1.2"
+  "dependencies": {
+    "astro": "^1.1.6"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -11,19 +11,17 @@
     "astro": "astro"
   },
   "dependencies": {
+    "astro": "^1.1.6",
+    "preact": "^10.7.3",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
+    "@astrojs/react": "^1.1.0",
+    "@astrojs/preact": "^1.0.2",
     "@algolia/client-search": "^4.13.1",
     "@docsearch/css": "^3.1.0",
     "@docsearch/react": "^3.1.0",
     "@types/react": "^17.0.45",
-    "preact": "^10.7.3",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
-  },
-  "devDependencies": {
-    "@astrojs/preact": "^1.0.2",
     "@types/node": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@astrojs/react": "^1.1.1",
-    "astro": "^1.1.2"
+    "@types/react-dom": "^18.0.0"
   }
 }
diff --git a/examples/docs/src/components/Header/Header.astro b/examples/docs/src/components/Header/Header.astro
@@ -135,13 +135,15 @@ const lang = getLanguageFromURL(currentPage);
 		max-width: 200px;
 	}
 
-	:global(.search-item > *) {
-		flex-grow: 1;
-	}
-
 	@media (min-width: 50em) {
 		.search-item {
 			max-width: 400px;
 		}
 	}
 </style>
+
+<style is:global>
+	.search-item > * {
+		flex-grow: 1;
+	}
+</style>
diff --git a/examples/docs/src/components/Header/LanguageSelect.tsx b/examples/docs/src/components/Header/LanguageSelect.tsx
@@ -36,7 +36,7 @@ const LanguageSelect: FunctionComponent<{ lang: string }> = ({ lang }) => {
 			>
 				{Object.entries(KNOWN_LANGUAGES).map(([key, value]) => {
 					return (
-						<option value={value}>
+						<option value={value} key={value}>
 							<span>{key}</span>
 						</option>
 					);

diff --git a/examples/docs/src/components/LeftSidebar/LeftSidebar.astro b/examples/docs/src/components/LeftSidebar/LeftSidebar.astro
@@ -101,13 +101,15 @@ const sidebar = SIDEBAR[langCode];
 		font-weight: 600;
 	}
 
-	:global(:root.theme-dark) .nav-link a[aria-current='page'] {
-		color: hsla(var(--color-base-white), 100%, 1);
-	}
-
 	@media (min-width: 50em) {
 		.nav-groups {
 			padding: 0;
 		}
 	}
 </style>
+
+<style is:global>
+	:root.theme-dark .nav-link a[aria-current='page'] {
+		color: hsla(var(--color-base-white), 100%, 1);
+	}
+</style>
diff --git a/examples/docs/src/layouts/MainLayout.astro b/examples/docs/src/layouts/MainLayout.astro
@@ -47,11 +47,6 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				overflow-x: hidden;
 			}
 
-			.layout :global(> *) {
-				width: 100%;
-				height: 100%;
-			}
-
 			.grid-sidebar {
 				height: 100vh;
 				position: sticky;
@@ -78,15 +73,6 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				display: none;
 			}
 
-			:global(.mobile-sidebar-toggle) {
-				overflow: hidden;
-			}
-
-			:global(.mobile-sidebar-toggle) #grid-left {
-				display: block;
-				top: 2rem;
-			}
-
 			@media (min-width: 50em) {
 				.layout {
 					overflow: initial;
@@ -116,6 +102,21 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				}
 			}
 		</style>
+		<style is:global>
+			.layout > * {
+				width: 100%;
+				height: 100%;
+			}
+
+			.mobile-sidebar-toggle {
+				overflow: hidden;
+			}
+
+			.mobile-sidebar-toggle #grid-left {
+				display: block;
+				top: 2rem;
+			}
+		</style>
 	</head>
 
 	<body>

diff --git a/examples/env-vars/.env b/examples/env-vars/.env
diff --git a/examples/env-vars/.gitignore b/examples/env-vars/.gitignore
diff --git a/examples/env-vars/.npmrc b/examples/env-vars/.npmrc
diff --git a/examples/env-vars/.stackblitzrc b/examples/env-vars/.stackblitzrc
diff --git a/examples/env-vars/.vscode/extensions.json b/examples/env-vars/.vscode/extensions.json
diff --git a/examples/env-vars/.vscode/launch.json b/examples/env-vars/.vscode/launch.json
diff --git a/examples/env-vars/README.md b/examples/env-vars/README.md
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ const { @@
     } = Astro.props;
     ---
-    <html>
+    <html lang="en">
     	<head>
     		<BaseHead title={title} description={description} />
     		<style>
@@ Expand Down @@