Skip to content

Commit eafa243

Browse files
sarah11918sarah11918
authored
Merge branch 'v3-upgrade-guide' into css-bundle-control
2 parents 9dfe633 + 1f8262f commit eafa243

49 files changed

Lines changed: 2071 additions & 580 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = {
99
ecmaVersion: 'latest',
1010
sourceType: 'module',
1111
},
12-
rules: {},
12+
rules: {
13+
'no-mixed-spaces-and-tabs': 'off',
14+
},
1315
settings: {
1416
react: {
1517
pragma: 'h',

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"p-retry": "^5.1.1",
7676
"parse-numeric-range": "^1.3.0",
7777
"preact": "^10.16.0",
78-
"prettier": "^2.8.8",
79-
"prettier-plugin-astro": "^0.8.0",
78+
"prettier": "^3.0.2",
79+
"prettier-plugin-astro": "^0.11.1",
8080
"prompts": "^2.4.2",
8181
"rehype": "^12.0.1",
8282
"remark": "^14.0.2",

‎pnpm-lock.yaml‎

Lines changed: 23 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/index.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,9 @@ h2.heading {
460460

461461
.header-link {
462462
font-size: 1em;
463-
transition: border-inline-start-color 100ms ease-out, background-color 200ms ease-out;
463+
transition:
464+
border-inline-start-color 100ms ease-out,
465+
background-color 200ms ease-out;
464466
}
465467

466468
a.header-link {

‎scripts/lib/translation-status/builder.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable no-mixed-spaces-and-tabs */
21
import dedent from 'dedent-js';
32
import glob from 'fast-glob';
43
import fs from 'fs';

‎scripts/lib/translation-status/template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html dir="ltr" lang="en">
33
<head>
44
<meta charset="utf-8" />

‎src/components/Header/ThemeToggleButton.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
.theme-toggle > label:focus-within {
1414
outline: 2px solid transparent;
15-
box-shadow: 0 0 0 0.08em var(--theme-accent), 0 0 0 0.12em white;
15+
box-shadow:
16+
0 0 0 0.08em var(--theme-accent),
17+
0 0 0 0.12em white;
1618
}
1719

1820
.theme-toggle > label {

‎src/content/docs/en/core-concepts/layouts.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ function fancyJsHelper() {
215215

216216
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:
217217

218-
```astro "fancyJsHelper" "title"
218+
```astro /{?title}?/ "fancyJsHelper" "{fancyJsHelper()}"
219219
---
220220
// src/layouts/BaseLayout.astro
221221
const { title, fancyJsHelper } = Astro.props;
@@ -233,7 +233,7 @@ const { title, fancyJsHelper } = Astro.props;
233233

234234
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.
235235

236-
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:
236+
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:
237237

238238
```astro /{?title}?/ /Astro.props[.a-z]*/
239239
---

0 commit comments

Comments
 (0)