Skip to content

Commit

Permalink
Changelog and readme.txt edits. (#40461)
Browse files Browse the repository at this point in the history
  • Loading branch information
tbradsha authored and matticbot committed Dec 4, 2024
1 parent b7e8d79 commit d996cef
Show file tree
Hide file tree
Showing 70 changed files with 2,838 additions and 471 deletions.
385 changes: 380 additions & 5 deletions CHANGELOG.md

Large diffs are not rendered by default.

Binary file added build/images/boost-9e9a227e7e7280d0aa85.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/boost-a54137485af36fdffe9c.png
Binary file not shown.
Binary file added build/images/complete-f4bd1db5fb786efbc9d5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/images/connect-c399837fe1621b176d10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/connect-f27775ac15cf885713c2.png
Binary file not shown.
Binary file removed build/images/crm-7e7684ae2c40327d8fed.png
Binary file not shown.
Binary file added build/images/crm-8a2b204e2c720730e928.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/extras-26daf36507504c96d066.png
Binary file not shown.
Binary file added build/images/extras-c6bd0796750901faa7fd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions build/images/github-45c648158e3e86b560f5.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/jetpack-ai-1a265a198f75543e342e.png
Binary file not shown.
Binary file added build/images/jetpack-ai-d29bf65dcea46074d72f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added build/images/search-d177a31292d96d5ccbc2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed build/images/search-f9756bd9c926d905fe70.png
Binary file not shown.
Binary file added build/images/security-53b7f3ddc8dcbe17b0c1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions build/images/shield-inactive-cba3b43d918377b506e5.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions build/images/shield-off-47426e7b562ef20ae513.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions build/images/shield-partial-48b279219c6389a129b9.svg
4 changes: 4 additions & 0 deletions build/images/shield-success-e64a26c3a6d0888fba06.svg
Binary file removed build/images/site-cards-143fca7aec7a8c370e82.png
Diff not rendered.
Binary file added build/images/site-cards-29522f090d5422fd7afd.png
Binary file removed build/images/social-e3fb80b2f32534fefe63.png
Diff not rendered.
Binary file added build/images/stats-95b42796ede4f632b642.png
Binary file removed build/images/stats-9802380852610a4d5908.png
Diff not rendered.
Binary file removed build/images/videopress-9591093a9a238cc48a35.png
Diff not rendered.
Binary file added build/images/videopress-9c064bc7b89c386e5e50.png
2 changes: 1 addition & 1 deletion build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '40f8b5913d1e098d4417');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '813da8f0fc4843fc96a5');
2 changes: 1 addition & 1 deletion build/index.css

Large diffs are not rendered by default.

146 changes: 97 additions & 49 deletions build/index.js

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions build/index.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@
* @see https://github.com/kvz/phpjs/blob/ffe1356af23a6f2512c84c954dd4e828e92579fa/functions/strings/number_format.js
*/

/**
* @license React
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @remix-run/router v1.2.1
*
Expand Down
2 changes: 1 addition & 1 deletion build/index.rtl.css

Large diffs are not rendered by default.

36 changes: 20 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-admin-ui": "^0.4.2",
"automattic/jetpack-assets": "^2.1.12",
"automattic/jetpack-boost-speed-score": "^0.3.11",
"automattic/jetpack-connection": "^2.10.1",
"automattic/jetpack-jitm": "^3.1.12",
"automattic/jetpack-licensing": "^2.0.5",
"automattic/jetpack-plugins-installer": "^0.4.0",
"automattic/jetpack-redirect": "^2.0.2",
"automattic/jetpack-constants": "^2.0.3",
"automattic/jetpack-plans": "^0.4.7",
"automattic/jetpack-status": "^3.3.0"
"php": ">=7.2",
"automattic/jetpack-admin-ui": "^0.5.1",
"automattic/jetpack-assets": "^4.0.1",
"automattic/jetpack-boost-speed-score": "^0.4.0",
"automattic/jetpack-connection": "^6.1.1",
"automattic/jetpack-explat": "^0.2.2",
"automattic/jetpack-jitm": "^4.0.2",
"automattic/jetpack-licensing": "^3.0.2",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-protect-status": "^0.4.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^4.2.4",
"automattic/wordbless": "@dev"
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.1.0",
"automattic/wordbless": "^0.4.2"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand All @@ -35,6 +38,7 @@
"phpunit": [
"./vendor/phpunit/phpunit/phpunit --colors=always"
],
"test-coverage": "pnpm concurrently --names php,js 'php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\"' 'pnpm:test-coverage'",
"test-php": [
"@composer phpunit"
],
Expand Down Expand Up @@ -68,7 +72,7 @@
"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
},
"branch-alias": {
"dev-trunk": "4.25.x-dev"
"dev-trunk": "5.1.x-dev"
},
"version-constants": {
"::PACKAGE_VERSION": "src/class-initializer.php"
Expand Down
176 changes: 173 additions & 3 deletions global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,22 @@ declare module '*.scss';
// These libraries don't have types, this suppresses the TypeScript errors
declare module '@wordpress/components';
declare module '@wordpress/compose';
declare module '@wordpress/i18n';
declare module '@wordpress/icons';
declare module '@automattic/jetpack-connection';
declare module '@wordpress/url';

type ProductStatus =
| 'active'
| 'inactive'
| 'module_disabled'
| 'site_connection_error'
| 'plugin_absent'
| 'plugin_absent_with_plan'
| 'needs_plan'
| 'needs_activation'
| 'needs_first_site_connection'
| 'user_connection_error'
| 'can_upgrade';

type JetpackModule =
| 'anti-spam'
Expand All @@ -18,6 +31,7 @@ type JetpackModule =
| 'crm'
| 'creator'
| 'extras'
| 'ai'
| 'jetpack-ai'
| 'scan'
| 'search'
Expand All @@ -26,7 +40,34 @@ type JetpackModule =
| 'protect'
| 'videopress'
| 'stats'
| 'ai';
| 'growth'
| 'complete';

type ThreatItem = {
// Protect API properties (free plan)
id: string;
title: string;
fixed_in: string;
description: string | null;
source: string | null;
// Scan API properties (paid plan)
context: string | null;
filename: string | null;
first_detected: string | null;
fixable: boolean | null;
severity: number | null;
signature: string | null;
status: number | null;
};

type ScanItem = {
checked: boolean;
name: string;
slug: string;
threats: ThreatItem[];
type: string;
version: string;
};

interface Window {
myJetpackInitialState?: {
Expand Down Expand Up @@ -60,6 +101,7 @@ interface Window {
showFullJetpackStatsCard: boolean;
videoPressStats: boolean;
};
purchaseToken: string;
lifecycleStats: {
historicallyActiveModules: JetpackModule[];
brokenModules: {
Expand All @@ -69,6 +111,8 @@ interface Window {
isSiteConnected: boolean;
isUserConnected: boolean;
jetpackPlugins: Array< string >;
ownedProducts: JetpackModule[];
unownedProducts: JetpackModule[];
modules: Array< string >;
purchases: Array< string >;
};
Expand Down Expand Up @@ -100,20 +144,25 @@ interface Window {
description: string;
disclaimers: Array< string[] >;
features: string[];
has_free_offering: boolean;
has_paid_plan_for_product: boolean;
features_by_tier: Array< string >;
is_bundle: boolean;
is_plugin_active: boolean;
is_upgradable: boolean;
is_upgradable_by_bundle: string[];
long_description: string;
manage_url: string;
name: string;
plugin_slug: string;
post_activation_url: string;
post_checkout_url?: string;
manage_paid_plan_purchase_url?: string;
renew_paid_plan_purchase_url?: string;
pricing_for_ui?: {
available: boolean;
wpcom_product_slug: string;
wpcom_free_product_slug?: string;
product_term: string;
currency_code: string;
full_price: number;
Expand All @@ -127,6 +176,36 @@ interface Window {
should_prorate_when_offer_ends: boolean;
transition_after_renewal_count: number;
usage_limit?: number;
reason?: {
errors: {
introductoryOfferRemovedSubscriptionFound: string[];
};
};
};
tiers?: {
[ key: string ]: {
available: boolean;
currencyCode: string;
discountPrice: number;
fullPrice: number;
introductoryOffer?: {
costPerInterval: number;
intervalCount: number;
intervalUnit: string;
shouldProrateWhenOfferEnds: boolean;
transitionAfterRenewalCount: number;
usageLimit?: number;
reason?: {
errors: {
introductoryOfferRemovedSubscriptionFound: string[];
};
};
};
isIntroductoryOffer: boolean;
productTerm: string;
wpcomProductSlug: string;
quantity: number;
};
};
};
purchase_url?: string;
Expand All @@ -137,14 +216,68 @@ interface Window {
is_standalone_installed: boolean;
is_standalone_active: boolean;
};
status: string;
status: ProductStatus;
supported_products: string[];
tiers: string[];
title: string;
wpcom_product_slug: string;
};
};
};
protect: {
scanData: {
core: ScanItem;
current_progress?: string;
data_source: string;
database: string[];
error: boolean;
error_code?: string;
error_message?: string;
files: string[];
has_unchecked_items: boolean;
last_checked: string;
num_plugins_threats: number;
num_themes_threats: number;
num_threats: number;
plugins: ScanItem[];
status: string;
themes: ScanItem[];
};
wafConfig: {
automatic_rules_available: boolean;
blocked_logins: number;
bootstrap_path: string;
brute_force_protection: boolean;
jetpack_waf_automatic_rules: '1' | '';
jetpack_waf_ip_allow_list: '1' | '';
jetpack_waf_ip_block_list: boolean;
jetpack_waf_ip_list: boolean;
jetpack_waf_share_data: '1' | '';
jetpack_waf_share_debug_data: boolean;
standalone_mode: boolean;
};
};
videopress: {
featuredStats?: {
label: string;
period: 'day' | 'year';
data: {
views: {
current: number;
previous: number;
};
impressions: {
current: number;
previous: number;
};
watch_time: {
current: number;
previous: number;
};
};
};
videoCount: number;
};
purchases: {
items: Array< {
ID: string;
Expand Down Expand Up @@ -228,8 +361,45 @@ interface Window {
plugin: string;
};
};
[ key: `${ string }--plan_expired` ]: {
product_slug: string;
product_name?: string;
expiry_date?: string;
expiry_message?: string;
manage_url?: string;
products_effected?: string[];
};
[ key: `${ string }--plan_expiring_soon` ]: {
product_slug: string;
product_name?: string;
expiry_date?: string;
expiry_message?: string;
manage_url?: string;
products_effected?: string[];
};
};
recommendedModules: {
modules: JetpackModule[] | null;
dismissed: boolean;
isFirstRun: boolean;
};
themes: {
[ key: string ]: {
Author: string;
Name: string;
RequiresPHP: string;
RequiresWP: string;
Status: string;
Template: string;
TextDomain: string;
ThemeURI: string;
Version: string;
active: boolean;
is_block_theme: boolean;
};
};
topJetpackMenuItemUrl: string;
isAtomic: boolean;
userIsAdmin: string;
userIsNewToJetpack: string;
};
Expand Down
Loading

0 comments on commit d996cef

Please sign in to comment.