Merge branch 'develop' into do/post-release-merge-190

# Conflicts:
#	.github/workflows/cypress.yml
#	.github/workflows/lint.yml
#	distributor.php
#	includes/classes/ExternalConnections/WordPressExternalConnection.php
#	includes/classes/InternalConnections/NetworkSiteConnection.php
#	includes/utils.php
#	package-lock.json
#	package.json
#	readme.txt
#	tests/bin/set-core-version.js

Author: peterwilsoncc

.babelrc

@@ -0,0 +1,6 @@
+node_modules
+release/*
+dist/*
+docs-built/*
+vendor/*
+gulp-tasks/*

.eslintignore

@@ -1,3 +1,9 @@
 {
-  "extends": "@10up/eslint-config"
+  "extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],
+  "settings": {
+    "import/core-modules": [ "jquery", "underscore" ]
+  },
+  "rules": {
+    "import/no-extraneous-dependencies": ["error", {"packageDir": ["./", "./node_modules/@wordpress/scripts"] }]
+  }
 }

.eslintrc.json

@@ -1,13 +1,11 @@
-**Release checklist for the version 1.x branch.**
-
-- [x] Branch: Starting from `develop-v1`, create a release branch named `release/X.Y.Z` for your changes.
+- [x] Branch: Starting from `develop`, create a release branch named `release/X.Y.Z` for your changes.
 - [ ] Version bump: Bump the version number in `distributor.php`, `package.json`, and `readme.txt` if it does not already reflect the version being released.  In `distributor.php` update both the plugin "Version:" property and the plugin `DT_VERSION` constant.
-- [ ] New files: Ensure any new files, especially in the vendor folder, are correctly included in `gulp-tasks/copy.js`.
+- [ ] New files: Ensure any new files, especially in the vendor folder, are correctly included in `webpack.config.release.js`.
 - [ ] Changelog: Add/update the changelog in `CHANGELOG.md`.
 - [ ] Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
 - [ ] Readme updates: Make any other readme changes as necessary.  `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
 - [ ] Since tag updates: ensure `@since` tags indicate the new version, replacing `x.x.x`, `n.e.x.t` and other placeholders.
-- [ ] Merge: Make a non-fast-forward merge from your release branch to `develop-v1` (or merge the Pull Request), then do the same for `develop-v1` into `trunk` (`git checkout trunk && git merge --no-ff develop-v1`).  `trunk` contains the stable development version.
+- [ ] Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the Pull Request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` contains the stable development version.
 - [ ] Build: Wait for the [Build Stable Release Action](https://github.com/10up/distributor/actions?query=workflow%3A%22Build+Stable+Release%22) to finish running.
 - [ ] Update this pull request's status from `draft` to `ready to merge`.
 - [ ] Review: Do a review of the commit to the `stable` branch to ensure the contents of the diffs are as expected.

.github/release-pull-request-template.md

@@ -13,19 +13,22 @@ on:
 jobs:
   cypress:
     name: ${{ matrix.core.name }} / ${{ matrix.php.name }}
+    ## Pending upgrade of `@wordpress/env` package.
+    continue-on-error: ${{ matrix.core.version == 'WordPress/WordPress#master' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
           - {name: 'PHP Default', version: null}
         core:
-          - {name: 'WP latest', version: 'latest'}
+          - {name: 'WP stable', version: 'latest'}
+          - {name: 'WP 5.7', version: 'WordPress/WordPress#5.7'}
           - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
         include:
+          - php: {name: 'PHP 7.4', version: '7.4'}
+            core: {name: 'WP 5.7', version: 'WordPress/WordPress#5.7'}
           - php: {name: 'PHP 8.1', version: '8.1'}
             core: {name: 'WP stable', version: 'latest'}
-          - php: {name: 'PHP 7.4', version: '7.4' }
-            core: {name: 'WP minimum', version: 'WordPress/WordPress#5.2'}
     steps:
     - name: Checkout
       uses: actions/checkout@v3

.github/workflows/cypress.yml

@@ -29,12 +29,19 @@ jobs:
       run: npm -v; node -v
     - name: npm install
       run: npm install
-    - name: eslint
-      uses: icrawl/action-eslint@v1
+    - name: Generate linting report
+      run: npm run lint:js -- --output-file eslint-report.json --format json
+      continue-on-error: true
+    - name: Annotate code linting results
+      uses: ataylorme/[email protected]
       with:
-        custom-glob: assets/js
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        repo-token: '${{ secrets.GITHUB_TOKEN }}'
+        report-json: 'eslint-report.json'
+    - name: Update summary
+      run: |
+        npm_config_yes=true npx github:10up/eslint-json-to-md --path ./eslint-report.json --output ./eslint-report.md
+        cat eslint-report.md >> $GITHUB_STEP_SUMMARY
+      if: ${{ failure() }}
   phpcs:
     name: phpcs
     runs-on: ubuntu-latest
@@ -68,9 +75,12 @@ jobs:
     - name: Check PHPCS standard
       run: ./vendor/bin/phpcs -i
 
+    - name: Check Compatibility of main plugin file.
+      run: ./vendor/bin/phpcs ./distributor.php --runtime-set testVersion 5.6- --standard=PHPCompatibilityWP
+
     - name: PHPCS check
       id: phpcs-sniffs
-      run: ./vendor/bin/phpcs . --runtime-set testVersion 5.6- --report-full --report-checkstyle=./.github/phpcs-report.xml
+      run: ./vendor/bin/phpcs . --report-full --report-checkstyle=./.github/phpcs-report.xml
 
     - name: Show PHPCS results in PR
       if: ${{ always() }}

.github/workflows/lint.yml

@@ -25,8 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # We claim to support from 5.6+ but WP Mock only supports 7.1+
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '7.4', '8.0', '8.1' ]
         os: [ ubuntu-latest ]
 
     steps:

.github/workflows/test.yml

@@ -0,0 +1,20 @@
+name: "WordPress version checker"
+on:
+  push:
+    branches:
+      - develop
+      - trunk
+  pull_request:
+    branches:
+      - develop
+  schedule:
+    - cron: '0 0 * * 1'
+
+jobs:
+  wordpress-version-checker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: WordPress version checker
+        uses: skaut/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/wordpress-latest.yml

@@ -0,0 +1,33 @@
+{
+	"extends": "@wordpress/npm-package-json-lint-config",
+	"rules": {
+		"description-format": [
+			"error",
+			{
+				"requireCapitalFirstLetter": true,
+				"requireEndingPeriod": true
+			}
+		],
+		"prefer-no-devDependencies": "error",
+		"require-publishConfig": "error",
+		"require-repository-directory": "error",
+		"valid-values-publishConfig": [
+			"error",
+			[
+				{
+					"access": "public"
+				}
+			]
+		]
+	},
+	"overrides": [
+		{
+			"patterns": [ "./package.json" ],
+			"rules": {
+				"require-publishConfig": "off",
+				"require-repository-directory": "off",
+				"prefer-no-devDependencies": "off"
+			}
+		}
+	]
+}

.npmpackagejsonlintrc.json

@@ -0,0 +1,6 @@
+node_modules
+release/*
+dist/*
+docs-built/*
+vendor/*
+gulp-tasks/*