Merge remote-tracking branch 'origin/trunk' into update/social-logos-…

…threads

.github/files/jetpack-staging-sites/k6-frontend.js

@@ -4,8 +4,8 @@ import http from 'k6/http';
 import { sites } from './k6-shared.js';
 
 export const options = {
-	vus: 3,
-	iterations: 3,
+	vus: 1,
+	iterations: 1,
 	thresholds: {
 		checks: [
 			{

.github/workflows/update-jetpack-staging-sites.yml

@@ -1,5 +1,6 @@
 name: Update Jetpack Staging Test Sites
 # Ran as part of the `UpdateJetpackStaging` TeamCity build.
+# After updating the sites, runs k6 tests against the same sites.
 
 on:
   workflow_dispatch:
@@ -24,3 +25,26 @@ jobs:
       - name: Execute shell script
         shell: bash
         run: .github/files/jetpack-staging-sites/update-jetpack-staging-sites.sh
+
+  run_k6_tests:
+    needs: run_shell_script
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Run k6 frontend tests
+        uses: grafana/k6-action@v0.3.0
+        with:
+          filename: .github/files/jetpack-staging-sites/k6-frontend.js
+        env:
+          JETPACKSTAGING_K6_USERNAME: ${{ secrets.JETPACKSTAGING_K6_USERNAME }}
+          JETPACKSTAGING_K6_PASSWORD: ${{ secrets.JETPACKSTAGING_K6_PASSWORD }}
+
+      - name: Run k6 backend tests
+        uses: grafana/k6-action@v0.3.0
+        with:
+          filename: .github/files/jetpack-staging-sites/k6-backend.js
+        env:
+          JETPACKSTAGING_K6_USERNAME: ${{ secrets.JETPACKSTAGING_K6_USERNAME }}
+          JETPACKSTAGING_K6_PASSWORD: ${{ secrets.JETPACKSTAGING_K6_PASSWORD }}

.pnpmfile.cjs

@@ -126,6 +126,15 @@ function fixDeps( pkg ) {
 		pkg.peerDependencies[ '@babel/runtime' ] = '^7';
 	}
 
+	// Annoying tilde dep, already fixed in storybook 7.1
+	if ( pkg.name === '@storybook/codemod' || pkg.name === '@storybook/csf-tools' ) {
+		for ( const [ dep, ver ] of Object.entries( pkg.dependencies ) ) {
+			if ( dep.startsWith( '@babel/' ) && ver.startsWith( '~' ) ) {
+				pkg.dependencies[ dep ] = '^' + ver.substring( 1 );
+			}
+		}
+	}
+
 	return pkg;
 }