Merge branch 'main' into bcd/getCurrentSupport

.env.testing

@@ -24,7 +24,7 @@ REACT_APP_AUTOCOMPLETE_SEARCH_WIDGET=true
 
 # These are set to fake values just to make sure the paths that
 # injects the relevant script tags actually run in end-to-end testing.
-BUILD_GOOGLE_ANALYTICS_ACCOUNT=UA-00000000-0
+BUILD_GOOGLE_ANALYTICS_MEASUREMENT_ID=G-XXXXXXXX
 
 # The functional tests are done in a production'y way as if it had
 # to go into full production mode.

.eslintrc.cjs

@@ -49,10 +49,12 @@ module.exports = {
     {
       files: ["**/*.ts", "**/*.tsx"],
       parser: "@typescript-eslint/parser",
-      extends: ["plugin:@typescript-eslint/recommended"],
+      extends: [
+        "plugin:@typescript-eslint/recommended",
+        //"plugin:@typescript-eslint/stylistic",
+      ],
       rules: {
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/no-unused-vars": [
           "warn",
           { ignoreRestSiblings: true },

.github/labeler.yml

@@ -1,45 +1,89 @@
 blog:
-  - "**/blog/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "**/blog/**/*"
+
 browser-compat:
-  - "**/browser-compatability-table/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "**/browser-compatability-table/**/*"
+
 macros:
-  - "kumascript/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "kumascript/**/*"
+
 cloud-function:
-  - "cloud-function/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "cloud-function/**/*"
+
 copy:
-  - "copy/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "copy/**/*"
+
 dependencies:
-  - "**/poetry.lock"
-  - "**/yarn.lock"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "**/poetry.lock"
+          - "**/yarn.lock"
+
 deployer:
-  - "deployer/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "deployer/**/*"
+
 filecheck:
-  - "filecheck/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "filecheck/**/*"
+
 flaw-system:
-  - "build/flaws/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "build/flaws/**/*"
+
 github-actions:
-  - ".github/workflows/**/*"
+  - changed-files:
+      - any-glob-to-any-file: ".github/workflows/**/*"
+
 markdown:
-  - "markdown/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "markdown/**/*"
+
 metrics:
-  - "**/telemetry/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "**/telemetry/**/*"
+
 placement:
-  - "**/placement/**/*"
-  - "**/pong/**/*"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "**/placement/**/*"
+          - "**/pong/**/*"
+
 plus:
-  - "**/plus/**/*"
-  - "**/plus-docs/**/*"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "**/plus/**/*"
+          - "**/plus-docs/**/*"
+
 plus:ai-help:
-  - "**/ai-help/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "**/ai-help/**/*"
+
 plus:offline:
-  - "client/pwa/src/**/*"
-  - "client/src/offline-settings/**/*"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "client/pwa/src/**/*"
+          - "client/src/offline-settings/**/*"
+
 plus:playground:
-  - "**/playground/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "**/playground/**/*"
+
 plus:updates:
-  - "client/src/plus/updates/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "client/src/plus/updates/**/*"
+
 python:
-  - "**/*.py"
+  - changed-files:
+      - any-glob-to-any-file: "**/*.py"
+
 redirects:
-  - "cloud-function/src/middlewares/redirect-*"
-  - "libs/fundamental-redirects/**/*"
+  - changed-files:
+      - any-glob-to-any-file:
+          - "cloud-function/src/middlewares/redirect-*"
+          - "libs/fundamental-redirects/**/*"

.github/workflows/auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: ${{ secrets.AUTOMERGE_TOKEN }}
 

.github/workflows/dev-build.yml

@@ -66,7 +66,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: yarn
 
       - name: Install all yarn packages
@@ -76,7 +76,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
@@ -125,7 +125,7 @@ jobs:
 
           # This just makes sure the Google Analytics script gets used even if
           # it goes nowhere.
-          BUILD_GOOGLE_ANALYTICS_ACCOUNT: UA-00000000-0
+          BUILD_GOOGLE_ANALYTICS_MEASUREMENT_ID: G-XXXXXXXX
 
           # This removes the ability to sign in
           REACT_APP_DISABLE_AUTH: true
@@ -136,11 +136,6 @@ jobs:
           echo "CONTENT_TRANSLATED_ROOT=$CONTENT_TRANSLATED_ROOT"
           yarn build:prepare
 
-          # (July 15, 2021) This is a temporary solution. This should become an
-          # integrated part of 'build:prepare'.
-          # See https://github.com/mdn/yari/issues/4217
-          yarn tool popularities
-
           yarn tool sync-translated-content
 
           # Spread the work across 2 processes. Why 2? Because that's what you
@@ -205,7 +200,7 @@ jobs:
           poetry run deployer search-index ../client/build
 
       - name: Configure AWS Credentials
-        uses: aws-actions/[email protected].1
+        uses: aws-actions/[email protected].2
         with:
           aws-access-key-id: ${{ secrets.DEPLOYER_STAGE_AND_DEV_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.DEPLOYER_STAGE_AND_DEV_AWS_SECRET_ACCESS_KEY }}

.github/workflows/developing.yml

@@ -18,9 +18,15 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: yarn
 
+      - name: Cache @vscode/ripgrep bin
+        uses: actions/cache@v4
+        with:
+          key: vscode-ripgrep-bin-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('yarn.lock') }}
+          path: node_modules/@vscode/ripgrep/bin/
+
       - name: Install all yarn packages
         run: yarn --frozen-lockfile
         env:

.github/workflows/labeler.yml

@@ -6,6 +6,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4.3.0
+      - uses: actions/labeler@v5.0.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/npm-publish.yml

@@ -16,18 +16,8 @@ jobs:
 
     steps:
       - name: Release
-        uses: google-github-actions/release-please-action@v3
+        uses: google-github-actions/release-please-action@v4
         id: release
-        with:
-          release-type: node
-          package-name: release-please-action
-          changelog-types: |
-            [
-              {"type": "feat", "section": "Features", "hidden": false},
-              {"type": "fix", "section": "Bug Fixes", "hidden": false},
-              {"type": "enhance", "section": "Enhancements", "hidden": false},
-              {"type": "chore", "section": "Miscellaneous", "hidden": false}
-            ]
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,10 +27,17 @@ jobs:
         uses: actions/setup-node@v4
         if: steps.release.outputs.release_created
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: yarn
           registry-url: "https://registry.npmjs.org"
 
+      - name: Cache @vscode/ripgrep bin
+        uses: actions/cache@v4
+        if: steps.release.outputs.release_created
+        with:
+          key: vscode-ripgrep-bin-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('yarn.lock') }}
+          path: node_modules/@vscode/ripgrep/bin/
+
       - name: Install
         if: steps.release.outputs.release_created
         run: yarn --frozen-lockfile

.github/workflows/npm-published-simulation.yml

@@ -23,9 +23,15 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: "yarn"
 
+      - name: Cache @vscode/ripgrep bin
+        uses: actions/cache@v4
+        with:
+          key: vscode-ripgrep-bin-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('yarn.lock') }}
+          path: node_modules/@vscode/ripgrep/bin/
+
       - name: Install all yarn packages
         run: yarn --frozen-lockfile
         env:

.github/workflows/performance.yml

@@ -27,9 +27,15 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: yarn
 
+      - name: Cache @vscode/ripgrep bin
+        uses: actions/cache@v4
+        with:
+          key: vscode-ripgrep-bin-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('yarn.lock') }}
+          path: node_modules/@vscode/ripgrep/bin/
+
       - name: Install all yarn packages
         run: yarn --frozen-lockfile
         env:
@@ -44,7 +50,7 @@ jobs:
 
           # Make sure it's set to something so that the build uses the
           # Google Analytics tag which is most realistic.
-          BUILD_GOOGLE_ANALYTICS_ACCOUNT: UA-00000000-0
+          BUILD_GOOGLE_ANALYTICS_MEASUREMENT_ID: G-XXXXXXXX
         run: |
           yarn build:prepare
           # BUILD_FOLDERSEARCH=mdn/kitchensink yarn build

.github/workflows/pr-deployer.yml

@@ -15,19 +15,19 @@ jobs:
 
       - name: Install Python
         id: setup-python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: deployer/.venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('.github/workflows/pr-deployer.yml') }}-${{ steps.setup-python.outputs.python-version }}
 
       - name: Load cached .local
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: dotlocal-${{ runner.os }}-${{ hashFiles('.github/workflows/pr-deployer.yml') }}-${{ steps.setup-python.outputs.python-version }}

.github/workflows/pr-docs.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: "yarn"
 
       - name: Lint markdown files

.github/workflows/pr-kumascript.yml

@@ -28,9 +28,15 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: ".nvmrc"
           cache: yarn
 
+      - name: Cache @vscode/ripgrep bin
+        uses: actions/cache@v4
+        with:
+          key: vscode-ripgrep-bin-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('yarn.lock') }}
+          path: node_modules/@vscode/ripgrep/bin/
+
       - name: Install all yarn packages
         run: yarn --frozen-lockfile
         env: