Merge branch 'trunk' into add/document-outline-main

WordPress · Mar 3, 2025 · d4213cb · d4213cb
2 parents eba3293 + 7c02f29
commit d4213cb
Show file tree

Hide file tree

Showing 513 changed files with 4,814 additions and 2,345 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -116,9 +116,15 @@ const restrictedSyntax = [
 	},
 	{
 		selector:
-			'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/^toggle\\b/i]',
+			'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/toggle\\b/i]',
 		message: "Avoid using the verb 'Toggle' in translatable strings",
 	},
+	{
+		selector:
+			'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/(?<![-\\w])sidebar(?![-\\w])/i]',
+		message:
+			"Avoid using the word 'sidebar' in translatable strings. Consider using 'panel' instead.",
+	},
 ];
 
 /** `no-restricted-syntax` rules for components. */

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,23 +4,21 @@ version: 2
 updates:
     # Check for updates to GitHub Actions.
     - package-ecosystem: 'github-actions'
-      directory: '/'
+      directories:
+          - '.github/workflows'
+          - '.github/setup-node'
       schedule:
           interval: 'daily'
       open-pull-requests-limit: 10
       labels:
           - 'GitHub Actions'
           - '[Type] Build Tooling'
+      ignore:
+          - dependency-name: 'actions/setup-java'
+          - dependency-name: 'gradle/*'
+          - dependency-name: 'reactivecircus/*'
+          - dependency-name: 'ruby/setup-ruby'
       groups:
           github-actions:
               patterns:
                   - '*'
-              exclude-patterns:
-                  - 'actions/setup-java'
-                  - 'gradle/*'
-                  - 'reactivecircus/*'
-          react-native:
-              patterns:
-                  - 'actions/setup-java'
-                  - 'gradle/*'
-                  - 'reactivecircus/*'
diff --git a/.github/setup-node/action.yml b/.github/setup-node/action.yml
@@ -10,7 +10,7 @@ runs:
     using: 'composite'
     steps:
         - name: Use desired version of Node.js
-          uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+          uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
           with:
               node-version-file: '.nvmrc'
               node-version: ${{ inputs.node-version }}
@@ -25,7 +25,7 @@ runs:
 
         - name: Cache node_modules
           id: cache-node_modules
-          uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+          uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
           with:
               path: '**/node_modules'
               key: node_modules-${{ runner.os }}-${{ runner.arch }}-${{ steps.node-version.outputs.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
@@ -36,7 +36,7 @@ runs:
               npm ci
           shell: bash
         - name: Upload npm logs as an artifact on failure
-          uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+          uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
           if: failure()
           with:
               name: npm-logs

diff --git a/.github/workflows/build-plugin-zip.yml b/.github/workflows/build-plugin-zip.yml
@@ -273,12 +273,12 @@ jobs:
               run: echo "version=$(echo $VERSION | cut -d / -f 3 | sed 's/-rc./ RC/' )" >> $GITHUB_OUTPUT
 
             - name: Download Plugin Zip Artifact
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
               with:
                   name: gutenberg-plugin
 
             - name: Download Release Notes Artifact
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
               with:
                   name: release-notes
 

diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml
@@ -49,7 +49,7 @@ jobs:
                   check-latest: true
                   cache: npm
 
-            - uses: preactjs/compressed-size-action@6fa0e7ca017120c754863b31123c5ee2860fd434 # v2.7.0
+            - uses: preactjs/compressed-size-action@946a292cd35bd1088e0d7eb92b69d1a8d5b5d76a # v2.8.0
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
                   pattern: '{build/**/*.min.js,build/**/*.css,build-module/**/*.min.js}'

diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
@@ -107,7 +107,7 @@ jobs:
                   ref: trunk
                   show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
 
-            - uses: actions/[email protected].8
+            - uses: actions/[email protected].9
               # Don't fail the job if there isn't any flaky tests report.
               continue-on-error: true
               with:

diff --git a/.github/workflows/rnmobile-android-runner.yml b/.github/workflows/rnmobile-android-runner.yml
@@ -38,7 +38,7 @@ jobs:
               uses: ./.github/setup-node
 
             - name: Restore tests setup cache
-              uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+              uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
               with:
                   path: |
                       ~/.appium
@@ -53,7 +53,7 @@ jobs:
             # AVD cache disabled as it caused emulator termination to hang indefinitely.
             # https://github.com/ReactiveCircus/android-emulator-runner/issues/385
             # - name: AVD cache
-            #   uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+            #   uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
             #   id: avd-cache
             #   with:
             #       path: |

diff --git a/.github/workflows/rnmobile-ios-runner.yml b/.github/workflows/rnmobile-ios-runner.yml
@@ -43,7 +43,7 @@ jobs:
               uses: ./.github/setup-node
 
             - name: Restore tests setup cache
-              uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+              uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
               with:
                   path: |
                       ~/.appium
@@ -56,15 +56,15 @@ jobs:
               run: find package-lock.json packages/react-native-editor/ios packages/react-native-aztec/ios packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
 
             - name: Restore build cache
-              uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+              uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
               with:
                   path: |
                       packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app
                       packages/react-native-editor/ios/build/WDA
                   key: ${{ runner.os }}-ios-build-${{ matrix.xcode }}-${{ matrix.device }}-${{ hashFiles('ios-checksums.txt') }}
 
             - name: Restore pods cache
-              uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+              uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
               with:
                   path: |
                       packages/react-native-editor/ios/Pods

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -206,7 +206,7 @@ jobs:
                   custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
 
             - name: Download built JavaScript assets
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
               with:
                   name: build-assets
 
@@ -296,7 +296,7 @@ jobs:
               run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
 
             - name: Cache PHPCS scan cache
-              uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+              uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
               with:
                   path: .cache/phpcs.json
                   key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}

diff --git a/.github/workflows/upload-release-to-plugin-repo.yml b/.github/workflows/upload-release-to-plugin-repo.yml
@@ -169,7 +169,7 @@ jobs:
         steps:
             - name: Install Subversion
               run: |
-                  apt-get update -y && apt-get install -y subversion
+                  sudo apt-get update -y && sudo apt-get install -y subversion
 
             - name: Check out Gutenberg trunk from WP.org plugin repo
               run: |
@@ -195,7 +195,7 @@ jobs:
                   sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" ./trunk/readme.txt
 
             - name: Download Changelog Artifact
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
               with:
                   name: changelog trunk
                   path: trunk
@@ -228,7 +228,7 @@ jobs:
         steps:
             - name: Install Subversion
               run: |
-                  apt-get update -y && apt-get install -y subversion
+                  sudo apt-get update -y && sudo apt-get install -y subversion
 
             - name: Download and unzip Gutenberg plugin asset into tags folder
               env:
@@ -246,7 +246,7 @@ jobs:
                   sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" "$VERSION/readme.txt"
 
             - name: Download Changelog Artifact
-              uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+              uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
               with:
                   name: changelog trunk
                   path: ${{ github.event.release.name }}

diff --git a/backport-changelog/6.8/8123.md b/backport-changelog/6.8/8123.md
@@ -2,3 +2,5 @@ https://github.com/WordPress/wordpress-develop/pull/8123
 
 * https://github.com/WordPress/gutenberg/pull/68549
 * https://github.com/WordPress/gutenberg/pull/68745
+* https://github.com/WordPress/gutenberg/pull/69160
+* https://github.com/WordPress/gutenberg/pull/69209
diff --git a/backport-changelog/6.8/8212.md b/backport-changelog/6.8/8212.md
@@ -1,3 +1,5 @@
 https://github.com/WordPress/wordpress-develop/pull/8212
 
 * https://github.com/WordPress/gutenberg/pull/68926
+* https://github.com/WordPress/gutenberg/pull/69142
+* https://github.com/WordPress/gutenberg/pull/69241
diff --git a/backport-changelog/6.8/8228.md b/backport-changelog/6.8/8228.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8228
+
+* https://github.com/WordPress/gutenberg/pull/68970
diff --git a/backport-changelog/6.8/8245.md b/backport-changelog/6.8/8245.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8245
+
+* https://github.com/WordPress/gutenberg/pull/68983
diff --git a/backport-changelog/6.8/8261.md b/backport-changelog/6.8/8261.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8261
+
+* https://github.com/WordPress/gutenberg/pull/68521
diff --git a/backport-changelog/6.8/8265.md b/backport-changelog/6.8/8265.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8265
+
+* https://github.com/WordPress/gutenberg/pull/69057
diff --git a/backport-changelog/6.8/8274.md b/backport-changelog/6.8/8274.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8274
+
+* https://github.com/WordPress/gutenberg/pull/69096
diff --git a/backport-changelog/6.8/8345.md b/backport-changelog/6.8/8345.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/8345
+
+* https://github.com/WordPress/gutenberg/pull/69106
diff --git a/backport-changelog/6.8/6910.md → backport-changelog/6.9/6910.md b/backport-changelog/6.8/6910.md → backport-changelog/6.9/6910.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		https://github.com/WordPress/wordpress-develop/pull/8228

		* https://github.com/WordPress/gutenberg/pull/68970