From 7d49a0dc7d220be84199a1f4e6ee78351fa76f3f Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Tue, 19 Nov 2024 18:12:14 +0100 Subject: [PATCH 1/5] Charts: add skeleton for a new JS package (#40250) --- pnpm-lock.yaml | 15 +++++++ projects/js-packages/charts/.gitattributes | 7 ++++ projects/js-packages/charts/.gitignore | 2 + projects/js-packages/charts/CHANGELOG.md | 7 ++++ projects/js-packages/charts/README.md | 24 +++++++++++ .../js-packages/charts/changelog/.gitkeep | 0 .../charts/changelog/initial-version | 4 ++ projects/js-packages/charts/composer.json | 42 +++++++++++++++++++ projects/js-packages/charts/package.json | 31 ++++++++++++++ projects/js-packages/charts/src/index.ts | 2 + .../js-packages/charts/tests/index.test.js | 18 ++++++++ .../js-packages/charts/tests/jest.config.cjs | 7 ++++ projects/js-packages/charts/tsconfig.json | 9 ++++ 13 files changed, 168 insertions(+) create mode 100644 projects/js-packages/charts/.gitattributes create mode 100644 projects/js-packages/charts/.gitignore create mode 100644 projects/js-packages/charts/CHANGELOG.md create mode 100644 projects/js-packages/charts/README.md create mode 100644 projects/js-packages/charts/changelog/.gitkeep create mode 100644 projects/js-packages/charts/changelog/initial-version create mode 100644 projects/js-packages/charts/composer.json create mode 100644 projects/js-packages/charts/package.json create mode 100644 projects/js-packages/charts/src/index.ts create mode 100644 projects/js-packages/charts/tests/index.test.js create mode 100644 projects/js-packages/charts/tests/jest.config.cjs create mode 100644 projects/js-packages/charts/tsconfig.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6855415eeadca..027417c51a9a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -291,6 +291,21 @@ importers: specifier: 4.9.1 version: 4.9.1(webpack@5.94.0) + projects/js-packages/charts: + devDependencies: + jest: + specifier: 29.7.0 + version: 29.7.0 + jest-environment-jsdom: + specifier: 29.7.0 + version: 29.7.0 + jest-extended: + specifier: 4.0.2 + version: 4.0.2(jest@29.7.0) + typescript: + specifier: 5.0.4 + version: 5.0.4 + projects/js-packages/components: dependencies: '@automattic/format-currency': diff --git a/projects/js-packages/charts/.gitattributes b/projects/js-packages/charts/.gitattributes new file mode 100644 index 0000000000000..7e44bd96454e9 --- /dev/null +++ b/projects/js-packages/charts/.gitattributes @@ -0,0 +1,7 @@ +# Files not needed to be distributed in the package. +.gitattributes export-ignore +node_modules export-ignore + +# Files to exclude from the mirror repo +/changelog/** production-exclude +/.eslintrc.cjs production-exclude diff --git a/projects/js-packages/charts/.gitignore b/projects/js-packages/charts/.gitignore new file mode 100644 index 0000000000000..140fd587d2d52 --- /dev/null +++ b/projects/js-packages/charts/.gitignore @@ -0,0 +1,2 @@ +vendor/ +node_modules/ diff --git a/projects/js-packages/charts/CHANGELOG.md b/projects/js-packages/charts/CHANGELOG.md new file mode 100644 index 0000000000000..721294abd00ad --- /dev/null +++ b/projects/js-packages/charts/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + diff --git a/projects/js-packages/charts/README.md b/projects/js-packages/charts/README.md new file mode 100644 index 0000000000000..91add458062f6 --- /dev/null +++ b/projects/js-packages/charts/README.md @@ -0,0 +1,24 @@ +# charts + +Display charts within Automattic products. + +## How to install charts + +### Installation From Git Repo + +## Contribute + +## Get Help + +## Using this package in your WordPress plugin + +If you plan on using this package in your WordPress plugin, we would recommend that you use [Jetpack Autoloader](https://packagist.org/packages/automattic/jetpack-autoloader) as your autoloader. This will allow for maximum interoperability with other plugins that use this package as well. + +## Security + +Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic). + +## License + +charts is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt) + diff --git a/projects/js-packages/charts/changelog/.gitkeep b/projects/js-packages/charts/changelog/.gitkeep new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/projects/js-packages/charts/changelog/initial-version b/projects/js-packages/charts/changelog/initial-version new file mode 100644 index 0000000000000..fb1837c901e51 --- /dev/null +++ b/projects/js-packages/charts/changelog/initial-version @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Initial version. diff --git a/projects/js-packages/charts/composer.json b/projects/js-packages/charts/composer.json new file mode 100644 index 0000000000000..8fc45449250b7 --- /dev/null +++ b/projects/js-packages/charts/composer.json @@ -0,0 +1,42 @@ +{ + "name": "automattic/charts", + "description": "Display charts within Automattic products.", + "type": "library", + "license": "GPL-2.0-or-later", + "require": {}, + "require-dev": { + "automattic/jetpack-changelogger": "@dev" + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "scripts": { + "test-coverage": [ + "pnpm run test-coverage" + ], + "test-js": [ + "pnpm run test" + ] + }, + "repositories": [ + { + "type": "path", + "url": "../../packages/*", + "options": { + "monorepo": true + } + } + ], + "minimum-stability": "dev", + "prefer-stable": true, + "extra": { + "autotagger": true, + "npmjs-autopublish": true, + "changelogger": { + "link-template": "https://github.com/Automattic/charts/compare/v${old}...v${new}" + }, + "mirror-repo": "Automattic/charts" + } +} diff --git a/projects/js-packages/charts/package.json b/projects/js-packages/charts/package.json new file mode 100644 index 0000000000000..82b515ffa287d --- /dev/null +++ b/projects/js-packages/charts/package.json @@ -0,0 +1,31 @@ +{ + "name": "@automattic/charts", + "version": "0.1.0-alpha", + "description": "Display charts within Automattic products.", + "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/charts/#readme", + "bugs": { + "url": "https://github.com/Automattic/jetpack/labels/[JS Package] Charts" + }, + "repository": { + "type": "git", + "url": "https://github.com/Automattic/jetpack.git", + "directory": "projects/js-packages/charts" + }, + "license": "GPL-2.0-or-later", + "author": "Automattic", + "scripts": { + "test": "jest --config=tests/jest.config.cjs", + "test-coverage": "pnpm run test --coverage" + }, + "devDependencies": { + "jest": "29.7.0", + "jest-environment-jsdom": "29.7.0", + "jest-extended": "4.0.2", + "typescript": "5.0.4" + }, + "exports": { + ".": "./src/index.ts", + "./state": "./src/state", + "./action-types": "./src/state/action-types" + } +} diff --git a/projects/js-packages/charts/src/index.ts b/projects/js-packages/charts/src/index.ts new file mode 100644 index 0000000000000..9ad1e06860e5c --- /dev/null +++ b/projects/js-packages/charts/src/index.ts @@ -0,0 +1,2 @@ +// Put your code in this `src/` folder! +// Feel free to delete or rename this file. diff --git a/projects/js-packages/charts/tests/index.test.js b/projects/js-packages/charts/tests/index.test.js new file mode 100644 index 0000000000000..5a3ba2ed0ddaa --- /dev/null +++ b/projects/js-packages/charts/tests/index.test.js @@ -0,0 +1,18 @@ +// We recommend using `jest` for testing. If you're testing React code, we recommend `@testing-library/react` and related packages. +// Please match the versions used elsewhere in the monorepo. +// +// Please don't add new uses of `mocha`, `chai`, `sinon`, `enzyme`, and so on. We're trying to standardize on one testing framework. +// +// The default setup is to have files named like "name.test.js" (or .jsx, .ts, or .tsx) in this `tests/` directory. +// But you could instead put them in `src/`, or put files like "name.js" (or .jsx, .ts, or .tsx) in `test` or `__tests__` directories somewhere. + +// This is a placeholder test, new tests will be added soon +const placeholderFunction = () => { + return true; +}; + +describe( 'placeholderTest', () => { + it( 'should be a function', () => { + expect( typeof placeholderFunction ).toBe( 'function' ); + } ); +} ); diff --git a/projects/js-packages/charts/tests/jest.config.cjs b/projects/js-packages/charts/tests/jest.config.cjs new file mode 100644 index 0000000000000..b5ceacda1f7e0 --- /dev/null +++ b/projects/js-packages/charts/tests/jest.config.cjs @@ -0,0 +1,7 @@ +const path = require( 'path' ); +const baseConfig = require( 'jetpack-js-tools/jest/config.base.js' ); + +module.exports = { + ...baseConfig, + rootDir: path.join( __dirname, '..' ), +}; diff --git a/projects/js-packages/charts/tsconfig.json b/projects/js-packages/charts/tsconfig.json new file mode 100644 index 0000000000000..0e1116eec9836 --- /dev/null +++ b/projects/js-packages/charts/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "jetpack-js-tools/tsconfig.base.json", + "compilerOptions": { + "typeRoots": [ "./node_modules/@types/", "src/*" ], + "outDir": "./build/" + }, + // List all sources and source-containing subdirs. + "include": [ "./src" ] +} From 2c5c801e65a592796e696ad10806c8a247713095 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 19 Nov 2024 12:45:30 -0500 Subject: [PATCH 2/5] Update Composer to 2.8.3 (#40257) Versions before 2.8.0 raise warnings with PHP 8.4. Then we may as well pick up the fixes in later releases. --- .github/versions.sh | 2 +- composer.lock | 2 +- .../changelog/update-composer | 5 +++++ .../automattic-for-agencies-client/composer.lock | 8 ++++---- projects/plugins/backup/changelog/update-composer | 5 +++++ projects/plugins/backup/composer.lock | 8 ++++---- projects/plugins/beta/changelog/update-composer | 5 +++++ projects/plugins/beta/composer.lock | 4 ++-- projects/plugins/boost/changelog/update-composer | 5 +++++ projects/plugins/boost/composer.lock | 6 +++--- .../changelog/update-composer | 5 +++++ .../classic-theme-helper-plugin/composer.lock | 8 ++++---- projects/plugins/crm/changelog/update-composer | 5 +++++ projects/plugins/crm/composer.lock | 6 +++--- .../plugins/debug-helper/changelog/update-composer | 5 +++++ projects/plugins/debug-helper/composer.lock | 4 ++-- projects/plugins/inspect/changelog/update-composer | 5 +++++ projects/plugins/inspect/composer.lock | 6 +++--- projects/plugins/jetpack/changelog/update-composer | 5 +++++ projects/plugins/jetpack/composer.lock | 8 ++++---- .../mu-wpcom-plugin/changelog/update-composer | 5 +++++ projects/plugins/mu-wpcom-plugin/composer.lock | 8 ++++---- projects/plugins/protect/changelog/update-composer | 5 +++++ projects/plugins/protect/composer.lock | 14 +++++++------- projects/plugins/search/changelog/update-composer | 5 +++++ projects/plugins/search/composer.lock | 8 ++++---- projects/plugins/social/changelog/update-composer | 5 +++++ projects/plugins/social/composer.lock | 12 ++++++------ .../starter-plugin/changelog/update-composer | 5 +++++ projects/plugins/starter-plugin/composer.lock | 10 +++++----- .../plugins/super-cache/changelog/update-composer | 5 +++++ projects/plugins/super-cache/composer.lock | 8 ++++---- .../plugins/vaultpress/changelog/update-composer | 5 +++++ projects/plugins/vaultpress/composer.lock | 8 ++++---- .../plugins/videopress/changelog/update-composer | 5 +++++ projects/plugins/videopress/composer.lock | 10 +++++----- projects/plugins/wpcomsh/changelog/update-composer | 5 +++++ projects/plugins/wpcomsh/composer.lock | 6 +++--- 38 files changed, 163 insertions(+), 73 deletions(-) create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/update-composer create mode 100644 projects/plugins/backup/changelog/update-composer create mode 100644 projects/plugins/beta/changelog/update-composer create mode 100644 projects/plugins/boost/changelog/update-composer create mode 100644 projects/plugins/classic-theme-helper-plugin/changelog/update-composer create mode 100644 projects/plugins/crm/changelog/update-composer create mode 100644 projects/plugins/debug-helper/changelog/update-composer create mode 100644 projects/plugins/inspect/changelog/update-composer create mode 100644 projects/plugins/jetpack/changelog/update-composer create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/update-composer create mode 100644 projects/plugins/protect/changelog/update-composer create mode 100644 projects/plugins/search/changelog/update-composer create mode 100644 projects/plugins/social/changelog/update-composer create mode 100644 projects/plugins/starter-plugin/changelog/update-composer create mode 100644 projects/plugins/super-cache/changelog/update-composer create mode 100644 projects/plugins/vaultpress/changelog/update-composer create mode 100644 projects/plugins/videopress/changelog/update-composer create mode 100644 projects/plugins/wpcomsh/changelog/update-composer diff --git a/.github/versions.sh b/.github/versions.sh index 839057a1c8579..961c6a050765e 100644 --- a/.github/versions.sh +++ b/.github/versions.sh @@ -1,6 +1,6 @@ # Versions of tools to use in CI. PHP_VERSION=8.2 -COMPOSER_VERSION=2.7.7 +COMPOSER_VERSION=2.8.3 NODE_VERSION=22.9.0 PNPM_VERSION=9.3.0 diff --git a/composer.lock b/composer.lock index 827ca54d3572c..5b159e66584ab 100644 --- a/composer.lock +++ b/composer.lock @@ -3126,6 +3126,6 @@ "platform": { "ext-json": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-composer b/projects/plugins/automattic-for-agencies-client/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 060fe4c4472d9..8958e1c8473bd 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -4109,17 +4109,17 @@ "stability-flags": { "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-connection": 20, "automattic/jetpack-plugin-deactivation": 20, - "automattic/jetpack-sync": 20, "automattic/jetpack-status": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-sync": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/backup/changelog/update-composer b/projects/plugins/backup/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 9e867332c1a34..fb420f18385d6 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -4545,14 +4545,14 @@ "stability-flags": { "automattic/jetpack-autoloader": 20, "automattic/jetpack-backup": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-my-jetpack": 20, - "automattic/jetpack-status": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-status": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/beta/changelog/update-composer b/projects/plugins/beta/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/beta/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock index 49785595daf99..d4816c55787c8 100644 --- a/projects/plugins/beta/composer.lock +++ b/projects/plugins/beta/composer.lock @@ -1121,7 +1121,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/boost/changelog/update-composer b/projects/plugins/boost/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index e85c83e821b15..56c3b975612d5 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -5335,6 +5335,7 @@ "automattic/jetpack-autoloader": 20, "automattic/jetpack-boost-core": 20, "automattic/jetpack-boost-speed-score": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-connection": 20, @@ -5345,15 +5346,14 @@ "automattic/jetpack-schema": 20, "automattic/jetpack-status": 20, "automattic/jetpack-sync": 20, - "automattic/jetpack-wp-js-data-sync": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-wp-js-data-sync": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "ext-json": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "ext-intl": "0.0.0" }, diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/update-composer b/projects/plugins/classic-theme-helper-plugin/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/classic-theme-helper-plugin/composer.lock b/projects/plugins/classic-theme-helper-plugin/composer.lock index 1bcf5bfc610cc..e19b788365e96 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.lock +++ b/projects/plugins/classic-theme-helper-plugin/composer.lock @@ -3705,15 +3705,15 @@ "stability-flags": { "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-classic-theme-helper": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, - "automattic/jetpack-plugins-installer": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-plugins-installer": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/crm/changelog/update-composer b/projects/plugins/crm/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/crm/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 20472c9b686e7..46342bd5d3f5f 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -5259,14 +5259,14 @@ "stability-flags": { "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, - "automattic/jetpack-composer-plugin": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-changelogger": 20, + "automattic/jetpack-composer-plugin": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=7.4" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/debug-helper/changelog/update-composer b/projects/plugins/debug-helper/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock index 460095e98bb12..3036c88f504b7 100644 --- a/projects/plugins/debug-helper/composer.lock +++ b/projects/plugins/debug-helper/composer.lock @@ -854,7 +854,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/inspect/changelog/update-composer b/projects/plugins/inspect/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index dda40f8d70d78..e973ca741a126 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -3363,16 +3363,16 @@ "stability-flags": { "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, - "automattic/jetpack-connection": 20, "automattic/jetpack-config": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-connection": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=7.4" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/jetpack/changelog/update-composer b/projects/plugins/jetpack/changelog/update-composer new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 24ef8be455e77..5a2b9e178f1b3 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -6126,6 +6126,7 @@ "automattic/jetpack-blaze": 20, "automattic/jetpack-blocks": 20, "automattic/jetpack-boost-speed-score": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-classic-theme-helper": 20, "automattic/jetpack-compat": 20, "automattic/jetpack-composer-plugin": 20, @@ -6156,9 +6157,8 @@ "automattic/jetpack-videopress": 20, "automattic/jetpack-waf": 20, "automattic/jetpack-wordads": 20, - "automattic/woocommerce-analytics": 20, - "automattic/jetpack-changelogger": 20, - "automattic/patchwork-redefine-exit": 20 + "automattic/patchwork-redefine-exit": 20, + "automattic/woocommerce-analytics": 20 }, "prefer-stable": true, "prefer-lowest": false, @@ -6167,7 +6167,7 @@ "ext-json": "*", "ext-openssl": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "ext-intl": "0.0.0" }, diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-composer b/projects/plugins/mu-wpcom-plugin/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 830a9e024a3be..ff393ba4eb006 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -4450,12 +4450,12 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "automattic/jetpack-mu-wpcom": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-changelogger": 20, + "automattic/jetpack-mu-wpcom": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/protect/changelog/update-composer b/projects/plugins/protect/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 296be21aff607..0652df0d5e085 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -4882,26 +4882,26 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "automattic/jetpack-assets": 20, "automattic/jetpack-admin-ui": 20, + "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-my-jetpack": 20, + "automattic/jetpack-plans": 20, "automattic/jetpack-plugins-installer": 20, + "automattic/jetpack-protect-status": 20, + "automattic/jetpack-status": 20, "automattic/jetpack-sync": 20, "automattic/jetpack-transport-helper": 20, - "automattic/jetpack-plans": 20, - "automattic/jetpack-waf": 20, - "automattic/jetpack-status": 20, - "automattic/jetpack-protect-status": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-waf": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "ext-json": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/search/changelog/update-composer b/projects/plugins/search/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index c2b7ad86becc8..ec329fb2a8ffa 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -4549,6 +4549,7 @@ "minimum-stability": "dev", "stability-flags": { "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-connection": 20, @@ -4556,12 +4557,11 @@ "automattic/jetpack-search": 20, "automattic/jetpack-stats": 20, "automattic/jetpack-status": 20, - "automattic/jetpack-sync": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-sync": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/social/changelog/update-composer b/projects/plugins/social/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index 6d5344bde8b8f..c1962a1f18840 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -5024,20 +5024,20 @@ "automattic/jetpack-admin-ui": 20, "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, - "automattic/jetpack-publicize": 20, "automattic/jetpack-connection": 20, "automattic/jetpack-my-jetpack": 20, - "automattic/jetpack-sync": 20, - "automattic/jetpack-status": 20, "automattic/jetpack-plans": 20, "automattic/jetpack-post-list": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-publicize": 20, + "automattic/jetpack-status": 20, + "automattic/jetpack-sync": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/starter-plugin/changelog/update-composer b/projects/plugins/starter-plugin/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index 73588ec97f9a5..5995890078064 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -4874,20 +4874,20 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "automattic/jetpack-assets": 20, "automattic/jetpack-admin-ui": 20, + "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-connection": 20, "automattic/jetpack-my-jetpack": 20, - "automattic/jetpack-sync": 20, "automattic/jetpack-status": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-sync": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/super-cache/changelog/update-composer b/projects/plugins/super-cache/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/super-cache/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock index 8914ed9387de4..780d2059d5d46 100644 --- a/projects/plugins/super-cache/composer.lock +++ b/projects/plugins/super-cache/composer.lock @@ -2708,12 +2708,12 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "automattic/jetpack-device-detection": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-changelogger": 20, + "automattic/jetpack-device-detection": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/vaultpress/changelog/update-composer b/projects/plugins/vaultpress/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/vaultpress/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock index 59bbb5d27489b..9d1ef5d4ea58b 100644 --- a/projects/plugins/vaultpress/composer.lock +++ b/projects/plugins/vaultpress/composer.lock @@ -2776,13 +2776,13 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "automattic/jetpack-logo": 20, "automattic/jetpack-autoloader": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-changelogger": 20, + "automattic/jetpack-logo": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/videopress/changelog/update-composer b/projects/plugins/videopress/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 1278de0d60eaa..10e895684f886 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -4707,18 +4707,18 @@ "stability-flags": { "automattic/jetpack-assets": 20, "automattic/jetpack-autoloader": 20, + "automattic/jetpack-changelogger": 20, "automattic/jetpack-composer-plugin": 20, "automattic/jetpack-config": 20, "automattic/jetpack-connection": 20, "automattic/jetpack-my-jetpack": 20, - "automattic/jetpack-sync": 20, - "automattic/jetpack-videopress": 20, "automattic/jetpack-status": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-sync": 20, + "automattic/jetpack-videopress": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/projects/plugins/wpcomsh/changelog/update-composer b/projects/plugins/wpcomsh/changelog/update-composer new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/update-composer @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 435d450035f08..70c8925bf7909 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -5417,16 +5417,16 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "automattic/jetpack-changelogger": 20, "automattic/jetpack-config": 20, - "automattic/jetpack-post-list": 20, "automattic/jetpack-mu-wpcom": 20, - "automattic/jetpack-changelogger": 20 + "automattic/jetpack-post-list": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=7.4" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } From c783873f9c0e0b95196c396c32726aa18c23b072 Mon Sep 17 00:00:00 2001 From: dkmyta <43220201+dkmyta@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:53:17 -0800 Subject: [PATCH 3/5] Components: Add ThreatModal (#40197) * Add ThreatDetailsModal component and stories * changelog * Fix type error * Fix child component overflow-x styling * Update scan package changelog * Add util for fixerState and separate subcomponents * Generalize component name * Updates after renaming * Ensure close button exists for vulns modal * Fixes and improvements * ThreatModal: Add user connection gate (#40204) * Add user connection gate * Fix stories * ThreatModal: Add credentials gate (#40205) * Add credentials gate * Fix stories * Fix credentials type * Fix build issues, and add early returns for gates --- .../add-components-threat-details-modal | 4 + .../components/diff-viewer/styles.module.scss | 2 +- .../marked-lines/styles.module.scss | 2 +- .../components/threat-fixer-button/index.tsx | 74 +-------- .../threat-modal/credentials-gate.tsx | 65 ++++++++ .../components/threat-modal/index.tsx | 153 ++++++++++++++++++ .../threat-modal/stories/index.stories.tsx | 135 ++++++++++++++++ .../threat-modal/styles.module.scss | 35 ++++ .../threat-modal/threat-actions.tsx | 97 +++++++++++ .../threat-modal/threat-fix-details.tsx | 68 ++++++++ .../threat-modal/threat-technical-details.tsx | 36 +++++ .../threat-modal/user-connection-gate.tsx | 64 ++++++++ .../add-components-threat-details-modal | 4 + projects/js-packages/scan/src/utils/index.ts | 94 ++++++++++- 14 files changed, 758 insertions(+), 75 deletions(-) create mode 100644 projects/js-packages/components/changelog/add-components-threat-details-modal create mode 100644 projects/js-packages/components/components/threat-modal/credentials-gate.tsx create mode 100644 projects/js-packages/components/components/threat-modal/index.tsx create mode 100644 projects/js-packages/components/components/threat-modal/stories/index.stories.tsx create mode 100644 projects/js-packages/components/components/threat-modal/styles.module.scss create mode 100644 projects/js-packages/components/components/threat-modal/threat-actions.tsx create mode 100644 projects/js-packages/components/components/threat-modal/threat-fix-details.tsx create mode 100644 projects/js-packages/components/components/threat-modal/threat-technical-details.tsx create mode 100644 projects/js-packages/components/components/threat-modal/user-connection-gate.tsx create mode 100644 projects/js-packages/scan/changelog/add-components-threat-details-modal diff --git a/projects/js-packages/components/changelog/add-components-threat-details-modal b/projects/js-packages/components/changelog/add-components-threat-details-modal new file mode 100644 index 0000000000000..f1a9596ce3b78 --- /dev/null +++ b/projects/js-packages/components/changelog/add-components-threat-details-modal @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Adds ThreatModal component and stories diff --git a/projects/js-packages/components/components/diff-viewer/styles.module.scss b/projects/js-packages/components/components/diff-viewer/styles.module.scss index 16c44d670f7f9..3e7f2eab65375 100644 --- a/projects/js-packages/components/components/diff-viewer/styles.module.scss +++ b/projects/js-packages/components/components/diff-viewer/styles.module.scss @@ -14,7 +14,7 @@ display: flex; font-family: "Courier 10 Pitch", Courier, monospace; flex-direction: row; - overflow-x: scroll; + overflow-x: auto; white-space: pre; } diff --git a/projects/js-packages/components/components/marked-lines/styles.module.scss b/projects/js-packages/components/components/marked-lines/styles.module.scss index 49733a4d9ebd2..dab9e17fcafb2 100644 --- a/projects/js-packages/components/components/marked-lines/styles.module.scss +++ b/projects/js-packages/components/components/marked-lines/styles.module.scss @@ -4,7 +4,7 @@ font-family: monospace; display: flex; flex-direction: row; - overflow-x: scroll; + overflow-x: auto; } .marked-lines__marked-line { diff --git a/projects/js-packages/components/components/threat-fixer-button/index.tsx b/projects/js-packages/components/components/threat-fixer-button/index.tsx index cd15c0294c313..11520c139ceee 100644 --- a/projects/js-packages/components/components/threat-fixer-button/index.tsx +++ b/projects/js-packages/components/components/threat-fixer-button/index.tsx @@ -1,9 +1,9 @@ import { Button } from '@automattic/jetpack-components'; import { type Threat, - fixerIsInError, - fixerIsInProgress, - fixerStatusIsStale, + getFixerState, + getFixerAction, + getFixerMessage, } from '@automattic/jetpack-scan'; import { Tooltip } from '@wordpress/components'; import { useCallback, useMemo } from '@wordpress/element'; @@ -30,10 +30,7 @@ export default function ThreatFixerButton( { className?: string; } ): JSX.Element { const fixerState = useMemo( () => { - const inProgress = threat.fixer && fixerIsInProgress( threat.fixer ); - const error = threat.fixer && fixerIsInError( threat.fixer ); - const stale = threat.fixer && fixerStatusIsStale( threat.fixer ); - return { inProgress, error, stale }; + return getFixerState( threat.fixer ); }, [ threat.fixer ] ); const tooltipText = useMemo( () => { @@ -53,54 +50,7 @@ export default function ThreatFixerButton( { return __( 'An auto-fixer is in progress.', 'jetpack' ); } - switch ( threat.fixable.fixer ) { - case 'delete': - if ( threat.filename ) { - if ( threat.filename.endsWith( '/' ) ) { - return __( 'Deletes the directory that the infected file is in.', 'jetpack' ); - } - - if ( threat.signature === 'Core.File.Modification' ) { - return __( 'Deletes the unexpected file in a core WordPress directory.', 'jetpack' ); - } - - return __( 'Deletes the infected file.', 'jetpack' ); - } - - if ( threat.extension?.type === 'plugin' ) { - return __( 'Deletes the plugin directory to fix the threat.', 'jetpack' ); - } - - if ( threat.extension?.type === 'theme' ) { - return __( 'Deletes the theme directory to fix the threat.', 'jetpack' ); - } - break; - case 'update': - return __( 'Upgrades the plugin or theme to a newer version.', 'jetpack' ); - case 'replace': - case 'rollback': - if ( threat.filename ) { - return threat.signature === 'Core.File.Modification' - ? __( - 'Replaces the modified core WordPress file with the original clean version from the WordPress source code.', - 'jetpack' - ) - : __( - 'Replaces the infected file with a previously backed up version that is clean.', - 'jetpack' - ); - } - - if ( threat.signature === 'php_hardening_WP_Config_NoSalts_001' ) { - return __( - 'Replaces the default salt keys in wp-config.php with unique ones.', - 'jetpack' - ); - } - break; - default: - return __( 'An auto-fixer is available.', 'jetpack' ); - } + return getFixerMessage( threat ); }, [ threat, fixerState ] ); const buttonText = useMemo( () => { @@ -112,18 +62,8 @@ export default function ThreatFixerButton( { return __( 'Error', 'jetpack' ); } - switch ( threat.fixable.fixer ) { - case 'delete': - return __( 'Delete', 'jetpack' ); - case 'update': - return __( 'Update', 'jetpack' ); - case 'replace': - case 'rollback': - return __( 'Replace', 'jetpack' ); - default: - return __( 'Fix', 'jetpack' ); - } - }, [ threat.fixable, fixerState.error ] ); + return getFixerAction( threat ); + }, [ threat, fixerState.error ] ); const handleClick = useCallback( ( event: React.MouseEvent ) => { diff --git a/projects/js-packages/components/components/threat-modal/credentials-gate.tsx b/projects/js-packages/components/components/threat-modal/credentials-gate.tsx new file mode 100644 index 0000000000000..34ee632a56af6 --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/credentials-gate.tsx @@ -0,0 +1,65 @@ +import { Text, Button } from '@automattic/jetpack-components'; +import { Notice } from '@wordpress/components'; +import { __ } from '@wordpress/i18n'; +import React, { ReactElement } from 'react'; +import styles from './styles.module.scss'; + +const CredentialsGate = ( { + siteCredentialsNeeded, + credentialsIsFetching, + credentialsRedirectUrl, + children, +}: { + siteCredentialsNeeded: boolean; + credentialsIsFetching: boolean; + credentialsRedirectUrl: string; + children: ReactElement; +} ): JSX.Element => { + if ( ! siteCredentialsNeeded ) { + return children; + } + + return ( + <> + + { __( + 'Before Jetpack can auto-fix threats on your site, it needs your server credentials.', + 'jetpack' + ) } + + } + /> + + + { __( + 'Your server credentials allow Jetpack to access the server that’s powering your website. This information is securely saved and only used to perform fix threats detected on your site.', + 'jetpack' + ) } + + + + { __( + 'Once you’ve entered server credentials, Jetpack will be fixing the selected threats.', + 'jetpack' + ) } + + +
+ +
+ + ); +}; + +export default CredentialsGate; diff --git a/projects/js-packages/components/components/threat-modal/index.tsx b/projects/js-packages/components/components/threat-modal/index.tsx new file mode 100644 index 0000000000000..2ed59e960c946 --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/index.tsx @@ -0,0 +1,153 @@ +import { Button, ThreatSeverityBadge } from '@automattic/jetpack-components'; +import { type Threat, getFixerState } from '@automattic/jetpack-scan'; +import { Modal, Notice } from '@wordpress/components'; +import { __ } from '@wordpress/i18n'; +import { useMemo } from 'react'; +import Text from '../text'; +import CredentialsGate from './credentials-gate'; +import styles from './styles.module.scss'; +import ThreatActions from './threat-actions'; +import ThreatFixDetails from './threat-fix-details'; +import ThreatTechnicalDetails from './threat-technical-details'; +import UserConnectionGate from './user-connection-gate'; + +/** + * ThreatModal component + * + * @param {object} props - The props. + * @param {object} props.threat - The threat. + * @param {boolean} props.isUserConnected - Whether the user is connected. + * @param {boolean} props.hasConnectedOwner - Whether the user has a connected owner. + * @param {boolean} props.userIsConnecting - Whether the user is connecting. + * @param {Function} props.handleConnectUser - The handleConnectUser function. + * @param {object} props.credentials - The credentials. + * @param {boolean} props.credentialsIsFetching - Whether the credentials are fetching. + * @param {string} props.credentialsRedirectUrl - The credentials redirect URL. + * @param {Function} props.handleUpgradeClick - The handleUpgradeClick function. + * @param {Function} props.handleFixThreatClick - The handleFixThreatClick function. + * @param {Function} props.handleIgnoreThreatClick - The handleIgnoreThreatClick function. + * @param {Function} props.handleUnignoreThreatClick - The handleUnignoreThreatClick function. + * + * @return {JSX.Element} The threat modal. + */ +export default function ThreatModal( { + threat, + isUserConnected, + hasConnectedOwner, + userIsConnecting, + handleConnectUser, + credentials, + credentialsIsFetching, + credentialsRedirectUrl, + handleUpgradeClick, + handleFixThreatClick, + handleIgnoreThreatClick, + handleUnignoreThreatClick, + ...modalProps +}: { + threat: Threat; + isUserConnected: boolean; + hasConnectedOwner: boolean; + userIsConnecting: boolean; + handleConnectUser: () => void; + credentials: false | Record< string, unknown >[]; + credentialsIsFetching: boolean; + credentialsRedirectUrl: string; + handleUpgradeClick?: () => void; + handleFixThreatClick?: ( threats: Threat[] ) => void; + handleIgnoreThreatClick?: ( threats: Threat[] ) => void; + handleUnignoreThreatClick?: ( threats: Threat[] ) => void; +} & React.ComponentProps< typeof Modal > ): JSX.Element { + const userConnectionNeeded = ! isUserConnected || ! hasConnectedOwner; + const siteCredentialsNeeded = ! credentials || credentials.length === 0; + + const fixerState = useMemo( () => { + return getFixerState( threat.fixer ); + }, [ threat.fixer ] ); + + const getModalTitle = useMemo( () => { + if ( userConnectionNeeded ) { + return { __( 'User connection needed', 'jetpack' ) }; + } + + if ( siteCredentialsNeeded ) { + return { __( 'Site credentials needed', 'jetpack' ) }; + } + + return ( + <> + { threat.title } + { !! threat.severity && } + + ); + }, [ userConnectionNeeded, siteCredentialsNeeded, threat.title, threat.severity ] ); + + return ( + { getModalTitle } } + { ...modalProps } + > +
+ + + <> + { fixerState.error && ( + + { __( 'An error occurred auto-fixing this threat.', 'jetpack' ) } + + ) } + { fixerState.stale && ( + + { __( 'The auto-fixer is taking longer than expected.', 'jetpack' ) } + + ) } + { fixerState.inProgress && ! fixerState.stale && ( + + { __( 'The auto-fixer is in progress.', 'jetpack' ) } + + ) } +
+ { !! threat.description && { threat.description } } + + { !! threat.source && ( +
+ +
+ ) } +
+ + + + + + + + + +
+ + ); +} diff --git a/projects/js-packages/components/components/threat-modal/stories/index.stories.tsx b/projects/js-packages/components/components/threat-modal/stories/index.stories.tsx new file mode 100644 index 0000000000000..c217a39f59ee4 --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/stories/index.stories.tsx @@ -0,0 +1,135 @@ +import { useCallback, useState } from 'react'; +import Button from '../../button/index.js'; +import ThreatModal from '../index.js'; + +export default { + title: 'JS Packages/Components/Threat Modal', + component: ThreatModal, +}; + +const Base = args => { + const [ isOpen, setIsOpen ] = useState( false ); + const onClick = useCallback( () => setIsOpen( true ), [] ); + const onRequestClose = useCallback( () => setIsOpen( false ), [] ); + return ( +
+ + { isOpen ? : null } +
+ ); +}; + +export const ThreatResult = Base.bind( {} ); +ThreatResult.args = { + threat: { + id: 185869885, + signature: 'EICAR_AV_Test', + title: 'Malicious code found in file: index.php', + description: + "This is the standard EICAR antivirus test code, and not a real infection. If your site contains this code when you don't expect it to, contact Jetpack support for some help.", + firstDetected: '2024-10-07T20:45:06.000Z', + fixedIn: null, + severity: 8, + fixable: { fixer: 'rollback', target: 'January 26, 2024, 6:49 am', extensionStatus: '' }, + fixer: { status: 'not_started' }, + status: 'current', + filename: '/var/www/html/wp-content/index.php', + context: { + '1': 'echo << {}, + handleIgnoreThreatClick: () => {}, + handleUnignoreThreatClick: () => {}, +}; + +export const UserConnectionNeeded = Base.bind( {} ); +UserConnectionNeeded.args = { + threat: { + id: 185869885, + signature: 'EICAR_AV_Test', + title: 'Malicious code found in file: index.php', + description: + "This is the standard EICAR antivirus test code, and not a real infection. If your site contains this code when you don't expect it to, contact Jetpack support for some help.", + firstDetected: '2024-10-07T20:45:06.000Z', + fixedIn: null, + severity: 8, + fixable: { fixer: 'rollback', target: 'January 26, 2024, 6:49 am', extensionStatus: '' }, + fixer: { status: 'not_started' }, + status: 'current', + filename: '/var/www/html/wp-content/index.php', + context: { + '1': 'echo << {}, + handleFixThreatClick: () => {}, + handleIgnoreThreatClick: () => {}, + handleUnignoreThreatClick: () => {}, +}; + +export const CredentialsNeeded = Base.bind( {} ); +CredentialsNeeded.args = { + threat: { + id: 185869885, + signature: 'EICAR_AV_Test', + title: 'Malicious code found in file: index.php', + description: + "This is the standard EICAR antivirus test code, and not a real infection. If your site contains this code when you don't expect it to, contact Jetpack support for some help.", + firstDetected: '2024-10-07T20:45:06.000Z', + fixedIn: null, + severity: 8, + fixable: { fixer: 'rollback', target: 'January 26, 2024, 6:49 am', extensionStatus: '' }, + fixer: { status: 'not_started' }, + status: 'current', + filename: '/var/www/html/wp-content/index.php', + context: { + '1': 'echo << {}, + handleIgnoreThreatClick: () => {}, + handleUnignoreThreatClick: () => {}, +}; + +export const VulnerableExtension = Base.bind( {} ); +VulnerableExtension.args = { + threat: { + id: 184847701, + signature: 'Vulnerable.WP.Extension', + title: 'Vulnerable Plugin: WP Super Cache (version 1.6.3)', + description: + 'The plugin WP Super Cache (version 1.6.3) has a known vulnerability. The WP Super Cache plugin before version 1.7.2 is vulnerable to an authenticated RCE in the settings page.', + fixedIn: '1.12.4', + source: 'https://wpscan.com/vulnerability/733d8a02-0d44-4b78-bbb2-37e447acd2f3', + extension: { + name: 'WP Super Cache', + slug: 'wp-super-cache', + version: '1.6.3', + type: 'plugin', + }, + }, + isUserConnected: true, + hasConnectedOwner: true, + credentials: [ { type: 'managed', role: 'main', still_valid: true } ], + handleUpgradeClick: () => {}, +}; diff --git a/projects/js-packages/components/components/threat-modal/styles.module.scss b/projects/js-packages/components/components/threat-modal/styles.module.scss new file mode 100644 index 0000000000000..be9bcbc392df5 --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/styles.module.scss @@ -0,0 +1,35 @@ +.threat-details { + display: flex; + flex-direction: column; + gap: calc( var( --spacing-base ) * 3 ); // 24px +} + +.section { + display: flex; + flex-direction: column; + gap: calc( var( --spacing-base ) * 2 ); // 16px +} + +.title { + display: flex; + align-items: center; + gap: calc( var( --spacing-base ) * 1.5 ); // 12px +} + +.filename { + background-color: var( --jp-gray-0 ); + padding: calc( var( --spacing-base ) * 3 ); // 24px + overflow-x: auto; +} + +.modal-actions { + display: flex; + justify-content: flex-end; + padding-top: calc( var( --spacing-base ) * 3 ); // 24px + border-top: 1px solid var( --jp-gray-0 ); + + .threat-actions { + display: flex; + gap: calc( var( --spacing-base ) * 2 ); // 16px; + } +} \ No newline at end of file diff --git a/projects/js-packages/components/components/threat-modal/threat-actions.tsx b/projects/js-packages/components/components/threat-modal/threat-actions.tsx new file mode 100644 index 0000000000000..d2a02c1cadf6f --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/threat-actions.tsx @@ -0,0 +1,97 @@ +import { Button } from '@automattic/jetpack-components'; +import { Threat, getFixerAction } from '@automattic/jetpack-scan'; +import { __ } from '@wordpress/i18n'; +import React, { useCallback, useMemo } from 'react'; +import styles from './styles.module.scss'; + +/** + * ThreatActions component + * + * @param {object} props - The component props. + * @param {object} props.threat - The threat object containing action details. + * @param {Function} props.closeModal - Function to close the modal. + * @param {Function} [props.handleFixThreatClick] - Function to handle fixing the threat. + * @param {Function} [props.handleIgnoreThreatClick] - Function to handle ignoring the threat. + * @param {Function} [props.handleUnignoreThreatClick] - Function to handle unignoring the threat. + * @param {object} props.fixerState - The state of the fixer (inProgress, error, stale). + * @param {boolean} props.fixerState.inProgress - Whether the fixer is in progress. + * @param {boolean} props.fixerState.error - Whether the fixer encountered an error. + * @param {boolean} props.fixerState.stale - Whether the fixer is stale. + * + * @return {JSX.Element | null} The rendered action buttons or null if no actions are available. + */ +const ThreatActions = ( { + threat, + closeModal, + handleFixThreatClick, + handleIgnoreThreatClick, + handleUnignoreThreatClick, + fixerState, +}: { + threat: Threat; + closeModal: () => void; + handleFixThreatClick?: ( threats: Threat[] ) => void; + handleIgnoreThreatClick?: ( threats: Threat[] ) => void; + handleUnignoreThreatClick?: ( threats: Threat[] ) => void; + fixerState: { inProgress: boolean; error: boolean; stale: boolean }; +} ): JSX.Element => { + const fixerAction = useMemo( () => getFixerAction( threat ), [ threat ] ); + + const onFixClick = useCallback( () => { + handleFixThreatClick?.( [ threat ] ); + closeModal(); + }, [ threat, handleFixThreatClick, closeModal ] ); + + const onIgnoreClick = useCallback( () => { + handleIgnoreThreatClick?.( [ threat ] ); + closeModal(); + }, [ threat, handleIgnoreThreatClick, closeModal ] ); + + const onUnignoreClick = useCallback( () => { + handleUnignoreThreatClick?.( [ threat ] ); + closeModal(); + }, [ threat, handleUnignoreThreatClick, closeModal ] ); + + if ( ! handleFixThreatClick && ! handleIgnoreThreatClick && ! handleUnignoreThreatClick ) { + return null; + } + + return ( +
+
+ { threat.status === 'ignored' && handleUnignoreThreatClick && ( + + ) } + { threat.status === 'current' && ( + <> + { handleIgnoreThreatClick && ( + + ) } + { threat.fixable && handleFixThreatClick && ( + + ) } + + ) } +
+
+ ); +}; + +export default ThreatActions; diff --git a/projects/js-packages/components/components/threat-modal/threat-fix-details.tsx b/projects/js-packages/components/components/threat-modal/threat-fix-details.tsx new file mode 100644 index 0000000000000..441348aadc92b --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/threat-fix-details.tsx @@ -0,0 +1,68 @@ +import { Threat, getFixerMessage } from '@automattic/jetpack-scan'; +import { __, sprintf } from '@wordpress/i18n'; +import React, { useMemo } from 'react'; +import ContextualUpgradeTrigger from '../contextual-upgrade-trigger'; +import Text from '../text'; +import styles from './styles.module.scss'; + +/** + * ThreatFixDetails component + * + * @param {object} props - The component props. + * @param {object} props.threat - The threat object containing fix details. + * @param {Function} props.handleUpgradeClick - Function to handle upgrade click events. + * + * @return {JSX.Element | null} The rendered fix details or null if no fixable details are available. + */ +const ThreatFixDetails = ( { + threat, + handleUpgradeClick, +}: { + threat: Threat; + handleUpgradeClick: () => void; +} ): JSX.Element => { + const title = useMemo( () => { + if ( threat.status === 'fixed' ) { + return __( 'How did Jetpack fix it?', 'jetpack' ); + } + if ( threat.status === 'current' && threat.fixable ) { + return __( 'How can Jetpack auto-fix this threat?', 'jetpack' ); + } + return __( 'How to fix it?', 'jetpack' ); + }, [ threat ] ); + + const fix = useMemo( () => { + // The threat has a fixed version available, but no auto-fix is available. + // The user needs to update the extension to the fixed version. + if ( ! threat.fixable && threat.fixedIn ) { + return sprintf( + /* translators: Translates to Updates to version. %1$s: Name. %2$s: Fixed version */ + __( 'Update %1$s to version %2$s.', 'jetpack' ), + threat.extension.name, + threat.fixedIn + ); + } + // The threat has an auto-fix available. + return getFixerMessage( threat ); + }, [ threat ] ); + + if ( ! threat.fixable && ! threat.fixedIn ) { + return null; + } + + return ( +
+ { title } + { fix } + { handleUpgradeClick && ( + + ) } +
+ ); +}; + +export default ThreatFixDetails; diff --git a/projects/js-packages/components/components/threat-modal/threat-technical-details.tsx b/projects/js-packages/components/components/threat-modal/threat-technical-details.tsx new file mode 100644 index 0000000000000..38793f704886d --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/threat-technical-details.tsx @@ -0,0 +1,36 @@ +import { Threat } from '@automattic/jetpack-scan'; +import { __ } from '@wordpress/i18n'; +import DiffViewer from '../diff-viewer'; +import MarkedLines from '../marked-lines'; +import Text from '../text'; +import styles from './styles.module.scss'; + +/** + * ThreatTechnicalDetails component + * + * @param {object} props - The component props. + * @param {object} props.threat - The threat object containing technical details. + * + * @return {JSX.Element | null} The rendered technical details or null if no details are available. + */ +const ThreatTechnicalDetails = ( { threat }: { threat: Threat } ): JSX.Element => { + if ( ! threat.filename && ! threat.context && ! threat.diff ) { + return null; + } + + return ( +
+ { __( 'The technical details', 'jetpack' ) } + { threat.filename && ( + <> + { __( 'Threat found in file:', 'jetpack' ) } + 
{ threat.filename }
+ + ) } + { threat.context && } + { threat.diff && } +
+ ); +}; + +export default ThreatTechnicalDetails; diff --git a/projects/js-packages/components/components/threat-modal/user-connection-gate.tsx b/projects/js-packages/components/components/threat-modal/user-connection-gate.tsx new file mode 100644 index 0000000000000..c016739a4d585 --- /dev/null +++ b/projects/js-packages/components/components/threat-modal/user-connection-gate.tsx @@ -0,0 +1,64 @@ +import { Text, Button } from '@automattic/jetpack-components'; +import { Notice } from '@wordpress/components'; +import { __ } from '@wordpress/i18n'; +import React, { ReactElement } from 'react'; +import styles from './styles.module.scss'; + +const UserConnectionGate = ( { + userConnectionNeeded, + userIsConnecting, + handleConnectUser, + children, +}: { + userConnectionNeeded: boolean; + userIsConnecting: boolean; + handleConnectUser: () => void; + children: ReactElement; +} ): JSX.Element => { + if ( ! userConnectionNeeded ) { + return children; + } + return ( + <> + + { __( + 'Before Jetpack can ignore and auto-fix threats on your site, a user connection is needed.', + 'jetpack' + ) } + + } + /> + + + { __( + 'A user connection provides Jetpack the access necessary to perform these tasks.', + 'jetpack' + ) } + + + + { __( + 'Once you’ve secured a user connection, all Jetpack features will be available for use.', + 'jetpack' + ) } + + +
+ +
+ + ); +}; + +export default UserConnectionGate; diff --git a/projects/js-packages/scan/changelog/add-components-threat-details-modal b/projects/js-packages/scan/changelog/add-components-threat-details-modal new file mode 100644 index 0000000000000..a81430663b3df --- /dev/null +++ b/projects/js-packages/scan/changelog/add-components-threat-details-modal @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Adds utilities for retrieving fixer messaging diff --git a/projects/js-packages/scan/src/utils/index.ts b/projects/js-packages/scan/src/utils/index.ts index be4fe59047694..8b186b065bb33 100644 --- a/projects/js-packages/scan/src/utils/index.ts +++ b/projects/js-packages/scan/src/utils/index.ts @@ -1,3 +1,4 @@ +import { __, sprintf } from '@wordpress/i18n'; import { Threat, ThreatFixStatus, FIXER_IS_STALE_THRESHOLD } from '..'; export const getThreatType = ( threat: Threat ) => { @@ -20,18 +21,99 @@ export const fixerTimestampIsStale = ( lastUpdatedTimestamp: string ) => { return now.getTime() - lastUpdated.getTime() >= FIXER_IS_STALE_THRESHOLD; }; -export const fixerIsInError = ( fixerStatus: ThreatFixStatus ) => { - return 'error' in fixerStatus && fixerStatus.error; +export const fixerIsInError = ( fixerStatus: ThreatFixStatus ): boolean => { + return !! ( 'error' in fixerStatus && fixerStatus.error ); }; -export const fixerIsInProgress = ( fixerStatus: ThreatFixStatus ) => { - return 'status' in fixerStatus && fixerStatus.status === 'in_progress'; +export const fixerIsInProgress = ( fixerStatus: ThreatFixStatus ): boolean => { + return !! ( 'status' in fixerStatus && fixerStatus.status === 'in_progress' ); }; -export const fixerStatusIsStale = ( fixerStatus: ThreatFixStatus ) => { +export const fixerStatusIsStale = ( fixerStatus: ThreatFixStatus ): boolean => { return ( fixerIsInProgress( fixerStatus ) && 'lastUpdated' in fixerStatus && - fixerTimestampIsStale( fixerStatus.lastUpdated ) + !! fixerTimestampIsStale( fixerStatus.lastUpdated ) ); }; + +export const getFixerState = ( fixerStatus: ThreatFixStatus ) => { + return { + inProgress: fixerStatus && fixerIsInProgress( fixerStatus ), + error: fixerStatus && fixerIsInError( fixerStatus ), + stale: fixerStatus && fixerStatusIsStale( fixerStatus ), + }; +}; + +export const getFixerAction = ( threat: Threat ) => { + switch ( threat.fixable && threat.fixable.fixer ) { + case 'delete': + return __( 'Delete', 'jetpack-scan' ); + case 'update': + return __( 'Update', 'jetpack-scan' ); + case 'replace': + case 'rollback': + return __( 'Replace', 'jetpack-scan' ); + default: + return __( 'Fix', 'jetpack-scan' ); + } +}; + +export const getFixerMessage = ( threat: Threat ) => { + switch ( threat.fixable && threat.fixable.fixer ) { + case 'delete': + if ( threat.filename ) { + if ( threat.filename.endsWith( '/' ) ) { + return __( 'Deletes the directory that the infected file is in.', 'jetpack-scan' ); + } + + if ( threat.signature === 'Core.File.Modification' ) { + return __( 'Deletes the unexpected file in a core WordPress directory.', 'jetpack-scan' ); + } + + return __( 'Deletes the infected file.', 'jetpack-scan' ); + } + + if ( threat.extension?.type === 'plugin' ) { + return __( 'Deletes the plugin directory to fix the threat.', 'jetpack-scan' ); + } + + if ( threat.extension?.type === 'theme' ) { + return __( 'Deletes the theme directory to fix the threat.', 'jetpack-scan' ); + } + break; + case 'update': + if ( threat.fixedIn && threat.extension.name ) { + return sprintf( + /* translators: Translates to Updates to version. %1$s: Name. %2$s: Fixed version */ + __( 'Updates %1$s to version %2$s', 'jetpack-scan' ), + threat.extension.name, + threat.fixedIn + ); + } + return __( 'Upgrades the plugin or theme to a newer version.', 'jetpack-scan' ); + case 'replace': + case 'rollback': + if ( threat.filename ) { + return threat.signature === 'Core.File.Modification' + ? __( + 'Replaces the modified core WordPress file with the original clean version from the WordPress source code.', + 'jetpack-scan' + ) + : __( + 'Replaces the infected file with a previously backed up version that is clean.', + 'jetpack-scan' + ); + } + + if ( threat.signature === 'php_hardening_WP_Config_NoSalts_001' ) { + return __( + 'Replaces the default salt keys in wp-config.php with unique ones.', + 'jetpack-scan' + ); + } + break; + default: + return __( 'Jetpack will auto-fix the threat.', 'jetpack-scan' ); + } +}; From 9af0c496bbdd0c7dfebc54ac48e287a121e81487 Mon Sep 17 00:00:00 2001 From: Dylan Munson <65001528+CodeyGuyDylan@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:39:31 -0700 Subject: [PATCH 4/5] Update remove creator card and handle growth bundle on applicable product classes (#40192) * Remove creator card and update checks for paid plans to include growth * Add changelog --- projects/packages/my-jetpack/_inc/admin.jsx | 2 -- .../_inc/components/product-cards-section/all.ts | 3 +-- .../product-cards-section/creator-card.jsx | 13 ------------- .../_inc/components/product-cards-section/index.tsx | 6 ++---- .../_inc/components/product-interstitial/index.jsx | 9 --------- projects/packages/my-jetpack/_inc/constants.ts | 1 - .../use-evaluation-recommendations.ts | 2 +- ...andle-creator-card-on-applicable-product-classes | 4 ++++ .../my-jetpack/src/products/class-social.php | 1 + .../my-jetpack/src/products/class-stats.php | 11 +++++++++-- 10 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 projects/packages/my-jetpack/_inc/components/product-cards-section/creator-card.jsx create mode 100644 projects/packages/my-jetpack/changelog/update-remove-creator-card-and-handle-creator-card-on-applicable-product-classes diff --git a/projects/packages/my-jetpack/_inc/admin.jsx b/projects/packages/my-jetpack/_inc/admin.jsx index b7ddc9a0b331c..c636331b2eee2 100644 --- a/projects/packages/my-jetpack/_inc/admin.jsx +++ b/projects/packages/my-jetpack/_inc/admin.jsx @@ -17,7 +17,6 @@ import { BackupInterstitial, BoostInterstitial, CRMInterstitial, - CreatorInterstitial, ExtrasInterstitial, JetpackAiInterstitial, ProtectInterstitial, @@ -70,7 +69,6 @@ const MyJetpack = () => { } /> } /> } /> - } /> } diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/all.ts b/projects/packages/my-jetpack/_inc/components/product-cards-section/all.ts index fd40453951af9..10e29b7fbca76 100644 --- a/projects/packages/my-jetpack/_inc/components/product-cards-section/all.ts +++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/all.ts @@ -2,7 +2,6 @@ import AiCard from './ai-card'; import AntiSpamCard from './anti-spam-card'; import BackupCard from './backup-card'; import BoostCard from './boost-card'; -import CreatorCard from './creator-card'; import CrmCard from './crm-card'; import ProtectCard from './protect-card'; import SearchCard from './search-card'; @@ -21,7 +20,6 @@ export const JetpackModuleToProductCard: { videopress: VideopressCard, stats: StatsCard, crm: CrmCard, - creator: CreatorCard, social: SocialCard, ai: AiCard, 'jetpack-ai': AiCard, @@ -29,4 +27,5 @@ export const JetpackModuleToProductCard: { extras: null, scan: null, security: null, + creator: null, }; diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/creator-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/creator-card.jsx deleted file mode 100644 index 3f89a4ea9c103..0000000000000 --- a/projects/packages/my-jetpack/_inc/components/product-cards-section/creator-card.jsx +++ /dev/null @@ -1,13 +0,0 @@ -import PropTypes from 'prop-types'; -import { PRODUCT_SLUGS } from '../../data/constants'; -import ProductCard from '../connected-product-card'; - -const CreatorCard = props => { - return ; -}; - -CreatorCard.propTypes = { - admin: PropTypes.bool.isRequired, -}; - -export default CreatorCard; diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx index 2d6427a2258af..ff10798442fc2 100644 --- a/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx +++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx @@ -9,7 +9,6 @@ import AiCard from './ai-card'; import AntiSpamCard from './anti-spam-card'; import BackupCard from './backup-card'; import BoostCard from './boost-card'; -import CreatorCard from './creator-card'; import CrmCard from './crm-card'; import ProtectCard from './protect-card'; import SearchCard from './search-card'; @@ -27,13 +26,13 @@ type DisplayItemType = Record< // We don't have a card for Security or Extras, and scan is displayed as protect. // 'jetpack-ai' is the official slug for the AI module, so we also exclude 'ai'. // The backend still supports the 'ai' slug, so it is part of the JetpackModule type. - Exclude< JetpackModule, 'extras' | 'scan' | 'security' | 'ai' >, + Exclude< JetpackModule, 'extras' | 'scan' | 'security' | 'ai' | 'creator' >, FC< { admin: boolean } > >; const DisplayItems: FC< DisplayItemsProps > = ( { slugs } ) => { const { showFullJetpackStatsCard = false } = getMyJetpackWindowInitialState( 'myJetpackFlags' ); - const { isAtomic = false, userIsAdmin = false } = getMyJetpackWindowInitialState(); + const { userIsAdmin = false } = getMyJetpackWindowInitialState(); const items: DisplayItemType = { backup: BackupCard, @@ -44,7 +43,6 @@ const DisplayItems: FC< DisplayItemsProps > = ( { slugs } ) => { videopress: VideopressCard, stats: StatsCard, crm: CrmCard, - creator: ! isAtomic ? CreatorCard : null, social: SocialCard, 'jetpack-ai': AiCard, }; diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx index 52177cf8c2e05..60cd848f1f817 100644 --- a/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx +++ b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx @@ -348,15 +348,6 @@ export function BoostInterstitial() { ); } -/** - * CreatorInterstitial component - * - * @return {object} CreatorInterstitial react component. - */ -export function CreatorInterstitial() { - return ; -} - /** * CRMInterstitial component * diff --git a/projects/packages/my-jetpack/_inc/constants.ts b/projects/packages/my-jetpack/_inc/constants.ts index 92cc89c183dbf..d861145a4162c 100644 --- a/projects/packages/my-jetpack/_inc/constants.ts +++ b/projects/packages/my-jetpack/_inc/constants.ts @@ -11,7 +11,6 @@ export const MyJetpackRoutes = { AddBackup: '/add-backup', AddBoost: '/add-boost', AddCRM: '/add-crm', - AddCreator: '/add-creator', AddJetpackAI: '/add-jetpack-ai', AddExtras: '/add-extras', AddProtect: '/add-protect/:feature?', diff --git a/projects/packages/my-jetpack/_inc/data/evaluation-recommendations/use-evaluation-recommendations.ts b/projects/packages/my-jetpack/_inc/data/evaluation-recommendations/use-evaluation-recommendations.ts index 95b8701e9197d..7d2b6214e7c15 100644 --- a/projects/packages/my-jetpack/_inc/data/evaluation-recommendations/use-evaluation-recommendations.ts +++ b/projects/packages/my-jetpack/_inc/data/evaluation-recommendations/use-evaluation-recommendations.ts @@ -41,7 +41,7 @@ const useEvaluationRecommendations = () => { // in zero(0) unownedRecommendedModules. const ownedProducts = ( process?.env?.NODE_ENV === 'development' - ? [ 'anti-spam', 'creator', 'extras', 'stats', 'jetpack-ai' ] + ? [ 'anti-spam', 'extras', 'stats', 'jetpack-ai' ] : getMyJetpackWindowInitialState( 'lifecycleStats' )?.ownedProducts || [] ) as JetpackModule[]; // We filter out owned modules, and return the top recommendations diff --git a/projects/packages/my-jetpack/changelog/update-remove-creator-card-and-handle-creator-card-on-applicable-product-classes b/projects/packages/my-jetpack/changelog/update-remove-creator-card-and-handle-creator-card-on-applicable-product-classes new file mode 100644 index 0000000000000..696faa92c210f --- /dev/null +++ b/projects/packages/my-jetpack/changelog/update-remove-creator-card-and-handle-creator-card-on-applicable-product-classes @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Remove creator card and update paid plan checks to account for growth diff --git a/projects/packages/my-jetpack/src/products/class-social.php b/projects/packages/my-jetpack/src/products/class-social.php index 80913a97b7d66..317eeaf303a01 100644 --- a/projects/packages/my-jetpack/src/products/class-social.php +++ b/projects/packages/my-jetpack/src/products/class-social.php @@ -156,6 +156,7 @@ public static function has_paid_plan_for_product() { 'jetpack_business', 'jetpack_premium', 'jetpack_personal', + 'jetpack_growth', ); // For atomic sites, do a feature check to see if the republicize feature is available // This feature is available by default on all Jetpack sites diff --git a/projects/packages/my-jetpack/src/products/class-stats.php b/projects/packages/my-jetpack/src/products/class-stats.php index 6f1118cf6f4c2..fa9aaf61f5561 100644 --- a/projects/packages/my-jetpack/src/products/class-stats.php +++ b/projects/packages/my-jetpack/src/products/class-stats.php @@ -194,7 +194,10 @@ public static function is_upgradable() { if ( ! is_wp_error( $purchases_data ) && is_array( $purchases_data ) && ! empty( $purchases_data ) ) { foreach ( $purchases_data as $purchase ) { // Jetpack complete includes Stats commercial & cannot be upgraded - if ( str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ) { + if ( + str_starts_with( $purchase->product_slug, 'jetpack_complete' ) || + str_starts_with( $purchase->product_slug, 'jetpack_growth' ) + ) { return false; } elseif ( // Stats commercial purchased with highest tier cannot be upgraded. @@ -229,7 +232,11 @@ public static function has_paid_plan_for_product() { if ( is_array( $purchases_data ) && ! empty( $purchases_data ) ) { foreach ( $purchases_data as $purchase ) { // Stats is available as standalone product and as part of the Complete plan. - if ( strpos( $purchase->product_slug, 'jetpack_stats' ) !== false || str_starts_with( $purchase->product_slug, 'jetpack_complete' ) ) { + if ( + strpos( $purchase->product_slug, 'jetpack_stats' ) !== false || + str_starts_with( $purchase->product_slug, 'jetpack_complete' ) || + str_starts_with( $purchase->product_slug, 'jetpack_growth' ) + ) { return true; } } From 42ddde50812fd8c7a4427dcdc6f8c3dca7600d3c Mon Sep 17 00:00:00 2001 From: Calypso Bot Date: Tue, 19 Nov 2024 20:56:20 +0100 Subject: [PATCH 5/5] Update dependency brain/monkey to ^2.6.2 (#40258) Co-authored-by: Renovate Bot --- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/assets/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/blocks/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/connection/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/constants/composer.json | 2 +- .../ip/changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/ip/composer.json | 2 +- .../jitm/changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/jitm/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/masterbar/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/redirect/composer.json | 2 +- .../roles/changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/roles/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/status/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ projects/packages/videopress/composer.json | 2 +- .../changelog/renovate-brain-monkey-2.x | 4 ++ .../changelog/renovate-brain-monkey-2.x#2 | 5 ++ .../composer.json | 2 +- .../composer.lock | 42 ++++++++--------- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/backup/composer.lock | 32 ++++++------- .../boost/changelog/renovate-brain-monkey-2.x | 4 ++ .../changelog/renovate-brain-monkey-2.x#2 | 5 ++ projects/plugins/boost/composer.json | 2 +- projects/plugins/boost/composer.lock | 46 +++++++++---------- .../changelog/renovate-brain-monkey-2.x | 4 ++ .../changelog/renovate-brain-monkey-2.x#2 | 5 ++ .../classic-theme-helper-plugin/composer.json | 2 +- .../classic-theme-helper-plugin/composer.lock | 26 +++++------ .../crm/changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/crm/composer.lock | 8 ++-- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/inspect/composer.lock | 24 +++++----- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/jetpack/composer.lock | 44 +++++++++--------- .../changelog/renovate-brain-monkey-2.x | 5 ++ .../plugins/mu-wpcom-plugin/composer.lock | 40 ++++++++-------- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/protect/composer.lock | 32 ++++++------- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/search/composer.lock | 32 ++++++------- .../changelog/renovate-brain-monkey-2.x | 4 ++ .../changelog/renovate-brain-monkey-2.x#2 | 5 ++ projects/plugins/social/composer.json | 2 +- projects/plugins/social/composer.lock | 46 +++++++++---------- .../changelog/renovate-brain-monkey-2.x | 4 ++ .../changelog/renovate-brain-monkey-2.x#2 | 5 ++ projects/plugins/starter-plugin/composer.json | 2 +- projects/plugins/starter-plugin/composer.lock | 46 +++++++++---------- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/videopress/composer.lock | 36 +++++++-------- .../changelog/renovate-brain-monkey-2.x | 5 ++ projects/plugins/wpcomsh/composer.lock | 40 ++++++++-------- 60 files changed, 397 insertions(+), 263 deletions(-) create mode 100644 projects/packages/assets/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/blocks/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/connection/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/constants/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/ip/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/jitm/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/masterbar/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/redirect/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/roles/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/status/changelog/renovate-brain-monkey-2.x create mode 100644 projects/packages/videopress/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2 create mode 100644 projects/plugins/backup/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/boost/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/boost/changelog/renovate-brain-monkey-2.x#2 create mode 100644 projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x#2 create mode 100644 projects/plugins/crm/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/inspect/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/jetpack/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/protect/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/search/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/social/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/social/changelog/renovate-brain-monkey-2.x#2 create mode 100644 projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x#2 create mode 100644 projects/plugins/videopress/changelog/renovate-brain-monkey-2.x create mode 100644 projects/plugins/wpcomsh/changelog/renovate-brain-monkey-2.x diff --git a/projects/packages/assets/changelog/renovate-brain-monkey-2.x b/projects/packages/assets/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/assets/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/assets/composer.json b/projects/packages/assets/composer.json index 1908880c06d29..3cbe9bad4655e 100644 --- a/projects/packages/assets/composer.json +++ b/projects/packages/assets/composer.json @@ -8,7 +8,7 @@ "automattic/jetpack-constants": "@dev" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0" diff --git a/projects/packages/blocks/changelog/renovate-brain-monkey-2.x b/projects/packages/blocks/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/blocks/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/blocks/composer.json b/projects/packages/blocks/composer.json index b376679245876..e7809ddd76f6c 100644 --- a/projects/packages/blocks/composer.json +++ b/projects/packages/blocks/composer.json @@ -9,7 +9,7 @@ }, "require-dev": { "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/connection/changelog/renovate-brain-monkey-2.x b/projects/packages/connection/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/connection/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json index 60656d599adff..50367c81e0ac9 100644 --- a/projects/packages/connection/composer.json +++ b/projects/packages/connection/composer.json @@ -16,7 +16,7 @@ "require-dev": { "automattic/wordbless": "@dev", "yoast/phpunit-polyfills": "^1.1.1", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "automattic/jetpack-changelogger": "@dev", "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev" diff --git a/projects/packages/constants/changelog/renovate-brain-monkey-2.x b/projects/packages/constants/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/constants/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/constants/composer.json b/projects/packages/constants/composer.json index 9c8a754c6c43d..023959332d568 100644 --- a/projects/packages/constants/composer.json +++ b/projects/packages/constants/composer.json @@ -7,7 +7,7 @@ "php": ">=7.2" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/ip/changelog/renovate-brain-monkey-2.x b/projects/packages/ip/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/ip/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/ip/composer.json b/projects/packages/ip/composer.json index 2fde4db5c96a8..243f4a3849c93 100644 --- a/projects/packages/ip/composer.json +++ b/projects/packages/ip/composer.json @@ -7,7 +7,7 @@ "php": ">=7.2" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/jitm/changelog/renovate-brain-monkey-2.x b/projects/packages/jitm/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/jitm/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json index 5382534544e64..351aa4d99324a 100644 --- a/projects/packages/jitm/composer.json +++ b/projects/packages/jitm/composer.json @@ -14,7 +14,7 @@ "automattic/jetpack-status": "@dev" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/masterbar/changelog/renovate-brain-monkey-2.x b/projects/packages/masterbar/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/masterbar/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/masterbar/composer.json b/projects/packages/masterbar/composer.json index f522542634a60..dbdc8b7a0427b 100644 --- a/projects/packages/masterbar/composer.json +++ b/projects/packages/masterbar/composer.json @@ -16,7 +16,7 @@ "automattic/jetpack-status": "@dev" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/patchwork-redefine-exit": "@dev", diff --git a/projects/packages/redirect/changelog/renovate-brain-monkey-2.x b/projects/packages/redirect/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/redirect/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/redirect/composer.json b/projects/packages/redirect/composer.json index 1a5e3e80aea9a..1f0607951f32a 100644 --- a/projects/packages/redirect/composer.json +++ b/projects/packages/redirect/composer.json @@ -8,7 +8,7 @@ "automattic/jetpack-status": "@dev" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/roles/changelog/renovate-brain-monkey-2.x b/projects/packages/roles/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/roles/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/roles/composer.json b/projects/packages/roles/composer.json index 1779a623f5130..1bed9945117a9 100644 --- a/projects/packages/roles/composer.json +++ b/projects/packages/roles/composer.json @@ -7,7 +7,7 @@ "php": ">=7.2" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev" }, diff --git a/projects/packages/status/changelog/renovate-brain-monkey-2.x b/projects/packages/status/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/status/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/status/composer.json b/projects/packages/status/composer.json index e642afa35e37f..f6510f57e2c96 100644 --- a/projects/packages/status/composer.json +++ b/projects/packages/status/composer.json @@ -8,7 +8,7 @@ "automattic/jetpack-constants": "@dev" }, "require-dev": { - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/jetpack-connection": "@dev", diff --git a/projects/packages/videopress/changelog/renovate-brain-monkey-2.x b/projects/packages/videopress/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/packages/videopress/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/packages/videopress/composer.json b/projects/packages/videopress/composer.json index e8efec22a869c..2076358f7c46e 100644 --- a/projects/packages/videopress/composer.json +++ b/projects/packages/videopress/composer.json @@ -15,7 +15,7 @@ "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1" + "brain/monkey": "^2.6.2" }, "suggest": { "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.json b/projects/plugins/automattic-for-agencies-client/composer.json index cf98450d7b0e2..4ac8a22093967 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.json +++ b/projects/plugins/automattic-for-agencies-client/composer.json @@ -17,7 +17,7 @@ "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "0.4.2", - "brain/monkey": "2.6.1" + "brain/monkey": "^2.6.2" }, "autoload": { "classmap": [ diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 8958e1c8473bd..591226b189324 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ff0eb6686ecd58efe192cea73aa8a89d", + "content-hash": "f92f3406e4ccd1aca7120aa9b8181360", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -399,7 +399,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -416,7 +416,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -491,14 +491,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -545,14 +545,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -732,7 +732,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -740,7 +740,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -787,14 +787,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -841,7 +841,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -852,7 +852,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1151,16 +1151,16 @@ }, { "name": "brain/monkey", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb" + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/d95a9d895352c30f47604ad1b825ab8fa9d1a373", + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373", "shasum": "" }, "require": { @@ -1177,7 +1177,7 @@ "extra": { "branch-alias": { "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -1217,7 +1217,7 @@ "issues": "https://github.com/Brain-WP/BrainMonkey/issues", "source": "https://github.com/Brain-WP/BrainMonkey" }, - "time": "2021-11-11T15:53:55+00:00" + "time": "2024-08-29T20:15:04+00:00" }, { "name": "doctrine/instantiator", diff --git a/projects/plugins/backup/changelog/renovate-brain-monkey-2.x b/projects/plugins/backup/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index fb420f18385d6..34681f18ede2b 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -693,7 +693,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -710,7 +710,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -785,14 +785,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -967,14 +967,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1025,7 +1025,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1039,7 +1039,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1649,7 +1649,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1657,7 +1657,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1704,14 +1704,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1758,7 +1758,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1769,7 +1769,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/boost/changelog/renovate-brain-monkey-2.x b/projects/plugins/boost/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/plugins/boost/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/plugins/boost/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/boost/changelog/renovate-brain-monkey-2.x#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/renovate-brain-monkey-2.x#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json index 79dd1e3e30fd1..79a9e33bdd9c7 100644 --- a/projects/plugins/boost/composer.json +++ b/projects/plugins/boost/composer.json @@ -36,7 +36,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "0.4.2", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "scripts": { diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 56c3b975612d5..693acc10e7a68 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "63417c6fcd57c38d7aabdd6748a48976", + "content-hash": "bc8e077ee06d50a0425a90195b2abf0a", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -543,7 +543,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -560,7 +560,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -635,14 +635,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -883,14 +883,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -941,7 +941,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -955,7 +955,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1633,7 +1633,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1641,7 +1641,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1688,14 +1688,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1812,7 +1812,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1823,7 +1823,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2374,16 +2374,16 @@ }, { "name": "brain/monkey", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb" + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/d95a9d895352c30f47604ad1b825ab8fa9d1a373", + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373", "shasum": "" }, "require": { @@ -2400,7 +2400,7 @@ "extra": { "branch-alias": { "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2440,7 +2440,7 @@ "issues": "https://github.com/Brain-WP/BrainMonkey/issues", "source": "https://github.com/Brain-WP/BrainMonkey" }, - "time": "2021-11-11T15:53:55+00:00" + "time": "2024-08-29T20:15:04+00:00" }, { "name": "doctrine/instantiator", diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-brain-monkey-2.x#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/classic-theme-helper-plugin/composer.json b/projects/plugins/classic-theme-helper-plugin/composer.json index 64bc477f9bdb7..768cb46f89105 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.json +++ b/projects/plugins/classic-theme-helper-plugin/composer.json @@ -15,7 +15,7 @@ "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "0.4.2", - "brain/monkey": "2.6.1" + "brain/monkey": "^2.6.2" }, "autoload": { "classmap": [ diff --git a/projects/plugins/classic-theme-helper-plugin/composer.lock b/projects/plugins/classic-theme-helper-plugin/composer.lock index e19b788365e96..cd9796d54eeed 100644 --- a/projects/plugins/classic-theme-helper-plugin/composer.lock +++ b/projects/plugins/classic-theme-helper-plugin/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a80643c18b9b84428499b3be34c1a011", + "content-hash": "40740bb85f1f040d55dd83ec4814501e", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -65,7 +65,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -73,7 +73,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -405,14 +405,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -515,7 +515,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -526,7 +526,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -747,16 +747,16 @@ }, { "name": "brain/monkey", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb" + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/d95a9d895352c30f47604ad1b825ab8fa9d1a373", + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373", "shasum": "" }, "require": { @@ -773,7 +773,7 @@ "extra": { "branch-alias": { "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -813,7 +813,7 @@ "issues": "https://github.com/Brain-WP/BrainMonkey/issues", "source": "https://github.com/Brain-WP/BrainMonkey" }, - "time": "2021-11-11T15:53:55+00:00" + "time": "2024-08-29T20:15:04+00:00" }, { "name": "doctrine/instantiator", diff --git a/projects/plugins/crm/changelog/renovate-brain-monkey-2.x b/projects/plugins/crm/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/crm/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock index 46342bd5d3f5f..1070e7ec5b9d2 100644 --- a/projects/plugins/crm/composer.lock +++ b/projects/plugins/crm/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -20,7 +20,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -209,14 +209,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/inspect/changelog/renovate-brain-monkey-2.x b/projects/plugins/inspect/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index e973ca741a126..b6aecd9caf604 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -399,7 +399,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -416,7 +416,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -491,14 +491,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -545,7 +545,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -553,7 +553,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -600,14 +600,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -654,7 +654,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -665,7 +665,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/jetpack/changelog/renovate-brain-monkey-2.x b/projects/plugins/jetpack/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 5a2b9e178f1b3..69aaea709cb00 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -498,7 +498,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "1a72ece8ab32f9d8bd2cdcf4690141db61a9ef5d" + "reference": "e817f660cad04dafee869691cc7dbea18e4fc8f9" }, "require": { "automattic/jetpack-constants": "@dev", @@ -507,7 +507,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -944,7 +944,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -961,7 +961,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1036,14 +1036,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1493,14 +1493,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1551,7 +1551,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -1565,7 +1565,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1741,7 +1741,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "a6f6a9f25685aa6fd366b592bc19043a31c86591" + "reference": "241190f98185b67e7591d35e4befa146871c6502" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1759,7 +1759,7 @@ "automattic/jetpack-changelogger": "@dev", "automattic/patchwork-redefine-exit": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2405,7 +2405,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -2413,7 +2413,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2460,14 +2460,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2742,7 +2742,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -2753,7 +2753,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2884,7 +2884,7 @@ "dist": { "type": "path", "url": "../../packages/videopress", - "reference": "0de033cc4f6dea3b482fc3cb85036751920a0f2f" + "reference": "41394c8cfa5152cec1fa087f522904c542f97d7f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -2897,7 +2897,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x b/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index ff393ba4eb006..a22f76e5b12ed 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -280,7 +280,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "1a72ece8ab32f9d8bd2cdcf4690141db61a9ef5d" + "reference": "e817f660cad04dafee869691cc7dbea18e4fc8f9" }, "require": { "automattic/jetpack-constants": "@dev", @@ -289,7 +289,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -515,7 +515,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -532,7 +532,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -607,14 +607,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -785,14 +785,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -843,7 +843,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -857,7 +857,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -971,7 +971,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "a6f6a9f25685aa6fd366b592bc19043a31c86591" + "reference": "241190f98185b67e7591d35e4befa146871c6502" }, "require": { "automattic/jetpack-assets": "@dev", @@ -989,7 +989,7 @@ "automattic/jetpack-changelogger": "@dev", "automattic/patchwork-redefine-exit": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1266,7 +1266,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1274,7 +1274,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1321,14 +1321,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1515,7 +1515,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1526,7 +1526,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/protect/changelog/renovate-brain-monkey-2.x b/projects/plugins/protect/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 0652df0d5e085..c3950ffde549b 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -603,7 +603,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -620,7 +620,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -695,14 +695,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -877,14 +877,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -935,7 +935,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -949,7 +949,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1559,7 +1559,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1567,7 +1567,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1614,14 +1614,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1668,7 +1668,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1679,7 +1679,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/search/changelog/renovate-brain-monkey-2.x b/projects/plugins/search/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index ec329fb2a8ffa..f80ff49f60d9d 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -543,7 +543,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -560,7 +560,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -635,14 +635,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -817,14 +817,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -889,7 +889,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1499,7 +1499,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1507,7 +1507,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1554,14 +1554,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1763,7 +1763,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1774,7 +1774,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/social/changelog/renovate-brain-monkey-2.x b/projects/plugins/social/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/plugins/social/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json index ada5315eac119..1fe12e483291f 100644 --- a/projects/plugins/social/composer.json +++ b/projects/plugins/social/composer.json @@ -21,7 +21,7 @@ "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "0.4.2", "yoast/phpunit-polyfills": "^1.1.1", - "brain/monkey": "2.6.1" + "brain/monkey": "^2.6.2" }, "autoload": { "classmap": [ diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index c1962a1f18840..102ce40c3f87c 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c544377bb7115e780fb1645dd295be0b", + "content-hash": "96f69334f5451aa4050c091e89f48c26", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -543,7 +543,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -560,7 +560,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -635,14 +635,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -817,14 +817,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -889,7 +889,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1646,7 +1646,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1654,7 +1654,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1701,14 +1701,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1755,7 +1755,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1766,7 +1766,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -2065,16 +2065,16 @@ }, { "name": "brain/monkey", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb" + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/d95a9d895352c30f47604ad1b825ab8fa9d1a373", + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373", "shasum": "" }, "require": { @@ -2091,7 +2091,7 @@ "extra": { "branch-alias": { "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2131,7 +2131,7 @@ "issues": "https://github.com/Brain-WP/BrainMonkey/issues", "source": "https://github.com/Brain-WP/BrainMonkey" }, - "time": "2021-11-11T15:53:55+00:00" + "time": "2024-08-29T20:15:04+00:00" }, { "name": "doctrine/instantiator", diff --git a/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x b/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..c47cb18e82997 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Updated package dependencies. diff --git a/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x#2 new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/renovate-brain-monkey-2.x#2 @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.json b/projects/plugins/starter-plugin/composer.json index 8d60b64f34728..efa0a3dbdebcb 100644 --- a/projects/plugins/starter-plugin/composer.json +++ b/projects/plugins/starter-plugin/composer.json @@ -18,7 +18,7 @@ "yoast/phpunit-polyfills": "^1.1.1", "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "0.4.2", - "brain/monkey": "2.6.1" + "brain/monkey": "^2.6.2" }, "autoload": { "classmap": [ diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index 5995890078064..279fbfab06f7c 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c94d573634bc63a25910ac40cc215dd8", + "content-hash": "7b7563c77e12608e555ce4caff78357a", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -543,7 +543,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -560,7 +560,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -635,14 +635,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -817,14 +817,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -889,7 +889,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1499,7 +1499,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1507,7 +1507,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1554,14 +1554,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1608,7 +1608,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1619,7 +1619,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1918,16 +1918,16 @@ }, { "name": "brain/monkey", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/Brain-WP/BrainMonkey.git", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb" + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/a31c84515bb0d49be9310f52ef1733980ea8ffbb", - "reference": "a31c84515bb0d49be9310f52ef1733980ea8ffbb", + "url": "https://api.github.com/repos/Brain-WP/BrainMonkey/zipball/d95a9d895352c30f47604ad1b825ab8fa9d1a373", + "reference": "d95a9d895352c30f47604ad1b825ab8fa9d1a373", "shasum": "" }, "require": { @@ -1944,7 +1944,7 @@ "extra": { "branch-alias": { "dev-version/1": "1.x-dev", - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -1984,7 +1984,7 @@ "issues": "https://github.com/Brain-WP/BrainMonkey/issues", "source": "https://github.com/Brain-WP/BrainMonkey" }, - "time": "2021-11-11T15:53:55+00:00" + "time": "2024-08-29T20:15:04+00:00" }, { "name": "doctrine/instantiator", diff --git a/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x b/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 10e895684f886..a777d4fcb2bcb 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -130,7 +130,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -138,7 +138,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -543,7 +543,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -560,7 +560,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -635,14 +635,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -817,14 +817,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -875,7 +875,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -889,7 +889,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1499,7 +1499,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1507,7 +1507,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1554,14 +1554,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1608,7 +1608,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1619,7 +1619,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1750,7 +1750,7 @@ "dist": { "type": "path", "url": "../../packages/videopress", - "reference": "0de033cc4f6dea3b482fc3cb85036751920a0f2f" + "reference": "41394c8cfa5152cec1fa087f522904c542f97d7f" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1763,7 +1763,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/projects/plugins/wpcomsh/changelog/renovate-brain-monkey-2.x b/projects/plugins/wpcomsh/changelog/renovate-brain-monkey-2.x new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/renovate-brain-monkey-2.x @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 70c8925bf7909..901e1573a5401 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -195,7 +195,7 @@ "dist": { "type": "path", "url": "../../packages/assets", - "reference": "63138ef0df4e49622c104b8fee4000f72bd5354d" + "reference": "150864e98715bbe0f68332225843adb5920e166d" }, "require": { "automattic/jetpack-constants": "@dev", @@ -203,7 +203,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0", "yoast/phpunit-polyfills": "^1.1.1" }, @@ -345,7 +345,7 @@ "dist": { "type": "path", "url": "../../packages/blocks", - "reference": "1a72ece8ab32f9d8bd2cdcf4690141db61a9ef5d" + "reference": "e817f660cad04dafee869691cc7dbea18e4fc8f9" }, "require": { "automattic/jetpack-constants": "@dev", @@ -354,7 +354,7 @@ "require-dev": { "automattic/jetpack-changelogger": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -652,7 +652,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "820d59441494360d9c71a08a7f72fd4cb8486bf6" + "reference": "39940d00321ffb2730bdef3408636788340c0443" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -669,7 +669,7 @@ "automattic/jetpack-licensing": "@dev", "automattic/jetpack-sync": "@dev", "automattic/wordbless": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -744,14 +744,14 @@ "dist": { "type": "path", "url": "../../packages/constants", - "reference": "903469d423a09a79c41b7f1d0904ebab6365b22c" + "reference": "e715b43a76eeb5847166871e7e0d192469ddeb32" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -922,14 +922,14 @@ "dist": { "type": "path", "url": "../../packages/ip", - "reference": "1526cc28c06e8677d928a4072b02f0dc9ecd7577" + "reference": "55173099d713a5a77463e99b6ceb212574712475" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -980,7 +980,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "53bd1527e8cc69e0542c9572ca2b3896c4c9196b" + "reference": "6b2795ebf1c65e0a1a0bb9f0f1a9accaac0e22bf" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -994,7 +994,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1108,7 +1108,7 @@ "dist": { "type": "path", "url": "../../packages/masterbar", - "reference": "a6f6a9f25685aa6fd366b592bc19043a31c86591" + "reference": "241190f98185b67e7591d35e4befa146871c6502" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1126,7 +1126,7 @@ "automattic/jetpack-changelogger": "@dev", "automattic/patchwork-redefine-exit": "@dev", "automattic/wordbless": "dev-master", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1468,7 +1468,7 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "b472c2b14cdbc78377f5dd1181c8c28679b6c0fd" + "reference": "8c08601a206cf1cb8b62416a4b6613dd96c06704" }, "require": { "automattic/jetpack-status": "@dev", @@ -1476,7 +1476,7 @@ }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1523,14 +1523,14 @@ "dist": { "type": "path", "url": "../../packages/roles", - "reference": "024e413907f91fb32d4db4cb35373100b276e756" + "reference": "3d127129f23b1a5bc796913ac009a40af8e663bd" }, "require": { "php": ">=7.2" }, "require-dev": { "automattic/jetpack-changelogger": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -1717,7 +1717,7 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "ccc903c45eb5f4bd60a23c40ab65ab56340e459b" + "reference": "347a36e47e47f389682efc2a6d77b1f6ecfe2136" }, "require": { "automattic/jetpack-constants": "@dev", @@ -1728,7 +1728,7 @@ "automattic/jetpack-connection": "@dev", "automattic/jetpack-ip": "@dev", "automattic/jetpack-plans": "@dev", - "brain/monkey": "2.6.1", + "brain/monkey": "^2.6.2", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": {