[sync] 2022/11/11

.github/workflows/build.yml

@@ -15,7 +15,7 @@ permissions: read-all
 
 env:
   NODE_ENV: production
-  NODE_VERSION: 17
+  NODE_VERSION: 18
 
 jobs:
 
@@ -62,7 +62,7 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Install Firebase CLI
-        run: npm install -g firebase-tools@11.0.1
+        run: npm install -g firebase-tools@11.16.0
       - name: Deploy
         run: make deploy
         env:

.github/workflows/codeql-analysis.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
+      uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
       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@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
+      uses: github/codeql-action/autobuild@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
 
     # ℹ️ 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@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
+      uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898

.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@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f
+        uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
         with:
           sarif_file: results.sarif

Dockerfile

@@ -10,67 +10,59 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
       xdg-user-dirs \
     && rm -rf /var/lib/apt/lists/*
 
-RUN echo "alias lla='ls -lAhG --color=auto'" >> ~/.bashrc
 WORKDIR /app
 
 
 
 # ============== INSTALL FLUTTER ==============
-# TODO recommended to move to a SHA based install for security reasons
+# NOTE that this will fail if you have not cloned the repo with --recurse-submodules 
+# or run `git submodule update --init --recursive` after cloning.
 FROM base AS flutter
 
-# TODO to avoid issues/clashes with the host repo, and to one day remove 
-# the flutter submodule in the host repo, test with clone. Only issue we need 
-# more information on is why the local version would ever be detached or pinned 
-# at a specific commit/hash???
-# RUN git clone https://github.com/flutter/website.git
-
 # This Flutter install uses/requires the local ./flutter submodule
 COPY ./flutter ./flutter
 COPY ./site-shared ./site-shared
 COPY pubspec.yaml ./
 
-ARG FLUTTER_BRANCH
-ENV FLUTTER_BRANCH=$FLUTTER_BRANCH
+ARG FLUTTER_BUILD_BRANCH
+ENV FLUTTER_BUILD_BRANCH=$FLUTTER_BUILD_BRANCH
 ENV FLUTTER_ROOT=flutter
 ENV FLUTTER_BIN=flutter/bin
 ENV PATH="/app/flutter/bin:$PATH"
 
 # Used if wanting to build the container with a different branch, this 
 # would change the current branch of and update the mirrored submodule
-# e.g. `make build FLUTTER_BRANCH=beta`
+# e.g. `make build FLUTTER_BUILD_BRANCH=beta`
 # This is not to be confused with the $FLUTTER_TEST_BRANCH
-RUN if test -n "$FLUTTER_BRANCH" -a "$FLUTTER_BRANCH" != "stable" ; then \
+RUN if test -n "$FLUTTER_BUILD_BRANCH" -a "$FLUTTER_BUILD_BRANCH" != "stable" ; then \
       cd flutter && \
       git fetch && \
-      git remote set-branches origin "$FLUTTER_BRANCH" && \
-      git fetch --depth 1 origin "$FLUTTER_BRANCH" && \
-      git checkout "$FLUTTER_BRANCH" -- && \
+      git remote set-branches origin "$FLUTTER_BUILD_BRANCH" && \
+      git fetch --depth 1 origin "$FLUTTER_BUILD_BRANCH" && \
+      git checkout "$FLUTTER_BUILD_BRANCH" -- && \
       git pull; \
     fi
 
 # Set up Flutter
 # NOTE You will get a warning "Woah! You appear to be trying to run flutter as root."  
 # and this is to be disregarded since this image is never deployed to production.
-# It is not worth setting up a Docker user or mirroring host, but you may run into 
-# conflicts with the local host repo and the Docker one.
 RUN flutter doctor
 RUN flutter --version
 RUN dart pub get
 
 
 
 # ============== NODEJS INTSALL ==============
-# TODO recommended to move to a SHA based install for security reasons
 FROM flutter AS node
 
-RUN curl -sL https://deb.nodesource.com/setup_17.x -o node_setup.sh && \
+RUN curl -sL https://deb.nodesource.com/setup_18.x -o node_setup.sh && \
       bash node_setup.sh 1> /dev/null
 RUN apt-get update -q && apt-get install -yq --no-install-recommends \
       nodejs \
     && rm -rf /var/lib/apt/lists/*
-# Ensure latest NPM, install global Firebase CLI
-RUN npm install -g npm [email protected]
+
+# Install global Firebase CLI
+RUN npm install -g [email protected]
 
 
 

Makefile

@@ -14,7 +14,7 @@ BUILD_CONFIGS ?= _config.yml
 BUILD_NAME = tmpbuild
 BUILD_TAG = "fltbuild:${BUILD_COMMIT}"
 FIREBASE_ALIAS ?= default
-FLUTTER_BRANCH ?= stable
+FLUTTER_BUILD_BRANCH ?= stable
 FLUTTER_TEST_BRANCH ?= stable
 JEKYLL_SITE_HOST ?= 0.0.0.0
 JEKYLL_SITE_PORT ?= 4002
@@ -33,7 +33,7 @@ STAGE_NAME ?= docs
 .env:
 	touch $@
 genenv: .env
-	@echo "FLUTTER_BRANCH=stable" >> $<
+	@echo "FLUTTER_BUILD_BRANCH=stable" >> $<
 	@echo "FIREBASE_ALIAS=default" >> $<
 	@echo "FIREBASE_TOKEN=" >> $<
 

docker-compose.yml

@@ -11,8 +11,6 @@ services:
     environment:
       - NODE_ENV=development
       - JEKYLL_ENV=development
-      - FIREBASE_ALIAS=${FIREBASE_ALIAS:-default}
-      - FIREBASE_TOKEN=$FIREBASE_TOKEN
     ports:
       - "4002:4002"
       - "35729:35729"

examples/ui/layout/adaptive_app_demos/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   bitsdojo_window: ^0.1.0+1
-  flextras: ^0.0.2
+  flextras: ^1.0.0
   provider: ^6.0.2
   universal_platform: ^1.0.0-nullsafety
   platform: ^3.0.2

firebase.json

@@ -179,6 +179,7 @@
       { "source": "/go/base-annotations-local-position-on-region", "destination": "https://docs.google.com/document/d/1r7FQTOw2vZJZ5c0VoNqi9CWmZY3MvUfz0spdf0-nK6k/edit", "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 },
       { "source": "/go/build-flows", "destination": "https://docs.google.com/document/d/1imsVxbeAsttTi90EFpbnbVzov9z0xXd7tLCAr_QAJ38", "type": 301 },
@@ -275,12 +276,14 @@
       { "source": "/go/handling-synchronous-keyboard-events", "destination": "https://docs.google.com/document/d/1rWXSjkb2ZKv-cpg26lVK0aZi4cVeXJ8j7YmSJdq2TOM/edit", "type": 301 },
       { "source": "/go/hot-ui-early-prototype-demos", "destination": "https://docs.google.com/document/d/1ZaHqKnON8-WEhke3Y6FpHeuB5BNlxDQj1cCYB1SoI_g", "type": 301 },
       { "source": "/go/i18n-user-guide", "destination": "https://docs.google.com/document/d/10e0saTfAv32OZLRmONy866vnaw0I2jwL8zukykpgWBc/edit", "type": 301 },
+      { "source": "/go/icu-message-parser", "destination": "https://docs.google.com/document/d/1wj5rBbuz1bXM1lvt0s0d35F5JRtIPmYUs1UDk1G3HLc/edit?usp=sharing", "type": 301 },
       { "source": "/go/idle-gc-metrics", "destination": "https://docs.google.com/document/d/1QjLTDr2cTsmS3DGIWdw9WSgqBMKJkFXD7Q8acziGIIA/edit?usp=sharing", "type": 301 },
       { "source": "/go/image-decoding-registry", "destination": "https://docs.google.com/document/d/167qWrlaSAmJm5muqQ-iiJKZy6Q7ZlugIeXmraXava5Y/edit?resourcekey=0-mVrr_zBiSI2Qmd6vqae7Bw", "type": 301 },
       { "source": "/go/impeller-geometry", "destination": "https://docs.google.com/document/d/1t-dzzi04nCdkIReoJp8ZyGNskqIip1TG3WhGEz7Osd8/edit?usp=sharing", "type": 301 },
       { "source": "/go/infinite-scroll", "destination": "https://docs.google.com/document/d/1TV2oF2iLIZtGd48336korxMTQrGizDAASAeZAeteMSc/edit?usp=sharing", "type": 301 },
       { "source": "/go/inheritedwidget-workshop", "destination": "https://dartpad.dev/workshops.html?webserver=https://dartpad-workshops-io2021.web.app/inherited_widget", "type": 301 },
       { "source": "/go/input-field-autofill", "destination": "https://docs.google.com/document/d/1wYLsoc7NiHl2jFueB4Ros09E3nDCotdWVovDCFSMcAk/edit", "type": 301 },
+      { "source": "/go/io22concurrency", "destination": "https://github.com/goderbauer/io22concurrency", "type": 301 },
       { "source": "/go/ios-autocorrection-highlight-support", "destination": "https://docs.google.com/document/d/18ZO7ThKu2wwCofGOKZSInPsq93IzkQTRn9eiyskeh7I/edit", "type": 301 },
       { "source": "/go/ios-camera-plugin-thread-model", "destination": "https://docs.google.com/document/d/1Znjp-BduXIb1Ix3JOE1YKyJi1Z0d6rB-2q6Lt7j8xSo/edit", "type": 301 },
       { "source": "/go/ios-platformview-backdrop-filter-blur", "destination": "https://docs.google.com/document/d/1V7Jc_RGaknrBBPPBBKB8lT7f3PKhYr8sin35MSMFAf4/edit?usp=sharing", "type": 301 },
@@ -409,6 +412,8 @@
       { "source": "/go/update-text-theme-api", "destination": "https://docs.google.com/document/d/1B1s4mm6OYM7mKQ3vZfSTI2HR_KljB78gN6oBHg_zYUs/edit", "type": 301 },
       { "source": "/go/variable-refresh-rate", "destination": "https://docs.google.com/document/d/1O-ot6MydAl5pAr_XGnpR-Qq5A5CPDF6edaPu8xQtgCQ/edit?usp=sharing&resourcekey=0-LlXeGtGRC67XL4NrGoc91A", "type": 301 },
       { "source": "/go/vector-graphics", "destination": "https://docs.google.com/document/d/1YWffrlc6ZqRwfIiR1qwp1AOkS9JyA_lEURI8p5PsZlg/edit", "type": 301 },
+      { "source": "/go/verbatim-logical-keys-for-non-latin-layout", "destination": "https://docs.google.com/document/d/1ZNgNxito-NVUS1JKlcjdzHUcKyyiupy8Za-jb131dD4/edit?usp=sharing&resourcekey=0-eeEZ5X0jAzuqSTdmPWlv0w", "type": 301 },
+      { "source": "/go/web-add-to-app", "destination": "https://docs.google.com/document/d/1rFM0qmYds1JkntTruBh8eO72xbT2KoP9JdbizucAAwQ/edit", "type": 301 },
       { "source": "/go/web-astral-projections", "destination": "https://docs.google.com/document/d/1pvH-J8opXsjntTpFf1bbsbU8N1vFd8tPKvBgcNn8UKQ", "type": 301 },
       { "source": "/go/web-plugins-layout", "destination": "https://docs.google.com/document/d/1PeS-QSAFydHXhjZrqkub-GRPMs83roh8VwhbUScWuGQ", "type": 301 },
       { "source": "/go/web-programmatic-bootstrap", "destination": "https://docs.google.com/document/d/13kVA40gQ3T0FLqmV4w5rNvLHjmU6XWFbb7j0_YV7k9M", "type": 301 },
@@ -420,11 +425,7 @@
       { "source": "/go/widget-budget", "destination": "https://docs.google.com/document/d/1JTmf7ae8hWJ3zzqhI-__I9DcUJdQ3TopWsJbKyNDO5A/edit?usp=sharing&resourcekey=0--A0AbM19K-zDXRmIIzaUAg", "type": 301 },
       { "source": "/go/windows-x86-arm64-support", "destination": "https://docs.google.com/document/d/1gAGqtTAjO0GntR8bPonIO1aZJnTghPCI_PHJPdNzEmo/edit?resourcekey=0-l1tL7iai47yw3bMl9IcpHw", "type": 301 },
       { "source": "/go/wrap-layout", "destination": "https://docs.google.com/document/d/1auZtWT1T5CkUKOUTUld8rF91iN7PvQoOF0IlBNXiDSo/edit?usp=sharing", "type": 301 },
-      { "source": "/go/wrap-popupmenu-with-safearea", "destination": "https://docs.google.com/document/d/15uBmyEKiOeYGYt1PuBVf4SFK5YhH07EP9ylWP-H9mVE/edit?usp=sharing", "type": 301 },
-      { "source": "/go/verbatim-logical-keys-for-non-latin-layout", "destination": "https://docs.google.com/document/d/1ZNgNxito-NVUS1JKlcjdzHUcKyyiupy8Za-jb131dD4/edit?usp=sharing&resourcekey=0-eeEZ5X0jAzuqSTdmPWlv0w", "type": 301 },
-      { "source": "/go/io22concurrency", "destination": "https://github.com/goderbauer/io22concurrency", "type": 301 },
-      { "source": "/go/buffer-queue", "destination": "https://docs.google.com/document/d/1rXl9G-VmISVlVkKVgrnQKeX7Mexyez0x9HZ5F5yKxrQ/edit?usp=sharing", "type": 301 },
-      { "source": "/go/icu-message-parser", "destination": "https://docs.google.com/document/d/1wj5rBbuz1bXM1lvt0s0d35F5JRtIPmYUs1UDk1G3HLc/edit?usp=sharing", "type": 301 }
+      { "source": "/go/wrap-popupmenu-with-safearea", "destination": "https://docs.google.com/document/d/15uBmyEKiOeYGYt1PuBVf4SFK5YhH07EP9ylWP-H9mVE/edit?usp=sharing", "type": 301 }
     ],
     "headers": [
       {