[sync] 2024/05/20

.devcontainer/devcontainer.json

@@ -1,22 +1,21 @@
 {
-	// Goal: Be able to run `./dash_site` once the devcontainer is up
-	// Base container includes node and pnpm
-	// Flutter is installed in the container
-	"name": "Dart & Flutter Website Development",
+	// The mcr base container includes node and pnpm.
+	// Flutter is installed in the container during creation.
+	"name": "Flutter documentation website development",
 	"image": "mcr.microsoft.com/devcontainers/javascript-node:latest",
 	"forwardPorts": [4000],
-	"remoteUser": "node",
+	"containerUser": "node",
 	"containerEnv": {
 		"FLUTTER_ROOT": "/home/node/flutter"
 	},
 	"remoteEnv": {
 		"PATH": "${containerEnv:PATH}:${containerEnv:FLUTTER_ROOT}/bin"
 	},
-	"onCreateCommand": "git clone --branch=stable https://github.com/flutter/flutter.git ${containerEnv:FLUTTER_ROOT} && ${containerEnv:FLUTTER_ROOT}/bin/flutter doctor",
+	"onCreateCommand": "git clone --branch=stable https://github.com/flutter/flutter.git ${FLUTTER_ROOT} && ${FLUTTER_ROOT}/bin/flutter doctor",
 	"postCreateCommand": "git submodule update --init --recursive && flutter pub get && corepack install && pnpm install",
 	"customizations": {
 		"vscode": {
-			"extensions": ["Dart-Code.dart-code","Dart-Code.flutter"]
+			"extensions": ["Dart-Code.dart-code", "Dart-Code.flutter"]
 		}
 	}
 }

.github/workflows/build.yml

@@ -29,15 +29,17 @@ jobs:
           - name: "Stable channel"
             branch: stable
             experimental: false
+    continue-on-error: ${{ matrix.experimental }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
           channel: ${{ matrix.branch }}
       - name: Fetch Dart dependencies
         run: dart pub get
+        continue-on-error: ${{ matrix.experimental }}
       - name: Check Dart code formatting
         run: dart run flutter_site format-dart --check
         continue-on-error: ${{ matrix.experimental }}
@@ -53,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
@@ -71,7 +73,7 @@ jobs:
     if: |
       github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - name: Enable Corepack
@@ -104,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
@@ -124,7 +126,7 @@ jobs:
       github.ref == 'refs/heads/main' &&
       github.repository == 'cfug/flutter.cn'
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - name: Enable Corepack

.github/workflows/stage.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.head.repo.full_name == 'cfug/flutter.cn' }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           submodules: recursive
       - name: Enable Corepack

.gitignore

@@ -1,4 +1,5 @@
 _site
+.cache
 .*-cache
 .*-metadata
 .DS_Store

README.md

@@ -188,22 +188,37 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
    dart pub get
    ```
 
-3. Install [`pnpm`][] using your preferred [installation method][pnpm-install].
-   `pnpm` is an alternative, efficient package manager for npm packages.
-   If you already have `pnpm`, verify you have the latest stable version.
-   We recommend using [`corepack`][] to install and manage `pnpm` versions,
-   since it is bundled with most installations of Node.
+3. Install `pnpm`, an alternative, efficient package manager for
+   npm packages. If you already have `pnpm`, verify you have the
+   latest stable version.
+
+   ```console
+   node --version
+   ```
+
+   If you do not 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
+   to install corepack separately:
+
+   ```console
+   brew install corepack
+   ```
 
    If you haven't used `corepack` before, you'll need to
    first enable it with `corepack enable`.
    Then, to install the correct `pnpm` version, from the
    root directory of the repository, run `corepack install`:
 
    ```console
-   corepack enable
+   corepack enable;
    corepack install
    ```
 
+   To install [`pnpm`][] without using `corepack`, you
+   can use your preferred [installation method][pnpm-install].
+
 4. 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`.

eleventy.config.js

@@ -37,7 +37,7 @@ export default function (eleventyConfig) {
   eleventyConfig.setLibrary('md', markdown);
 
   eleventyConfig.addDataExtension('yml,yaml', (contents) =>
-      yaml.load(contents),
+    yaml.load(contents),
   );
 
   eleventyConfig.setLiquidOptions({
@@ -53,7 +53,7 @@ export default function (eleventyConfig) {
   let _currentTabIsActive = false;
 
   // TODO(parlough): Replace samplecode with something easier.
-  eleventyConfig.addShortcode('samplecode', function(tabsTitle, tabsString) {
+  eleventyConfig.addShortcode('samplecode', function (tabsTitle, tabsString) {
     _currentTabsTitle = tabsTitle.toLowerCase();
     let tabMarkup = `<ul class="nav nav-tabs sample-code-tabs" id="${_currentTabsTitle}-language" role="tablist">`;
 
@@ -74,11 +74,11 @@ export default function (eleventyConfig) {
     return tabMarkup;
   });
 
-  eleventyConfig.addShortcode('endsamplecode', function() {
+  eleventyConfig.addShortcode('endsamplecode', function () {
     return `</div>`
   });
 
-  eleventyConfig.addPairedShortcode('sample', function(content, tabName) {
+  eleventyConfig.addPairedShortcode('sample', function (content, tabName) {
     const tabId = `${_currentTabsTitle}-${tabName.toLowerCase().replaceAll("+", "-plus")}`;
     const tabContent = `<div class="tab-pane ${_currentTabIsActive ? "active" : ""}" id="${tabId}" role="tabpanel" aria-labelledby="${tabId}-tab">
 
@@ -129,11 +129,11 @@ ${content}
       });
 
       const dependencies = result.loadedUrls
-          .filter(
-              (loadedUrl) =>
-                  loadedUrl.protocol === 'file:' && loadedUrl.pathname !== '',
-          )
-          .map((url) => path.relative('.', url.pathname));
+        .filter(
+          (loadedUrl) =>
+            loadedUrl.protocol === 'file:' && loadedUrl.pathname !== '',
+        )
+        .map((url) => path.relative('.', url.pathname));
 
       this.addDependencies(inputPath, dependencies);
 
@@ -147,6 +147,7 @@ ${content}
   eleventyConfig.addPassthroughCopy('src/content/assets/images', { expand: true });
   // docs.flutter.cn - translator
   eleventyConfig.addPassthroughCopy('src/content/assets/translator');
+  eleventyConfig.addPassthroughCopy('src/content/cookbook/img-files', { expand: true });
   eleventyConfig.addPassthroughCopy('src/content/f', {
     expand: true,
     filter: /^(?!_).+/,

examples/_animation/basic_hero_animation/pubspec.yaml

@@ -4,7 +4,7 @@ description: >-
   Shows how to create a simple or Hero animation using the Hero class directly.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/basic_radial_hero_animation/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
   as it animates to the new route.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/basic_staggered_animation/pubspec.yaml

@@ -3,7 +3,7 @@ publish_to: none
 description: An introductory example to staggered animations.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/hero_animation/pubspec.yaml

@@ -3,7 +3,7 @@ publish_to: none
 description: Shows how to create a simple Hero transition.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/radial_hero_animation/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
   as it animates to the new route.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/radial_hero_animation_animate_rectclip/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
   as it animates to the new route.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/_animation/staggered_pic_selection/pubspec.yaml

@@ -3,7 +3,7 @@ publish_to: none
 description: A more complex staggered animation example.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate0/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate1/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate2/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate3/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate4/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/animate5/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/animation/implicit/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: none
 version: 1.0.0+1
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/basics/lib/main.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 
 void main() => runApp(const MyApp());
 
-// #docregion MyApp
+// #docregion my-app
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
@@ -35,4 +35,4 @@ class MyApp extends StatelessWidget {
     );
   }
 }
-// #enddocregion MyApp
+// #enddocregion my-app

examples/basics/pubspec.yaml

@@ -3,7 +3,7 @@ description: Some code to demonstrate null safety.
 version: 1.0.0
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/cookbook/animation/animated_container/pubspec.yaml

@@ -2,7 +2,7 @@ name: animated_container
 description: Sample code for cookbook.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/cookbook/animation/opacity_animation/pubspec.yaml

@@ -2,7 +2,7 @@ name: opacity_animation
 description: Sample code for cookbook.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/cookbook/animation/page_route_animation/pubspec.yaml

@@ -2,7 +2,7 @@ name: page_route_animation
 description: Sample code for cookbook.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter:

examples/cookbook/animation/physics_simulation/pubspec.yaml

@@ -2,7 +2,7 @@ name: physics_simulation
 description: Sample code for cookbook.
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.4.0
 
 dependencies:
   flutter: