Super Cache: add an admin notice to encourage migration to Jetpack Boost

.github/actions/tool-setup/action.yml

@@ -20,7 +20,7 @@ runs:
 
         if [[ "${INPUT_PHP:-$PHP_VERSION}" == 7.[01] ]]; then
           printf "Downgrading composer for PHP %s\n\n" "${INPUT_PHP:-$PHP_VERSION}"
-          COMPOSER_VERSION=2.2.23
+          COMPOSER_VERSION=2.2.24
         fi
 
         printf "\n\e[1mSelected tool versions\e[0m\n"

.github/files/gh-autorelease/files/autorelease.sh

@@ -28,7 +28,7 @@ if [[ ! -f composer.json ]]; then
 	exit 1
 fi
 
-SLUG="$(jq -r '.extra.autorelease.slug? // .extra["wp-plugin-slug"] // ( .name | sub( "^.*/"; "" ) )' composer.json)"
+SLUG="$(jq -r '.extra.autorelease.slug? // .extra["wp-plugin-slug"] // .extra["beta-plugin-slug"] // ( .name | sub( "^.*/"; "" ) )' composer.json)"
 if [[ -z "$SLUG" ]]; then
 	echo '::error::Failed to get slug from composer.json.'
 	exit 1

.github/renovate.json5

@@ -26,6 +26,13 @@
 		// Monorepo packages are excluded in renovate-config.js, where we can read
 		// the list of them in code.
 
+		// Disable the packagist 'wordpress/classic-editor-plugin'. It's not in packagist, and we have a customManager for it below.
+		{
+			matchDatasources: [ 'packagist' ],
+			matchDepNames: [ 'wordpress/classic-editor-plugin' ],
+			enabled: false,
+		},
+
 		// Widen PHP dev deps to maintain support for old PHP versions we still support.
 		// When we drop an old PHP version we'll manually go through and narrow any ranges.
 		// (non-dev deps are handled in renovate-config.js where we can read the correct value for `constraints.php`)
@@ -106,7 +113,35 @@
 			depNameTemplate: 'renovate',
 			packageNameTemplate: 'ghcr.io/renovatebot/renovate',
 		},
+
+		// wpcomsh's wordpress/classic-editor-plugin fake-package.
+		{
+			customType: 'regex',
+			fileMatch: [ '^projects/plugins/wpcomsh/composer\\.json$' ],
+			matchStrings: [
+				// Alas the only option is regexing to match against the JSON. Four patterns for the four different places the version number appears.
+				// .require:
+				'"wordpress/classic-editor-plugin": "(?<currentValue>[0-9.]+)",',
+				// .repositories[].package.version
+				'"name": "wordpress/classic-editor-plugin",\\s+"version": "(?<currentValue>[0-9.]+)",',
+				// .repositories[].package.dist.url
+				'"url": "https://downloads\\.wordpress\\.org/plugin/classic-editor\\.(?<currentValue>[0-9.]+)\\.zip",',
+				// .repositories[].package.source.reference
+				'"url": "https://plugins\\.svn\\.wordpress\\.org/classic-editor/",\\s+"type": "svn",\\s+"reference": "tags/(?<currentValue>[0-9.]+)/"',
+			],
+			depNameTemplate: 'wordpress/classic-editor-plugin',
+			packageNameTemplate: 'classic-editor',
+			datasourceTemplate: 'custom.wordpress-plugin',
+		},
 	],
+	customDatasources: {
+		'wordpress-plugin': {
+			defaultRegistryUrlTemplate: 'https://api.wordpress.org/plugins/info/1.0/{{packageName}}.json',
+			transformTemplates: [
+				'{ "releases": $each( versions, function($v, $k) { $match( $k, /^[0-9.]+$/ ) ? { "version": $k } } ) }',
+			],
+		},
+	},
 
 	lockFileMaintenance: {
 		enabled: true,

.github/versions.sh

@@ -1,6 +1,6 @@
 # Versions of tools to use in CI.
 PHP_VERSION=8.2
-COMPOSER_VERSION=2.7.1
+COMPOSER_VERSION=2.7.7
 NODE_VERSION=20.8.1
 PNPM_VERSION=9.3.0
 

.github/workflows/post-build.yml

@@ -120,7 +120,7 @@ jobs:
             )"
             echo "$JSON"
             echo "::endgroup::"
-            ZIPURL="$(jq -r '.artifacts[] | select( .name == "jetpack-build" ) | .archive_download_url' <<<"$JSON")"
+            ZIPURL="$(jq -r '.artifacts | map( select( .name == "jetpack-build" ) ) | sort_by( .created_at ) | last | .archive_download_url // empty' <<<"$JSON")"
             PLUGINS="$(jq -r '.artifacts[] | select( .name == "plugins.tsv" )' <<<"$JSON")"
             if [[ -n "$ZIPURL" ]]; then
               break

.gitignore

@@ -4,13 +4,11 @@
 vendor/
 jetpack_vendor/
 /.nova/
-/.vscode/
 /logs
 /allure-results/
 
 ## FILES
 .DS_Store
-*.code-workspace
 *.swp
 # Custom environment for Docker compose (used by docker-compose.yml)
 /.env
@@ -56,4 +54,6 @@ phpcs.xml
 # This file indicates we're in draft mode, which reduces checks
 .jetpack-draft
 
-.vscode/settings.json
+# VS Code setting files
+*.code-workspace
+/.vscode/settings.json

.pnpmfile.cjs

@@ -143,6 +143,15 @@ function fixPeerDeps( pkg ) {
 		}
 	}
 
+	// It assumes hoisting to find its plugins. Sigh. Add peer deps for the plugins we use.
+	// https://github.com/ai/size-limit/issues/366
+	if ( pkg.name === 'size-limit' ) {
+		pkg.peerDependencies ??= {};
+		pkg.peerDependencies[ '@size-limit/preset-app' ] = '*';
+		pkg.peerDependenciesMeta ??= {};
+		pkg.peerDependenciesMeta[ '@size-limit/preset-app' ] = { optional: true };
+	}
+
 	return pkg;
 }
 

.vscode/settings.json → .vscode/settings.dist.jsonc

@@ -1,41 +1,42 @@
+// This is a managed VS Code settings file.
+// It is copied into place by `tools/install-vscode-settings.sh`.
+// If you no longer want the settings managed, remove these comments.
 {
-	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": "explicit"
-	},
+	// Define schema to allow auto-completion.
+	"$schema": "vscode://schemas/settings/workspace",
+	// Don't show these files in VS Code.
 	"files.exclude": {
+		"**/.DS_Store/**": true
+	},
+	// Don't search these files in VS Code.
+	"search.exclude": {
 		"**/.cache/**": true,
-		"**/.DS_Store/**": true,
-		"**/.git/**": true,
-		"**/.hg/**": true,
-		"**/.svn/**": true,
-		"**/bower_components/**": true,
-		"**/CVS/**": true,
 		"**/jetpack_vendor/**": true,
 		"**/node_modules/**": true,
-		"**/vendor/**": true,
+		"**/vendor/**": true
 	},
+	// Don't run Intelephense on these files.
 	"intelephense.files.exclude": [
 		"**/.cache/**",
 		"**/.git/**",
-		"**/.svn/**",
-		"**/.hg/**",
 		"**/.history/**",
-		"**/bower_components/**",
 		"**/jetpack_vendor/**",
 		"**/packages/**/wordpress/**",
 		"**/projects/**/wordpress/**",
 		"**/plugins/**/wordpress/**",
-		"**/vendor/**",
+		"**/vendor/**"
 	],
 	"phpCodeSniffer.autoExecutable": true,
 	"phpCodeSniffer.standard": "Automatic",
+	// Have PHPCS ignore these files.
 	"phpCodeSniffer.exclude": [
 		"**/.git/**",
 		"**/.svn/**",
 		"**/.hg/**",
 		"**/.cache/**",
 		"**/jetpack_vendor/**",
-		"**/vendor/**",
+		"**/vendor/**"
 	],
+	// Use this wp-prettier from this path.
 	"prettier.prettierPath": "tools/js-tools/node_modules/prettier/index.cjs"
 }

.vscode/tasks.json

@@ -0,0 +1,20 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=733558
+	// for the documentation about the tasks.json format
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "Install VS Code settings",
+			"type": "shell",
+			"command": "./tools/install-vscode-settings.sh",
+			"runOptions": {
+				"runOn": "folderOpen"
+			},
+			"problemMatcher": [],
+			"presentation": {
+				"reveal": "silent",
+				"close": true
+			}
+		}
+	]
+}

docs/git-workflow.md

@@ -74,6 +74,28 @@ $ git rebase jetpack/trunk
 $ git push -f origin update/my-changes
 ```
 
+### Updating an external contributor's PR
+
+If you're working directly with Jetpack trunk and need to update an external contributor's PR, the below commands will be helpful. 
+This method assumes you are using the `gh` shorthand from the [Github CLI](https://cli.github.com/):
+
+```sh
+# Use the Github CLI to checkout the PR with the PR number - for example gh pr checkout 12345.
+gh pr checkout xxxxx
+
+# Run merge-base to check where that branch differed from trunk - example git merge-base update/broken-jetpack-feature trunk.
+git merge-base forkedbranchname trunk
+
+## With the SHA returned from the above command, we can rebase from that.
+git rebase -i the-sha
+
+## Rebase the current branch onto origin/trunk.
+git rebase origin/trunk
+
+## Push the updated branch to the forked branch. Note that using --force-with-lease won't work due to an existing GitHub CLI issue, but --force will)
+git push --force
+```
+
 ### Tips for common issues when merging
 
 #### Dealing with lock files