Skip to content

Commit 4fe9e72

Browse files
authored
Node and pnpm related updates and cleanup (#11808)
1 parent beab5c7 commit 4fe9e72

File tree

5 files changed

+244
-259
lines changed

5 files changed

+244
-259
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
permissions: read-all
1515

1616
env:
17-
NODE_VERSION: 20
17+
NODE_VERSION: 22
1818

1919
jobs:
2020
test:

README.md

+24-24
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

+1-1
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

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"node": ">=22.11.0",
1313
"pnpm": ">=9.12.3"
1414
},
15-
"packageManager": "pnpm@10.5.0",
15+
"packageManager": "pnpm@10.6.2",
1616
"scripts": {
1717
"serve": "PRODUCTION=false tsx node_modules/@11ty/eleventy/cmd.cjs --serve --config=eleventy.config.ts",
1818
"build-site-for-staging": "PRODUCTION=false OPTIMIZE=true tsx node_modules/@11ty/eleventy/cmd.cjs --config=eleventy.config.ts",
@@ -22,8 +22,8 @@
2222
"@11ty/eleventy": "^3.0.0",
2323
"@types/hast": "^3.0.4",
2424
"@types/markdown-it": "^14.1.2",
25-
"@types/node": "^22.13.5",
26-
"firebase-tools": "^13.31.2",
25+
"@types/node": "^22.13.10",
26+
"firebase-tools": "^13.34.0",
2727
"hast-util-from-html": "^2.0.3",
2828
"hast-util-select": "^6.0.4",
2929
"hast-util-to-html": "^9.0.5",
@@ -37,7 +37,7 @@
3737
"markdown-it-deflist": "^3.0.0",
3838
"markdown-it-footnote": "^4.0.0",
3939
"sass": "^1.85.1",
40-
"shiki": "^2.5.0",
40+
"shiki": "^3.2.1",
4141
"tsx": "^4.19.3"
4242
},
4343
"pnpm": {

0 commit comments

Comments
 (0)