diff --git a/.github/renovate.json5 b/.github/renovate.json5 index fa24b2f98894e..3eb1ceb8cbb98 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -70,6 +70,11 @@ matchDatasources: [ 'packagist' ], matchPackagePrefixes: [ 'codeception/' ], }, + { + groupName: 'Docker actions', + matchDepTypes: [ 'action' ], + matchPackagePrefixes: [ 'docker/' ], + }, // 🤷 { @@ -89,7 +94,7 @@ }, ], - regexManagers: [ + customManagers: [ // Update the renovate-version in the action itself. // See also https://github.com/renovatebot/github-action/issues/756 { diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 5435d4e4942e7..340e4ab847be8 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -42,7 +42,7 @@ jobs: configurationFile: /tmp/monorepo/.github/renovate-config.js token: ${{ secrets.RENOVATE_TOKEN }} mount-docker-socket: true - renovate-version: 36.92.1 + renovate-version: 37.18.4 env: LOG_LEVEL: ${{ github.event.inputs.logLevel || 'debug' }} RENOVATE_DRY_RUN: ${{ github.event.inputs.dryRun == 'no' && 'null' || github.event.inputs.dryRun || 'null' }} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9725b3a6c8660..e20cddeca8cfa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -300,6 +300,9 @@ importers: react-slider: specifier: 2.0.5 version: 2.0.5(@babel/runtime@7.23.1)(react@18.2.0) + social-logos: + specifier: 2.5.6 + version: 2.5.6(react@18.2.0) uplot: specifier: 1.6.24 version: 1.6.24 @@ -506,7 +509,7 @@ importers: version: 5.3.4 browserslist: specifier: ^4.17.6 - version: 4.21.9 + version: 4.22.1 debug: specifier: ^4.3.2 version: 4.3.4 @@ -911,6 +914,40 @@ importers: specifier: 18.2.0 version: 18.2.0(react@18.2.0) + projects/js-packages/react-data-sync-client: + dependencies: + swr: + specifier: 2.2.4 + version: 2.2.4(react@18.2.0) + devDependencies: + '@automattic/jetpack-webpack-config': + specifier: workspace:* + version: link:../webpack-config + jest: + specifier: '*' + version: 29.7.0 + react: + specifier: 18.2.0 + version: 18.2.0 + ts-loader: + specifier: 9.4.2 + version: 9.4.2(typescript@5.0.4)(webpack@5.76.0) + tslib: + specifier: 2.5.0 + version: 2.5.0 + typescript: + specifier: 5.0.4 + version: 5.0.4 + webpack: + specifier: 5.76.0 + version: 5.76.0(webpack-cli@4.9.1) + webpack-cli: + specifier: 4.9.1 + version: 4.9.1(webpack@5.76.0) + zod: + specifier: 3.22.3 + version: 3.22.3 + projects/js-packages/remove-asset-webpack-plugin: dependencies: debug: @@ -1274,8 +1311,8 @@ importers: specifier: 9.1.2 version: 9.1.2(@babel/core@7.23.0)(webpack@5.76.0) browserslist: - specifier: 4.21.9 - version: 4.21.9 + specifier: 4.22.1 + version: 4.22.1 css-loader: specifier: 6.5.1 version: 6.5.1(webpack@5.76.0) @@ -3043,8 +3080,8 @@ importers: specifier: 7.5.2 version: 7.5.2 social-logos: - specifier: 2.5.5 - version: 2.5.5(react@18.2.0) + specifier: 2.5.6 + version: 2.5.6(react@18.2.0) swiper: specifier: 6.7.0 version: 6.7.0 @@ -4269,7 +4306,7 @@ packages: dependencies: '@babel/compat-data': 7.22.20 '@babel/helper-validator-option': 7.22.15 - browserslist: 4.21.9 + browserslist: 4.22.1 lru-cache: 5.1.1 semver: 6.3.1 @@ -13297,7 +13334,7 @@ packages: peerDependencies: postcss: ^8.1.0 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 caniuse-lite: 1.0.30001547 fraction.js: 4.3.6 normalize-range: 0.1.2 @@ -13656,16 +13693,6 @@ packages: pako: 0.2.9 dev: true - /browserslist@4.21.9: - resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - dependencies: - caniuse-lite: 1.0.30001547 - electron-to-chromium: 1.4.549 - node-releases: 2.0.13 - update-browserslist-db: 1.0.13(browserslist@4.21.9) - /browserslist@4.22.1: resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -13795,7 +13822,7 @@ packages: /caniuse-api@3.0.0: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 caniuse-lite: 1.0.30001547 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 @@ -14013,6 +14040,10 @@ packages: resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==} engines: {node: '>= 10'} + /client-only@0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + dev: false + /clipboard@2.0.11: resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==} dependencies: @@ -20147,7 +20178,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 caniuse-api: 3.0.0 colord: 2.9.3 postcss: 8.4.31 @@ -20159,7 +20190,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 postcss: 8.4.31 postcss-value-parser: 4.2.0 @@ -20251,7 +20282,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 caniuse-api: 3.0.0 cssnano-utils: 4.0.0(postcss@8.4.31) postcss: 8.4.31 @@ -20283,7 +20314,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 cssnano-utils: 4.0.0(postcss@8.4.31) postcss: 8.4.31 postcss-value-parser: 4.2.0 @@ -20409,7 +20440,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 postcss: 8.4.31 postcss-value-parser: 4.2.0 @@ -20447,7 +20478,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 caniuse-api: 3.0.0 postcss: 8.4.31 @@ -22179,8 +22210,8 @@ packages: dot-case: 3.0.4 tslib: 2.5.0 - /social-logos@2.5.5(react@18.2.0): - resolution: {integrity: sha512-8l9kJmevAKqMgGQEJxlVaeMhv8iHNSTnTr2FxApELyW5txjKKGEK5xdvIDS2K3JFsiFnoP/L2Kd9TUSQSbJ4LA==} + /social-logos@2.5.6(react@18.2.0): + resolution: {integrity: sha512-i6/lafcegSau6G5JXqbUyUF/FLrNQgh9yd3wAe/VItsg/CAb5iGaP4kNtAQxf+fRBzC6UZpXmUsU8N7AbUN/vw==} peerDependencies: react: 15 - 18 dependencies: @@ -22564,7 +22595,7 @@ packages: peerDependencies: postcss: ^8.2.15 dependencies: - browserslist: 4.21.9 + browserslist: 4.22.1 postcss: 8.4.31 postcss-selector-parser: 6.0.13 @@ -22716,6 +22747,16 @@ packages: ssr-window: 3.0.0 dev: false + /swr@2.2.4(react@18.2.0): + resolution: {integrity: sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==} + peerDependencies: + react: ^16.11.0 || ^17.0.0 || ^18.0.0 + dependencies: + client-only: 0.0.1 + react: 18.2.0 + use-sync-external-store: 1.2.0(react@18.2.0) + dev: false + /symbol-observable@1.2.0: resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==} engines: {node: '>=0.10.0'} @@ -23388,16 +23429,6 @@ packages: engines: {node: '>=8'} dev: true - /update-browserslist-db@1.0.13(browserslist@4.21.9): - resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - dependencies: - browserslist: 4.21.9 - escalade: 3.1.1 - picocolors: 1.0.0 - /update-browserslist-db@1.0.13(browserslist@4.22.1): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true @@ -23823,7 +23854,7 @@ packages: '@webassemblyjs/wasm-parser': 1.11.1 acorn: 8.10.0 acorn-import-assertions: 1.9.0(acorn@8.10.0) - browserslist: 4.21.9 + browserslist: 4.22.1 chrome-trace-event: 1.0.3 enhanced-resolve: 5.15.0 es-module-lexer: 0.9.3 @@ -23864,7 +23895,7 @@ packages: '@webassemblyjs/wasm-parser': 1.11.1 acorn: 8.10.0 acorn-import-assertions: 1.9.0(acorn@8.10.0) - browserslist: 4.21.9 + browserslist: 4.22.1 chrome-trace-event: 1.0.3 enhanced-resolve: 5.15.0 es-module-lexer: 0.9.3 diff --git a/projects/js-packages/ai-client/CHANGELOG.md b/projects/js-packages/ai-client/CHANGELOG.md index ab4b2ac15c305..c60ede9e422ba 100644 --- a/projects/js-packages/ai-client/CHANGELOG.md +++ b/projects/js-packages/ai-client/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.1.12] - 2023-10-16 +### Changed +- Updated package dependencies. [#33584] + ## [0.1.11] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -140,6 +144,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated package dependencies. [#31659] - Updated package dependencies. [#31785] +[0.1.12]: https://github.com/Automattic/jetpack-ai-client/compare/v0.1.11...v0.1.12 [0.1.11]: https://github.com/Automattic/jetpack-ai-client/compare/v0.1.10...v0.1.11 [0.1.10]: https://github.com/Automattic/jetpack-ai-client/compare/v0.1.9...v0.1.10 [0.1.9]: https://github.com/Automattic/jetpack-ai-client/compare/v0.1.8...v0.1.9 diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json index a39a7b6f6c8d9..956ef0bab98e7 100644 --- a/projects/js-packages/ai-client/package.json +++ b/projects/js-packages/ai-client/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@automattic/jetpack-ai-client", - "version": "0.1.12-alpha", + "version": "0.1.12", "description": "A JS client for consuming Jetpack AI services", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme", "bugs": { diff --git a/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md b/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md index ec1f0b1ce44b2..6cd03dfe754fa 100644 --- a/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md +++ b/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [1.0.29] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [1.0.28] - 2023-09-13 ### Changed - Updated package dependencies. [#33001] @@ -135,6 +139,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial release. - Replace missing domains too. +[1.0.29]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.28...v1.0.29 [1.0.28]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.27...v1.0.28 [1.0.27]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.26...v1.0.27 [1.0.26]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.25...v1.0.26 diff --git a/projects/js-packages/babel-plugin-replace-textdomain/package.json b/projects/js-packages/babel-plugin-replace-textdomain/package.json index b0204445aa063..7b39c22acf544 100644 --- a/projects/js-packages/babel-plugin-replace-textdomain/package.json +++ b/projects/js-packages/babel-plugin-replace-textdomain/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/babel-plugin-replace-textdomain", - "version": "1.0.29-alpha", + "version": "1.0.29", "description": "A Babel plugin to replace the textdomain in gettext-style function calls.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/babel-plugin-replace-textdomain/#readme", "bugs": { diff --git a/projects/js-packages/boost-score-api/CHANGELOG.md b/projects/js-packages/boost-score-api/CHANGELOG.md index 391c6560bc7eb..ca915a763ee03 100644 --- a/projects/js-packages/boost-score-api/CHANGELOG.md +++ b/projects/js-packages/boost-score-api/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.1.13] - 2023-10-16 +### Changed +- Updated package dependencies. [#33567, #33569] + ## [0.1.12] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -67,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Create package for the boost score bar API [#30781] +[0.1.13]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.12...v0.1.13 [0.1.12]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.11...v0.1.12 [0.1.11]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.10...v0.1.11 [0.1.10]: https://github.com/Automattic/jetpack-boost-score-api/compare/v0.1.9...v0.1.10 diff --git a/projects/js-packages/boost-score-api/package.json b/projects/js-packages/boost-score-api/package.json index 51aca35fd305a..065f672fb4e9f 100644 --- a/projects/js-packages/boost-score-api/package.json +++ b/projects/js-packages/boost-score-api/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-boost-score-api", - "version": "0.1.13-alpha", + "version": "0.1.13", "description": "A package to get the Jetpack Boost score of a site", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/boost-score-api/#readme", "bugs": { diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md index dd4d6be74f088..3331b191d72e2 100644 --- a/projects/js-packages/components/CHANGELOG.md +++ b/projects/js-packages/components/CHANGELOG.md @@ -2,6 +2,11 @@ ### This is a list detailing changes for the Jetpack RNA Components package releases. +## [0.43.3] - 2023-10-16 +### Changed +- Replaced inline social icons with social-logos package. [#33613] +- Updated package dependencies. [#33584, #33429] + ## [0.43.2] - 2023-10-11 ### Changed - Changed Twitter icon and label to X [#33445] @@ -839,6 +844,7 @@ ### Changed - Update node version requirement to 14.16.1 +[0.43.3]: https://github.com/Automattic/jetpack-components/compare/0.43.2...0.43.3 [0.43.2]: https://github.com/Automattic/jetpack-components/compare/0.43.1...0.43.2 [0.43.1]: https://github.com/Automattic/jetpack-components/compare/0.43.0...0.43.1 [0.43.0]: https://github.com/Automattic/jetpack-components/compare/0.42.5...0.43.0 diff --git a/projects/js-packages/components/changelog/renovate-babel-monorepo b/projects/js-packages/components/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/components/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/components/changelog/renovate-major-eslint-packages b/projects/js-packages/components/changelog/renovate-major-eslint-packages deleted file mode 100644 index 2abc0f6a79c68..0000000000000 --- a/projects/js-packages/components/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Make new version of prettier happy. No functional change. - - diff --git a/projects/js-packages/components/changelog/renovate-storybook-monorepo b/projects/js-packages/components/changelog/renovate-storybook-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/components/changelog/renovate-storybook-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/components/components/icons/README.md b/projects/js-packages/components/components/icons/README.md index 279e87a2bef95..40b58bbf22841 100644 --- a/projects/js-packages/components/components/icons/README.md +++ b/projects/js-packages/components/components/icons/README.md @@ -16,12 +16,6 @@ Available slugs are: * star * videopress * jetpack -* facebook -* twitter -* linkedin -* tumblr -* google -* mastodon ```es6 import { @@ -49,12 +43,6 @@ return ( * VideopressIcon * JetpackIcon * ShareIcon -* FacebookIcon -* TwitterIcon -* LinkedinIcon -* TumblrIcon -* GoogleIcon -* MastodonIcon ```es6 import { @@ -69,12 +57,6 @@ import { VideoPressIcon, JetpackIcon, ShareIcon, - FacebookIcon, - TwitterIcon, - LinkedinIcon, - TumblrIcon, - GoogleIcon, - MastodonIcon } from '@automattic/jetpack-components'; return ( @@ -90,12 +72,6 @@ return ( - - - - - - ) ``` diff --git a/projects/js-packages/components/components/icons/index.tsx b/projects/js-packages/components/components/icons/index.tsx index 640db4b8fec08..71cdf5c8a08dc 100644 --- a/projects/js-packages/components/components/icons/index.tsx +++ b/projects/js-packages/components/components/icons/index.tsx @@ -1,7 +1,8 @@ import { Path, SVG, G, Polygon } from '@wordpress/components'; import classNames from 'classnames'; +import SocialLogo from 'social-logos'; import styles from './style.module.scss'; -import { BaseIconProps, SocialIconWrapperProps } from './types'; +import { BaseIconProps } from './types'; import type React from 'react'; /** @@ -211,149 +212,6 @@ export const ShareIcon: React.FC< BaseIconProps > = ( { size = 16, className, co ); }; -/** - * Wrapper of the Social Icons. Adds a default CSS class. - * - * @param {SocialIconWrapperProps} props - Component props. - * @returns {React.ReactNode} - Social Icon component. - */ -const SocialIconWrapper: React.FC< SocialIconWrapperProps > = ( { - className, - fill = 'none', - size, - children, -} ) => { - return ( - - { children } - - ); -}; - -export const FacebookIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const InstagramIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const TwitterIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const XIcon: React.FC< SocialIconWrapperProps > = ( { - fill = 'black', - size, - className, -} ) => { - return ( - - - - ); -}; - -export const LinkedinIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const TumblrIcon: React.FC< SocialIconWrapperProps > = ( { - fill, - size, - className, - invert, -} ) => { - return ( - - { invert ? ( - - ) : ( - - ) } - - ); -}; - -export const GoogleIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const MastodonIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - -export const WhatsAppIcon: React.FC< SocialIconWrapperProps > = ( { fill, size, className } ) => { - return ( - - - - ); -}; - const jetpackIcons = { 'anti-spam': AntiSpamIcon, backup: BackupIcon, @@ -370,27 +228,12 @@ const jetpackIcons = { share: ShareIcon, }; -const socialIcons = { - facebook: FacebookIcon, - instagram: InstagramIcon, - twitter: TwitterIcon, - linkedin: LinkedinIcon, - tumblr: TumblrIcon, - google: GoogleIcon, - mastodon: MastodonIcon, - whatsapp: WhatsAppIcon, - x: XIcon, -}; - const iconsMap = { ...jetpackIcons, - ...socialIcons, }; export type JetpackIconSlug = keyof typeof jetpackIcons; -export type SocialIconSlug = keyof typeof socialIcons; - export type IconsMap = typeof iconsMap; export type IconSlug = keyof IconsMap; @@ -410,10 +253,13 @@ export function getIconBySlug< Slug extends IconSlug >( slug: Slug ): IconsMap[ } export const SocialServiceIcon: React.FC< { - serviceName: keyof typeof socialIcons; + serviceName: React.ComponentProps< typeof SocialLogo >[ 'icon' ]; className?: string; - invert?: boolean; -} > = ( { serviceName, className, invert } ) => { - const Icon = getIconBySlug( serviceName ); - return Icon ? : null; +} > = ( { serviceName, className } ) => { + return ( + + ); }; diff --git a/projects/js-packages/components/components/icons/types.ts b/projects/js-packages/components/components/icons/types.ts index d780537e5c168..753d4df576a21 100644 --- a/projects/js-packages/components/components/icons/types.ts +++ b/projects/js-packages/components/components/icons/types.ts @@ -31,8 +31,3 @@ export type BaseIconProps = { */ color?: string; }; - -export type SocialIconWrapperProps = Pick< BaseIconProps, 'className' | 'size' | 'children' > & { - fill?: string; - invert?: boolean; -}; diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json index b9cf102dd80fa..51a2a1a0b75c2 100644 --- a/projects/js-packages/components/package.json +++ b/projects/js-packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-components", - "version": "0.43.3-alpha", + "version": "0.43.3", "description": "Jetpack Components Package", "author": "Automattic", "license": "GPL-2.0-or-later", @@ -29,6 +29,7 @@ "prop-types": "^15.7.2", "qrcode.react": "3.1.0", "react-slider": "2.0.5", + "social-logos": "2.5.6", "uplot": "1.6.24", "uplot-react": "1.1.4" }, diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md index 31d292abcd392..9e8d7be1bdefd 100644 --- a/projects/js-packages/connection/CHANGELOG.md +++ b/projects/js-packages/connection/CHANGELOG.md @@ -2,6 +2,10 @@ ### This is a list detailing changes for the Jetpack RNA Connection Component releases. +## [0.30.2] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429, #33584] + ## [0.30.1] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -636,6 +640,7 @@ - `Main` and `ConnectUser` components added. - `JetpackRestApiClient` API client added. +[0.30.2]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.1...v0.30.2 [0.30.1]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.0...v0.30.1 [0.30.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.29.10...v0.30.0 [0.29.10]: https://github.com/Automattic/jetpack-connection-js/compare/v0.29.9...v0.29.10 diff --git a/projects/js-packages/connection/changelog/renovate-babel-monorepo b/projects/js-packages/connection/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/connection/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/connection/changelog/renovate-storybook-monorepo b/projects/js-packages/connection/changelog/renovate-storybook-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/connection/changelog/renovate-storybook-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json index 2e6cfd3ac0fd6..5ee9c4a8748fc 100644 --- a/projects/js-packages/connection/package.json +++ b/projects/js-packages/connection/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-connection", - "version": "0.30.2-alpha", + "version": "0.30.2", "description": "Jetpack Connection Component", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme", "bugs": { diff --git a/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md b/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md index ccd1d794c031d..d028d7399c485 100644 --- a/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md +++ b/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [1.1.1] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [1.1.0] - 2023-10-03 ### Added - Add a sub-plugin, `I18nSafeMangleExportsPlugin`, to allow for avoiding problems with Webpack's `optimization.mangleExports` option occasionally mangling an export to one of the i18n function names. [#33392] @@ -176,6 +180,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Initial release. +[1.1.1]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.36...v1.1.0 [1.0.36]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.35...v1.0.36 [1.0.35]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.34...v1.0.35 diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-babel-monorepo b/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-major-eslint-packages b/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-major-eslint-packages deleted file mode 100644 index 2abc0f6a79c68..0000000000000 --- a/projects/js-packages/i18n-check-webpack-plugin/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Make new version of prettier happy. No functional change. - - diff --git a/projects/js-packages/i18n-check-webpack-plugin/package.json b/projects/js-packages/i18n-check-webpack-plugin/package.json index ad49b733d095b..8330f48b02c31 100644 --- a/projects/js-packages/i18n-check-webpack-plugin/package.json +++ b/projects/js-packages/i18n-check-webpack-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/i18n-check-webpack-plugin", - "version": "1.1.1-alpha", + "version": "1.1.1", "description": "A Webpack plugin to check that WordPress i18n hasn't been mangled by Webpack optimizations.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/i18n-check-webpack-plugin/#readme", "bugs": { diff --git a/projects/js-packages/idc/CHANGELOG.md b/projects/js-packages/idc/CHANGELOG.md index 1b127b2417f41..b875930da3618 100644 --- a/projects/js-packages/idc/CHANGELOG.md +++ b/projects/js-packages/idc/CHANGELOG.md @@ -2,6 +2,10 @@ ### This is a list detailing changes for the Jetpack RNA IDC package releases. +## 0.10.48 - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## 0.10.47 - 2023-10-10 ### Changed - Updated package dependencies. [#33428] diff --git a/projects/js-packages/idc/changelog/renovate-babel-monorepo b/projects/js-packages/idc/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/idc/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json index 45e283407db2a..3ab823c54a272 100644 --- a/projects/js-packages/idc/package.json +++ b/projects/js-packages/idc/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-idc", - "version": "0.10.48-alpha", + "version": "0.10.48", "description": "Jetpack Connection Component", "author": "Automattic", "license": "GPL-2.0-or-later", diff --git a/projects/js-packages/licensing/CHANGELOG.md b/projects/js-packages/licensing/CHANGELOG.md index 7c55352e48c3b..033726b423eba 100644 --- a/projects/js-packages/licensing/CHANGELOG.md +++ b/projects/js-packages/licensing/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## 0.11.8 - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## 0.11.7 - 2023-10-10 ### Changed - Updated package dependencies. [#33428] diff --git a/projects/js-packages/licensing/changelog/renovate-babel-monorepo b/projects/js-packages/licensing/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/licensing/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json index a2a23a015f91a..5c413a2c48b1b 100644 --- a/projects/js-packages/licensing/package.json +++ b/projects/js-packages/licensing/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-licensing", - "version": "0.11.8-alpha", + "version": "0.11.8", "description": "Jetpack licensing flow", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/licensing/#readme", "bugs": { diff --git a/projects/js-packages/partner-coupon/CHANGELOG.md b/projects/js-packages/partner-coupon/CHANGELOG.md index 2b1a9a12a8545..894144ec58c8f 100644 --- a/projects/js-packages/partner-coupon/CHANGELOG.md +++ b/projects/js-packages/partner-coupon/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## 0.2.57 - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## 0.2.56 - 2023-10-10 ### Changed - Updated package dependencies. [#33428] diff --git a/projects/js-packages/partner-coupon/changelog/renovate-babel-monorepo b/projects/js-packages/partner-coupon/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/partner-coupon/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json index 6873b2f381a53..75545539cc1fe 100644 --- a/projects/js-packages/partner-coupon/package.json +++ b/projects/js-packages/partner-coupon/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-partner-coupon", - "version": "0.2.57-alpha", + "version": "0.2.57", "description": "This package aims to add components to make it easier to redeem partner coupons", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/partner-coupon/#readme", "bugs": { diff --git a/projects/js-packages/publicize-components/CHANGELOG.md b/projects/js-packages/publicize-components/CHANGELOG.md index fa2e5880537f4..bb062884e1d38 100644 --- a/projects/js-packages/publicize-components/CHANGELOG.md +++ b/projects/js-packages/publicize-components/CHANGELOG.md @@ -5,6 +5,21 @@ 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). +## [0.40.2] - 2023-10-16 +### Added +- Added aspect-ratio validation for Instagram images. [#33522] + +### Changed +- Added type prop to custom media for social posts. [#33504] +- Changed Twitter icon and label to X. [#33445] +- Convert Twitter to X. [#33574] +- Replaced inline social icons with social-logos package. [#33613] +- Updated package dependencies. [#33429] + +### Fixed +- Fixed an issue with conditional className property [#33592] +- Fixed tracking for quick share buttons [#33589] + ## [0.40.1] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -451,6 +466,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Updated package dependencies. [#24470] +[0.40.2]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.40.1...v0.40.2 [0.40.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.40.0...v0.40.1 [0.40.0]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.39.1...v0.40.0 [0.39.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.39.0...v0.39.1 diff --git a/projects/js-packages/publicize-components/changelog/fix-add-instagram-image-dimension-validation b/projects/js-packages/publicize-components/changelog/fix-add-instagram-image-dimension-validation deleted file mode 100644 index 3be32cf6ee3ed..0000000000000 --- a/projects/js-packages/publicize-components/changelog/fix-add-instagram-image-dimension-validation +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Added aspect-ratio validation for Instagram images diff --git a/projects/js-packages/publicize-components/changelog/fix-quick-share-tracking b/projects/js-packages/publicize-components/changelog/fix-quick-share-tracking deleted file mode 100644 index c9e0b39bb79d2..0000000000000 --- a/projects/js-packages/publicize-components/changelog/fix-quick-share-tracking +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Fixed tracking for quick share buttons diff --git a/projects/js-packages/publicize-components/changelog/renovate-babel-monorepo b/projects/js-packages/publicize-components/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/publicize-components/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/publicize-components/changelog/update-add-type-prop-to-custom-media b/projects/js-packages/publicize-components/changelog/update-add-type-prop-to-custom-media deleted file mode 100644 index 610143d163549..0000000000000 --- a/projects/js-packages/publicize-components/changelog/update-add-type-prop-to-custom-media +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Added type prop to custom media for social posts diff --git a/projects/js-packages/publicize-components/changelog/update-convert-twitter-icons-to-X b/projects/js-packages/publicize-components/changelog/update-convert-twitter-icons-to-X deleted file mode 100644 index 9aea379ed77cf..0000000000000 --- a/projects/js-packages/publicize-components/changelog/update-convert-twitter-icons-to-X +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Changed Twitter icon and label to X diff --git a/projects/js-packages/publicize-components/changelog/update-social-previews-convert-twitter-to-x b/projects/js-packages/publicize-components/changelog/update-social-previews-convert-twitter-to-x deleted file mode 100644 index e3ba45f287705..0000000000000 --- a/projects/js-packages/publicize-components/changelog/update-social-previews-convert-twitter-to-x +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Convert Twitter to X diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json index 58793a55f0cda..a755867320fcd 100644 --- a/projects/js-packages/publicize-components/package.json +++ b/projects/js-packages/publicize-components/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-publicize-components", - "version": "0.40.2-alpha", + "version": "0.40.2", "description": "A library of JS components required by the Publicize editor plugin", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme", "bugs": { diff --git a/projects/js-packages/publicize-components/src/components/connection-icon/index.jsx b/projects/js-packages/publicize-components/src/components/connection-icon/index.jsx index 389d12aeed6a5..89b11bb51c779 100644 --- a/projects/js-packages/publicize-components/src/components/connection-icon/index.jsx +++ b/projects/js-packages/publicize-components/src/components/connection-icon/index.jsx @@ -48,7 +48,6 @@ const ConnectionIcon = props => { alt={ label } serviceName={ getServiceName() } className="jetpack-publicize-gutenberg-social-icon" - invert={ 'tumblr' === serviceName } /> ); diff --git a/projects/js-packages/publicize-components/src/components/panel/index.jsx b/projects/js-packages/publicize-components/src/components/panel/index.jsx index 251e38371e350..3673cc52c8320 100644 --- a/projects/js-packages/publicize-components/src/components/panel/index.jsx +++ b/projects/js-packages/publicize-components/src/components/panel/index.jsx @@ -54,12 +54,14 @@ const PublicizePanel = ( { prePublish, enableTweetStorm, children } ) => { // Panel wrapper. const PanelWrapper = prePublish ? Fragment : PanelBody; - const wrapperProps = prePublish ? {} : { title: __( 'Share this post', 'jetpack' ) }; + const wrapperProps = prePublish + ? {} + : { title: __( 'Share this post', 'jetpack' ), className: styles.panel }; const [ isModalOpen, toggleModal ] = useReducer( isOpen => ! isOpen, false ); return ( - + { isPostPublished && ( , + icon: props => , name: 'tumblr', preview: TumblrPreview, }, diff --git a/projects/js-packages/react-data-sync-client/.eslintrc.cjs b/projects/js-packages/react-data-sync-client/.eslintrc.cjs new file mode 100644 index 0000000000000..f35f9d3574713 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/.eslintrc.cjs @@ -0,0 +1,27 @@ +module.exports = { + extends: [ require.resolve( 'jetpack-js-tools/eslintrc/typescript' ) ], + rules: { + 'jsdoc/check-alignment': 0, + 'jsdoc/check-examples': 0, + 'jsdoc/check-indentation': 0, + 'jsdoc/check-param-names': 0, + 'jsdoc/check-syntax': 0, + 'jsdoc/check-tag-names': 0, + 'jsdoc/check-types': 0, + 'jsdoc/implements-on-classes': 0, + 'jsdoc/require-description': 0, + 'jsdoc/require-hyphen-before-param-description': 0, + 'jsdoc/require-jsdoc': 0, + 'jsdoc/require-param': 0, + 'jsdoc/require-param-description': 0, + 'jsdoc/require-param-name': 0, + 'jsdoc/require-param-type': 0, + 'jsdoc/require-returns': 0, + 'jsdoc/require-returns-check': 0, + 'jsdoc/require-returns-description': 0, + 'jsdoc/require-returns-type': 0, + 'jsdoc/tag-lines': 0, + 'jsdoc/valid-types': 0, + 'jsdoc/check-values': 0, + }, +}; diff --git a/projects/js-packages/react-data-sync-client/.gitattributes b/projects/js-packages/react-data-sync-client/.gitattributes new file mode 100644 index 0000000000000..61b9bb45227f0 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/.gitattributes @@ -0,0 +1,18 @@ +# Files not needed to be distributed in the package. +.gitattributes export-ignore +node_modules export-ignore +package.json export-ignore + +# Files to include in the mirror repo, but excluded via gitignore +# Remember to end all directories with `/**` to properly tag every file. +/build/** production-include + +# Files to exclude from the mirror repo +/changelog/** production-exclude +/.eslintrc.cjs production-exclude +.gitignore production-exclude +tests/** production-exclude +babel.config.cjs production-exclude +webpack.config.cjs production-exclude +tsconfig.json production-exclude +jsconfig.json production-exclude diff --git a/projects/js-packages/react-data-sync-client/.gitignore b/projects/js-packages/react-data-sync-client/.gitignore new file mode 100644 index 0000000000000..f8206b742cb31 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/.gitignore @@ -0,0 +1,4 @@ +vendor/ +node_modules/ +build/ +.cache/ diff --git a/projects/js-packages/react-data-sync-client/CHANGELOG.md b/projects/js-packages/react-data-sync-client/CHANGELOG.md new file mode 100644 index 0000000000000..721294abd00ad --- /dev/null +++ b/projects/js-packages/react-data-sync-client/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/react-data-sync-client/README.md b/projects/js-packages/react-data-sync-client/README.md new file mode 100644 index 0000000000000..a0dcba920c466 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/README.md @@ -0,0 +1,24 @@ +# react-data-sync-client + +DataSync client for React + +## How to install react-data-sync-client + +### 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 + +react-data-sync-client is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt) + diff --git a/projects/js-packages/react-data-sync-client/babel.config.cjs b/projects/js-packages/react-data-sync-client/babel.config.cjs new file mode 100644 index 0000000000000..96978eea82216 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/babel.config.cjs @@ -0,0 +1,10 @@ +module.exports = { + presets: [ + [ + '@automattic/jetpack-webpack-config/babel/preset', + { + /* options */ + }, + ], + ], +}; diff --git a/projects/js-packages/react-data-sync-client/changelog/.gitkeep b/projects/js-packages/react-data-sync-client/changelog/.gitkeep new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/projects/js-packages/react-data-sync-client/changelog/boost-react-react-datasync-client-init b/projects/js-packages/react-data-sync-client/changelog/boost-react-react-datasync-client-init new file mode 100644 index 0000000000000..84566fb82debc --- /dev/null +++ b/projects/js-packages/react-data-sync-client/changelog/boost-react-react-datasync-client-init @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Init diff --git a/projects/js-packages/react-data-sync-client/composer.json b/projects/js-packages/react-data-sync-client/composer.json new file mode 100644 index 0000000000000..cc642c4dfe3e5 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/composer.json @@ -0,0 +1,49 @@ +{ + "name": "automattic/jetpack-react-data-sync-client", + "description": "DataSync client for React", + "type": "library", + "license": "GPL-2.0-or-later", + "require": {}, + "require-dev": { + "yoast/phpunit-polyfills": "1.1.0", + "automattic/jetpack-changelogger": "@dev" + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "scripts": { + "build-development": [ + "pnpm run build" + ], + "build-production": [ + "NODE_ENV=production pnpm run build" + ], + "watch": [ + "Composer\\Config::disableProcessTimeout", + "pnpm run watch" + ], + "test-js": [ + "pnpm run test" + ] + }, + "repositories": [ + { + "type": "path", + "url": "../../packages/*", + "options": { + "monorepo": true + } + } + ], + "minimum-stability": "dev", + "prefer-stable": true, + "extra": { + "mirror-repo": "Automattic/jetpack-react-data-sync-client", + "changelogger": { + "link-template": "https://github.com/Automattic/jetpack-react-data-sync-client/compare/v${old}...v${new}" + }, + "autotagger": true + } +} diff --git a/projects/js-packages/react-data-sync-client/package.json b/projects/js-packages/react-data-sync-client/package.json new file mode 100644 index 0000000000000..49b5c9a11d0c0 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/package.json @@ -0,0 +1,52 @@ +{ + "private": true, + "name": "@automattic/jetpack-react-data-sync-client", + "version": "0.1.0-alpha", + "description": "DataSync client for React", + "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/react-data-sync-client/#readme", + "bugs": { + "url": "https://github.com/Automattic/jetpack/labels/[JS Package] React Data Sync Client" + }, + "repository": { + "type": "git", + "url": "https://github.com/Automattic/jetpack.git", + "directory": "projects/js-packages/react-data-sync-client" + }, + "license": "GPL-2.0-or-later", + "author": "Automattic", + "scripts": { + "build": "pnpm run clean && webpack", + "clean": "rm -rf build/", + "watch": "pnpm run build && pnpm webpack watch", + "reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path .eslintignore --write --plugin-search-dir=. ./src/**/*.ts", + "lint": "pnpm run reformat-files && echo 'Running eslint...' && pnpm eslint src --fix && echo '✔ prettier and eslint ran successfully.'", + "test": "NODE_OPTIONS=--experimental-vm-modules jest" + }, + "devDependencies": { + "@automattic/jetpack-webpack-config": "workspace:*", + "jest": "*", + "react": "18.2.0", + "ts-loader": "9.4.2", + "tslib": "2.5.0", + "typescript": "5.0.4", + "webpack": "5.76.0", + "webpack-cli": "4.9.1", + "zod": "3.22.3" + }, + "engines": { + "node": "^18.13.0", + "yarn": "use pnpm instead - see docs/yarn-upgrade.md" + }, + "exports": { + ".": { + "jetpack:src": "./src/index.ts", + "types": "./build/index.d.ts", + "default": "./build/index.js" + } + }, + "main": "./build/index.js", + "types": "./build/index.d.ts", + "dependencies": { + "swr": "2.2.4" + } +} diff --git a/projects/js-packages/react-data-sync-client/src/index.ts b/projects/js-packages/react-data-sync-client/src/index.ts new file mode 100644 index 0000000000000..92a8f89ec28ab --- /dev/null +++ b/projects/js-packages/react-data-sync-client/src/index.ts @@ -0,0 +1,2 @@ +// eslint-disable-next-line no-console +console.log( 'Hello World!' ); diff --git a/projects/js-packages/react-data-sync-client/tests/index.test.js b/projects/js-packages/react-data-sync-client/tests/index.test.js new file mode 100644 index 0000000000000..ddf5d1187c0dc --- /dev/null +++ b/projects/js-packages/react-data-sync-client/tests/index.test.js @@ -0,0 +1,12 @@ +// 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. +describe( 'Blank Test', () => { + it( 'is a noop', () => { + expect( true ).toBe( true ); + } ); +} ); diff --git a/projects/js-packages/react-data-sync-client/tsconfig.json b/projects/js-packages/react-data-sync-client/tsconfig.json new file mode 100644 index 0000000000000..a88a0ca2461c4 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "jetpack-js-tools/tsconfig.base.json", + "include": [ "./src/*" ], + "compilerOptions": { + "typeRoots": [ "./node_modules/@types/", "src" ], + "sourceMap": true, + "forceConsistentCasingInFileNames": true, + "outDir": "./build/", + "noEmit": false, + "declaration": true, + "module": "es6", + "target": "es5" + } +} diff --git a/projects/js-packages/react-data-sync-client/webpack.config.cjs b/projects/js-packages/react-data-sync-client/webpack.config.cjs new file mode 100644 index 0000000000000..308ddf6ba0d18 --- /dev/null +++ b/projects/js-packages/react-data-sync-client/webpack.config.cjs @@ -0,0 +1,36 @@ +// eslint-disable-next-line @typescript-eslint/no-var-requires +const path = require( 'path' ); +// eslint-disable-next-line @typescript-eslint/no-var-requires +const jetpackWebpackConfig = require( '@automattic/jetpack-webpack-config/webpack' ); + +module.exports = { + entry: './src/index.ts', + mode: jetpackWebpackConfig.mode, + devtool: jetpackWebpackConfig.isProduction ? false : 'source-map', + module: { + strictExportPresence: true, + rules: [ + { + test: /\.ts?$/, + use: 'ts-loader', + exclude: /node_modules/, + }, + ], + }, + optimization: { + ...jetpackWebpackConfig.optimization, + }, + resolve: { + ...jetpackWebpackConfig.resolve, + }, + output: { + ...jetpackWebpackConfig.output, + path: path.resolve( __dirname, 'build' ), + filename: 'index.js', + library: { + name: 'ReactDataSyncClient', + type: 'umd', + }, + }, + plugins: [ ...jetpackWebpackConfig.StandardPlugins() ], +}; diff --git a/projects/js-packages/shared-extension-utils/CHANGELOG.md b/projects/js-packages/shared-extension-utils/CHANGELOG.md index aed328c9e2faf..175f8467e3804 100644 --- a/projects/js-packages/shared-extension-utils/CHANGELOG.md +++ b/projects/js-packages/shared-extension-utils/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.12.2] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [0.12.1] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -260,6 +264,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Core: prepare utility for release +[0.12.2]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.1...0.12.2 [0.12.1]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.12.0...0.12.1 [0.12.0]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.11.5...0.12.0 [0.11.5]: https://github.com/Automattic/jetpack-shared-extension-utils/compare/0.11.4...0.11.5 diff --git a/projects/js-packages/shared-extension-utils/changelog/renovate-babel-monorepo b/projects/js-packages/shared-extension-utils/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/shared-extension-utils/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/shared-extension-utils/changelog/renovate-major-eslint-packages b/projects/js-packages/shared-extension-utils/changelog/renovate-major-eslint-packages deleted file mode 100644 index 2abc0f6a79c68..0000000000000 --- a/projects/js-packages/shared-extension-utils/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Make new version of prettier happy. No functional change. - - diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json index 48e6db2f03eb2..f593bdc10646f 100644 --- a/projects/js-packages/shared-extension-utils/package.json +++ b/projects/js-packages/shared-extension-utils/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-shared-extension-utils", - "version": "0.12.2-alpha", + "version": "0.12.2", "description": "Utility functions used by the block editor extensions", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/shared-extension-utils/#readme", "bugs": { diff --git a/projects/js-packages/webpack-config/CHANGELOG.md b/projects/js-packages/webpack-config/CHANGELOG.md index e3a98ca3a9555..07fe2ef4475b0 100644 --- a/projects/js-packages/webpack-config/CHANGELOG.md +++ b/projects/js-packages/webpack-config/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## 2.0.2 - 2023-10-16 +### Changed +- Updated package dependencies. [#33429, #33600] + ## 2.0.1 - 2023-10-10 ### Changed - Updated package dependencies. [#33428] diff --git a/projects/js-packages/webpack-config/changelog/renovate-babel-monorepo b/projects/js-packages/webpack-config/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/js-packages/webpack-config/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/js-packages/webpack-config/package.json b/projects/js-packages/webpack-config/package.json index 0571d7b5a8678..a33aa6534947e 100644 --- a/projects/js-packages/webpack-config/package.json +++ b/projects/js-packages/webpack-config/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-webpack-config", - "version": "2.0.2-alpha", + "version": "2.0.2", "description": "Library of pieces for webpack config in Jetpack projects.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/webpack-config/#readme", "bugs": { @@ -31,7 +31,7 @@ "@wordpress/browserslist-config": "5.26.0", "@wordpress/dependency-extraction-webpack-plugin": "4.26.0", "babel-loader": "9.1.2", - "browserslist": "4.21.9", + "browserslist": "4.22.1", "css-loader": "6.5.1", "css-minimizer-webpack-plugin": "5.0.1", "mini-css-extract-plugin": "2.4.5", diff --git a/projects/packages/action-bar/CHANGELOG.md b/projects/packages/action-bar/CHANGELOG.md index 372f91a201a81..b640180579930 100644 --- a/projects/packages/action-bar/CHANGELOG.md +++ b/projects/packages/action-bar/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.1.29] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [0.1.28] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -122,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Adds the Action Bar package and Jetpack plugin module for follows, likes, and comments. Just a scaffold to build on, for now. [#25447] +[0.1.29]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.28...v0.1.29 [0.1.28]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.27...v0.1.28 [0.1.27]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.26...v0.1.27 [0.1.26]: https://github.com/Automattic/jetpack-action-bar/compare/v0.1.25...v0.1.26 diff --git a/projects/packages/action-bar/changelog/renovate-babel-monorepo b/projects/packages/action-bar/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/action-bar/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/action-bar/package.json b/projects/packages/action-bar/package.json index 560b82849bb05..25505b6f605d8 100644 --- a/projects/packages/action-bar/package.json +++ b/projects/packages/action-bar/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-action-bar", - "version": "0.1.29-alpha", + "version": "0.1.29", "description": "An easy way for visitors to follow, like, and comment on your WordPress site.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/action-bar/#readme", "bugs": { diff --git a/projects/packages/backup/CHANGELOG.md b/projects/packages/backup/CHANGELOG.md index 2b168b0fad0f0..a43e7045406c2 100644 --- a/projects/packages/backup/CHANGELOG.md +++ b/projects/packages/backup/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [1.17.8] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [1.17.7] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -491,6 +495,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add API endpoints and Jetpack Backup package for managing Help… +[1.17.8]: https://github.com/Automattic/jetpack-backup/compare/v1.17.7...v1.17.8 [1.17.7]: https://github.com/Automattic/jetpack-backup/compare/v1.17.6...v1.17.7 [1.17.6]: https://github.com/Automattic/jetpack-backup/compare/v1.17.5...v1.17.6 [1.17.5]: https://github.com/Automattic/jetpack-backup/compare/v1.17.4...v1.17.5 diff --git a/projects/packages/backup/changelog/renovate-babel-monorepo b/projects/packages/backup/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/backup/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php index a66deb291601c..29eb22b4c4351 100644 --- a/projects/packages/backup/src/class-package-version.php +++ b/projects/packages/backup/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.17.8-alpha'; + const PACKAGE_VERSION = '1.17.8'; const PACKAGE_SLUG = 'backup'; diff --git a/projects/packages/blaze/CHANGELOG.md b/projects/packages/blaze/CHANGELOG.md index c4e8bd8275c5c..a48a5b25e903d 100644 --- a/projects/packages/blaze/CHANGELOG.md +++ b/projects/packages/blaze/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.10.4] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [0.10.3] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -211,6 +215,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Updated package dependencies. [#27906] +[0.10.4]: https://github.com/automattic/jetpack-blaze/compare/v0.10.3...v0.10.4 [0.10.3]: https://github.com/automattic/jetpack-blaze/compare/v0.10.2...v0.10.3 [0.10.2]: https://github.com/automattic/jetpack-blaze/compare/v0.10.1...v0.10.2 [0.10.1]: https://github.com/automattic/jetpack-blaze/compare/v0.10.0...v0.10.1 diff --git a/projects/packages/blaze/changelog/renovate-babel-monorepo b/projects/packages/blaze/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/blaze/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/blaze/package.json b/projects/packages/blaze/package.json index 4c90a6cf49542..199130a2509c7 100644 --- a/projects/packages/blaze/package.json +++ b/projects/packages/blaze/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-blaze", - "version": "0.10.4-alpha", + "version": "0.10.4", "description": "Attract high-quality traffic to your site using Blaze. Using this service, you can advertise a post or page on some of the millions of pages across WordPress.com and Tumblr from just $5 per day.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/blaze/#readme", "bugs": { diff --git a/projects/packages/blaze/src/class-dashboard.php b/projects/packages/blaze/src/class-dashboard.php index 07e58e27d3727..84fd3ad3fa63b 100644 --- a/projects/packages/blaze/src/class-dashboard.php +++ b/projects/packages/blaze/src/class-dashboard.php @@ -21,7 +21,7 @@ class Dashboard { * * @var string */ - const PACKAGE_VERSION = '0.10.4-alpha'; + const PACKAGE_VERSION = '0.10.4'; /** * List of dependencies needed to render the dashboard in wp-admin. diff --git a/projects/packages/blocks/changelog/fix-block-translations-2 b/projects/packages/blocks/changelog/fix-block-translations-2 new file mode 100644 index 0000000000000..d00d974d266a2 --- /dev/null +++ b/projects/packages/blocks/changelog/fix-block-translations-2 @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Fix missing block translations diff --git a/projects/packages/blocks/src/class-blocks.php b/projects/packages/blocks/src/class-blocks.php index 85043897322e9..158497992ae32 100644 --- a/projects/packages/blocks/src/class-blocks.php +++ b/projects/packages/blocks/src/class-blocks.php @@ -50,18 +50,11 @@ public static function jetpack_register_block( $slug, $args = array() ) { $block_type = $slug; - // If a path is passed, find the slug in the file then create a block type object to register - // the block. - // Note: passing the path directly to register_block_type seems to loose the interactivity of - // the block once in the editor once it's out of focus. + // If a path is passed, make sure to get the block.json file from the build directory and get + // the block name from that file. if ( path_is_absolute( $slug ) ) { - $metadata = self::get_block_metadata_from_file( self::get_path_to_block_metadata( $slug ) ); - $name = self::get_block_name_from_metadata( $metadata ); - - if ( ! empty( $name ) ) { - $slug = $name; - $block_type = new \WP_Block_Type( $slug, array_merge( $metadata, $args ) ); - } + $block_type = self::get_path_to_block_metadata( $slug ); + $slug = self::get_block_name( $block_type ); } if ( diff --git a/projects/packages/forms/CHANGELOG.md b/projects/packages/forms/CHANGELOG.md index 006b280757da5..19fb9ed16788d 100644 --- a/projects/packages/forms/CHANGELOG.md +++ b/projects/packages/forms/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.22.3] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [0.22.2] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -340,6 +344,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added a new jetpack/forms package [#28409] - Added a public load_contact_form method for initializing the contact form module. [#28416] +[0.22.3]: https://github.com/automattic/jetpack-forms/compare/v0.22.2...v0.22.3 [0.22.2]: https://github.com/automattic/jetpack-forms/compare/v0.22.1...v0.22.2 [0.22.1]: https://github.com/automattic/jetpack-forms/compare/v0.22.0...v0.22.1 [0.22.0]: https://github.com/automattic/jetpack-forms/compare/v0.21.0...v0.22.0 diff --git a/projects/packages/forms/changelog/renovate-babel-monorepo b/projects/packages/forms/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/forms/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/forms/changelog/renovate-major-eslint-packages b/projects/packages/forms/changelog/renovate-major-eslint-packages deleted file mode 100644 index 2abc0f6a79c68..0000000000000 --- a/projects/packages/forms/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Make new version of prettier happy. No functional change. - - diff --git a/projects/packages/forms/package.json b/projects/packages/forms/package.json index 697ce65d1b76f..7e032f008f506 100644 --- a/projects/packages/forms/package.json +++ b/projects/packages/forms/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-forms", - "version": "0.22.3-alpha", + "version": "0.22.3", "description": "Jetpack Forms", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/forms/#readme", "bugs": { diff --git a/projects/packages/forms/src/class-jetpack-forms.php b/projects/packages/forms/src/class-jetpack-forms.php index 89f173d60030a..70d855c8d75a1 100644 --- a/projects/packages/forms/src/class-jetpack-forms.php +++ b/projects/packages/forms/src/class-jetpack-forms.php @@ -15,7 +15,7 @@ */ class Jetpack_Forms { - const PACKAGE_VERSION = '0.22.3-alpha'; + const PACKAGE_VERSION = '0.22.3'; /** * Load the contact form module. diff --git a/projects/packages/identity-crisis/CHANGELOG.md b/projects/packages/identity-crisis/CHANGELOG.md index a583b9704d73a..f639c0a1ba1d2 100644 --- a/projects/packages/identity-crisis/CHANGELOG.md +++ b/projects/packages/identity-crisis/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.10.7] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429] + ## [0.10.6] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -417,6 +421,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated package dependencies. - Use Connection/Urls for home_url and site_url functions migrated from Sync. +[0.10.7]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.6...v0.10.7 [0.10.6]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.5...v0.10.6 [0.10.5]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.4...v0.10.5 [0.10.4]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.3...v0.10.4 diff --git a/projects/packages/identity-crisis/changelog/fix-idc-search-replace-protection b/projects/packages/identity-crisis/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..889394fc687e6 --- /dev/null +++ b/projects/packages/identity-crisis/changelog/fix-idc-search-replace-protection @@ -0,0 +1,4 @@ +Significance: minor +Type: fixed + +Added search and replace protection for wpcom urls stored in the database. diff --git a/projects/packages/identity-crisis/changelog/renovate-babel-monorepo b/projects/packages/identity-crisis/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/identity-crisis/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/identity-crisis/composer.json b/projects/packages/identity-crisis/composer.json index 7fffca9289b93..e535796fe7f44 100644 --- a/projects/packages/identity-crisis/composer.json +++ b/projects/packages/identity-crisis/composer.json @@ -65,7 +65,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "config": { diff --git a/projects/packages/identity-crisis/package.json b/projects/packages/identity-crisis/package.json index a0099daa04f7b..883da1f4a20c7 100644 --- a/projects/packages/identity-crisis/package.json +++ b/projects/packages/identity-crisis/package.json @@ -1,6 +1,6 @@ { "name": "jetpack-identity-crisis", - "version": "0.10.7-alpha", + "version": "0.11.0-alpha", "description": "Jetpack Identity Crisis", "main": "_inc/admin.jsx", "repository": { diff --git a/projects/packages/identity-crisis/src/class-identity-crisis.php b/projects/packages/identity-crisis/src/class-identity-crisis.php index 5230fc6b3d49d..124ec69956fe1 100644 --- a/projects/packages/identity-crisis/src/class-identity-crisis.php +++ b/projects/packages/identity-crisis/src/class-identity-crisis.php @@ -27,7 +27,7 @@ class Identity_Crisis { /** * Package Version */ - const PACKAGE_VERSION = '0.10.7-alpha'; + const PACKAGE_VERSION = '0.11.0-alpha'; /** * Instance of the object. @@ -88,6 +88,8 @@ private function __construct() { add_filter( 'jetpack_connection_validate_urls_for_idc_mitigation_response', array( static::class, 'add_secret_to_url_validation_response' ) ); + add_filter( 'jetpack_options', array( static::class, 'reverse_wpcom_urls_for_idc' ) ); + $urls_in_crisis = self::check_identity_crisis(); if ( false === $urls_in_crisis ) { return; @@ -285,7 +287,6 @@ public static function check_identity_crisis() { if ( ! $connection->is_connected() || ( new Status() )->is_offline_mode() || ! self::validate_sync_error_idc_option() ) { return false; } - return Jetpack_Options::get_option( 'sync_error_idc' ); } @@ -336,7 +337,7 @@ public function check_response_for_idc( $response ) { ); if ( in_array( $error_code, $allowed_idc_error_codes, true ) ) { - \Jetpack_Options::update_option( + Jetpack_Options::update_option( 'sync_error_idc', self::get_sync_error_idc_option( $response ) ); @@ -437,6 +438,24 @@ public static function validate_sync_error_idc_option() { return $is_valid; } + /** + * Reverses WP.com URLs stored in sync_error_idc option. + * + * @param array $sync_error error option containing reversed URLs. + * @return array + */ + public static function reverse_wpcom_urls_for_idc( $sync_error ) { + if ( isset( $sync_error['reversed_url'] ) ) { + if ( array_key_exists( 'wpcom_siteurl', $sync_error ) ) { + $sync_error['wpcom_siteurl'] = strrev( $sync_error['wpcom_siteurl'] ); + } + if ( array_key_exists( 'wpcom_home', $sync_error ) ) { + $sync_error['wpcom_home'] = strrev( $sync_error['wpcom_home'] ); + } + } + return $sync_error; + } + /** * Normalizes a url by doing three things: * - Strips protocol @@ -506,6 +525,12 @@ public static function get_sync_error_idc_option( $response = array() ) { $returned_values[ $key ] = $normalized_url; } + // We need to protect WPCOM URLs from search & replace by reversing them. See https://wp.me/pf5801-3R + // Add 'reversed_url' key for backward compatibility + if ( array_key_exists( 'wpcom_home', $returned_values ) && array_key_exists( 'wpcom_siteurl', $returned_values ) ) { + $returned_values['reversed_url'] = true; + $returned_values = self::reverse_wpcom_urls_for_idc( $returned_values ); + } return $returned_values; } diff --git a/projects/packages/identity-crisis/tests/php/test-identity-crisis.php b/projects/packages/identity-crisis/tests/php/test-identity-crisis.php index ec1eabc289b7f..29cd9612ab926 100644 --- a/projects/packages/identity-crisis/tests/php/test-identity-crisis.php +++ b/projects/packages/identity-crisis/tests/php/test-identity-crisis.php @@ -584,6 +584,8 @@ public function test_check_response_for_idc_with_error_code( $input, $option_upd ), $input ); + // Add reversed_url key + $expected_option['reversed_url'] = true; } else { $expected_option = false; } @@ -1000,4 +1002,40 @@ public static function test_add_secret_to_url_validation_response() { static::assertEquals( $data, $data_updated ); static::assertArrayNotHasKey( 'url_secret_error', $data_updated ); } + + /** + * Test the `reverse_wpcom_urls_for_idc()` method. + * + * @return void + */ + public function testReverseWpcomUrlsForIdc() { + // Create a sample input array for testing + $sync_error = array( + 'reversed_url' => true, + 'wpcom_siteurl' => 'example.com', + 'wpcom_home' => 'example.org', + ); + + // Call the method to be tested + $result = Identity_Crisis::reverse_wpcom_urls_for_idc( $sync_error ); + + // Assert that the 'wpcom_siteurl' and 'wpcom_home' keys have been reversed + $this->assertEquals( 'moc.elpmaxe', $result['wpcom_siteurl'] ); + $this->assertEquals( 'gro.elpmaxe', $result['wpcom_home'] ); + + // Test with an array that doesn't contain 'reversed_url' + $sync_error2 = array( + 'wpcom_siteurl' => 'example.com', + 'wpcom_home' => 'example.org', + ); + + $result2 = Identity_Crisis::reverse_wpcom_urls_for_idc( $sync_error2 ); + + // Assert that 'wpcom_siteurl' and 'wpcom_home' keys have been reversed + $this->assertEquals( 'example.com', $result2['wpcom_siteurl'] ); + $this->assertEquals( 'example.org', $result2['wpcom_home'] ); + + // Assert that 'reversed_url' key is not present, and other keys are not changed + $this->assertArrayNotHasKey( 'reversed_url', $result2 ); + } } diff --git a/projects/packages/image-cdn/CHANGELOG.md b/projects/packages/image-cdn/CHANGELOG.md index 98f9c3ab81495..2b7d4e80a3b5e 100644 --- a/projects/packages/image-cdn/CHANGELOG.md +++ b/projects/packages/image-cdn/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.2.7] - 2023-10-16 +### Added +- Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon. [#33494] + ## [0.2.6] - 2023-09-28 ### Fixed - Use WordPress `str_ends_with` polyfill. [#33288] @@ -43,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add image CDN package. [#29561] +[0.2.7]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.2.6...v0.2.7 [0.2.6]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.2.5...v0.2.6 [0.2.5]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.2.4...v0.2.5 [0.2.4]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.2.3...v0.2.4 diff --git a/projects/packages/image-cdn/changelog/xyu-patch-1 b/projects/packages/image-cdn/changelog/xyu-patch-1 deleted file mode 100644 index 4472cb197276d..0000000000000 --- a/projects/packages/image-cdn/changelog/xyu-patch-1 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon. diff --git a/projects/packages/image-cdn/package.json b/projects/packages/image-cdn/package.json index 5a90b98fd1749..0718543eccc0c 100644 --- a/projects/packages/image-cdn/package.json +++ b/projects/packages/image-cdn/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-image-cdn", - "version": "0.2.7-alpha", + "version": "0.2.7", "description": "Serve images through Jetpack's powerful CDN", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/image-cdn/#readme", "bugs": { diff --git a/projects/packages/image-cdn/src/class-image-cdn.php b/projects/packages/image-cdn/src/class-image-cdn.php index 1fe3ba8b98a7a..a05ac09dbc5a3 100644 --- a/projects/packages/image-cdn/src/class-image-cdn.php +++ b/projects/packages/image-cdn/src/class-image-cdn.php @@ -14,7 +14,7 @@ */ final class Image_CDN { - const PACKAGE_VERSION = '0.2.7-alpha'; + const PACKAGE_VERSION = '0.2.7'; /** * Singleton. diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md index 6178419c8ba11..fa57d8ac0aa54 100644 --- a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md +++ b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md @@ -5,6 +5,13 @@ 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). +## [4.15.0] - 2023-10-16 +### Added +- Launchpad: Add earn-newsletter checklist. [#33200] + +### Changed +- Launchpad: Update copy for global styles in plan_selected task. [#33462] + ## [4.14.0] - 2023-10-10 ### Added - Expose newsletter_categories_location to JavaScript [#33374] @@ -392,6 +399,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Testing initial package release. +[4.15.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.14.0...v4.15.0 [4.14.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.13.0...v4.14.0 [4.13.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.12.0...v4.13.0 [4.12.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.11.0...v4.12.0 diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-earn-newsletter-launchpad-checklist b/projects/packages/jetpack-mu-wpcom/changelog/add-earn-newsletter-launchpad-checklist deleted file mode 100644 index 8a4c779484731..0000000000000 --- a/projects/packages/jetpack-mu-wpcom/changelog/add-earn-newsletter-launchpad-checklist +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Launchpad: Add earn-newsletter checklist. diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-jetpack-mu-wpcom-launchpad-global-styles-copy b/projects/packages/jetpack-mu-wpcom/changelog/update-jetpack-mu-wpcom-launchpad-global-styles-copy deleted file mode 100644 index 5bd54a486aefb..0000000000000 --- a/projects/packages/jetpack-mu-wpcom/changelog/update-jetpack-mu-wpcom-launchpad-global-styles-copy +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: changed - -Launchpad: Update copy for global styles in plan_selected task diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index a5024c5436553..96dbb76ee4d19 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "4.15.0-alpha", + "version": "4.15.0", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 24d2d39ad00b0..64768051eaa69 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -14,7 +14,7 @@ */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '4.15.0-alpha'; + const PACKAGE_VERSION = '4.15.0'; const PKG_DIR = __DIR__ . '/../'; /** diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/projects/packages/my-jetpack/CHANGELOG.md index a96bb1365366b..fe715b6d4b149 100644 --- a/projects/packages/my-jetpack/CHANGELOG.md +++ b/projects/packages/my-jetpack/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [3.8.2] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429, #33584] + ## [3.8.1] - 2023-10-10 ### Changed - Changes title of the my-jetpack page to "My Jetpack" [#33486] @@ -1053,6 +1057,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Created package +[3.8.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.1...3.8.2 [3.8.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.0...3.8.1 [3.8.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.7.0...3.8.0 [3.7.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.6.0...3.7.0 diff --git a/projects/packages/my-jetpack/changelog/fix-videopress-upgrade-path b/projects/packages/my-jetpack/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..de754f7920117 --- /dev/null +++ b/projects/packages/my-jetpack/changelog/fix-videopress-upgrade-path @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Add has_required_plan method for VideoPress product class, check plan purchase exists for site diff --git a/projects/packages/my-jetpack/changelog/renovate-babel-monorepo b/projects/packages/my-jetpack/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/my-jetpack/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/my-jetpack/changelog/renovate-storybook-monorepo b/projects/packages/my-jetpack/changelog/renovate-storybook-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/my-jetpack/changelog/renovate-storybook-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json index 9b6f7d59931b8..b5c8a48b7a3f2 100644 --- a/projects/packages/my-jetpack/composer.json +++ b/projects/packages/my-jetpack/composer.json @@ -74,7 +74,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index fbc514e3a6bf9..35ba214154a60 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-my-jetpack", - "version": "3.8.2-alpha", + "version": "3.9.0-alpha", "description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme", "bugs": { diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php index e22b075ffa1c8..3b9503291efa7 100644 --- a/projects/packages/my-jetpack/src/class-initializer.php +++ b/projects/packages/my-jetpack/src/class-initializer.php @@ -32,7 +32,7 @@ class Initializer { * * @var string */ - const PACKAGE_VERSION = '3.8.2-alpha'; + const PACKAGE_VERSION = '3.9.0-alpha'; /** * HTML container ID for the IDC screen on My Jetpack page. diff --git a/projects/packages/my-jetpack/src/products/class-videopress.php b/projects/packages/my-jetpack/src/products/class-videopress.php index f3bf5f1ee6a33..21961da7ba254 100644 --- a/projects/packages/my-jetpack/src/products/class-videopress.php +++ b/projects/packages/my-jetpack/src/products/class-videopress.php @@ -7,6 +7,7 @@ namespace Automattic\Jetpack\My_Jetpack\Products; +use Automattic\Jetpack\Current_Plan; use Automattic\Jetpack\My_Jetpack\Hybrid_Product; use Automattic\Jetpack\My_Jetpack\Wpcom_Products; @@ -156,4 +157,14 @@ public static function get_manage_url() { return admin_url( 'admin.php?page=jetpack#/settings?term=videopress' ); } } + + /** + * Checks whether the current plan (or purchases) of the site already supports the product + * + * @return boolean + */ + public static function has_required_plan() { + // using second argument `true` to force fetching from wpcom + return Current_Plan::supports( 'videopress-1tb-storage', true ); + } } diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md index 8a8dbe55b37c3..8143ce552bbe4 100644 --- a/projects/packages/publicize/CHANGELOG.md +++ b/projects/packages/publicize/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.36.3] - 2023-10-16 +### Changed +- Added type prop to custom media for social posts. [#33504] + ## [0.36.2] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -393,6 +397,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated package dependencies. - Update package.json metadata. +[0.36.3]: https://github.com/Automattic/jetpack-publicize/compare/v0.36.2...v0.36.3 [0.36.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.36.1...v0.36.2 [0.36.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.36.0...v0.36.1 [0.36.0]: https://github.com/Automattic/jetpack-publicize/compare/v0.35.0...v0.36.0 diff --git a/projects/packages/publicize/changelog/update-add-type-prop-to-custom-media b/projects/packages/publicize/changelog/update-add-type-prop-to-custom-media deleted file mode 100644 index 610143d163549..0000000000000 --- a/projects/packages/publicize/changelog/update-add-type-prop-to-custom-media +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Added type prop to custom media for social posts diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json index f99616880c851..b160fe927c2de 100644 --- a/projects/packages/publicize/package.json +++ b/projects/packages/publicize/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-publicize", - "version": "0.36.3-alpha", + "version": "0.36.3", "description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme", "bugs": { diff --git a/projects/packages/search/CHANGELOG.md b/projects/packages/search/CHANGELOG.md index 462ec44e22e13..67ec65ab48a31 100644 --- a/projects/packages/search/CHANGELOG.md +++ b/projects/packages/search/CHANGELOG.md @@ -5,6 +5,16 @@ 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). +## [0.39.2] - 2023-10-16 +### Added +- Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon during instant search. [#33494] + +### Changed +- Updated package dependencies. [#33429, #33569] + +### Fixed +- Search: Fixed excluded types option is not available under certain circumstances. [#33548] + ## [0.39.1] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -812,6 +822,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated package dependencies. - Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. +[0.39.2]: https://github.com/Automattic/jetpack-search/compare/v0.39.1...v0.39.2 [0.39.1]: https://github.com/Automattic/jetpack-search/compare/v0.39.0...v0.39.1 [0.39.0]: https://github.com/Automattic/jetpack-search/compare/v0.38.8...v0.39.0 [0.38.8]: https://github.com/Automattic/jetpack-search/compare/v0.38.7...v0.38.8 diff --git a/projects/packages/search/changelog/fix-allow-only-valid-post-types b/projects/packages/search/changelog/fix-allow-only-valid-post-types deleted file mode 100644 index 74021d361b373..0000000000000 --- a/projects/packages/search/changelog/fix-allow-only-valid-post-types +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Search: fixed excluded types option is not available under certain circumstances diff --git a/projects/packages/search/changelog/renovate-babel-monorepo b/projects/packages/search/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/search/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/search/changelog/renovate-major-eslint-packages b/projects/packages/search/changelog/renovate-major-eslint-packages deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/search/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/search/changelog/xyu-patch-1 b/projects/packages/search/changelog/xyu-patch-1 deleted file mode 100644 index e59204780d7ed..0000000000000 --- a/projects/packages/search/changelog/xyu-patch-1 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon during instant search diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json index 50b9701f170a4..693b18e53767b 100644 --- a/projects/packages/search/package.json +++ b/projects/packages/search/package.json @@ -1,6 +1,6 @@ { "name": "jetpack-search", - "version": "0.39.2-alpha", + "version": "0.39.2", "description": "Package for Jetpack Search products", "main": "main.js", "directories": { diff --git a/projects/packages/search/src/class-package.php b/projects/packages/search/src/class-package.php index 1112ab8a7afd5..a4283e92f2cf9 100644 --- a/projects/packages/search/src/class-package.php +++ b/projects/packages/search/src/class-package.php @@ -11,7 +11,7 @@ * Search package general information */ class Package { - const VERSION = '0.39.2-alpha'; + const VERSION = '0.39.2'; const SLUG = 'search'; /** diff --git a/projects/packages/stats/changelog/fix-increase-timeout-20s b/projects/packages/stats/changelog/fix-increase-timeout-20s new file mode 100644 index 0000000000000..3dd446212c326 --- /dev/null +++ b/projects/packages/stats/changelog/fix-increase-timeout-20s @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Stats: increase timeout to 20s diff --git a/projects/packages/stats/src/class-wpcom-stats.php b/projects/packages/stats/src/class-wpcom-stats.php index 70328cbc58dc2..b3f92c2e51ef4 100644 --- a/projects/packages/stats/src/class-wpcom-stats.php +++ b/projects/packages/stats/src/class-wpcom-stats.php @@ -405,7 +405,7 @@ protected function fetch_remote_stats( $endpoint, $args ) { if ( is_array( $args ) && ! empty( $args ) ) { $endpoint .= '?' . http_build_query( $args ); } - $response = Client::wpcom_json_api_request_as_blog( $endpoint, self::STATS_REST_API_VERSION ); + $response = Client::wpcom_json_api_request_as_blog( $endpoint, self::STATS_REST_API_VERSION, array( 'timeout' => 20 ) ); $response_code = wp_remote_retrieve_response_code( $response ); $response_body = wp_remote_retrieve_body( $response ); diff --git a/projects/packages/sync/CHANGELOG.md b/projects/packages/sync/CHANGELOG.md index f9b165897b8aa..6390d051f719d 100644 --- a/projects/packages/sync/CHANGELOG.md +++ b/projects/packages/sync/CHANGELOG.md @@ -5,7 +5,12 @@ 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). +## [1.58.0] - 2023-10-16 +### Changed +- Migrated 'jetpack_sync_before_send*' actions for Sync queue to 'jetpack_sync_before_enqueue' instead. [#33384] + ## [1.57.4] - 2023-10-10 + - Minor internal updates. ## [1.57.3] - 2023-09-28 @@ -937,6 +942,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Packages: Move sync to a classmapped package +[1.58.0]: https://github.com/Automattic/jetpack-sync/compare/v1.57.4...v1.58.0 [1.57.4]: https://github.com/Automattic/jetpack-sync/compare/v1.57.3...v1.57.4 [1.57.3]: https://github.com/Automattic/jetpack-sync/compare/v1.57.2...v1.57.3 [1.57.2]: https://github.com/Automattic/jetpack-sync/compare/v1.57.1...v1.57.2 diff --git a/projects/packages/sync/changelog/update-sync-migrate-before-send-to-before-enqueue b/projects/packages/sync/changelog/update-sync-migrate-before-send-to-before-enqueue deleted file mode 100644 index 455d01849c598..0000000000000 --- a/projects/packages/sync/changelog/update-sync-migrate-before-send-to-before-enqueue +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: changed - -Migrated 'jetpack_sync_before_send*' actions for Sync queue to 'jetpack_sync_before_enqueue' instead diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php index f767bab01cd86..18f7daad7a521 100644 --- a/projects/packages/sync/src/class-package-version.php +++ b/projects/packages/sync/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.58.0-alpha'; + const PACKAGE_VERSION = '1.58.0'; const PACKAGE_SLUG = 'sync'; diff --git a/projects/packages/videopress/CHANGELOG.md b/projects/packages/videopress/CHANGELOG.md index c016d1a5ef590..ac47ff9149048 100644 --- a/projects/packages/videopress/CHANGELOG.md +++ b/projects/packages/videopress/CHANGELOG.md @@ -5,6 +5,13 @@ 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). +## [0.17.5] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429, #33584] + +### Fixed +- VideoPress: Handle block registration in the REST API request context. [#33565] + ## [0.17.4] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -1134,6 +1141,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Created empty package [#24952] +[0.17.5]: https://github.com/Automattic/jetpack-videopress/compare/v0.17.4...v0.17.5 [0.17.4]: https://github.com/Automattic/jetpack-videopress/compare/v0.17.3...v0.17.4 [0.17.3]: https://github.com/Automattic/jetpack-videopress/compare/v0.17.2...v0.17.3 [0.17.2]: https://github.com/Automattic/jetpack-videopress/compare/v0.17.1...v0.17.2 diff --git a/projects/packages/videopress/changelog/improve-vp-attribute-escaping b/projects/packages/videopress/changelog/improve-vp-attribute-escaping new file mode 100644 index 0000000000000..294f81842c2b9 --- /dev/null +++ b/projects/packages/videopress/changelog/improve-vp-attribute-escaping @@ -0,0 +1,4 @@ +Significance: patch +Type: security + +Escape VideoPress attributes diff --git a/projects/packages/videopress/changelog/renovate-babel-monorepo b/projects/packages/videopress/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/videopress/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/videopress/changelog/renovate-major-eslint-packages b/projects/packages/videopress/changelog/renovate-major-eslint-packages deleted file mode 100644 index 2abc0f6a79c68..0000000000000 --- a/projects/packages/videopress/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Make new version of prettier happy. No functional change. - - diff --git a/projects/packages/videopress/changelog/renovate-storybook-monorepo b/projects/packages/videopress/changelog/renovate-storybook-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/videopress/changelog/renovate-storybook-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/videopress/changelog/update-videopress-video-block-register-when-rest-request b/projects/packages/videopress/changelog/update-videopress-video-block-register-when-rest-request deleted file mode 100644 index f33839a0f5eb2..0000000000000 --- a/projects/packages/videopress/changelog/update-videopress-video-block-register-when-rest-request +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -VideoPress: handle block registration in the REST API request context diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json index 196d9c548c854..dbf3ed6df4786 100644 --- a/projects/packages/videopress/package.json +++ b/projects/packages/videopress/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-videopress", - "version": "0.17.5-alpha", + "version": "0.17.6-alpha", "description": "VideoPress package", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme", "bugs": { diff --git a/projects/packages/videopress/src/class-initializer.php b/projects/packages/videopress/src/class-initializer.php index 8f87791a342f1..6cfdcbad1d704 100644 --- a/projects/packages/videopress/src/class-initializer.php +++ b/projects/packages/videopress/src/class-initializer.php @@ -237,7 +237,7 @@ public static function render_videopress_video_block( $block_attributes, $conten // Try to get the custom anchor from the block attributes. if ( isset( $block_attributes['anchor'] ) && $block_attributes['anchor'] ) { - $id_attribute = sprintf( 'id="%s"', $block_attributes['anchor'] ); + $id_attribute = sprintf( 'id="%s"', esc_attr( $block_attributes['anchor'] ) ); } elseif ( preg_match( '/]*id="([^"]+)"/', $content, $matches ) ) { // Othwerwise, try to get the custom anchor from the
element. $id_attribute = sprintf( 'id="%s"', $matches[1] ); @@ -266,9 +266,8 @@ public static function render_videopress_video_block( $block_attributes, $conten $inline_style = ''; if ( $poster ) { $inline_style = sprintf( - 'style="background-image: url(%s); background-size: cover; - background-position: center center;"', - $poster + 'style="background-image: url(%s); background-size: cover; background-position: center center;"', + esc_attr( $poster ) ); } @@ -309,6 +308,7 @@ public static function render_videopress_video_block( $block_attributes, $conten ); } + // $id_attribute, $video_wrapper, $figcaption properly escaped earlier on the code return sprintf( $figure_template, esc_attr( $classes ), diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php index 7135f31b24c97..cc83a06783dce 100644 --- a/projects/packages/videopress/src/class-package-version.php +++ b/projects/packages/videopress/src/class-package-version.php @@ -11,7 +11,7 @@ * The Package_Version class. */ class Package_Version { - const PACKAGE_VERSION = '0.17.5-alpha'; + const PACKAGE_VERSION = '0.17.6-alpha'; const PACKAGE_SLUG = 'videopress'; diff --git a/projects/packages/wordads/CHANGELOG.md b/projects/packages/wordads/CHANGELOG.md index 02ae1ac8cb849..ea6856283de19 100644 --- a/projects/packages/wordads/CHANGELOG.md +++ b/projects/packages/wordads/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.2.54] - 2023-10-16 +### Changed +- Updated package dependencies. [#33429, #33569] + ## [0.2.53] - 2023-10-10 ### Changed - Updated package dependencies. [#33428] @@ -253,6 +257,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - PHPCS: Fix `WordPress.Security.ValidatedSanitizedInput` - Updated package dependencies. +[0.2.54]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.53...v0.2.54 [0.2.53]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.52...v0.2.53 [0.2.52]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.51...v0.2.52 [0.2.51]: https://github.com/Automattic/jetpack-wordads/compare/v0.2.50...v0.2.51 diff --git a/projects/packages/wordads/changelog/renovate-babel-monorepo b/projects/packages/wordads/changelog/renovate-babel-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/wordads/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/wordads/changelog/renovate-major-eslint-packages b/projects/packages/wordads/changelog/renovate-major-eslint-packages deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/packages/wordads/changelog/renovate-major-eslint-packages +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json index 4cd3e1e0a606c..a67e15f1faec4 100644 --- a/projects/packages/wordads/package.json +++ b/projects/packages/wordads/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-wordads", - "version": "0.2.54-alpha", + "version": "0.2.54", "description": "Earn income by allowing Jetpack to display high quality ads.", "main": "main.js", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/wordads/#readme", diff --git a/projects/packages/wordads/src/class-package.php b/projects/packages/wordads/src/class-package.php index df1f822266f6e..bfcbad1feb275 100644 --- a/projects/packages/wordads/src/class-package.php +++ b/projects/packages/wordads/src/class-package.php @@ -11,7 +11,7 @@ * WordAds package general information */ class Package { - const VERSION = '0.2.54-alpha'; + const VERSION = '0.2.54'; const SLUG = 'wordads'; /** diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/backup/changelog/fix-idc-search-replace-protection similarity index 100% rename from projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#2 rename to projects/plugins/backup/changelog/fix-idc-search-replace-protection diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-jetpack-mu-wpcom-launchpad-global-styles-copy b/projects/plugins/backup/changelog/fix-videopress-upgrade-path similarity index 100% rename from projects/plugins/mu-wpcom-plugin/changelog/update-jetpack-mu-wpcom-launchpad-global-styles-copy rename to projects/plugins/backup/changelog/fix-videopress-upgrade-path diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 24670cfefe931..10fbd9a7c4f99 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -595,7 +595,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -624,7 +624,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -929,7 +929,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/js-packages/ai-client/changelog/renovate-storybook-monorepo b/projects/plugins/boost/changelog/fix-videopress-upgrade-path similarity index 51% rename from projects/js-packages/ai-client/changelog/renovate-storybook-monorepo rename to projects/plugins/boost/changelog/fix-videopress-upgrade-path index c47cb18e82997..9aa70e3ec1f75 100644 --- a/projects/js-packages/ai-client/changelog/renovate-storybook-monorepo +++ b/projects/plugins/boost/changelog/fix-videopress-upgrade-path @@ -1,4 +1,5 @@ Significance: patch Type: changed +Comment: Updated composer.lock. + -Updated package dependencies. diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 2a01094645ff2..be6528939e1df 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -954,7 +954,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -984,7 +984,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/crm/admin/settings/mail-delivery.page.php b/projects/plugins/crm/admin/settings/mail-delivery.page.php index 50d8497f52f05..525fbeb78ca7a 100644 --- a/projects/plugins/crm/admin/settings/mail-delivery.page.php +++ b/projects/plugins/crm/admin/settings/mail-delivery.page.php @@ -541,7 +541,7 @@ if ( $runningLocally ) { ?> -

(e.g. your computer may block outgoing SMTP traffic via firewall or anti-virus software).
Jetpack CRM may require external web hosting to properly send via SMTP.', 'zero-bs-crm' ); ?>

+

setupUrlsSlugsEtc(); - - // build message - $message_html = '

' . sprintf( __( 'This version of CRM (%1$s) requires an upgraded database (3.0). Your database is using an older version than this (%2$s). To use CRM you will need to install version 4 of CRM and run the database upgrade.', 'zero-bs-crm' ), $this->version, $this->dal_version ) . '

'; - - ##WLREMOVE - $message_html = '

' . sprintf( __( 'This version of Jetpack CRM (%1$s) requires an upgraded database (3.0). Your database is using an older version than this (%2$s). To use Jetpack CRM you will need to install version 4 of Jetpack CRM and run the database upgrade.', 'zero-bs-crm' ), $this->version, $this->dal_version ) . '

'; - $message_html .= '

' . __( 'Read the guide on migrating', 'zero-bs-crm' ) . '

'; - ##/WLREMOVE - - $this->add_wp_admin_notice( - '', - array( - 'class' => 'warning', - 'html' => $message_html, - ) - ); - + // extensions use the dependency checker functions + require_once ZEROBSCRM_INCLUDE_PATH . 'jpcrm-dependency-checker.php'; + $this->dependency_checker = new JPCRM_DependencyChecker(); } // display any wp admin notices in the stack @@ -613,8 +597,41 @@ private function verify_minimum_requirements() { // v5.0+ JPCRM requires DAL3+ if ( ! $this->isDAL3() ) { + // we need urls + $this->setupUrlsSlugsEtc(); + + // build message + $message_html = '

' . sprintf( esc_html__( 'This version of CRM (%1$s) requires an upgraded database (3.0). Your database is using an older version than this (%2$s). To use CRM you will need to install version 4 of CRM and run the database upgrade.', 'zero-bs-crm' ), $this->version, $this->dal_version ) . '

'; // phpcs:ignore WordPress.WP.I18n.MissingTranslatorsComment + + ##WLREMOVE + $message_html = '

' . sprintf( esc_html__( 'This version of Jetpack CRM (%1$s) requires an upgraded database (3.0). Your database is using an older version than this (%2$s). To use Jetpack CRM you will need to install version 4 of Jetpack CRM and run the database upgrade.', 'zero-bs-crm' ), $this->version, $this->dal_version ) . '

'; // phpcs:ignore WordPress.WP.I18n.MissingTranslatorsComment + $message_html .= '

' . __( 'Read the guide on migrating', 'zero-bs-crm' ) . '

'; + ##/WLREMOVE + + $this->add_wp_admin_notice( + '', + array( + 'class' => 'warning', + 'html' => $message_html, + ) + ); + return false; + } elseif ( ! function_exists( 'openssl_get_cipher_methods' ) ) { + + // build message + $message_html = '

' . sprintf( __( 'Jetpack CRM uses the OpenSSL extension for PHP to properly protect sensitive data. Most PHP environments have this installed by default, but it seems yours does not; we recommend contacting your host for further help.', 'zero-bs-crm' ), $this->version, $this->dal_version ) . '

'; + $message_html .= '

' . __( 'PHP docs on OpenSSL', 'zero-bs-crm' ) . '

'; + + $this->add_wp_admin_notice( + '', + array( + 'class' => 'warning', + 'html' => $message_html, + ) + ); + return false; } return true; diff --git a/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.QuoteTemplates.php b/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.QuoteTemplates.php index 98124c61d33b4..cb7d36cc07628 100644 --- a/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.QuoteTemplates.php +++ b/projects/plugins/crm/includes/ZeroBSCRM.DAL3.Obj.QuoteTemplates.php @@ -1056,7 +1056,7 @@ public function deleteQuotetemplate($args=array()){ * @return array quotetemplate (clean obj) */ private function tidy_quotetemplate($obj=false,$withCustomFields=false){ - + global $zbs; $res = false; if (isset($obj->ID)){ @@ -1076,7 +1076,7 @@ private function tidy_quotetemplate($obj=false,$withCustomFields=false){ $res['date'] = (int)$obj->zbsqt_date; $res['date_date'] = (isset($obj->zbsqt_date) && $obj->zbsqt_date > 0) ? zeroBSCRM_locale_utsToDatetime($obj->zbsqt_date) : false; $res['content'] = $this->stripSlashes($obj->zbsqt_content); - $res['notes'] = $this->stripSlashes($obj->zbsqt_notes); + $res['notes'] = wp_kses( html_entity_decode( $obj->zbsqt_notes, ENT_QUOTES, 'UTF-8' ), $zbs->acceptable_restricted_html ); $res['currency'] = $this->stripSlashes($obj->zbsqt_currency); $res['created'] = (int)$obj->zbsqt_created; $res['created_date'] = (isset($obj->zbsqt_created) && $obj->zbsqt_created > 0) ? zeroBSCRM_locale_utsToDatetime($obj->zbsqt_created) : false; diff --git a/projects/plugins/crm/includes/jpcrm-dependency-checker.php b/projects/plugins/crm/includes/jpcrm-dependency-checker.php index c19af3cc05270..5372f9ec11f73 100644 --- a/projects/plugins/crm/includes/jpcrm-dependency-checker.php +++ b/projects/plugins/crm/includes/jpcrm-dependency-checker.php @@ -31,15 +31,18 @@ class JPCRM_DependencyChecker { */ protected $dal_ver; - public function __construct( ) { - if ( ! function_exists( 'get_plugins' ) ) { - require_once ABSPATH . 'wp-admin/includes/plugin.php'; - } - global $zbs; - $this->all_plugins = get_plugins(); - $this->core_ver = $zbs->version; - $this->dal_ver = $zbs->dal_version; - } + /** + * Build DependencyChecker class + */ + public function __construct() { + if ( ! function_exists( 'get_plugins' ) ) { + require_once ABSPATH . 'wp-admin/includes/plugin.php'; + } + global $zbs; + $this->all_plugins = get_plugins(); + $this->core_ver = $zbs->version ?? ''; + $this->dal_ver = $zbs->dal_version ?? ''; + } /** * @@ -95,7 +98,12 @@ public function check_core_reqs( $feature_name='', $args=array(), $is_silent=fal // otherwise, proceed to trigger an admin notice $feature_name = !empty( $feature_name ) ? $feature_name : __( 'CRM feature', 'zero-bs-crm' ); - if ( !$is_good_core_ver ) { + if ( empty( $this->core_ver ) || empty( $this->dal_ver ) ) { + $error_msg = __( 'Your CRM install appears to have issues. Please verify the CRM is fully installed and any notices are properly handled before trying again.', 'zero-bs-crm' ); + ##WLREMOVE + $error_msg = __( 'Your Jetpack CRM install appears to have issues. Please verify the CRM is fully installed and any notices are properly handled before trying again.', 'zero-bs-crm' ); + ##/WLREMOVE + } elseif ( ! $is_good_core_ver ) { $error_msg = sprintf( __( '%s requires CRM version %s or greater, but version %s is currently installed. Please update your CRM to use this feature.', 'zero-bs-crm' ), $feature_name, $req_core_ver, $this->core_ver ); ##WLREMOVE $error_msg = sprintf( __( '%s requires Jetpack CRM version %s or greater, but version %s is currently installed. Please update Jetpack CRM to use this feature.', 'zero-bs-crm' ), $feature_name, $req_core_ver, $this->core_ver ); diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md index dfd89c5b882f5..79396d1abf630 100644 --- a/projects/plugins/jetpack/CHANGELOG.md +++ b/projects/plugins/jetpack/CHANGELOG.md @@ -2,6 +2,23 @@ ### This is a list detailing changes for all Jetpack releases. +## 12.8-a.1 - 2023-10-16 +### Enhancements +- AI Assistant: Enable backend prompts for 50% of production sites. [#33514] +- Sitemaps: Update the colors used on the sitemap page to match updated Jetpack branding colors. [#33582] +- Subscriptions: Do not display token in URL. [#33561] + +### Bug fixes +- Blogging prompts block: Add default gravatar attribute to prevent js error. [#33572] + +### Other changes +- Convert Twitter to X. [#33574] +- Remove newsletter categories from the subscriber block. [#33579] +- Sync unit test: Fixes sync unit test to Aaccount for new post type properties. [#33553] +- Unit tests: Updated Sync related unit tests. [#33384] +- Update "social-logos" to the latest version. [#33613] +- Updated package dependencies. [#33429, #33498] + ## [12.7] - 2023-10-12 ### Enhancements - Blogroll: move blogroll and blogroll-items blocks from beta to production, along with various improvements. [#33475] [#33483] diff --git a/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx b/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx index 252d197811ff3..15489302768a3 100644 --- a/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx +++ b/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx @@ -165,14 +165,14 @@ function SubscriptionsSettings( props ) { />

{ __( - 'Grow subscribers by enabling a popup subscribe form that will show as readers scroll.', + 'Automatically add a subscribe form pop-up to every post and turn visitors into subscribers. It will appear as readers scroll through your posts.', 'jetpack' ) } { isBlockTheme && subscribeModalEditorUrl && ( <> { ' ' } - { __( 'Preview and edit.', 'jetpack' ) } + { __( 'Preview and edit the pop-up', 'jetpack' ) } ) } diff --git a/projects/plugins/jetpack/_inc/client/scss/variables/_colors.scss b/projects/plugins/jetpack/_inc/client/scss/variables/_colors.scss index 0518c09bb90f5..86a73a21cc9ac 100644 --- a/projects/plugins/jetpack/_inc/client/scss/variables/_colors.scss +++ b/projects/plugins/jetpack/_inc/client/scss/variables/_colors.scss @@ -75,7 +75,7 @@ $sidebar-selected-color: $gray; $dashboard-number-border: #cbd7e1; //Social media colors -$color-facebook: #1877f2; +$color-facebook: #0866ff; $color-twitter: #55acee; $color-gplus: #df4a32; $color-tumblr: #35465c; diff --git a/projects/plugins/jetpack/_inc/social-logos/social-logos.css b/projects/plugins/jetpack/_inc/social-logos/social-logos.css index 1bdfd67c4bed1..377b507917f0e 100644 --- a/projects/plugins/jetpack/_inc/social-logos/social-logos.css +++ b/projects/plugins/jetpack/_inc/social-logos/social-logos.css @@ -5,7 +5,7 @@ @font-face { font-family:"social-logos"; - src: url(data:application/octet-stream;base64,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) format('woff2'); + src: url(data:application/octet-stream;base64,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) format('woff2'); font-weight:normal; font-style:normal; } diff --git a/projects/plugins/jetpack/_inc/social-logos/social-logos.html b/projects/plugins/jetpack/_inc/social-logos/social-logos.html index ff2a40a15bab7..b102642faa278 100644 --- a/projects/plugins/jetpack/_inc/social-logos/social-logos.html +++ b/projects/plugins/jetpack/_inc/social-logos/social-logos.html @@ -58,7 +58,7 @@ @font-face { font-family:"social-logos"; - src: url(data:application/octet-stream;base64,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) format('woff2'); + src: url(data:application/octet-stream;base64,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) format('woff2'); font-weight:normal; font-style:normal; } diff --git a/projects/plugins/jetpack/_inc/social-logos/social-logos.min.css b/projects/plugins/jetpack/_inc/social-logos/social-logos.min.css index e98726f15d0dd..55899285f8d74 100644 --- a/projects/plugins/jetpack/_inc/social-logos/social-logos.min.css +++ b/projects/plugins/jetpack/_inc/social-logos/social-logos.min.css @@ -1 +1 @@ -@font-face{font-family:social-logos;src:url(data:application/octet-stream;base64,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) format('woff2');font-weight:400;font-style:normal}.social-logo{font-family:social-logos;display:inline-block;vertical-align:middle;line-height:1;font-weight:400;font-style:normal;speak:none;text-decoration:inherit;text-transform:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.social-logo__amazon:before{content:"\f600"}.social-logo__behance:before{content:"\f101"}.social-logo__blogger-alt:before{content:"\f601"}.social-logo__blogger:before{content:"\f602"}.social-logo__codepen:before{content:"\f216"}.social-logo__dribbble:before{content:"\f201"}.social-logo__dropbox:before{content:"\f225"}.social-logo__eventbrite:before{content:"\f603"}.social-logo__facebook:before{content:"\f203"}.social-logo__fediverse:before{content:"\f10b"}.social-logo__feed:before{content:"\f413"}.social-logo__flickr:before{content:"\f211"}.social-logo__foursquare:before{content:"\f226"}.social-logo__ghost:before{content:"\f61c"}.social-logo__github:before{content:"\f200"}.social-logo__google-alt:before{content:"\f102"}.social-logo__google-plus-alt:before{content:"\f218"}.social-logo__google-plus:before{content:"\f206"}.social-logo__google:before{content:"\f103"}.social-logo__instagram:before{content:"\f215"}.social-logo__link:before{content:"\f109"}.social-logo__linkedin:before{content:"\f207"}.social-logo__mail:before{content:"\f410"}.social-logo__mastodon:before{content:"\f10a"}.social-logo__medium-alt:before{content:"\f106"}.social-logo__medium:before{content:"\f623"}.social-logo__nextdoor:before{content:"\f10c"}.social-logo__patreon:before{content:"\f105"}.social-logo__pinterest-alt:before{content:"\f210"}.social-logo__pinterest:before{content:"\f209"}.social-logo__pocket:before{content:"\f224"}.social-logo__polldaddy:before{content:"\f217"}.social-logo__print:before{content:"\f469"}.social-logo__reddit:before{content:"\f222"}.social-logo__share:before{content:"\f415"}.social-logo__skype:before{content:"\f220"}.social-logo__spotify:before{content:"\f515"}.social-logo__squarespace:before{content:"\f605"}.social-logo__stumbleupon:before{content:"\f223"}.social-logo__telegram:before{content:"\f606"}.social-logo-threads:before{content:"\f10d"}.social-logo__tiktok-alt:before{content:"\f107"}.social-logo__tiktok:before{content:"\f108"}.social-logo__tumblr-alt:before{content:"\f607"}.social-logo__tumblr:before{content:"\f214"}.social-logo__twitch:before{content:"\f516"}.social-logo__twitter-alt:before{content:"\f202"}.social-logo__twitter:before{content:"\f610"}.social-logo__vimeo:before{content:"\f212"}.social-logo__whatsapp:before{content:"\f608"}.social-logo__woocommerce:before{content:"\f104"}.social-logo__wordpress:before{content:"\f205"}.social-logo__x:before{content:"\f10e"}.social-logo__xanga:before{content:"\f609"}.social-logo__youtube:before{content:"\f213"} +@font-face{font-family:social-logos;src:url(data:application/octet-stream;base64,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) format('woff2');font-weight:400;font-style:normal}.social-logo{font-family:social-logos;display:inline-block;vertical-align:middle;line-height:1;font-weight:400;font-style:normal;speak:none;text-decoration:inherit;text-transform:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.social-logo__amazon:before{content:"\f600"}.social-logo__behance:before{content:"\f101"}.social-logo__blogger-alt:before{content:"\f601"}.social-logo__blogger:before{content:"\f602"}.social-logo__codepen:before{content:"\f216"}.social-logo__dribbble:before{content:"\f201"}.social-logo__dropbox:before{content:"\f225"}.social-logo__eventbrite:before{content:"\f603"}.social-logo__facebook:before{content:"\f203"}.social-logo__fediverse:before{content:"\f10b"}.social-logo__feed:before{content:"\f413"}.social-logo__flickr:before{content:"\f211"}.social-logo__foursquare:before{content:"\f226"}.social-logo__ghost:before{content:"\f61c"}.social-logo__github:before{content:"\f200"}.social-logo__google-alt:before{content:"\f102"}.social-logo__google-plus-alt:before{content:"\f218"}.social-logo__google-plus:before{content:"\f206"}.social-logo__google:before{content:"\f103"}.social-logo__instagram:before{content:"\f215"}.social-logo__link:before{content:"\f109"}.social-logo__linkedin:before{content:"\f207"}.social-logo__mail:before{content:"\f410"}.social-logo__mastodon:before{content:"\f10a"}.social-logo__medium-alt:before{content:"\f106"}.social-logo__medium:before{content:"\f623"}.social-logo__nextdoor:before{content:"\f10c"}.social-logo__patreon:before{content:"\f105"}.social-logo__pinterest-alt:before{content:"\f210"}.social-logo__pinterest:before{content:"\f209"}.social-logo__pocket:before{content:"\f224"}.social-logo__polldaddy:before{content:"\f217"}.social-logo__print:before{content:"\f469"}.social-logo__reddit:before{content:"\f222"}.social-logo__share:before{content:"\f415"}.social-logo__skype:before{content:"\f220"}.social-logo__spotify:before{content:"\f515"}.social-logo__squarespace:before{content:"\f605"}.social-logo__stumbleupon:before{content:"\f223"}.social-logo__telegram:before{content:"\f606"}.social-logo-threads:before{content:"\f10d"}.social-logo__tiktok-alt:before{content:"\f107"}.social-logo__tiktok:before{content:"\f108"}.social-logo__tumblr-alt:before{content:"\f607"}.social-logo__tumblr:before{content:"\f214"}.social-logo__twitch:before{content:"\f516"}.social-logo__twitter-alt:before{content:"\f202"}.social-logo__twitter:before{content:"\f610"}.social-logo__vimeo:before{content:"\f212"}.social-logo__whatsapp:before{content:"\f608"}.social-logo__woocommerce:before{content:"\f104"}.social-logo__wordpress:before{content:"\f205"}.social-logo__x:before{content:"\f10e"}.social-logo__xanga:before{content:"\f609"}.social-logo__youtube:before{content:"\f213"} diff --git a/projects/plugins/jetpack/_inc/social-logos/social-logos.woff2 b/projects/plugins/jetpack/_inc/social-logos/social-logos.woff2 index 8de8e64062bb7..07e9c98d566db 100644 Binary files a/projects/plugins/jetpack/_inc/social-logos/social-logos.woff2 and b/projects/plugins/jetpack/_inc/social-logos/social-logos.woff2 differ diff --git a/projects/plugins/jetpack/changelog/Create a new site option for WPCOM admin interface b/projects/plugins/jetpack/changelog/Create a new site option for WPCOM admin interface new file mode 100644 index 0000000000000..a1b160f801635 --- /dev/null +++ b/projects/plugins/jetpack/changelog/Create a new site option for WPCOM admin interface @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Create a new site option for WPCOM admin interface + + diff --git a/projects/plugins/jetpack/changelog/add-remove-newsletter-categories b/projects/plugins/jetpack/changelog/add-remove-newsletter-categories deleted file mode 100644 index a91a29a0be963..0000000000000 --- a/projects/plugins/jetpack/changelog/add-remove-newsletter-categories +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: other - -Remove newsletter categories from the subscriber block. diff --git a/projects/plugins/jetpack/changelog/fix-block-translations-2 b/projects/plugins/jetpack/changelog/fix-block-translations-2 new file mode 100644 index 0000000000000..a4f20db10c534 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-block-translations-2 @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Fix missing block translations diff --git a/projects/plugins/jetpack/changelog/fix-blogging-prompts-save-js-error b/projects/plugins/jetpack/changelog/fix-blogging-prompts-save-js-error deleted file mode 100644 index 71d295dfcafa8..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-blogging-prompts-save-js-error +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: bugfix - -Blogging prompts block: add default gravatar attribute to prevent js error diff --git a/projects/plugins/jetpack/changelog/fix-check-for-paywall-access-prior-to-tracking b/projects/plugins/jetpack/changelog/fix-check-for-paywall-access-prior-to-tracking new file mode 100644 index 0000000000000..c7fbe29e0d6e7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-check-for-paywall-access-prior-to-tracking @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Check for post access first then do tracking action. diff --git a/projects/plugins/jetpack/changelog/fix-idc-search-replace-protection b/projects/plugins/jetpack/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..82c229b45b50e --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-idc-search-replace-protection @@ -0,0 +1,4 @@ +Significance: patch +Type: compat + +Connection: added protection for wpcom urls stored in the database during identity crisis. diff --git a/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/jetpack/changelog/fix-idc-search-replace-protection#2 similarity index 100% rename from projects/plugins/jetpack/changelog/renovate-lock-file-maintenance#2 rename to projects/plugins/jetpack/changelog/fix-idc-search-replace-protection#2 diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-test-deprecation-notices b/projects/plugins/jetpack/changelog/fix-jetpack-test-deprecation-notices deleted file mode 100644 index ff5d20a60ab13..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-jetpack-test-deprecation-notices +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Fix PHP 8.2 deprecation notices in tests. No changes to the plugin itself. - - diff --git a/projects/plugins/jetpack/changelog/fix-map-block-not-rendering b/projects/plugins/jetpack/changelog/fix-map-block-not-rendering new file mode 100644 index 0000000000000..5ec00093c9f5c --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-map-block-not-rendering @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Fix Map block not rendering diff --git a/projects/plugins/jetpack/changelog/fix-subscribe-modal-block-markup b/projects/plugins/jetpack/changelog/fix-subscribe-modal-block-markup new file mode 100644 index 0000000000000..78ad7aa74320d --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-subscribe-modal-block-markup @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Subscribe modal: match block markup with params diff --git a/projects/plugins/jetpack/changelog/fix-sync-unit-test b/projects/plugins/jetpack/changelog/fix-sync-unit-test deleted file mode 100644 index b4ba5b6d4a26d..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-sync-unit-test +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Sync unit test: Fixes sync unit test to Aaccount for new post type properties diff --git a/projects/plugins/jetpack/changelog/update-sync-migrate-before-send-to-before-enqueue#2 b/projects/plugins/jetpack/changelog/fix-videopress-upgrade-path similarity index 100% rename from projects/plugins/jetpack/changelog/update-sync-migrate-before-send-to-before-enqueue#2 rename to projects/plugins/jetpack/changelog/fix-videopress-upgrade-path diff --git a/projects/plugins/jetpack/changelog/init-release-cycle b/projects/plugins/jetpack/changelog/init-release-cycle index d0e5fb158ca35..9321586753dc1 100644 --- a/projects/plugins/jetpack/changelog/init-release-cycle +++ b/projects/plugins/jetpack/changelog/init-release-cycle @@ -1,5 +1,5 @@ Significance: patch Type: other -Comment: Init 12.8-a.0 +Comment: Init 12.8-a.2 diff --git a/projects/plugins/jetpack/changelog/renovate-babel-monorepo b/projects/plugins/jetpack/changelog/renovate-babel-monorepo deleted file mode 100644 index 1eaea6a769e84..0000000000000 --- a/projects/plugins/jetpack/changelog/renovate-babel-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Updated package dependencies. diff --git a/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance b/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance deleted file mode 100644 index 1eaea6a769e84..0000000000000 --- a/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Updated package dependencies. diff --git a/projects/plugins/jetpack/changelog/update-access-panel-merge b/projects/plugins/jetpack/changelog/update-access-panel-merge deleted file mode 100644 index fb0a146781da3..0000000000000 --- a/projects/plugins/jetpack/changelog/update-access-panel-merge +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: other - -refactor diff --git a/projects/plugins/jetpack/changelog/update-access-panel-merge-2 b/projects/plugins/jetpack/changelog/update-access-panel-merge-2 deleted file mode 100644 index 8c67b462e9270..0000000000000 --- a/projects/plugins/jetpack/changelog/update-access-panel-merge-2 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -refactoring diff --git a/projects/plugins/jetpack/changelog/update-ai-assistant-enable-backend-prompts-for-half-site-base b/projects/plugins/jetpack/changelog/update-ai-assistant-enable-backend-prompts-for-half-site-base deleted file mode 100644 index e06f3d1d91f19..0000000000000 --- a/projects/plugins/jetpack/changelog/update-ai-assistant-enable-backend-prompts-for-half-site-base +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -AI Assistant: Enable backend prompts for 50% of production sites. diff --git a/projects/plugins/jetpack/changelog/update-counted-textarea-show-overcount b/projects/plugins/jetpack/changelog/update-counted-textarea-show-overcount new file mode 100644 index 0000000000000..47f5e2e353e69 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-counted-textarea-show-overcount @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +SEO Title & Description - Display the current nucount of characters, even when over the suggested limit.. diff --git a/projects/plugins/jetpack/changelog/update-facebook-color-code b/projects/plugins/jetpack/changelog/update-facebook-color-code new file mode 100644 index 0000000000000..40427b3cbe736 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-facebook-color-code @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +General: update Facebook color code to match newer brand colors. diff --git a/projects/plugins/jetpack/changelog/update-jetpack-colors-misc b/projects/plugins/jetpack/changelog/update-jetpack-colors-misc new file mode 100644 index 0000000000000..e883cde6b2277 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-jetpack-colors-misc @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +General: update mentions of the old Jetpack color code. diff --git a/projects/plugins/jetpack/changelog/update-jetpack-colors-sitemap b/projects/plugins/jetpack/changelog/update-jetpack-colors-sitemap deleted file mode 100644 index 8c7319e65984a..0000000000000 --- a/projects/plugins/jetpack/changelog/update-jetpack-colors-sitemap +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Sitemaps: update the colors used on the sitemap page to match updated Jetpack branding colors. diff --git a/projects/plugins/jetpack/changelog/update-jetpack-form-change-filter-to-extend-components b/projects/plugins/jetpack/changelog/update-jetpack-form-change-filter-to-extend-components new file mode 100644 index 0000000000000..2e84cfa510894 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-jetpack-form-change-filter-to-extend-components @@ -0,0 +1,4 @@ +Significance: patch +Type: enhancement + +AI Extension: change the filter to populate the Jetpack Form block with AI components diff --git a/projects/plugins/jetpack/changelog/update-jetpack-form-improve-extending b/projects/plugins/jetpack/changelog/update-jetpack-form-improve-extending new file mode 100644 index 0000000000000..353a273a25bef --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-jetpack-form-improve-extending @@ -0,0 +1,4 @@ +Significance: patch +Type: enhancement + +AI Extension: do not skip React hook instances diff --git a/projects/plugins/jetpack/changelog/update-jetpack_ai_enabled_assistant b/projects/plugins/jetpack/changelog/update-jetpack_ai_enabled_assistant new file mode 100644 index 0000000000000..d423c53b600e0 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-jetpack_ai_enabled_assistant @@ -0,0 +1,4 @@ +Significance: minor +Type: compat + +Make the jetpack_ai_enabled filter decide whether to register AI editor extensions diff --git a/projects/plugins/jetpack/changelog/update-show-subscribe-modal-to-admins b/projects/plugins/jetpack/changelog/update-show-subscribe-modal-to-admins new file mode 100644 index 0000000000000..84cf892b44e01 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-show-subscribe-modal-to-admins @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +Subscribers: Allow admins to see subscribe modal. diff --git a/projects/plugins/jetpack/changelog/update-social-logos-256 b/projects/plugins/jetpack/changelog/update-social-logos-256 new file mode 100644 index 0000000000000..00942f6984084 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-social-logos-256 @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Social Logos: update logos with the most recent version of the package, including bug fixes for the Threads and X logos, as well as an updated X logo to match updated X branding guidelines. diff --git a/projects/plugins/jetpack/changelog/update-social-previews-convert-twitter-to-x b/projects/plugins/jetpack/changelog/update-social-previews-convert-twitter-to-x deleted file mode 100644 index 33aac940afe79..0000000000000 --- a/projects/plugins/jetpack/changelog/update-social-previews-convert-twitter-to-x +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Convert Twitter to X diff --git a/projects/plugins/jetpack/changelog/update-subscriber-modal-option-text b/projects/plugins/jetpack/changelog/update-subscriber-modal-option-text new file mode 100644 index 0000000000000..8a021a9feea1b --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-subscriber-modal-option-text @@ -0,0 +1,5 @@ +Significance: patch +Type: bugfix +Comment: Minor text change. + + diff --git a/projects/plugins/jetpack/changelog/update-sync-migrate-before-send-to-before-enqueue b/projects/plugins/jetpack/changelog/update-sync-migrate-before-send-to-before-enqueue deleted file mode 100644 index 564ffeece51c4..0000000000000 --- a/projects/plugins/jetpack/changelog/update-sync-migrate-before-send-to-before-enqueue +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Unit tests: Updated Sync related unit tests diff --git a/projects/plugins/jetpack/changelog/update-youtube-embeds-popup-sandbox b/projects/plugins/jetpack/changelog/update-youtube-embeds-popup-sandbox new file mode 100644 index 0000000000000..0090d95a27e96 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-youtube-embeds-popup-sandbox @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +YouTube embeds: avoid errors when opening YouTube in a new window from a YouTube embed. diff --git a/projects/plugins/jetpack/class.jetpack.php b/projects/plugins/jetpack/class.jetpack.php index 14d6e9fd7caea..03dab52b69a84 100644 --- a/projects/plugins/jetpack/class.jetpack.php +++ b/projects/plugins/jetpack/class.jetpack.php @@ -5660,7 +5660,6 @@ public static function check_identity_crisis() { if ( ! self::is_connection_ready() || ( new Status() )->is_offline_mode() || ! Identity_Crisis::validate_sync_error_idc_option() ) { return false; } - return Jetpack_Options::get_option( 'sync_error_idc' ); } diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json index da01518f62601..c39297f316101 100644 --- a/projects/plugins/jetpack/composer.json +++ b/projects/plugins/jetpack/composer.json @@ -103,7 +103,7 @@ "platform": { "ext-intl": "0.0.0" }, - "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackâ“¥12_8_a_0", + "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackâ“¥12_8_a_2", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 4dcd6e86ca735..429e19c29c2ca 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -1198,7 +1198,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1227,7 +1227,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -1703,7 +1703,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1733,7 +1733,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/ai-assistant.php b/projects/plugins/jetpack/extensions/blocks/ai-assistant/ai-assistant.php index 8c8653cdeb003..b03e7d221e9ea 100644 --- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/ai-assistant.php +++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/ai-assistant.php @@ -24,8 +24,9 @@ */ function register_block() { if ( - ( new Host() )->is_wpcom_simple() + ( ( new Host() )->is_wpcom_simple() || ! ( new Status() )->is_offline_mode() + ) && apply_filters( 'jetpack_ai_enabled', true ) ) { Blocks::jetpack_register_block( BLOCK_NAME, @@ -62,7 +63,9 @@ function load_assets( $attr, $content ) { add_action( 'jetpack_register_gutenberg_extensions', function () { - \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-support' ); + if ( apply_filters( 'jetpack_ai_enabled', true ) ) { + \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-support' ); + } } ); @@ -72,7 +75,9 @@ function () { add_action( 'jetpack_register_gutenberg_extensions', function () { - \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-form-support' ); + if ( apply_filters( 'jetpack_ai_enabled', true ) ) { + \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-form-support' ); + } } ); @@ -82,7 +87,9 @@ function () { add_action( 'jetpack_register_gutenberg_extensions', function () { - \Jetpack_Gutenberg::set_extension_available( 'ai-content-lens' ); + if ( apply_filters( 'jetpack_ai_enabled', true ) ) { + \Jetpack_Gutenberg::set_extension_available( 'ai-content-lens' ); + } } ); @@ -92,6 +99,8 @@ function () { add_action( 'jetpack_register_gutenberg_extensions', function () { - \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-backend-prompts' ); + if ( apply_filters( 'jetpack_ai_enabled', true ) ) { + \Jetpack_Gutenberg::set_extension_available( 'ai-assistant-backend-prompts' ); + } } ); diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/ai-assistant/index.ts b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/ai-assistant/index.ts index bb51e5db7ac4f..926f20014b6b6 100644 --- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/ai-assistant/index.ts +++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/ai-assistant/index.ts @@ -30,7 +30,7 @@ type BlockSettingsProps = { }; export const isAiAssistantSupportExtensionEnabled = - window?.Jetpack_Editor_Initial_State.available_blocks?.[ AI_ASSISTANT_SUPPORT_NAME ]; + window?.Jetpack_Editor_Initial_State?.available_blocks?.[ AI_ASSISTANT_SUPPORT_NAME ]; /** * Check if it is possible to extend the block. diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/constants.ts b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/constants.ts index fe35eaa1003ed..0563fb73d8dfd 100644 --- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/constants.ts +++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/constants.ts @@ -1,7 +1,7 @@ export const JETPACK_FORM_AI_COMPOSITION_EXTENSION = 'ai-assistant-form-support' as const; export const isJetpackFromBlockAiCompositionAvailable = - window?.Jetpack_Editor_Initial_State.available_blocks?.[ JETPACK_FORM_AI_COMPOSITION_EXTENSION ] + window?.Jetpack_Editor_Initial_State?.available_blocks?.[ JETPACK_FORM_AI_COMPOSITION_EXTENSION ] ?.available; // All blocks to extend diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/index.tsx b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/index.tsx index b6bd634e1ea36..b5ed9ae09a26d 100644 --- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/index.tsx +++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/index.tsx @@ -84,11 +84,12 @@ export function isPossibleToExtendJetpackFormBlock( return true; } -const withAiAssistantComponents = createHigherOrderComponent( BlockEdit => { +/** + * HOC to populate the Jetpack Form edit component + * with the AI Assistant bar and button. + */ +const jetpackFormEditWithAiComponents = createHigherOrderComponent( BlockEdit => { return props => { - if ( ! isPossibleToExtendJetpackFormBlock( props?.name, { clientId: props.clientId } ) ) { - return ; - } const { eventSource } = useAiContext(); const stopSuggestion = useCallback( () => { @@ -104,9 +105,19 @@ const withAiAssistantComponents = createHigherOrderComponent( BlockEdit => { * and close the event source. */ return () => { + // Only stop when the parent block is unmouted. + if ( props?.name !== 'jetpack/contact-form' ) { + return; + } + stopSuggestion(); }; - }, [ stopSuggestion ] ); + }, [ stopSuggestion, props?.name ] ); + + // Only extend Jetpack Form block (children not included). + if ( ! isPossibleToExtendJetpackFormBlock( props?.name, { clientId: props.clientId } ) ) { + return ; + } const blockControlsProps = { group: 'block', @@ -124,9 +135,36 @@ const withAiAssistantComponents = createHigherOrderComponent( BlockEdit => { ); }; -}, 'withAiAssistantComponents' ); +}, 'jetpackFormEditWithAiComponents' ); -addFilter( 'editor.BlockEdit', 'jetpack/jetpack-form-block-edit', withAiAssistantComponents, 100 ); +/** + * Function used to extend the registerBlockType settings. + * + * - Populate the Jetpack Form edit component + * with the AI Assistant bar and button (jetpackFormEditWithAiComponents). + * + * @param {object} settings - The block settings. + * @param {string} name - The block name. + * @returns {object} The block settings. + */ +function jetpackFormWithAiSupport( settings, name: string ) { + // Only extend Jetpack Form block type. + if ( name !== 'jetpack/contact-form' ) { + return settings; + } + + return { + ...settings, + edit: jetpackFormEditWithAiComponents( settings.edit ), + }; +} + +addFilter( + 'blocks.registerBlockType', + 'jetpack/ai-assistant-support', + jetpackFormWithAiSupport, + 100 +); /** * Add the AI Assistant button to the toolbar. diff --git a/projects/plugins/jetpack/extensions/blocks/ai-chat/editor.js b/projects/plugins/jetpack/extensions/blocks/ai-chat/editor.js index 3b980e082b653..b4c8833bc2c77 100644 --- a/projects/plugins/jetpack/extensions/blocks/ai-chat/editor.js +++ b/projects/plugins/jetpack/extensions/blocks/ai-chat/editor.js @@ -7,8 +7,6 @@ import './editor.scss'; import './components/feedback/style.scss'; registerJetpackBlockFromMetadata( metadata, { - // The API version needs to be explicitly specified in this instance for styles to be loaded. - apiVersion: metadata.apiVersion, edit, save, } ); diff --git a/projects/plugins/jetpack/extensions/blocks/amazon/block.json b/projects/plugins/jetpack/extensions/blocks/amazon/block.json index 77cd0617526b1..8f2b03b27f990 100644 --- a/projects/plugins/jetpack/extensions/blocks/amazon/block.json +++ b/projects/plugins/jetpack/extensions/blocks/amazon/block.json @@ -1,6 +1,6 @@ { "$schema": "https://schemas.wp.org/trunk/block.json", - "apiVersion": 3, + "apiVersion": 1, "name": "jetpack/amazon", "title": "Amazon (Beta)", "description": "Promote Amazon products and earn a commission from sales.", diff --git a/projects/plugins/jetpack/extensions/blocks/business-hours/block.json b/projects/plugins/jetpack/extensions/blocks/business-hours/block.json index 76dbbc84b2781..f636fecebc223 100644 --- a/projects/plugins/jetpack/extensions/blocks/business-hours/block.json +++ b/projects/plugins/jetpack/extensions/blocks/business-hours/block.json @@ -1,6 +1,6 @@ { "$schema": "https://schemas.wp.org/trunk/block.json", - "apiVersion": 3, + "apiVersion": 1, "name": "jetpack/business-hours", "title": "Business Hours", "description": "Display opening hours for your business.", diff --git a/projects/plugins/jetpack/extensions/blocks/map/edit.js b/projects/plugins/jetpack/extensions/blocks/map/edit.js index c477b82bd637f..7f5e739e7aafe 100644 --- a/projects/plugins/jetpack/extensions/blocks/map/edit.js +++ b/projects/plugins/jetpack/extensions/blocks/map/edit.js @@ -284,7 +284,7 @@ class MapEdit extends Component { ); const instructions = ( - +

{ __( 'To use the map block, you need an Access Token.', 'jetpack' ) }
@@ -295,16 +295,12 @@ class MapEdit extends Component { 'Locate and copy the default access token. Then, paste it into the field below.', 'jetpack' ) } - +

); const placeholderAPIStateFailure = ( - + + { instructions }
token_from_request(); - if ( null !== $token ) { $this->set_token_cookie( $token ); + return $token; } - return $token; + return $this->token_from_cookie(); } /** @@ -74,30 +74,14 @@ public function visitor_can_view_content( $valid_plan_ids, $access_level ) { global $current_user; $old_user = $current_user; // backup the current user so we can set the current user to the token user for paywall purposes - // URL token always has a precedence, so it can overwrite the cookie when new data available. - $token = $this->token_from_request(); - if ( $token ) { - $this->set_token_cookie( $token ); - } else { - $token = $this->token_from_cookie(); - } - - $is_valid_token = true; - - if ( empty( $token ) ) { - // no token, no access. - $is_valid_token = false; - } else { - $payload = $this->decode_token( $token ); - if ( empty( $payload ) ) { - $is_valid_token = false; - } + $token = $this->get_and_set_token_from_request(); + $payload = $this->decode_token( $token ); + $is_valid_token = ! empty( $payload ); + if ( $is_valid_token && isset( $payload['user_id'] ) ) { // set the current user to the payload's user id - if ( isset( $payload['user_id'] ) ) { - // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited - $current_user = get_user_by( 'id', $payload['user_id'] ); - } + // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited + $current_user = get_user_by( 'id', $payload['user_id'] ); } $is_blog_subscriber = false; diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/view.js b/projects/plugins/jetpack/extensions/blocks/premium-content/view.js index 48722494e4ff8..9e81a24695dea 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/view.js +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/view.js @@ -1,31 +1,7 @@ import './view.scss'; -import { - setPurchaseResultCookie, - reloadPageWithPremiumContentQueryString, -} from '../../../extensions/shared/memberships'; +import { handleIframeResult } from '../../../extensions/shared/memberships'; document.addEventListener( 'DOMContentLoaded', function () { - let premiumContentJWTToken = ''; - - /** - * @typedef globalThis - * @param {globalThis.Event} eventFromIframe - message event that gets emitted in the checkout iframe. - * @listens window#message - */ - function handleIframeResult( eventFromIframe ) { - if ( eventFromIframe.origin === 'https://subscribe.wordpress.com' && eventFromIframe.data ) { - const data = JSON.parse( eventFromIframe.data ); - if ( data && data.result && data.result.jwt_token ) { - // We save the token for now, doing nothing. - premiumContentJWTToken = data.result.jwt_token; - setPurchaseResultCookie( premiumContentJWTToken ); - } - if ( data && data.action === 'close' && premiumContentJWTToken ) { - reloadPageWithPremiumContentQueryString( premiumContentJWTToken ); - } - } - } - if ( typeof window !== 'undefined' ) { window.addEventListener( 'message', handleIframeResult, false ); } diff --git a/projects/plugins/jetpack/extensions/blocks/recipe/recipe.php b/projects/plugins/jetpack/extensions/blocks/recipe/recipe.php index a08ffbc20f689..0fce092a7506a 100644 --- a/projects/plugins/jetpack/extensions/blocks/recipe/recipe.php +++ b/projects/plugins/jetpack/extensions/blocks/recipe/recipe.php @@ -9,55 +9,60 @@ use Automattic\Jetpack\Blocks; -Blocks::jetpack_register_block( - __DIR__, - array( - 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render' ), - ) -); +add_action( + 'init', + function () { + Blocks::jetpack_register_block( + __DIR__, + array( + 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-details', - array( - 'parent' => array( 'jetpack/recipe' ), - ) -); + Blocks::jetpack_register_block( + 'jetpack/recipe-details', + array( + 'parent' => array( 'jetpack/recipe' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-hero', - array( - 'parent' => array( 'jetpack/recipe' ), - 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render_hero' ), - ) -); + Blocks::jetpack_register_block( + 'jetpack/recipe-hero', + array( + 'parent' => array( 'jetpack/recipe' ), + 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render_hero' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-ingredients-list', - array( - 'parent' => array( 'jetpack/recipe' ), - ) -); + Blocks::jetpack_register_block( + 'jetpack/recipe-ingredients-list', + array( + 'parent' => array( 'jetpack/recipe' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-ingredient-item', - array( - 'parent' => array( 'jetpack/recipe' ), - ) -); + Blocks::jetpack_register_block( + 'jetpack/recipe-ingredient-item', + array( + 'parent' => array( 'jetpack/recipe' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-steps', - array( - 'parent' => array( 'jetpack/recipe' ), - ) -); + Blocks::jetpack_register_block( + 'jetpack/recipe-steps', + array( + 'parent' => array( 'jetpack/recipe' ), + ) + ); -Blocks::jetpack_register_block( - 'jetpack/recipe-step', - array( - 'parent' => array( 'jetpack/recipe' ), - 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render_step' ), - ) + Blocks::jetpack_register_block( + 'jetpack/recipe-step', + array( + 'parent' => array( 'jetpack/recipe' ), + 'render_callback' => array( 'Automattic\\Jetpack\\Extensions\\Recipe\\Jetpack_Recipe_Block', 'render_step' ), + ) + ); + } ); require_once __DIR__ . '/class-jetpack-recipe-block.php'; diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php index 878020ca18062..dadc2dc101fdb 100644 --- a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php +++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php @@ -9,7 +9,9 @@ use Automattic\Jetpack\Blocks; use Automattic\Jetpack\Connection\Manager as Connection_Manager; +use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Jetpack_Token_Subscription_Service; use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Token_Subscription_Service; +use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\WPCOM_Token_Subscription_Service; use Automattic\Jetpack\Status; use Automattic\Jetpack\Status\Host; use Jetpack; @@ -914,19 +916,28 @@ function jetpack_filter_excerpt_for_newsletter( $excerpt, $post = null ) { function add_paywall( $the_content ) { require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php'; + $post_access_level = Jetpack_Memberships::get_post_access_level(); + if ( Jetpack_Memberships::user_can_view_post() ) { - do_action( - 'earn_track_paywalled_post_view', - array( - 'post_id' => get_the_ID(), - ) - ); + if ( $post_access_level !== Token_Subscription_Service::POST_ACCESS_LEVEL_EVERYBODY ) { + do_action( + 'earn_track_paywalled_post_view', + array( + 'post_id' => get_the_ID(), + ) + ); + } return $the_content; } - $post_access_level = Jetpack_Memberships::get_post_access_level(); + require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php'; + $token_service = is_wpcom() ? new WPCOM_Token_Subscription_Service() : new Jetpack_Token_Subscription_Service(); + $token = $token_service->get_and_set_token_from_request(); + $payload = $token_service->decode_token( $token ); + $is_valid_token = ! empty( $payload ); + $email_confirmation_pending = $is_valid_token && isset( $payload['blog_sub'] ) && $payload['blog_sub'] === 'pending'; - $paywalled_content = get_paywall_content( $post_access_level, isset( $_GET['subscribe'] ) && 'success' === $_GET['subscribe'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $paywalled_content = get_paywall_content( $post_access_level, $email_confirmation_pending ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended if ( has_block( \Automattic\Jetpack\Extensions\Paywall\BLOCK_NAME ) ) { if ( strpos( $the_content, \Automattic\Jetpack\Extensions\Paywall\BLOCK_HTML ) ) { @@ -1101,7 +1112,7 @@ function get_paywall_blocks( $newsletter_access_level ) { * @return string */ function get_paywall_blocks_subscribe_pending() { - $access_heading = esc_html__( 'Verify your email and continue reading', 'jetpack' ); + $access_heading = esc_html__( 'Verify your email to continue reading', 'jetpack' ); $subscribe_text = esc_html__( 'Please check your inbox to confirm your subscription.', 'jetpack' ); diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js index 04cd583958a4d..f611dc8e4e39e 100644 --- a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js +++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js @@ -1,20 +1,16 @@ -/* global tb_show, tb_remove */ +/* global tb_show */ import './view.scss'; import '../../shared/memberships.scss'; import domReady from '@wordpress/dom-ready'; -import { - setPurchaseResultCookie, - reloadPageWithPremiumContentQueryString, -} from '../../../extensions/shared/memberships'; +import { handleIframeResult } from '../../../extensions/shared/memberships'; domReady( function () { const form = document.querySelector( '.wp-block-jetpack-subscriptions__container form' ); if ( ! form ) { return; } - let premiumContentJWTToken = ''; if ( ! form.payments_attached ) { form.payments_attached = true; form.addEventListener( 'submit', function ( event ) { @@ -46,29 +42,6 @@ domReady( function () { window.scrollTo( 0, 0 ); tb_show( null, url + '&TB_iframe=true', null ); - //TODO: Unify this code across premium content, subscribe and payment button. - const handleIframeResult = function ( eventFromIframe ) { - if ( - eventFromIframe.origin === 'https://subscribe.wordpress.com' && - eventFromIframe.data - ) { - const data = JSON.parse( eventFromIframe.data ); - if ( data && data.result && data.result.jwt_token ) { - // We save the token for now, doing nothing. - premiumContentJWTToken = data.result.jwt_token; - setPurchaseResultCookie( premiumContentJWTToken ); - } else if ( data && data.action === 'close' && premiumContentJWTToken ) { - // The token was set during the purchase flow, we want to relead the whole page with token in query string so it recognizes that the user is logged in. - reloadPageWithPremiumContentQueryString( premiumContentJWTToken, { - subscribe: 'success', - } ); - } else if ( data && data.action === 'close' ) { - // User just aborted. - window.removeEventListener( 'message', handleIframeResult ); - tb_remove(); - } - } - }; window.addEventListener( 'message', handleIframeResult, false ); const tbWindow = document.querySelector( '#TB_window' ); tbWindow.classList.add( 'jetpack-memberships-modal' ); diff --git a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/editor.js b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/editor.js index 3109c04b0c7f5..f5f3dcb790edb 100644 --- a/projects/plugins/jetpack/extensions/plugins/ai-content-lens/editor.js +++ b/projects/plugins/jetpack/extensions/plugins/ai-content-lens/editor.js @@ -13,7 +13,7 @@ import { aiExcerptPluginName, aiExcerptPluginSettings } from '.'; export const AI_CONTENT_LENS = 'ai-content-lens'; const isAiAssistantSupportExtensionEnabled = - window?.Jetpack_Editor_Initial_State.available_blocks[ 'ai-content-lens' ]; + window?.Jetpack_Editor_Initial_State?.available_blocks[ 'ai-content-lens' ]; /** * Extend the editor with AI Content Lens features, diff --git a/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js b/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js index dd6bd43ff8f27..4e21e80740265 100644 --- a/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js +++ b/projects/plugins/jetpack/extensions/plugins/seo/counted-textarea.js @@ -12,8 +12,12 @@ export const CountedTextArea = ( { suggestedLimit, value, label, ...inputProps } ) : sprintf( /* translators: Placeholder is a number of characters in a sentence. */ - __( "It's recommended to use less than %d characters in this field.", 'jetpack' ), - suggestedLimit + __( + 'It’s recommended to use less than %1$d characters in this field. (%2$d used)', + 'jetpack' + ), + suggestedLimit, + value.length ); return ( diff --git a/projects/plugins/jetpack/extensions/shared/memberships.js b/projects/plugins/jetpack/extensions/shared/memberships.js index d1337d4c9e3b7..bb5687dbab862 100644 --- a/projects/plugins/jetpack/extensions/shared/memberships.js +++ b/projects/plugins/jetpack/extensions/shared/memberships.js @@ -1,17 +1,27 @@ /* global tb_show, tb_remove */ +let premiumContentJWTTokenForCookie = ''; + /** - * Since "close" button is inside our checkout iframe, in order to close it, it has to pass a message to higher scope to close the modal. - * - * @param {event} eventFromIframe - message event that gets emmited in the checkout iframe. + * @typedef globalThis + * @param {globalThis.Event} eventFromIframe - message event that gets emitted in the checkout iframe. * @listens window#message */ -function handleIframeResult( eventFromIframe ) { +export function handleIframeResult( eventFromIframe ) { if ( eventFromIframe.origin === 'https://subscribe.wordpress.com' && eventFromIframe.data ) { const data = JSON.parse( eventFromIframe.data ); - if ( data && data.action === 'close' ) { + if ( data && data.result && data.result.jwt_token ) { + // We save the token for now, doing nothing. + premiumContentJWTTokenForCookie = data.result.jwt_token; + setPurchaseResultCookie( premiumContentJWTTokenForCookie ); + } + if ( data && data.action === 'close' && premiumContentJWTTokenForCookie ) { + // The token was set during the purchase flow, we want to reload the whole page so the content is displayed + window.location.reload(); + } else if ( data && data.action === 'close' ) { + // User just aborted. window.removeEventListener( 'message', handleIframeResult ); - tb_remove(); + tb_remove && tb_remove(); } } } diff --git a/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js b/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js index 481da6507feca..47196680064a3 100644 --- a/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js +++ b/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js @@ -12,15 +12,21 @@ const JETPACK_PREFIX = 'jetpack/'; /** * Registers a gutenberg block if the availability requirements are met. * - * @param {string} name - The block's name. Jetpack blocks must be registered with a name prefixed - * with `jetpack/`. This function accepts an unprefixed name too, though (it'd handle both - * `business-hours` and `jetpack/business-hours` similarly, for instance). + * @param {string} nameOrMetadata - The block's name or metadata object. Jetpack blocks must be + * registered with a name prefixed with `jetpack/`. This function accepts an unprefixed name too, + * though (it'd handle both `business-hours` and `jetpack/business-hours` similarly, for instance). * @param {object} settings - The block's settings. * @param {object} childBlocks - The block's child blocks. * @param {boolean} prefix - Should this block be prefixed with `jetpack/`? * @returns {object|boolean} Either false if the block is not available, or the results of `registerBlockType` */ -export default function registerJetpackBlock( name, settings, childBlocks = [], prefix = true ) { +export default function registerJetpackBlock( + nameOrMetadata, + settings, + childBlocks = [], + prefix = true +) { + const name = typeof nameOrMetadata === 'string' ? nameOrMetadata : nameOrMetadata.name; const isNamePrefixed = name.startsWith( JETPACK_PREFIX ); const rawName = isNamePrefixed ? name.slice( JETPACK_PREFIX.length ) : name; @@ -40,7 +46,10 @@ export default function registerJetpackBlock( name, settings, childBlocks = [], } const prefixedName = jpPrefix + rawName; - const result = registerBlockType( prefixedName, settings ); + const result = registerBlockType( + nameOrMetadata === 'object' ? nameOrMetadata : prefixedName, + settings + ); if ( requiredPlan ) { addFilter( @@ -69,14 +78,14 @@ export default function registerJetpackBlock( name, settings, childBlocks = [], * @returns {object|boolean} Either false if the block is not available, or the results of `registerBlockType` */ export function registerJetpackBlockFromMetadata( metadata, settings, childBlocks, prefix ) { - const clientSettings = { + const mergedSettings = { ...settings, icon: getBlockIconProp( metadata ), }; const { variations } = metadata; if ( Array.isArray( variations ) && variations.length > 0 ) { - clientSettings.variations = variations.map( variation => { + mergedSettings.variations = variations.map( variation => { return { ...variation, icon: getBlockIconProp( variation ), @@ -84,5 +93,5 @@ export function registerJetpackBlockFromMetadata( metadata, settings, childBlock } ); } - return registerJetpackBlock( metadata.name, clientSettings, childBlocks, prefix ); + return registerJetpackBlock( metadata, mergedSettings, childBlocks, prefix ); } diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index 3fc1525724e9b..61c09783442da 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -4,7 +4,7 @@ * Plugin URI: https://jetpack.com * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things. * Author: Automattic - * Version: 12.8-a.0 + * Version: 12.8-a.2 * Author URI: https://jetpack.com * License: GPL2+ * Text Domain: jetpack @@ -34,7 +34,7 @@ define( 'JETPACK__MINIMUM_WP_VERSION', '6.2' ); define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); -define( 'JETPACK__VERSION', '12.8-a.0' ); +define( 'JETPACK__VERSION', '12.8-a.2' ); /** * Constant used to fetch the connection owner token diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php index 5f270e2fea856..42ea62446891b 100644 --- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php +++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php @@ -206,6 +206,7 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint { 'can_blaze', 'wpcom_site_setup', 'is_commercial', + 'wpcom_admin_interface', ); /** @@ -275,6 +276,7 @@ class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint { 'wpcom_production_blog_id', 'wpcom_staging_blog_ids', 'is_commercial', + 'wpcom_admin_interface', ); /** @@ -909,6 +911,9 @@ function ( $key ) use ( $visible_options ) { case 'is_commercial': $options[ $key ] = $site->is_commercial(); break; + case 'wpcom_admin_interface': + $options[ $key ] = $site->get_wpcom_admin_interface(); + break; } } diff --git a/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css b/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css index ad739cc41a107..b1e339fa78572 100644 --- a/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css +++ b/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css @@ -55,7 +55,7 @@ amp-social-share[type='tumblr']::before { } amp-social-share[type='facebook'] { - background: #1877F2; + background: #0866ff; } amp-social-share[type='facebook']::before { diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharing.css b/projects/plugins/jetpack/modules/sharedaddy/sharing.css index aa10df2be8903..607d6eb8a5989 100644 --- a/projects/plugins/jetpack/modules/sharedaddy/sharing.css +++ b/projects/plugins/jetpack/modules/sharedaddy/sharing.css @@ -637,7 +637,7 @@ body .sd-social-icon .sd-content li.share-custom a span { } .sd-social-icon .sd-content ul li[class*='share-'].share-facebook a.sd-button { - background: #1877F2; + background: #0866ff; color: #fff !important; } diff --git a/projects/plugins/jetpack/modules/shortcodes/youtube.php b/projects/plugins/jetpack/modules/shortcodes/youtube.php index fd5b4f77e44d1..0f77ee811598c 100644 --- a/projects/plugins/jetpack/modules/shortcodes/youtube.php +++ b/projects/plugins/jetpack/modules/shortcodes/youtube.php @@ -342,7 +342,7 @@ function youtube_id( $url ) { $layout = $is_amp ? 'layout="responsive" ' : ''; $html = sprintf( - '', + '', esc_attr( $w ), esc_attr( $h ), $layout, diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php index 0f78eb417eb27..cbb00910afb77 100644 --- a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php +++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php @@ -139,7 +139,7 @@ public function get_subscribe_template_content() {
- +

$discover_more_from

@@ -149,7 +149,7 @@ public function get_subscribe_template_content() { - +

$continue_reading

@@ -189,11 +189,6 @@ public function should_user_see_modal() { return false; } - // Dont show if user is member of site. - if ( is_user_member_of_blog( get_current_user_id(), get_current_blog_id() ) ) { - return false; - } - // Don't show if user is subscribed to blog. require_once __DIR__ . '/../views.php'; if ( $this->has_subscription_cookie() || Jetpack_Subscriptions_Widget::is_current_user_subscribed() ) { diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json index d0418f20952ac..2ccef17650064 100644 --- a/projects/plugins/jetpack/package.json +++ b/projects/plugins/jetpack/package.json @@ -1,6 +1,6 @@ { "name": "Jetpack", - "version": "12.8.0-a.0", + "version": "12.8.0-a.2", "private": true, "description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).", "homepage": "https://jetpack.com", @@ -104,7 +104,7 @@ "resize-observer-polyfill": "1.5.1", "sass": "1.64.1", "semver": "7.5.2", - "social-logos": "2.5.5", + "social-logos": "2.5.6", "swiper": "6.7.0", "tinycolor2": "1.4.2", "turndown": "7.1.2", diff --git a/projects/plugins/jetpack/sal/class.json-api-site-base.php b/projects/plugins/jetpack/sal/class.json-api-site-base.php index bbea6b2eedf0c..d6e84d82d315e 100644 --- a/projects/plugins/jetpack/sal/class.json-api-site-base.php +++ b/projects/plugins/jetpack/sal/class.json-api-site-base.php @@ -1538,4 +1538,13 @@ public function is_commercial() { $is_commercial = get_option( '_jetpack_site_is_commercial', null ); return $is_commercial === null ? null : (bool) $is_commercial; } + + /** + * Returns the site's interface selection e.g. calypso vs. wp-admin + * + * @return string + **/ + public function get_wpcom_admin_interface() { + return (string) get_option( 'wpcom_admin_interface' ); + } } diff --git a/projects/plugins/jetpack/sal/class.json-api-site-jetpack.php b/projects/plugins/jetpack/sal/class.json-api-site-jetpack.php index 87305ade280d4..ae86f5251138b 100644 --- a/projects/plugins/jetpack/sal/class.json-api-site-jetpack.php +++ b/projects/plugins/jetpack/sal/class.json-api-site-jetpack.php @@ -675,4 +675,13 @@ public function get_wpcom_production_blog_id() { public function get_wpcom_staging_blog_ids() { return null; } + + /** + * Get site option for the admin interface on WordPress.com Atomic sites. Not used in Jetpack. + * + * @return null + */ + public function get_wpcom_admin_interface() { + return null; + } } diff --git a/projects/plugins/jetpack/scss/atoms/colors/_colors.scss b/projects/plugins/jetpack/scss/atoms/colors/_colors.scss index bfe20c76950df..5d5c1e8c37232 100644 --- a/projects/plugins/jetpack/scss/atoms/colors/_colors.scss +++ b/projects/plugins/jetpack/scss/atoms/colors/_colors.scss @@ -2,7 +2,7 @@ // Jetpack Colors // ========================================================================== -$green: #81a844; +$green: #008710; $white: #fff; $red: #d94f4f; diff --git a/projects/plugins/jetpack/scss/templates/_main.scss b/projects/plugins/jetpack/scss/templates/_main.scss index b7e795faa7323..5106947a7af5c 100644 --- a/projects/plugins/jetpack/scss/templates/_main.scss +++ b/projects/plugins/jetpack/scss/templates/_main.scss @@ -365,7 +365,7 @@ &:hover, &:focus { - color: #81A844; + color: $green; } } @include breakpoint(large-desktop){ diff --git a/projects/plugins/jetpack/tests/php/modules/shortcodes/test-class.youtube.php b/projects/plugins/jetpack/tests/php/modules/shortcodes/test-class.youtube.php index 2ba3087889e11..d0553c2bc7957 100644 --- a/projects/plugins/jetpack/tests/php/modules/shortcodes/test-class.youtube.php +++ b/projects/plugins/jetpack/tests/php/modules/shortcodes/test-class.youtube.php @@ -195,12 +195,12 @@ public function get_amp_youtube_data() { 'valid_url' => array( 'https://www.youtube.com/watch?v=SVRiktFlWxI', '', - '', + '', ), 'short_youtube_url' => array( 'https://youtu.be/gS6_xOABTWo', '', - '', + '', ), 'url_without_id' => array( 'https://youtube.com', @@ -209,28 +209,28 @@ public function get_amp_youtube_data() { ), 'videoseries_url' => array( 'https://www.youtube.com/videoseries?list=PL56C3506BBE979C1B', - '', - '', + '', + '', ), 'with_v_query_param' => array( 'https://www.youtube.com/watch?v=WVbQ-oro7FQ', '', - '', + '', ), 'only_width_in_url' => array( 'youtube="https://www.youtube.com/watch?v=SVRiktFlWxI&w=850"', '', - '', + '', ), 'only_height_in_url' => array( 'youtube="https://www.youtube.com/watch?v=SVRiktFlWxI&h=550"', '', - '', + '', ), 'width_and_height_in_url' => array( 'youtube="https://www.youtube.com/watch?v=SVRiktFlWxI&w=600&h=400"', '', - '', + '', ), ); } diff --git a/projects/plugins/jetpack/tools/webpack.config.extensions.js b/projects/plugins/jetpack/tools/webpack.config.extensions.js index c4e254c8a51ea..ac538c63d9e8f 100644 --- a/projects/plugins/jetpack/tools/webpack.config.extensions.js +++ b/projects/plugins/jetpack/tools/webpack.config.extensions.js @@ -212,21 +212,13 @@ module.exports = [ return metadata; } - let scriptName = 'editor'; - - if ( presetIndex.beta.includes( name ) ) { - scriptName += '-beta'; - } else if ( presetIndex.experimental.includes( name ) ) { - scriptName += '-experimental'; - } - // `editorScript` is required for block.json to be valid and WordPress.org to be able // to parse it before building the page at https://wordpress.org/plugins/jetpack/. // Don't add other scripts or styles while block assets are still enqueued manually // in the backend. const result = { ...metadata, - editorScript: `file:../${ scriptName }.js`, + editorScript: `jetpack-blocks-editor`, }; return JSON.stringify( result, null, 4 ); diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/renovate-babel-monorepo b/projects/plugins/migration/changelog/fix-idc-search-replace-protection similarity index 51% rename from projects/js-packages/babel-plugin-replace-textdomain/changelog/renovate-babel-monorepo rename to projects/plugins/migration/changelog/fix-idc-search-replace-protection index c47cb18e82997..9aa70e3ec1f75 100644 --- a/projects/js-packages/babel-plugin-replace-textdomain/changelog/renovate-babel-monorepo +++ b/projects/plugins/migration/changelog/fix-idc-search-replace-protection @@ -1,4 +1,5 @@ Significance: patch Type: changed +Comment: Updated composer.lock. + -Updated package dependencies. diff --git a/projects/js-packages/boost-score-api/changelog/renovate-eslint-packages b/projects/plugins/migration/changelog/fix-videopress-upgrade-path similarity index 51% rename from projects/js-packages/boost-score-api/changelog/renovate-eslint-packages rename to projects/plugins/migration/changelog/fix-videopress-upgrade-path index c47cb18e82997..9aa70e3ec1f75 100644 --- a/projects/js-packages/boost-score-api/changelog/renovate-eslint-packages +++ b/projects/plugins/migration/changelog/fix-videopress-upgrade-path @@ -1,4 +1,5 @@ Significance: patch Type: changed +Comment: Updated composer.lock. + -Updated package dependencies. diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index 17525409f9488..760323e35abd4 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -595,7 +595,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -624,7 +624,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -899,7 +899,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -929,7 +929,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md index 2368b25b279c5..79a6fd2c556e8 100644 --- a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md +++ b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## 1.7.1 - 2023-10-16 +### Changed +- Updated package dependencies. [#33498] + ## 1.7.0 - 2023-10-10 ### Changed - Updated lock files [#33456] diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance b/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index 2305c6cd1e357..ba2112124fce4 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginâ“¥1_7_1_alpha" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginâ“¥1_7_2_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index bb71074c2a8c2..7525a72182ce0 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 1.7.1-alpha + * Version: 1.7.2-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index 301aa7082c9c6..86e00a2df69db 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "1.7.1-alpha", + "version": "1.7.2-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/js-packages/boost-score-api/changelog/renovate-major-eslint-packages b/projects/plugins/protect/changelog/fix-idc-search-replace-protection similarity index 51% rename from projects/js-packages/boost-score-api/changelog/renovate-major-eslint-packages rename to projects/plugins/protect/changelog/fix-idc-search-replace-protection index c47cb18e82997..9aa70e3ec1f75 100644 --- a/projects/js-packages/boost-score-api/changelog/renovate-major-eslint-packages +++ b/projects/plugins/protect/changelog/fix-idc-search-replace-protection @@ -1,4 +1,5 @@ Significance: patch Type: changed +Comment: Updated composer.lock. + -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/fix-videopress-upgrade-path b/projects/plugins/protect/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/fix-videopress-upgrade-path @@ -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 7ca6ea241b4e7..ac534a286b5d0 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -510,7 +510,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -539,7 +539,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -844,7 +844,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/search/changelog/fix-idc-search-replace-protection b/projects/plugins/search/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/fix-idc-search-replace-protection @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/changelog/fix-videopress-upgrade-path b/projects/plugins/search/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/fix-videopress-upgrade-path @@ -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 6e9ff0da3d8a5..af4a75d068ffa 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -510,7 +510,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -539,7 +539,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -844,7 +844,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/social/changelog/fix-idc-search-replace-protection b/projects/plugins/social/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/fix-idc-search-replace-protection @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/changelog/fix-videopress-upgrade-path b/projects/plugins/social/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/fix-videopress-upgrade-path @@ -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 5273272d39538..2b0139030b09d 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -510,7 +510,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -539,7 +539,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -844,7 +844,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/starter-plugin/changelog/fix-idc-search-replace-protection b/projects/plugins/starter-plugin/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/fix-idc-search-replace-protection @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/changelog/fix-videopress-upgrade-path b/projects/plugins/starter-plugin/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/fix-videopress-upgrade-path @@ -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 bbcb368c5d19b..46bb2c27f77d3 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -510,7 +510,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -539,7 +539,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -844,7 +844,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/videopress/changelog/fix-idc-search-replace-protection b/projects/plugins/videopress/changelog/fix-idc-search-replace-protection new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/fix-idc-search-replace-protection @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/changelog/fix-videopress-upgrade-path b/projects/plugins/videopress/changelog/fix-videopress-upgrade-path new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/fix-videopress-upgrade-path @@ -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 c551fceebfc78..97120d7e918d2 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -510,7 +510,7 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "bdb1408d3bb21f92d0d920bc6c7fa417238af18f" + "reference": "ca590c3fe1ae0c9fe2f645e4a48e19080a7f6aff" }, "require": { "automattic/jetpack-assets": "@dev", @@ -539,7 +539,7 @@ "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.10.x-dev" + "dev-trunk": "0.11.x-dev" } }, "autoload": { @@ -814,7 +814,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "f03839036e98449c2c740dca99d1f84ffe2b20af" + "reference": "76b8ab03a2bcc2f1702f5d4d43838badf9df7480" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -844,7 +844,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "3.8.x-dev" + "dev-trunk": "3.9.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/tools/check-changelogger-use.php b/tools/check-changelogger-use.php index f3c95ca8ec731..27b9840c88bac 100755 --- a/tools/check-changelogger-use.php +++ b/tools/check-changelogger-use.php @@ -158,7 +158,7 @@ function debug() { debug( 'Checking diff from %s...%s.', $base, $head ); $pipes = null; $p = proc_open( - sprintf( 'git -c core.quotepath=off diff --no-renames --name-only %s...%s', escapeshellarg( $base ), escapeshellarg( $head ) ), + sprintf( 'git -c core.quotepath=off diff --no-renames --name-status %s...%s', escapeshellarg( $base ), escapeshellarg( $head ) ), array( array( 'pipe', 'r' ), array( 'pipe', 'w' ), STDERR ), $pipes ); @@ -171,35 +171,40 @@ function debug() { $touched_projects = array(); // phpcs:ignore Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition while ( ( $line = fgets( $pipes[1] ) ) ) { - $line = trim( $line ); - $parts = explode( '/', $line, 5 ); + $line = trim( $line ); + list( $status, $file ) = explode( "\t", $line, 2 ); + $parts = explode( '/', $file, 5 ); if ( count( $parts ) < 4 || 'projects' !== $parts[0] ) { - debug( 'Ignoring non-project file %s.', $line ); + debug( 'Ignoring non-project file %s.', $file ); continue; } $slug = "{$parts[1]}/{$parts[2]}"; if ( ! isset( $changelogger_projects[ $slug ] ) ) { - debug( 'Ignoring file %s, project %s does not use changelogger.', $line, $slug ); + debug( 'Ignoring file %s, project %s does not use changelogger.', $file, $slug ); continue; } if ( $parts[3] === $changelogger_projects[ $slug ]['changelog'] ) { - debug( 'PR touches changelog file %s, marking %s as having a change file.', $line, $slug ); - $ok_projects[ $slug ] = true; - continue; + if ( $status === 'A' ) { + debug( 'PR adds changelog file %s, this does not count as having a change file.', $file ); + } else { + debug( 'PR touches changelog file %s, marking %s as having a change file.', $file, $slug ); + $ok_projects[ $slug ] = true; + continue; + } } if ( $parts[3] === $changelogger_projects[ $slug ]['changes-dir'] ) { if ( '.' === $parts[4][0] ) { - debug( 'Ignoring changes dir dotfile %s.', $line ); + debug( 'Ignoring changes dir dotfile %s.', $file ); } else { - debug( 'PR touches file %s, marking %s as having a change file.', $line, $slug ); + debug( 'PR touches file %s, marking %s as having a change file.', $file, $slug ); $ok_projects[ $slug ] = true; } continue; } - debug( 'PR touches file %s, marking %s as touched.', $line, $slug ); + debug( 'PR touches file %s, marking %s as touched.', $file, $slug ); if ( ! isset( $touched_projects[ $slug ] ) ) { - $touched_projects[ $slug ][] = $line; + $touched_projects[ $slug ][] = $file; } } @@ -231,8 +236,7 @@ function debug() { $unmerged_projects = array(); // phpcs:ignore Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition while ( ( $line = fgets( $pipes[1] ) ) ) { - $line = trim( $line ); - $file = substr( $line, 3 ); + $file = trim( substr( $line, 3 ) ); $parts = explode( '/', $file, 5 ); if ( count( $parts ) < 4 || 'projects' !== $parts[0] ) { debug( 'Ignoring non-project file %s.', $file ); diff --git a/tools/cli/commands/build.js b/tools/cli/commands/build.js index 8735656417dab..fce0456b494ac 100644 --- a/tools/cli/commands/build.js +++ b/tools/cli/commands/build.js @@ -994,7 +994,13 @@ async function buildProject( t ) { await once( rl, 'close' ); if ( ! projectVersionNumber ) { - throw new Error( `\nError fetching latest version number from ${ changelogFileName }\n` ); + const dir = npath.relative( + process.cwd(), + npath.resolve( t.cwd, composerJson.extra?.changelogger?.[ 'changes-dir' ] || 'changelog' ) + ); + throw new Error( + `\nFailed to fetch latest version number from ${ changelogFileName }\n\nIf this is the initial commit of a new project, be sure there's a change entry in ${ dir }/\n` + ); } if ( t.project.startsWith( 'packages/' ) && projectVersionNumber.endsWith( 'alpha' ) ) { diff --git a/tools/cli/commands/changelog.js b/tools/cli/commands/changelog.js index 5b1d721d8ef21..22be4459ebc98 100644 --- a/tools/cli/commands/changelog.js +++ b/tools/cli/commands/changelog.js @@ -595,7 +595,7 @@ async function checkChangelogFiles() { // Check for any existing changelog files. for ( const file of touchedFiles ) { - const match = file.match( /^projects\/([^/]+\/[^/]+)\/changelog\// ); + const match = file.match( /^projects\/([^/]+\/[^/]+)\/changelog\/[^.]/ ); if ( match ) { changelogsAdded.add( match[ 1 ] ); } diff --git a/tools/cli/skeletons/common/changelog/initial-version b/tools/cli/skeletons/common/changelog/initial-version new file mode 100644 index 0000000000000..fb1837c901e51 --- /dev/null +++ b/tools/cli/skeletons/common/changelog/initial-version @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Initial version.