Merge branch 'v3-upgrade-guide' into css-bundle-control

withastro · Aug 19, 2023 · eafa243 · eafa243
2 parents 9dfe633 + 1f8262f
commit eafa243
Show file tree

Hide file tree

Showing 49 changed files with 2,071 additions and 580 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,9 @@ module.exports = {
     ecmaVersion: 'latest',
     sourceType: 'module',
   },
-  rules: {},
+  rules: {
+    'no-mixed-spaces-and-tabs': 'off',
+  },
   settings: {
     react: {
       pragma: 'h',

diff --git a/package.json b/package.json
@@ -75,8 +75,8 @@
     "p-retry": "^5.1.1",
     "parse-numeric-range": "^1.3.0",
     "preact": "^10.16.0",
-    "prettier": "^2.8.8",
-    "prettier-plugin-astro": "^0.8.0",
+    "prettier": "^3.0.2",
+    "prettier-plugin-astro": "^0.11.1",
     "prompts": "^2.4.2",
     "rehype": "^12.0.1",
     "remark": "^14.0.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/index.css b/public/index.css
@@ -460,7 +460,9 @@ h2.heading {
 
 .header-link {
 	font-size: 1em;
-	transition: border-inline-start-color 100ms ease-out, background-color 200ms ease-out;
+	transition:
+		border-inline-start-color 100ms ease-out,
+		background-color 200ms ease-out;
 }
 
 a.header-link {

diff --git a/scripts/lib/translation-status/builder.ts b/scripts/lib/translation-status/builder.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-mixed-spaces-and-tabs */
 import dedent from 'dedent-js';
 import glob from 'fast-glob';
 import fs from 'fs';

diff --git a/scripts/lib/translation-status/template.html b/scripts/lib/translation-status/template.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html dir="ltr" lang="en">
 	<head>
 		<meta charset="utf-8" />

diff --git a/src/components/Header/ThemeToggleButton.css b/src/components/Header/ThemeToggleButton.css
@@ -12,7 +12,9 @@
 
 .theme-toggle > label:focus-within {
 	outline: 2px solid transparent;
-	box-shadow: 0 0 0 0.08em var(--theme-accent), 0 0 0 0.12em white;
+	box-shadow:
+		0 0 0 0.08em var(--theme-accent),
+		0 0 0 0.12em white;
 }
 
 .theme-toggle > label {

diff --git a/src/content/docs/en/core-concepts/layouts.mdx b/src/content/docs/en/core-concepts/layouts.mdx
@@ -215,7 +215,7 @@ function fancyJsHelper() {
 
 Then, your values are available to you through `Astro.props` in your layout, and your MDX content will be injected into the page where your `<slot />` component is written:
 
-```astro "fancyJsHelper" "title"
+```astro /{?title}?/ "fancyJsHelper" "{fancyJsHelper()}"
 ---
 // src/layouts/BaseLayout.astro
 const { title, fancyJsHelper } = Astro.props;
@@ -233,7 +233,7 @@ const { title, fancyJsHelper } = Astro.props;
 
 A single Astro layout can be written to receive the `frontmatter` object from `.md` and `.mdx` files, as well as any named props passed from `.astro` files.
 
-In the example below, the layout will display the page title either from an Astro component passing a `title` attribute or from a frontmatter YAML `title` property:
+In the example below, the layout will display the page title either from a frontmatter YAML `title` property or from an Astro component passing a `title` attribute:
 
 ```astro /{?title}?/ /Astro.props[.a-z]*/
 ---