Merge pull request #5151 from Automattic/staging

Production release v20240116.0

.github/workflows/codeql-analysis.yml

@@ -32,10 +32,10 @@ jobs:
         uses: actions/[email protected]
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/core-tests.yml

@@ -60,7 +60,7 @@ jobs:
           echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
 
       - name: Set up Node.js
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version-file: 'wordpress/.nvmrc'
           cache: npm

.github/workflows/e2e.yml

@@ -76,7 +76,7 @@ jobs:
         uses: ./.github/actions/prepare-source
 
       - name: Setup Node
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: 'lts/*'
           cache: npm
@@ -113,7 +113,7 @@ jobs:
         working-directory: __tests__/e2e
 
       - name: Archive test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-results

.github/workflows/lint.yml

@@ -36,7 +36,7 @@ jobs:
           fail-fast: 'true'
 
       - name: Setup Node
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: 'lts/*'
           cache: npm
@@ -55,7 +55,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup Node
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: 'lts/*'
           cache: npm

.github/workflows/search-dev-tools.yml

@@ -27,7 +27,7 @@ jobs:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 
       - name: Setup Node
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: 'lts/*'
           cache: npm

.github/workflows/search-e2e.yml

@@ -38,7 +38,7 @@ jobs:
       uses: ./.github/actions/prepare-source
 
     - name: "Install node v${{ env.NODE_VERSION }}"
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: npm
@@ -59,7 +59,7 @@ jobs:
       run: npm run cypress:run
 
     - name: Make artifacts available
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cypress-artifact

001-core/privacy.php

@@ -457,3 +457,22 @@ function delete_old_export_files() {
 		}
 	}
 }
+
+/**
+ * Disable crawling for go-vip.co and go-vip.net domains.
+ * 
+ * @param string $output The robots.txt content.
+ * @return string The modified robots.txt content.
+ */
+function vip_convenience_domain_robots_txt( $output ) {
+	$host = strtolower( $_SERVER['HTTP_HOST'] ?? '' ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+	if ( false !== strpos( $host, '.go-vip.co' ) || false !== strpos( $host, '.go-vip.net' ) ) {
+		$output  = "# Crawling is blocked for go-vip.co and go-vip.net domains\n";
+		$output .= "User-agent: *\n";
+		$output .= "Disallow: /\n";
+	}
+
+	return $output;
+}
+// phpcs:ignore WordPressVIPMinimum.Hooks.RestrictedHooks.robots_txt
+add_filter( 'robots_txt', __NAMESPACE__ . '\vip_convenience_domain_robots_txt' );

__tests__/e2e/package.json

@@ -16,7 +16,7 @@
     "@playwright/test": "^1.39.0",
     "asana-phrase": "^0.0.8",
     "eslint": "^8.51.0",
-    "eslint-plugin-playwright": "^0.19.0",
+    "eslint-plugin-playwright": "^0.21.0",
     "playwright": "^1.39.0",
     "typescript": "^5.2.2"
   }

akismet/.htaccess

@@ -12,7 +12,7 @@
 </IfModule>
 
 # Akismet CSS and JS
-<FilesMatch "^(form\.js|akismet\.js|akismet\.css)$">
+<FilesMatch "^(form\.js|akismet(-frontend|-admin)?\.js|akismet(-admin)?(-rtl)?\.css|inter\.css)$">
 	<IfModule !mod_authz_core.c>
 		Allow from all
 	</IfModule>
@@ -23,12 +23,12 @@
 </FilesMatch>
 
 # Akismet images
-<FilesMatch "^logo-(a|full)-2x\.png$">
+<FilesMatch "^(logo-(a|full)-2x\.png|akismet-refresh-logo\.svg|akismet-refresh-logo@2x\.png|arrow-left\.svg)$">
 	<IfModule !mod_authz_core.c>
 		Allow from all
 	</IfModule>
 
 	<IfModule mod_authz_core.c>
 		Require all granted
 	</IfModule>
-</FilesMatch>
+</FilesMatch>