Skip to content

Commit 9799802

Browse files
authored
[sync] 2025/04/04 (#1552)
2 parents fc84e07 + 9aaa494 commit 9799802

File tree

598 files changed

+6213
-7476
lines changed

Some content is hidden

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

598 files changed

+6213
-7476
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
permissions: read-all
1313

1414
env:
15-
NODE_VERSION: 20
15+
NODE_VERSION: 22
1616

1717
jobs:
1818
test:
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3535
with:
3636
submodules: recursive
37-
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
37+
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
3838
with:
3939
channel: ${{ matrix.branch }}
4040
- name: Fetch Dart dependencies
@@ -78,7 +78,7 @@ jobs:
7878
submodules: recursive
7979
- name: Enable Corepack
8080
run: npm i -g corepack@latest && corepack enable
81-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
81+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
8282
with:
8383
node-version: ${{ env.NODE_VERSION }}
8484
cache: 'pnpm'
@@ -133,7 +133,7 @@ jobs:
133133
fetch-depth: 0
134134
- name: Enable Corepack
135135
run: npm i -g corepack@latest && corepack enable
136-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
136+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
137137
with:
138138
node-version: ${{ env.NODE_VERSION }}
139139
cache: 'pnpm'

.github/workflows/stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fetch-depth: 0
2828
- name: Enable Corepack
2929
run: npm i -g corepack@latest && corepack enable
30-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
30+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
3131
with:
3232
node-version: ${{ env.NODE_VERSION }}
3333
cache: 'pnpm'

README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[Flutter logo]: https://github.com/dart-lang/site-shared/blob/main/src/_assets/image/flutter/icon/64.png?raw=1
44

5-
# [Flutter][] documentation website
5+
# [Flutter][] documentation website
66

77
The [documentation site][Flutter] for the [Flutter framework][],
88
built with [Eleventy][] and hosted on [Firebase][].
@@ -32,41 +32,41 @@ built with [Eleventy][] and hosted on [Firebase][].
3232

3333
## Issues, bugs, and requests
3434

35-
We welcome contributions and feedback on our website.
35+
We welcome contributions and feedback on our website.
3636
Please file a request in our
37-
[issue tracker](https://github.com/flutter/website/issues/new/choose)
38-
or create a [pull request](https://github.com/flutter/website/pulls).
39-
For simple changes (such as tweaking some text),
37+
[issue tracker](https://github.com/flutter/website/issues/new/choose)
38+
or create a [pull request](https://github.com/flutter/website/pulls).
39+
For simple changes (such as tweaking some text),
4040
it's easiest to make changes using the GitHub UI.
4141

42-
If you have an issue with the
43-
API docs on [api.flutter.dev](https://api.flutter.dev),
44-
please file those issues on
45-
the [`flutter/flutter`](https://github.com/flutter/flutter/issues) repo,
46-
not on this (`flutter/website`) repo.
47-
The API docs are embedded in Flutter's source code,
42+
If you have an issue with the
43+
API docs on [api.flutter.dev](https://api.flutter.dev),
44+
please file those issues on
45+
the [`flutter/flutter`](https://github.com/flutter/flutter/issues) repo,
46+
not on this (`flutter/website`) repo.
47+
The API docs are embedded in Flutter's source code,
4848
so the engineering team handles those.
4949

5050

5151
## Before you submit a PR
5252

53-
We love it when the community gets involved in improving our docs!
53+
We love it when the community gets involved in improving our docs!
5454
But here are a few notes to keep in mind before you submit a PR:
5555

56-
- When triaging issues,
57-
we sometimes label an issue with the tag **PRs welcome**.
56+
- When triaging issues,
57+
we sometimes label an issue with the tag **PRs welcome**.
5858
But we welcome PRs on other issues as well—
5959
it doesn't have to be tagged with that label.
60-
- Please don't run our docs through Grammarly (or similar)
60+
- Please don't run our docs through Grammarly (or similar)
6161
and submit those changes as a PR.
6262
- We follow the [Google Developer Documentation Style Guidelines][]
63-
for example, don't use "i.e." or "e.g.",
63+
for example, don't use "i.e." or "e.g.",
6464
avoid writing in first person,
6565
and avoid writing in future tense.
6666
You can start with the
67-
[style guide highlights](https://developers.google.com/style/highlights)
68-
or the [word list](https://developers.google.com/style/word-list),
69-
or use the search bar that's at the top of every style guide page.
67+
[style guide highlights](https://developers.google.com/style/highlights)
68+
or the [word list](https://developers.google.com/style/word-list),
69+
or use the search bar at the top of every style guide page.
7070

7171
> We truly thank you for your willingness and helpfulness
7272
> in keeping the website docs up to date!
@@ -83,12 +83,12 @@ you probably don't need to build this site.
8383
Often you can make changes using the GitHub UI.
8484
If needed, we can stage the changes automatically in your pull request.
8585

86-
> [!IMPORTANT]
86+
> [!IMPORTANT]
8787
> If you are cloning this repository locally,
8888
> follow the below instruction on cloning with its submodule.
8989
9090
If your change involves code samples, adds/removes pages, or affects navigation,
91-
do consider building and test your work before submitting.
91+
do consider building and testing your work before submitting.
9292

9393
If you want or need to build the site, follow the steps below.
9494

@@ -239,7 +239,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
239239
```console
240240
pnpm install
241241
```
242-
242+
243243
Rerun `pnpm install` whenever you incorporate the
244244
latest changes to the `main` branch or if you
245245
experience dependency or import errors when building the site.
@@ -318,7 +318,7 @@ in the corresponding `.dart` files.
318318

319319
The `.dart` files are the source of truth for code snippets,
320320
and the preceding `<?code-excerpt>` instructions in Markdown files specify
321-
how the snippets are copied from the `.dart` files.
321+
how the snippets are copied from the `.dart` files.
322322

323323
To resolve this error and update the Markdown snippets to match,
324324
from the root of the `website` directory,
@@ -341,7 +341,7 @@ you can build a full version and upload it to Firebase.
341341
- Navigate to the [Firebase Console](https://console.firebase.google.com)
342342
and create your own Firebase project (for example, `flutter-dev-staging`).
343343

344-
- Head back to your local terminal and verify that you are logged in.
344+
- Head back to your local terminal and verify that you're logged in.
345345

346346
```console
347347
firebase login

dash_site

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
REQUIRED_DART_VERSION="3.6"
3+
REQUIRED_DART_VERSION="3.7"
44
REQUIRED_NODE_VERSION="22.11"
55
REQUIRED_PNPM_VERSION="9.12"
66

eleventy.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export default function (eleventyConfig: UserConfig) {
7676
eleventyConfig.addPassthroughCopy('src/content/assets/js');
7777
// inject_dartpad 暂时放置在本地 tool/inject_dartpad/
7878
// eleventyConfig.addPassthroughCopy({'site-shared/pkgs/inject_dartpad/lib/inject_dartpad.js': 'assets/js/inject_dartpad.js'});
79+
eleventyConfig.addPassthroughCopy({'tool/inject_dartpad/lib/inject_dartpad.js': 'assets/js/inject_dartpad.js'});
7980
eleventyConfig.addPassthroughCopy('src/content/assets/images', { expand: true });
8081
// docs.flutter.cn - translator
8182
eleventyConfig.addPassthroughCopy('src/content/assets/translator');

examples/_animation/basic_hero_animation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >-
55
66
resolution: workspace
77
environment:
8-
sdk: ^3.7.0-0
8+
sdk: ^3.7.0
99

1010
dependencies:
1111
flutter:

examples/_animation/basic_radial_hero_animation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66
77
resolution: workspace
88
environment:
9-
sdk: ^3.7.0-0
9+
sdk: ^3.7.0
1010

1111
dependencies:
1212
flutter:

examples/_animation/basic_staggered_animation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An introductory example to staggered animations.
44

55
resolution: workspace
66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.0
88

99
dependencies:
1010
flutter:

examples/_animation/hero_animation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Shows how to create a simple Hero transition.
44

55
resolution: workspace
66
environment:
7-
sdk: ^3.7.0-0
7+
sdk: ^3.7.0
88

99
dependencies:
1010
flutter:

examples/_animation/radial_hero_animation/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66
77
resolution: workspace
88
environment:
9-
sdk: ^3.7.0-0
9+
sdk: ^3.7.0
1010

1111
dependencies:
1212
flutter:

0 commit comments

Comments
 (0)