Merge branch 'main' into main

Author: chenglu

.github/workflows/build.yml

@@ -25,16 +25,16 @@ jobs:
         include:
           - name: "Beta channel"
             branch: beta
-            experimental: true
+            experimental: false
           - name: "Stable channel"
             branch: stable
-            experimental: false
+            experimental: true
     continue-on-error: ${{ matrix.experimental }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
-      - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
+      - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
         with:
           channel: ${{ matrix.branch }}
       - name: Fetch Dart dependencies
@@ -55,12 +55,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: stable
+          sdk: beta
       - name: Fetch Dart dependencies
         run: dart pub get
       - name: Check if excerpts are up to date
@@ -73,22 +73,22 @@ jobs:
     if: |
       github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
       - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b
+        run: npm i -g corepack@latest && corepack enable
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'pnpm'
       - name: Setup pnpm
         run: corepack install
       - name: Install node dependencies
         run: pnpm install --frozen-lockfile
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: stable
+          sdk: beta
       - name: Fetch Dart dependencies
         run: dart pub get
       - name: Build site
@@ -106,12 +106,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: stable
+          sdk: beta
       - name: Fetch Dart dependencies
         run: dart pub get
       - name: Validate the firebase.json file
@@ -126,26 +126,28 @@ jobs:
       github.ref == 'refs/heads/main' &&
       github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
+          # docs.flutter.cn | https://github.com/cfug/flutter.cn/pull/1518
+          fetch-depth: 0
       - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b
+        run: npm i -g corepack@latest && corepack enable
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'pnpm'
       - name: Setup pnpm
         run: corepack install
       - name: Install node dependencies
         run: pnpm install --frozen-lockfile
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: stable
+          sdk: beta
       - name: Fetch Dart dependencies
         run: dart pub get
       - name: Build site
-        run: dart run flutter_site build
+        run: dart run flutter_site build --release
       - name: Translated (docs.flutter.cn)
         run: bash tool/translator/build.sh
         shell: bash

.github/workflows/stage.yml

@@ -20,26 +20,28 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.head.repo.full_name == 'cfug/flutter.cn' }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           submodules: recursive
+          # docs.flutter.cn | https://github.com/cfug/flutter.cn/pull/1518
+          fetch-depth: 0
       - name: Enable Corepack
-        run: corepack enable
-      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b
+        run: npm i -g corepack@latest && corepack enable
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'pnpm'
       - name: Setup pnpm
         run: corepack install
       - name: Install node dependencies
         run: pnpm install --frozen-lockfile
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
+      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: stable
+          sdk: beta
       - name: Fetch Dart dependencies
         run: dart pub get
       - name: Build site
-        run: dart run flutter_site build
+        run: dart run flutter_site build --release
       - name: Translated (docs.flutter.cn)
         run: bash tool/translator/build.sh
         shell: bash

.gitignore

@@ -21,3 +21,6 @@ node_modules
 package-lock.json
 pubspec.lock
 tmp/
+
+# Temporary as codelabs used to be a submodule
+examples/codelabs

.gitmodules

@@ -2,6 +2,3 @@
 	path = site-shared
 	url = https://github.com/dart-lang/site-shared
 	branch = main
-[submodule "examples/codelabs"]
-	path = examples/codelabs
-	url = https://github.com/flutter/codelabs

.idx/dev.nix

@@ -0,0 +1,51 @@
+# To learn more about how to use Nix to configure your environment
+# see: https://developers.google.com/idx/guides/customize-idx-env
+{ pkgs, ... }: {
+  # Which nixpkgs channel to use.
+  channel = "stable-24.11"; # or "unstable"
+
+  # Use https://search.nixos.org/packages to find packages
+  packages = [
+    pkgs.nodejs_22
+    pkgs.pnpm
+  ];
+
+  # Sets environment variables in the workspace
+  env = {};
+  idx = {
+    # Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
+    extensions = [
+      "Dart-Code.flutter"
+      "Dart-Code.dart-code"
+    ];
+
+    # Enable previews
+    previews = {
+      enable = true;
+      previews = {
+        web = {
+          command = ["./dash_site" "serve"];
+          manager = "web";
+          env = {
+            # Environment variables to set for your server
+            PORT = "$PORT";
+          };
+        };
+      };
+    };
+
+    # Workspace lifecycle hooks
+    workspace = {
+      # Runs when a workspace is first created
+      onCreate = {
+        get-submodule = "git submodule update --init --recursive";
+        pnpm-install = "pnpm install";
+      };
+      # Runs when the workspace is (re)started
+      onStart = {
+        # Example: start a background task to watch and re-build backend code
+        # watch-backend = "npm run watch-backend";
+      };
+    };
+  };
+}

CONTRIBUTING.md

@@ -60,5 +60,5 @@ Happy Fluttering!
 [doc-PRs]: https://github.com/flutter/website/pulls
 [so]: https://stackoverflow.com/tags/flutter
 [mailinglist]: https://groups.google.com/d/forum/flutter-dev
-[chat]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
+[chat]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
 [reddit]: https://www.reddit.com/r/FlutterDev

README.md

@@ -7,9 +7,6 @@
 The [documentation site][Flutter] for the [Flutter framework][],
 built with [Eleventy][] and hosted on [Firebase][].
 
-[![Build Status][]][Repo on GitHub Actions]
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/flutter/website/badge)](https://deps.dev/project/github/flutter%2Fwebsite)
-
 [Flutter framework]: https://flutter.dev
 [Eleventy]: https://11ty.dev/
 [Firebase]: https://firebase.google.com/
@@ -18,6 +15,21 @@ built with [Eleventy][] and hosted on [Firebase][].
 [Flutter]: https://docs.flutter.dev/
 [Repo on GitHub Actions]: https://github.com/flutter/website/actions?query=workflow%3Abuild+branch%3Amain
 
+<a href="https://idx.google.com/import?url=https%3A%2F%2Fgithub.com%2Fflutter%2Fwebsite">
+  <picture>
+    <source
+      media="(prefers-color-scheme: dark)"
+      srcset="https://cdn.idx.dev/btn/open_dark_32.svg">
+    <source
+      media="(prefers-color-scheme: light)"
+      srcset="https://cdn.idx.dev/btn/open_light_32.svg">
+    <img
+      height="32"
+      alt="Open in IDX"
+      src="https://cdn.idx.dev/btn/open_purple_32.svg">
+  </picture>
+</a>
+
 ## Issues, bugs, and requests
 
 We welcome contributions and feedback on our website. 
@@ -30,8 +42,8 @@ it's easiest to make changes using the GitHub UI.
 If you have an issue with the 
 API docs on [api.flutter.dev](https://api.flutter.dev), 
 please file those issues on 
-the [flutter/flutter](https://github.com/flutter/flutter/issues) repo, 
-not on this (flutter/website) repo. 
+the [`flutter/flutter`](https://github.com/flutter/flutter/issues) repo, 
+not on this (`flutter/website`) repo. 
 The API docs are embedded in Flutter's source code, 
 so the engineering team handles those.
 
@@ -117,7 +129,7 @@ If you prefer, you can use a version manager such as [nvm][],
 and run `nvm install` from the repository's root directory.
 
 If you already have Node installed, verify it's available on your path
-and already the latest stable version _(currently `20.12` or later)_:
+and already the latest stable version _(currently `22.12` or later)_:
 
 ```console
 node --version
@@ -188,7 +200,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
    dart pub get
    ```
 
-3. (optional - We highly recommend you use `pnpm`, but you can also use `npm`.)
+3. _Optional:_ We recommend you use `pnpm`, but you can also use `npm`.
    Install `pnpm`, an alternative, efficient package manager for
    npm packages. If you already have `pnpm`, verify you have the
    latest stable version.
@@ -197,7 +209,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
    node --version
    ```
 
-   If you do not already have `pnpm` installed, we recommend
+   If you don't already have `pnpm` installed, we recommend
    using [`corepack`][] to install and manage `pnpm` versions,
    since `corepack` is bundled with most installations of
    Node. If you installed `node` using Homebrew, you'll need
@@ -220,7 +232,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
    To install [`pnpm`][] without using `corepack`, you
    can use your preferred [installation method][pnpm-install].
 
-5. (optional) Once you have `pnpm` installed and setup,
+5. _(optional)_ Once you have `pnpm` installed and setup,
    fetch the site's npm dependencies using `pnpm install`.
    We highly recommend you use `pnpm`, but you can also use `npm`.
 
@@ -294,7 +306,7 @@ and we'll try our best to help you.
 You can also chat with us on the `#hackers-devrel` channel
 on the [Flutter contributors Discord][]!
 
-[Flutter contributors Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
+[Flutter contributors Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
 
 ### Refresh code excerpts
 
@@ -315,7 +327,7 @@ run `./dash_site refresh-excerpts`.
 To learn more about creating, editing, and using code excerpts,
 check out the [excerpt updater package documentation][].
 
-[excerpt updater package documentation]: https://github.com/dart-lang/site-shared/tree/main/packages/excerpter#readme
+[excerpt updater package documentation]: https://github.com/dart-lang/site-shared/tree/main/pkgs/excerpter#readme
 
 ## [Optional] Deploy to a staging site
 
@@ -348,7 +360,7 @@ you can build a full version and upload it to Firebase.
    ./dash_site build
    ```
 
-   This will build the site and copy it to your local `_site` directory.
+   This builds the site and copies it to your local `_site` directory.
    If that directory previously existed, it will be replaced.
 
 3. Deploy to your activated Firebase project's default hosting site:

analysis_options.yaml

@@ -1,2 +1,2 @@
 analyzer:
-  exclude: [flutter, site-shared, src, tmp, 'examples/codelabs']
+  exclude: [_site, flutter, site-shared, src, tmp]

dash_site

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-REQUIRED_DART_VERSION="3.5"
-REQUIRED_NODE_VERSION="20.12"
-REQUIRED_PNPM_VERSION="9.0"
+REQUIRED_DART_VERSION="3.6"
+REQUIRED_NODE_VERSION="22.11"
+REQUIRED_PNPM_VERSION="9.12"
 
 # Check that the 'dart' command is available on the user's path.
 if ! command -v dart &> /dev/null; then
@@ -79,6 +79,10 @@ if command -v pnpm &> /dev/null; then
     echo "pnpm version $pnpm_version is too low. Version $REQUIRED_PNPM_VERSION or later is required."
     exit 1
   fi
+
+  # If using pnpm, update the dependencies silently as it is quick.
+  echo "Verifying npm dependencies are up to date..."
+  pnpm install --silent
 fi
 
 # Verify that Node packages have been installed.