[sync] 2022/11/28

.github/workflows/codeql-analysis.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+      uses: github/codeql-action/init@678fc3afe258fb2e0cdc165ccf77b85719de7b3c
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+      uses: github/codeql-action/autobuild@678fc3afe258fb2e0cdc165ccf77b85719de7b3c
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -58,4 +58,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+      uses: github/codeql-action/analyze@678fc3afe258fb2e0cdc165ccf77b85719de7b3c

.github/workflows/scorecards-analysis.yml

@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+        uses: github/codeql-action/upload-sarif@678fc3afe258fb2e0cdc165ccf77b85719de7b3c
         with:
           sarif_file: results.sarif

CONTRIBUTING.md

@@ -15,7 +15,7 @@ To contribute a fix to a repo, submit a [pull request
 
 For information on contributing code or API docs to the Flutter SDK, see
 [Contributing to
-Flutter](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
+Flutter](https://github.com/flutter/flutter/blob/main/CONTRIBUTING.md)
 in the [Flutter SDK](https://github.com/flutter/flutter) repo.
 
 We are also happy to accept your PRs to the

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.2-buster@sha256:d2e0889c0d5f071a8ac71acc1a0e58282fa20851bd0260919bff071cc7f2c888 AS base
+FROM ruby:3.1.2-buster@sha256:1c24e30299029b6b8f3662eaa77c8a1ce7f414710dfd70be4d4f2033783278db AS base
 
 ENV TZ=Asia/Shanghai
 RUN apt-get update && apt-get install -yq --no-install-recommends \
@@ -97,12 +97,12 @@ RUN npm install
 COPY ./ ./
 
 # Jekyl ports
-EXPOSE 35729
+EXPOSE 35730
 EXPOSE 4002
 
 # Firebase emulator port
 # Airplay runs on :5000 by default now
-EXPOSE 5500
+EXPOSE 5502
 
 
 

Makefile

@@ -73,6 +73,7 @@ serve:
 		--port ${JEKYLL_SITE_PORT} \
 		--config _config.yml,_config_dev.yml \
 		--livereload \
+		--livereload_port 37530 \
 		--incremental \
 		--trace
 

README.md

@@ -9,7 +9,7 @@
 
 [Build Status]: https://github.com/flutter/website/workflows/build/badge.svg
 [Flutter]: https://docs.flutter.dev/
-[Repo on GitHub Actions]: https://github.com/flutter/website/actions?query=workflow%3Abuild+branch%3Amaster
+[Repo on GitHub Actions]: https://github.com/flutter/website/actions?query=workflow%3Abuild+branch%3Amain
 
 ## Table of contents
 

docker-compose.yml

@@ -13,7 +13,8 @@ services:
       - JEKYLL_ENV=development
     ports:
       - "4002:4002"
-      - "35729:35729"
+      - "35730:35730"
+      - "5502:5502"
     volumes:
       - ./:/app
       - site_bundle:/usr/local/bundle

example/README.md

@@ -1,4 +1,4 @@
-Code snippets extracted using [tool/extract.dart](https://github.com/flutter/website/blob/master/tool/extract.dart), are saved
+Code snippets extracted using [tool/extract.dart](https://github.com/flutter/website/blob/main/tool/extract.dart), are saved
 into [example.g](example.g). The Yaml files in this folder are copied into
 [example.g](example.g), then the snippets are run through the analyzer and
 formatter.

firebase.json

@@ -136,7 +136,7 @@
       { "source": "/testing/ui-performance", "destination": "/perf/ui-performance", "type": 301 },
       { "source": "/whats-new-archive", "destination": "/whats-new", "type": 301 },
 
-      { "source": "/assets/images/docs/intellij/hot-reload.gif", "destination": "https://raw.githubusercontent.com/flutter/website/master/src/assets/images/docs/tools/android-studio/hot-reload.gif", "type": 301 },
+      { "source": "/assets/images/docs/intellij/hot-reload.gif", "destination": "https://raw.githubusercontent.com/flutter/website/main/src/assets/images/docs/tools/android-studio/hot-reload.gif", "type": 301 },
       { "source": "/catalog/samples", "destination": "https://flutter.github.io/samples/#", "type": 301 },
       { "source": "/catalog/samples", "destination": "https://flutter.github.io/samples/#", "type": 301 },
       { "source": "/catalog/samples/*", "destination": "https://flutter.github.io/samples/#", "type": 301 },
@@ -177,8 +177,8 @@
       { "source": "/go/automatic-android-plugin-registration", "destination": "https://docs.google.com/document/d/1xNkBmcdVL1yEXqtZ65KzTwfr5UXDD05VVKYXIXGX7p8/edit", "type": 301 },
       { "source": "/go/backdrop-filter-with-overlay-canvas", "destination": "https://docs.google.com/document/d/1t_offKOgkuVzvB3fqGTfcltovb-yxqV6tbuP1qIBqVI/edit?usp=sharing", "type": 301 },
       { "source": "/go/base-annotations-local-position-on-region", "destination": "https://docs.google.com/document/d/1r7FQTOw2vZJZ5c0VoNqi9CWmZY3MvUfz0spdf0-nK6k/edit", "type": 301 },
+      { "source": "/go/blankcanvas", "destination": "https://docs.google.com/document/d/1rS_RO2DQ_d4_roc3taAB6vXFjv7-9hJP7pyZ9NhPOdA/edit?resourcekey=0-VBzTPoqLwsruo0j9dokuOg", "type": 301 },
       { "source": "/go/bottom-navigation-bar-title-deprecation", "destination": "https://docs.google.com/document/d/1L-2nPf5hbLGNoRvOSUmnxgUHahBVzW1ybhTXGY3ObDw/edit?usp=sharing", "type": 301 },
-      { "source": "/go/breaking-changes-template", "destination": "https://github.com/flutter/website/blob/master/src/docs/release/breaking-changes/template.md", "type": 301 },
       { "source": "/go/buffer-queue", "destination": "https://docs.google.com/document/d/1rXl9G-VmISVlVkKVgrnQKeX7Mexyez0x9HZ5F5yKxrQ/edit?usp=sharing", "type": 301 },
       { "source": "/go/build-aar", "destination": "/development/add-to-app/android/project-setup#option-a---depend-on-the-android-archive-aar", "type": 301 },
       { "source": "/go/build-dashboard-v2", "destination": "https://docs.google.com/document/d/1kwh48xYuoVtadYFb2I2t6BJMGEW07K7T5WYcieAZZiY", "type": 301 },
@@ -243,6 +243,7 @@
       { "source": "/go/ffi-plugins", "destination": "https://docs.google.com/document/d/1vMw-W6L-r-uL1SUgzDh6J5rmtqum7SZdO9khWACrZJI/edit?resourcekey=0-vvjEK88N-pApyKTPWJ2IZQ", "type": 301 },
       { "source": "/go/flame-dartpad", "destination": "https://dartpad.dev/?id=3e52ca7b51ba15f989ad880b8b3314a2", "type": 301 },
       { "source": "/go/floating-snackbar-offset", "destination": "https://docs.google.com/document/d/1elP-y83PtvfAZHNcpHCtnOFhZO9VnnlobwfQ33QO4hg/edit", "type": 301 },
+      { "source": "/go/flutter-drop-android-jellybean-2023", "destination": "https://docs.google.com/document/d/1wWNly2SZRDqupSsHkBWDI_lS2MohBGEwPSXF6W05NOc/edit?usp=sharing", "type": 301 },
       { "source": "/go/flutter-doctor-app-folder", "destination": "https://docs.google.com/document/d/1_N70oh5rl0pMlz-epE_3fIr7gqE94dgoV-DHq5OlF2I/edit", "type": 301 },
       { "source": "/go/flutter-drop-macOS-10.13-2022-q4", "destination": "https://docs.google.com/document/d/1wHqr2cob78VfUKhOFEKjaUM_mnV4gL-mg3gSQCFhF7Y/edit", "type": 301 },
       { "source": "/go/flutter-engine-clocks", "destination": "https://docs.google.com/document/d/1Sx8QA1qXgJGw5r4ESviDnU2LSShNHiq_LjbRWPgSvXQ/edit?usp=sharing&resourcekey=0-BoBvLxgqf_nc_rwLc0zmTw", "type": 301 },
@@ -327,10 +328,12 @@
       { "source": "/go/nullable-cupertinothemedata-brightness", "destination": "https://docs.google.com/document/d/1qivq0CdkWGst5LU5iTLFUe_LTfLY84679-NxWiDgJXg/edit", "type": 301 },
       { "source": "/go/ondirtycallbacks", "destination": "https://docs.google.com/document/d/1Vk_QWC92fFGxx2oIrIjkCL0ZZFHxmrprlLedyQsnkus/edit?usp=sharing", "type": 301 },
       { "source": "/go/opengl-on-ios", "destination":"https://docs.google.com/document/d/1kvrb6HeTRN4noAKO82o6x-Ii61PW-BQ-8s9YNtLgosM", "type": 301 },
+      { "source": "/go/optimized-platform-view-layers", "destination": "https://docs.google.com/document/d/1YHwVz7-F03psEzHxByGka_lIFaDV5K90BJMbNxQeK4k/edit?resourcekey=0-n4_VcUnMU-99sjJ6C1_Ycw#", "type": 301 },
       { "source": "/go/os-adaptive-shortcut-activator", "destination": "https://docs.google.com/document/d/11NWj13MSDw1XQg4MpYIeqzcCFGuzQ_Cz7tYXW7fqzPY/edit?usp=sharing", "type": 301 },
       { "source": "/go/outline-input-border-padding-fix", "destination": "https://docs.google.com/document/d/1QBM5oM9qPWVeFSPSqpXOFbdXV9dH9A9ABKsNMs1J2XU/edit?usp=sharing", "type": 301 },
       { "source": "/go/overridable-text-actions", "destination": "https://docs.google.com/document/d/11vmEZTjB4_E4el1IjTo2VBI2d_fR7tjQWeCajsQc-q4/edit?usp=sharing", "type": 301 },
       { "source": "/go/performance-best-practices", "destination": "https://docs.google.com/document/d/16bd3HtkuvzAk0uizDGTT3aNtjI8Mfr0f6C3ZVrYYqvI", "type": 301 },
+      { "source": "/go/permissible-slider-interaction", "destination": "https://docs.google.com/document/d/151iaqbK-rZSRI34NdkvfIk4RkzOpAevoJ87TwiXfTpM/edit?usp=sharing&resourcekey=0-o0Gx6nrgl-fpw7_zUdMaQA", "type": 301 },
       { "source": "/go/picture-lifecycle", "destination": "https://docs.google.com/document/d/1aTBj38k6NSVsYRwySEBItlqxdQbjzurjmHsXAr3yGiI/edit?usp=sharing&resourcekey=0-TbKDu4BVInqphkzAlasBnw", "type": 301 },
       { "source": "/go/platform-api-breakages", "destination": "https://docs.google.com/document/d/1OxDsf_eot7TlsRn57z-1_dGbvuqnMxO7QEGIAmOCZtA/edit?usp=sharing", "type": 301 },
       { "source": "/go/platform-based-key-events", "destination": "https://docs.google.com/document/d/1FDuxxEh810XpY561SgeiyUR0gU2eVz5kRpCFI55ibec/edit", "type": 301 },
@@ -420,6 +423,7 @@
       { "source": "/go/web-renderer-options", "destination": "https://docs.google.com/document/d/1aY0iU16wf_sdT7nwfpjgT-IatHNfF3slTiYHKmxcIog", "type": 301 },
       { "source": "/go/web-slot-content", "destination": "https://docs.google.com/document/d/1U6aCSuzQsFpOP8_OseL-fwl2-MC2bxJAsgt2R_-sC30", "type": 301 },
       { "source": "/go/webview_flutter_4_interface", "destination": "https://docs.google.com/document/d/14tZpyj5oxB6a5ugaR7-kQrxD2wBgctlK5jxwvItv0LI/edit?usp=sharing&resourcekey=0-M5oUr3Pm3f5wtE7v4aQbkQ", "type":301 },
+      { "source": "/go/widget-test-frame-precision", "destination": "https://docs.google.com/document/d/1lECLbcmfWdyZFUG5TTGtem3l_SEefcJWHwPO_aZIqwM/edit?usp=sharing&resourcekey=0-6L6P_D571XnvK5oIfpe4MQ", "type": 301 },
       { "source": "/go/widget-tree-image-cache", "destination": "https://docs.google.com/document/d/1deEtxZk1VYRmzvkL4gTb3sEnjBrHejQkWObQ4yrP5jE/edit?pli=1#", "type": 301 },
       { "source": "/go/widgetspan-in-selectabletext", "destination": "https://docs.google.com/document/d/1nrVRytWVF-1hr8LvUKyENE5s074UInni9ZiColtIIxI", "type": 301 },
       { "source": "/go/widget-budget", "destination": "https://docs.google.com/document/d/1JTmf7ae8hWJ3zzqhI-__I9DcUJdQ3TopWsJbKyNDO5A/edit?usp=sharing&resourcekey=0--A0AbM19K-zDXRmIIzaUAg", "type": 301 },

src/_data/sidenav.yml

@@ -170,6 +170,8 @@
         - title: iOS 平台
           permalink: /docs/development/platform-integration/ios
           children:
+            - title: 使用 Apple 的系统库
+              permalink: /docs/development/platform-integration/ios/apple-frameworks
             - title: 添加 iOS App Clip 支持
               permalink: /docs/development/platform-integration/ios/ios-app-clip
             - title: C 语言代码集成及调用

src/_includes/banner.html

@@ -6,7 +6,6 @@
     Header doesn't support markdown, please use HTML only.
   {% endcomment %}
   <div class="site-banner site-banner--default" role="alert">
-    Flutter 3.3 <a href="https://flutter.cn/posts/announcing-flutter-3-3-at-flutter-vikings">现已发布</a>，
-    查看 <a href="https://flutter.cn/posts/whats-new-in-flutter-3-3">发布详解</a>。
+    <a href="https://flutter.cn/events/flutter-forward" target="_blank">注册 2023 年 1 月 25 日的 Flutter Forward 大会</a>，了解 Flutter 将如何进一步推动 UI 开发。
   </div>
 {% endif -%}

src/_includes/docs/cookbook-toc.md

@@ -8,7 +8,7 @@
 {% for dir in dirs %}
 
   {% assign dir_name = dir.name | capitalize %}
-  <h2>{{ dir_name }}</h2>
+  <h2 id="{{dir.name}}">{{ dir_name }}</h2>
 
   {% assign items = dir.items | where_exp: "item", "item.title != dir_name" | sort: "title" %}
   {% for item in items %}

src/_includes/header.html

@@ -39,40 +39,40 @@
             {% include shared/sidenav-level-1.html nav=site.data.sidenav %}
           </div>
           <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" id="navbarDropdown" 
+            <a class="nav-link dropdown-toggle" id="platform-navbar-dropdown"
                href="{{site.main-url}}/multi-platform" 
                role="button" data-toggle="dropdown" 
                aria-haspopup="true" aria-expanded="false">
                多平台
             </a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <div class="dropdown-menu" aria-labelledby="platform-navbar-dropdown">
               <a class="dropdown-item" href="{{site.main-url}}/multi-platform/mobile">移动平台</a>
               <a class="dropdown-item" href="{{site.main-url}}/multi-platform/web">Web 平台</a>
               <a class="dropdown-item" href="{{site.main-url}}/multi-platform/desktop">桌面平台</a>
               <a class="dropdown-item" href="{{site.main-url}}/multi-platform/embedded">嵌入式平台</a>
             </div>
           </li>
           <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" id="navbarDropdown" 
+            <a class="nav-link dropdown-toggle" id="dev-navbar-dropdown"
                href="{{site.main-url}}/development"
                role="button" data-toggle="dropdown" 
                aria-haspopup="true" aria-expanded="false">
                开发
             </a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <div class="dropdown-menu" aria-labelledby="dev-navbar-dropdown">
               <a class="dropdown-item" href="{{site.main-url}}/learn">学习资源</a>
               <a class="dropdown-item" href="{{site.pub}}/flutter/favorites" target="_blank">推荐插件</a>
               <a class="dropdown-item" href="{{site.pub}}/" target="_blank">使用 Package</a>
             </div>
           </li>
           <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" id="navbarDropdown" 
+            <a class="nav-link dropdown-toggle" id="ecosystem-navbar-dropdown"
                href="{{site.main-url}}/ecosystem"
                role="button" data-toggle="dropdown" 
                aria-haspopup="true" aria-expanded="false">
                生态
             </a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <div class="dropdown-menu" aria-labelledby="ecosystem-navbar-dropdown">
               <a class="dropdown-item" href="{{site.main-url}}/community">社区</a>
               <!-- <a class="dropdown-item" href="{{site.main-url}}/events">Events</a> -->
               <a class="dropdown-item" href="{{site.main-url}}/monetization">盈利</a>
@@ -87,13 +87,13 @@
 
           <li class="nav-item dropdown docs-item">
             <a class="nav-link dropdown-toggle{% if route == '/' %} active{% endif %}"
-               id="navbarDropdown" 
+               id="docs-navbar-dropdown"
                href="/"
                role="button" data-toggle="dropdown" 
                aria-haspopup="true" aria-expanded="false">
                文档
             </a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <div class="dropdown-menu" aria-labelledby="docs-navbar-dropdown">
               <a class="dropdown-item {% if route == '/' %} active{% endif %}"
                  href="/posts">最新更新</a>
               <a class="dropdown-item {% if route contains '/get-started/editor' %} active{% endif %}"

src/_layouts/base.html

@@ -113,12 +113,12 @@
       {% include footer.html %}
     {% endif %}
 
-    <script src="https://cdn.staticfile.org/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js" integrity="sha512-aVKKRRi/Q/YV+4mjoKBsE4x3H+BkegoM/em46NNlCqNTmUYADjBbeNefNxYV7giUp0VxICtqdrbqU7iVaeZNXA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdn.staticfile.org/popper.js/1.16.1/umd/popper.min.js" integrity="sha512-ubuT8Z88WxezgSqf3RLuNi5lmjstiJcyezx34yIU2gAHonIi27Na7atqzUZCOoY4CExaoFumzOsFQ2Ch+I/HCw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdn.staticfile.org/bootstrap/4.6.0/js/bootstrap.min.js" integrity="sha512-XKa9Hemdy1Ui3KSGgJdgMyYlUg1gM+QhL6cnlyTe2qzMCYm4nAZ1PsVerQzTTXzonUR+dmswHqgJPuwCq1MaAg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdn.staticfile.org/clipboard.js/2.0.0/clipboard.min.js" integrity="sha512-hPzAQ7RgUQ/jsM6VWPWBpv2btjd9HWvEm8WIwAngYpMuaoMpihN6ROj8cRFUeYnV0vTYHepksRyzzskrhoL5Zg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdn.staticfile.org/bootstrap/4.6.2/js/bootstrap.min.js" integrity="sha512-7rusk8kGPFynZWu26OKbTeI+QPoYchtxsmPeBqkHIEXJxeun4yJ4ISYe7C6sz9wdxeE1Gk3VxsIWgCZTc+vX3g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdn.staticfile.org/clipboard.js/2.0.11/clipboard.min.js" integrity="sha512-7O5pXpc0oCRrxk8RUfDYFgn0nO1t+jLuIOQdOMRp4APB7uZ4vSjspzp5y6YDtDs4VzUSTbWzBFZ/LKJhnyFOKw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <!-- <script src="https://cdn.staticfile.org/js-cookie/3.0.1/js.cookie.min.js" integrity="sha512-wT7uPE7tOP6w4o28u1DN775jYjHQApdBnib5Pho4RB0Pgd9y7eSkAV1BTqQydupYDB9GBhTcQQzyNMPMV3cAew==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
-    
+
     <script src="{{ '/assets/js/vendor/code-prettify/prettify.js' | append: cache_bust }}"></script>
     <script src="{{ '/assets/js/vendor/code-prettify/lang-css.js' | append: cache_bust }}"></script>
     <script src="{{ '/assets/js/vendor/code-prettify/lang-dart.js' | append: cache_bust }}"></script>

src/_sass/_d2h.scss

@@ -1,3 +1,7 @@
 .d2h-wrapper {
-    margin: 35px 0px;
-}
+    margin: 30px 0;
+}
+
+.d2h-file-header {
+    height: unset;
+}

src/assets/js/codelabs/animations_examples.js

@@ -1,22 +1,26 @@
-var animation_1_play_button_=document.getElementById("animation_1_play_button_");
-var animation_1=document.getElementById("animation_1");
+const animation1PlayButton =
+    document.getElementById('animation_1_play_button_');
+const animation1 =
+    document.getElementById("animation_1");
 
-animation_1_play_button_.addEventListener('click', function (event) {
-  if (animation_1.paused) {
-    animation_1.play();
-    this.style.display = 'none';
-  } else {
-    animation_1.pause();
-    this.style.display = 'block';
-  }
-}, false);
+if (animation1PlayButton && animation1) {
+  animation1PlayButton.addEventListener('click', function (_) {
+    if (animation1.paused) {
+      animation1.play();
+      this.style.display = 'none';
+    } else {
+      animation1.pause();
+      this.style.display = 'block';
+    }
+  }, false);
 
-animation_1.addEventListener('click', function(event) {
-  if (this.paused) {
-    this.play();
-    animation_1_play_button_.style.display = 'none';
-  } else {
-    this.pause();
-    animation_1_play_button_.style.display = 'block';
-  }
-});
+  animation1.addEventListener('click', function (_) {
+    if (this.paused) {
+      this.play();
+      animation1PlayButton.style.display = 'none';
+    } else {
+      this.pause();
+      animation1PlayButton.style.display = 'block';
+    }
+  });
+}