Merge release/6.4.0 into trunk

Automattic · Aug 31, 2023 · 4db4181 · 4db4181
2 parents a16368b + ebf4400
commit 4db4181
Show file tree

Hide file tree

Showing 233 changed files with 6,514 additions and 2,549 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -137,7 +137,10 @@
 				"wpcalypso/jsx-classname-namespace": "off",
 				"react/react-in-jsx-scope": "error",
 				"no-shadow": "off",
-				"@typescript-eslint/no-shadow": "error"
+				"@typescript-eslint/no-shadow": "error",
+				"jsdoc/require-param-type": 0,
+				"jsdoc/require-returns-type": 0,
+				"valid-jsdoc": "off"
 			}
 		}
 	]

diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
@@ -4,9 +4,10 @@ on:
   pull_request
 
 env:
-  WC_MIN_SUPPORTED_VERSION: '7.6.0'
-  WP_MIN_SUPPORTED_VERSION: '6.0'
+  WC_MIN_SUPPORTED_VERSION: '7.8.0'
+  WP_MIN_SUPPORTED_VERSION: '6.1'
   PHP_MIN_SUPPORTED_VERSION: '7.3'
+  GUTENBERG_VERSION_FOR_WP_MIN: '15.7.0'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,7 +24,7 @@ jobs:
         id: generate_matrix
         run: |
           WC_VERSIONS=$( echo "[\"$WC_MIN_SUPPORTED_VERSION\", \"latest\", \"beta\"]" )
-          MATRIX_INCLUDE=$( echo "[{\"woocommerce\":\"$WC_MIN_SUPPORTED_VERSION\",\"wordpress\":\"$WP_MIN_SUPPORTED_VERSION\",\"gutenberg\":\"13.6.0\",\"php\":\"$PHP_MIN_SUPPORTED_VERSION\"}]" )
+          MATRIX_INCLUDE=$( echo "[{\"woocommerce\":\"$WC_MIN_SUPPORTED_VERSION\",\"wordpress\":\"$WP_MIN_SUPPORTED_VERSION\",\"gutenberg\":\"$GUTENBERG_VERSION_FOR_WP_MIN\",\"php\":\"$PHP_MIN_SUPPORTED_VERSION\"}]" )
           echo "matrix={\"woocommerce\":$WC_VERSIONS,\"wordpress\":[\"latest\"],\"gutenberg\":[\"latest\"],\"php\":[\"7.4\"], \"include\":$MATRIX_INCLUDE}" >> $GITHUB_OUTPUT
 
   woocommerce-compatibility:

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -23,7 +23,7 @@ env:
   E2E_SLACK_TOKEN:       ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_USE_LOCAL_SERVER:  false
   E2E_RESULT_FILEPATH:   'tests/e2e/results.json'
-  WC_MIN_SUPPORTED_VERSION: '7.6.0'
+  WC_MIN_SUPPORTED_VERSION: '7.8.0'
   NODE_ENV: 'test'
   FORCE_E2E_DEPS_SETUP: true
 

diff --git a/.github/workflows/php-lint-test.yml b/.github/workflows/php-lint-test.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   WP_VERSION:        latest
-  WC_MIN_SUPPORTED_VERSION: '7.6.0'
+  WC_MIN_SUPPORTED_VERSION: '7.8.0'
   GUTENBERG_VERSION: latest
   PHP_MIN_SUPPORTED_VERSION: '7.3'
 

diff --git a/.github/workflows/pr-build-live-branch.yml b/.github/workflows/pr-build-live-branch.yml
@@ -122,7 +122,7 @@ jobs:
           
           #### Option 2. Jurassic Ninja - available for logged-in A12s
          
-          :rocket: [Launch a JN site with this branch](https://jurassic.ninja/create/?jetpack-beta&shortlived&nojetpack&woocommerce&branches.woocommerce-payments=${PR_HEAD_REF}) :rocket:
+          :rocket: [Launch a JN site with this branch](https://jurassic.ninja/create/?jetpack-beta&shortlived&nojetpack&woocommerce&woocommerce-payments-dev-tools&branches.woocommerce-payments=${PR_HEAD_REF}) :rocket:
           
           :information_source: Install this [Tampermonkey script](https://github.com/Automattic/woocommerce-payments/tree/develop/bin/wcpay-live-branches) to get more options.
           

diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml
@@ -37,7 +37,9 @@ jobs:
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v3
-
+        with:
+          token: ${{ SECRETS.BOTWOO_TOKEN }}
+
       - name: "Format the release date"
         id: format_date
         run: |
@@ -54,8 +56,8 @@ jobs:
 
       - name: "Commit and push the changes"
         run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git config user.name "botwoo"
+          git config user.email "botwoo@users.noreply.github.com"
           if ${{ env.CHANGELOG_ACTION == 'amend' }}; then
             git commit -am "Amend changelog entries for release $RELEASE_VERSION"
           else

diff --git a/assets/images/subscriptions-empty-state-connected.svg b/assets/images/subscriptions-empty-state-connected.svg
diff --git a/bin/wcpay-live-branches/wcpay-live-branches.user.js b/bin/wcpay-live-branches/wcpay-live-branches.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         WCPay Live Branches
 // @namespace    https://wordpress.com/
-// @version      1.1
+// @version      1.2
 // @description  Adds links to PRs pointing to Jurassic Ninja sites for live-testing a changeset
 // @grant        GM_xmlhttpRequest
 // @connect      jurassic.ninja
@@ -186,6 +186,7 @@
 								{
 									label: 'WooCommerce Payments Dev Tools',
 									name: 'woocommerce-payments-dev-tools',
+									checked: true,
 								},
 								{
 									label: 'WooCommerce Smooth Generator',