Jetpack Google Fonts: Fix the fonts provided by theme are still added #34608

arthur791004 · 2023-12-13T06:53:18Z

Related to p1702367211316529/1702365341.631869-slack-CRWCHQGUB

Proposed changes:

We have to ignore the fonts that are provided by the theme to keep the behavior consistent between the Site Editor & frontend page

Before	After

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Apply this change to your WoA site via Jetpack Beta Tester
Active the Adventurer theme
Go to the Site Editor
Open the Styles > Typography > Any Element (e.g.: Text) > Font
Pick the Rubik font
Pick different font weights
Make sure that only font-weight: 900 works
Go to your frontend page
Make sure that only font-weight: 900 works as well

github-actions · 2023-12-13T06:54:13Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen daily.
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for January 9, 2024 (scheduled code freeze on January 8, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

github-actions · 2023-12-13T06:54:14Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/google-fonts-exclude-theme-fonts branch.

To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack fix/google-fonts-exclude-theme-fonts

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

jeherve

This looks good, I just have a tiny nitpick!

jeherve · 2023-12-13T08:06:22Z

projects/plugins/jetpack/modules/google-fonts/current/load-google-fonts.php

+		$font_family_name = isset( $font_family['name'] )
+			? $font_family['name']
+			: Jetpack_Google_Font_Face::get_font_family_name( $font_family );


The good news is, since Jetpack now requires PHP 7+, we can use the null coalescing operator :)

Suggested change

$font_family_name = isset( $font_family['name'] )

? $font_family['name']

: Jetpack_Google_Font_Face::get_font_family_name( $font_family );

$font_family_name = $font_family['name'] ?? Jetpack_Google_Font_Face::get_font_family_name( $font_family );

Oh, nice! I saw Jetpack still supported PHP 5.6+ last time

mreishus · 2023-12-13T15:59:27Z

I tried testing it out WPCOM by looking on a client site that was having problems (They select weight 100 in the editor and see it render thin there, but on the homepage it renders thicker than 100). It didn't seem to fix the issue for me. See more info at D131894-code.

arthur791004 · 2023-12-14T04:36:37Z

It didn't seem to fix the issue for me but on the homepage it renders thicker than 100).

It looks good on my side, and the font remains the same (it renders 400 actually) on both the Site Editor and the front page.

The purpose of this PR is to keep the fonts remaining the same on both the Site Editor and the front page. It won't solve the problem that the font weights are not provided by the theme.

taipeicoder

Tested and works as intended:

Screen.Capture.on.2023-12-14.at.14-25-12.mp4

Although I feel that as a result of making the Site Editor more "accurate", we are making it also a bit more "buggier" (aka: Users wondering why font weights don't work).

arthur791004 · 2023-12-14T06:34:20Z

we are making it also a bit more "buggier" (aka: Users wondering why font weights don't work).

I don't think it's a bit more “buggier” as the issue exists on the self-hosted sites.

taipeicoder · 2023-12-14T06:37:36Z

we are making it also a bit more "buggier" (aka: Users wondering why font weights don't work).

I don't think it's a bit more “buggier” as the issue exists on the self-hosted sites.

Yes, I meant that we are exposing an existing issue that is more discoverable to users.
But either way users will be confused as to why their font appearances don't work as they want to 😅

mreishus · 2023-12-14T23:00:43Z

Right, I have a user that wants to use 100 weight font, and they can't because their theme ships the font, but not 100 weight. I can't think of a workaround for them.

* Social: Fix auto-conversion cleanup logic (Automattic#34666) * Fix logic to be mindful of absent option * changelog * Fixup versions * Launchpad: Improve the WC task visibility check (Automattic#34648) * Improve the WC task visibility check * Bump version * Fix composer * changelog * Bump version --------- Co-authored-by: Valter Lorran <valter.lorran@automattic.com> * Improve sharing buttons events performance (Automattic#34652) * Backport mu-wpcom-plugin 2.0.7, jetpack 13.0-a.5 Changes (Automattic#34676) * Changelog edits. * Init new cycle * Carousel: fix unresponsive navigation (Automattic#34678) * Check for both aksimet and antispam for backwards compatibility (Automattic#34674) * Jetpack Google Fonts: Fix the fonts provided by theme are still added (Automattic#34608) * Google Fonts: Ignore the fonts that are provied by the active theme * changelog * Update syntax * Subscribers: fix the reach count above 1000 (Automattic#34689) Allows strings in translation strings. Ensures reachCount is consistently a Number, and convert it to string for localization. * Subscriptions: localize number format in access panel (Automattic#34691) * Added preemptive check full sync posts processing (Automattic#34661) * Added preemptive check to break the loop of adding metadata if we are already over the MAX SIZE * Added changelog * Added break 2 since there is no point in doing the comparison in the outer loop which will break too * Version bump * Like block: remove like module dependency (Automattic#34664) * - Remove dependency on likes module - Render master iframe (only once) * Changelog * Don't render anything when post_id is missing * Better check * Change master to main * Enqueue styles & register them on first usage * Remove require_once * Update iframe for WPCOM * Require the module * Docs: update quick start guide (Automattic#34656) * Clarify quick start guide is geared for a12s * Cleanup cloning and install script steps * Move env checker script heading below install steps * Adjust heading levels * Move jtube a11n-only note to top of its section * Add ngrok/jtube info to full dev-env guide * CRM: Ensure segments can be deleted (Automattic#34690) * Update JS unit testing packages (major) (Automattic#34694) * Update JS unit testing packages * Update indirect @adobe/css-tools dep --------- Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com> * Update storybook monorepo to v7.6.5 (Automattic#34696) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Show an error when one is encountered while rendering a payment button (Automattic#34380) * Render an error message when the button cannot be rendered * changelog * CRM: Resolves 3399 - make KB links consistent in settings (Automattic#34695) * Adjust wording to clarify all fields can show in Woo My Account * Add KB link * Use consistent UI to link to KB from settings * Simplify wording * Remove stray end tag * Remove errant colspan attribute * Add changelog * Only contact fields * Feature: AI Assistant UI fixes (Automattic#34383) * use spinner instead of ai icon * adjust main action button styles * only show main action buttons when there's content. Switch between icon and label for mobile. Do not show clear button is state is requesting * do not show clearbutton * changelog * fix versions * keep spinner while suggesting state * remove clear button * AI Assistant: change main action buttons style and behavior (Automattic#34370) * optimize style declaration * always use inputValue * AI Assistant: add suggestions actions (Automattic#34399) * add suggestion action buttons * add editRequest state to handle back and forth editing 'mode' * add discard callback on AI control, pass on tryAgain handler * add changelog entries * adjust behavior upon observations * AI Assistant: improve spacing and sizes for block and action buttons (Automattic#34444) * address spacing and size issues on the assistant block * modify loading icon wrapper and size * avoid height jumps when buttons wrapper is introduced * fix spacing on icon buttons * add changelogger entry for js-package * AI Assistant: fix block to bottom when content exceeds the viewport height (Automattic#34452) * fix ai block to bottom when content exceeds the viewport height * add outside wrapper * move positioning directive to outside wrapper * adjust bottom space for outside wrapper * AI Assistant: remove try again toolbar button (Automattic#34464) * make handleTryAgain optional so to remove when not present * add changelog entry * AI Assistant bar: fix positioning on mobile (Automattic#34476) * wrap assistant bar to control positioning * always make sure the assistant bar is placed AFTER the toolbar * add changelog entry * AI Assistant: add prompt to attributes (Automattic#34438) * add userPrompt to the block's attributes * set last value to default to initial prop * add requestingState to attributes to keep consistency between reloads * add changelog entry * AI assistant: change guideline component (Automattic#34496) * fix multiple line display on ai control footer message * export AI control message as FooterMessage * add changelog entry * AI Assistant: fix bottom padding issue (Automattic#34519) * fix bottom padding by using bottom directive for sticky positioning * add changelog entry * remove unnecessary directive * AI Assistant: restrict stored state value (Automattic#34522) * restrict stored states to 'init' and 'done' so we don't reload into half way scenarios * add changelog entry * fix misuse of ternary * add cancel button to get rid of the assistant block (Automattic#34524) * AI Client: fix empty prompts handling (Automattic#34547) * use a default value to keep track of changes in the prompt, allow for empty prompts to show suggestion action buttons * use null instead of a made up default value * handle edit mode logic on one-click actions (Automattic#34584) * AI Assistant: prepare new UI/UX features for merge (Automattic#34620) * consolidate changelog entry for ai-client * consolidate changelog entry for Jetpack plugin * add test instructions for the new AI Assistant UI/UX * AI Assistant: change prompt placeholder (Automattic#34671) * remove typing effect from prompt placeholders * use a fixed placeholder with suggestions on how to create a prompt * use different placeholders depending on whether there is content or not * move ternary out of jsx chunk * take i18n out of ternary * change placeholder text * remove back to edit button (Automattic#34675) * add showRemove attribute to AIControl (Automattic#34677) * Cleanup quick wins after feedback (Automattic#34679) * clean up changelog entries for ai-client * clean up changelog entries for jetpack plugin * AI assistant: fix positioning (Automattic#34700) * remove some confusing 100% widths messing with border alignments * fix colliding bottom directives on assistant bar * Membership services: small refactor (Automattic#34635) * Very small clean up * Rename abstract class filename * Create membership-abstract-token-class * Fix path * fix typing * Update class-wpcom-online-subscription-service.php * Update projects/plugins/jetpack/extensions/blocks/premium-content/_inc/subscription-service/class-asbtract-token-subscription-service.php Co-authored-by: Miguel Lezama <miguel@automattic.com> * Update projects/plugins/jetpack/extensions/blocks/premium-content/_inc/subscription-service/class-jetpack-token-subscription-service.php Co-authored-by: Miguel Lezama <miguel@automattic.com> * Rename file * Update class-wpcom-online-subscription-service.php * Rename references to Token_Subscription_Service * Fix naming --------- Co-authored-by: Miguel Lezama <miguel@automattic.com> * Boost: Refactor module, index and more into React (Automattic#34662) * Create skeleton for Module component in React * Refactor UpgradeCTA to React * Added a small variant for toggle control * Use small variant of toggle control * Fix onEnable, onMountEnable, and onDisable * Do not pass yearlyPricing * Implement onEnable and onDisable * changelog * Create index component * Make module errors consistent with old design * Fix ISA alignment * Improve alignments and spacing * Add resize unavailable notice * Add fake recommendations meta * Add missing pieces * Cleanup * Remove Index.svelte * Move pricing to ds based config * Remove Module.svelte * Use React DS based moduleState management * Restore tsconfig change * Change interface for useModuleState callbacks * Call useModuleState hook directly on the component * Fix infinite loop on purchase success * Fixup project version * Fix selector in test * Make speed score dependent on useModulesState for auto-refresh to work * Fix isModuleEnabled check * Update modules-state endpoint in tests --------- Co-authored-by: Mark George <thingalon@gmail.com> * Boost: Migrate Tips to react (Automattic#34697) * Update Tips to react * add changelog * Backport crm 6.3.2 Changes (Automattic#34708) * Fix missing class fatal related to PR Automattic#34635 (Automattic#34705) * CRM: start 6.3.3-alpha release cycle (Automattic#34710) * Fix My plan dashboard js errors due to nested anchor tags (Automattic#34707) * Moved href from Button props to ExternalLink props to avoid duplicate anchor tags * Added changelog * Admin Page: avoid react warning with VideoPress card (Automattic#34713) This should avoid us getting the following warning: ``` Warning: Failed prop type: Invalid prop `overrideContent` of type `boolean` supplied to `DashItem`, expected a single ReactElement. DashItem@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:36878:1 SettingsForm@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:43524:3 ConnectFunction@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:8870:68 ConnectFunction@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:8870:68 DashVideoPress@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:34467:1 ``` * Fix missing class fatal related to PR Automattic#34635 (Automattic#34718) * Subscriptions: update "verify your email" wall copy (Automattic#34716) Co-authored-by: Jeremy Herve <jeremy@jeremy.hu> * Fix sharing buttons window open (Automattic#34703) * Contact Form: add extra field settings to base field (Automattic#34704) * Contact Form: add extra field settings to base field * Fix package version * Fix the media validation notice shown even when auto conversion is enabled. (Automattic#34730) Co-authored-by: Gergely Juhasz <gergely.juhasz@automattic.com> * Add `wpcom_ai_site_prompt` option to the site settings endpoint (Automattic#34709) * Social: Fix endpoint backwards compatibility (Automattic#34566) * Readd REST controllers with updated logic * Readd class-settings classes for initial state population * changelog * Use depreacted and next_version tags * Fixup versions * Boost: Update Settings Page to react (Automattic#34714) * Update Settings Page to react * add changelog * Sharing: update Twitter and X buttons to support official X button (Automattic#34719) * Sharing: update Twitter and X buttons to support official X button See Automattic#34459 - The official Twitter button is no more; it has been updated to the X design. Let's update our preview Twitter button match. - Since we now have an official X button, let's offer it with the X service. * Adjust official button styles in wp-admin * This method is not needed * Update domain name * Update source name * Bump version by specifying Jetpack version when enqueuing * Update logo * Update icon with more radius * Social | Hide conversion notice for Simple sites (Automattic#34733) * Hide notice on simple sites * changelog * Make auto-conversion disabled if not available * Fixup versions * Sharing buttons block alternate settings screen (Automattic#34673) * build: Use a GitHub webhook to trigger the betadownload site (Automattic#34604) Once Automattic/jetpack-builder#36 is deployed, we can update our build script to produce the artifact for forked PRs and set up a GitHub webhook for the `workflow_run` event to support testing with PRs from forked repositories. This requires the GitHub "Fork pull request workflows from outside collaborators" setting to be set to "Require approval for all outside contributors" to avoid unreviewed code potentially producing malicious zips for the betadownload server. We've had that set since March 2023 (p9dueE-6Rp-p2). This also updates the Jetpack Live Branches script to remove the check for a forked PR, since we can now test with them. * Contact Form: minify stylesheets in prod (Automattic#34672) * Contact Form: minify stylesheets in prod * Update registered styles paths * Fix package version * Tools: Add the Readme to the release script (Automattic#34722) * Make sure the readme.txt file gets updated after saving changelog edits * Fix command being run * comment out a check * pass the correct flag * Undo comments * Update the next steps at the end * Fix token subscription service name (Automattic#34723) * Rename Token_Subscript_Service to Abstract_Token_Subscription_Service * changelog * Allow old class just in case * `use` classes at the top to shorten up the class check. * Content Lens: move feature to `beta` (Automattic#34740) * move `content-lens` feature to beta * changelog * Newsletter prepublish panel: update toggle appearance (Automattic#34724) * Contact Form: add accessible name to form (Automattic#34667) * Contact Form: add accessible name to form * Update accessible name on content change * Remove unused code * Fix package version * Add warning notice * Backport mu-wpcom-plugin 2.0.8, jetpack 13.0-a.7 Changes (Automattic#34742) * Changelog and readme.txt edits. * Init new cycle * Fix the stable tag * [Boost] Fix importmap deferral (Automattic#34746) * Add importmap to the set of script types we exclude from deferral * changelog * Fix versions in packages/forms * changelog --------- Co-authored-by: Mark George <thingalon@gmail.com> * Update changelog (Automattic#34747) * Admin page: remove alt attribute from decorative icon (Automattic#34715) The Alt value isn't necessary here, since the icon doesn't bring any additional info on the page for folks using screen readers. This has the added benefit of getting rid of a React warning: ``` Warning: Failed prop type: Invalid prop `alt` of type `object` supplied to `PlanIcon`, expected `string`. PlanIcon@wp-content/plugins/jetpack/_inc/build/admin.js?ver=15a830895a6f6d1e3c39:44686:1 MyPlanCard@wp-content/plugins/jetpack/_inc/build/admin.js?ver=15a830895a6f6d1e3c39:51709:20 ``` * Add/fix typo (Automattic#34712) * Fix typo * Chnagelog --------- Co-authored-by: Fabien MILLERAND <fab.millerand@automattic.com> * Boost: Refactor navigation into react (Automattic#34731) * Use react router * Add redirects * Fix typo * Add dummy ISA page * Add tracks * Restore getting started functionality * Move props to DS * Move connection to DS and cleanup props * Remove connection from JS constants * Improve getting started handling * Remove wrapping individual components with `DataSyncProvider` * Only start ISA if ISA is active * changelog * Use hook and component provided by react-router-dom * Remove data-sync provider wrapping from settings-page * Remove jetpack connection prop from analytics Analytics isn't collected while there is no connection. So, this prop is unnecessary anyway. * Pop bubbles for performanceHistoryNeedsUpdate * Fix priority support * Cast wpcom blogId into integer * Fix getting started with free * Fix getting started for real * Show index for missing routes * Stats: add passing select UTM parameters (Automattic#34431) This commit adds select UTM parameters to the pixel requests send to wp.com, so that we can show more statistics to site owners. --------- Co-authored-by: Gergely Márk Juhász <36671565+gmjuhasz@users.noreply.github.com> Co-authored-by: valterlorran <valterlorran@hotmail.com> Co-authored-by: Valter Lorran <valter.lorran@automattic.com> Co-authored-by: Andrii Lysenko <60262784+andrii-lysenko@users.noreply.github.com> Co-authored-by: Steve D <33553323+sdixon194@users.noreply.github.com> Co-authored-by: Kev <kevin.zoschke@automattic.com> Co-authored-by: arthur791004 <arthur.chu@automattic.com> Co-authored-by: Mikael Korpela <mikael@ihminen.org> Co-authored-by: Juanma Rodriguez Escriche <juanma.rodriguez.escriche@automattic.com> Co-authored-by: Tim Broddin <tim@wannabes.be> Co-authored-by: Samiff <samiff@users.noreply.github.com> Co-authored-by: Karen Attfield <karenlattfield@gmail.com> Co-authored-by: Calypso Bot <sysops+ghmatticbot@automattic.com> Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com> Co-authored-by: Chris McCluskey <chris.mccluskey@automattic.com> Co-authored-by: tbradsha <32492176+tbradsha@users.noreply.github.com> Co-authored-by: Christian Gastrell <cgastrell@gmail.com> Co-authored-by: MILLER/F <millerf@automattic.com> Co-authored-by: Miguel Lezama <miguel@automattic.com> Co-authored-by: Adnan Haque <3737780+haqadn@users.noreply.github.com> Co-authored-by: Mark George <thingalon@gmail.com> Co-authored-by: Peter Petrov <peter.petrov89@gmail.com> Co-authored-by: Jeremy Herve <jeremy@jeremy.hu> Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com> Co-authored-by: Gergely Juhasz <gergely.juhasz@automattic.com> Co-authored-by: Griffith Chen <cferrios@gmail.com> Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> Co-authored-by: Christopher Smith <8002138+chrisfromthelc@users.noreply.github.com> Co-authored-by: Damián Suárez <rdsuarez@gmail.com> Co-authored-by: thingalon <mark@thingalon.com> Co-authored-by: Fabien MILLERAND <fab.millerand@automattic.com> Co-authored-by: Piotr Stankowski <6437642+trakos@users.noreply.github.com>

* Initial commit * Add block * Improving handling for no post ID * Improve i18n * Override cache * Run tools/fixup-project-versions.sh * Cache stats again * Cache in post meta * Catch up your branch (#2) * Social: Fix auto-conversion cleanup logic (#34666) * Fix logic to be mindful of absent option * changelog * Fixup versions * Launchpad: Improve the WC task visibility check (#34648) * Improve the WC task visibility check * Bump version * Fix composer * changelog * Bump version --------- Co-authored-by: Valter Lorran <valter.lorran@automattic.com> * Improve sharing buttons events performance (#34652) * Backport mu-wpcom-plugin 2.0.7, jetpack 13.0-a.5 Changes (#34676) * Changelog edits. * Init new cycle * Carousel: fix unresponsive navigation (#34678) * Check for both aksimet and antispam for backwards compatibility (#34674) * Jetpack Google Fonts: Fix the fonts provided by theme are still added (#34608) * Google Fonts: Ignore the fonts that are provied by the active theme * changelog * Update syntax * Subscribers: fix the reach count above 1000 (#34689) Allows strings in translation strings. Ensures reachCount is consistently a Number, and convert it to string for localization. * Subscriptions: localize number format in access panel (#34691) * Added preemptive check full sync posts processing (#34661) * Added preemptive check to break the loop of adding metadata if we are already over the MAX SIZE * Added changelog * Added break 2 since there is no point in doing the comparison in the outer loop which will break too * Version bump * Like block: remove like module dependency (#34664) * - Remove dependency on likes module - Render master iframe (only once) * Changelog * Don't render anything when post_id is missing * Better check * Change master to main * Enqueue styles & register them on first usage * Remove require_once * Update iframe for WPCOM * Require the module * Docs: update quick start guide (#34656) * Clarify quick start guide is geared for a12s * Cleanup cloning and install script steps * Move env checker script heading below install steps * Adjust heading levels * Move jtube a11n-only note to top of its section * Add ngrok/jtube info to full dev-env guide * CRM: Ensure segments can be deleted (#34690) * Update JS unit testing packages (major) (#34694) * Update JS unit testing packages * Update indirect @adobe/css-tools dep --------- Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com> * Update storybook monorepo to v7.6.5 (#34696) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Show an error when one is encountered while rendering a payment button (#34380) * Render an error message when the button cannot be rendered * changelog * CRM: Resolves 3399 - make KB links consistent in settings (#34695) * Adjust wording to clarify all fields can show in Woo My Account * Add KB link * Use consistent UI to link to KB from settings * Simplify wording * Remove stray end tag * Remove errant colspan attribute * Add changelog * Only contact fields * Feature: AI Assistant UI fixes (#34383) * use spinner instead of ai icon * adjust main action button styles * only show main action buttons when there's content. Switch between icon and label for mobile. Do not show clear button is state is requesting * do not show clearbutton * changelog * fix versions * keep spinner while suggesting state * remove clear button * AI Assistant: change main action buttons style and behavior (#34370) * optimize style declaration * always use inputValue * AI Assistant: add suggestions actions (#34399) * add suggestion action buttons * add editRequest state to handle back and forth editing 'mode' * add discard callback on AI control, pass on tryAgain handler * add changelog entries * adjust behavior upon observations * AI Assistant: improve spacing and sizes for block and action buttons (#34444) * address spacing and size issues on the assistant block * modify loading icon wrapper and size * avoid height jumps when buttons wrapper is introduced * fix spacing on icon buttons * add changelogger entry for js-package * AI Assistant: fix block to bottom when content exceeds the viewport height (#34452) * fix ai block to bottom when content exceeds the viewport height * add outside wrapper * move positioning directive to outside wrapper * adjust bottom space for outside wrapper * AI Assistant: remove try again toolbar button (#34464) * make handleTryAgain optional so to remove when not present * add changelog entry * AI Assistant bar: fix positioning on mobile (#34476) * wrap assistant bar to control positioning * always make sure the assistant bar is placed AFTER the toolbar * add changelog entry * AI Assistant: add prompt to attributes (#34438) * add userPrompt to the block's attributes * set last value to default to initial prop * add requestingState to attributes to keep consistency between reloads * add changelog entry * AI assistant: change guideline component (#34496) * fix multiple line display on ai control footer message * export AI control message as FooterMessage * add changelog entry * AI Assistant: fix bottom padding issue (#34519) * fix bottom padding by using bottom directive for sticky positioning * add changelog entry * remove unnecessary directive * AI Assistant: restrict stored state value (#34522) * restrict stored states to 'init' and 'done' so we don't reload into half way scenarios * add changelog entry * fix misuse of ternary * add cancel button to get rid of the assistant block (#34524) * AI Client: fix empty prompts handling (#34547) * use a default value to keep track of changes in the prompt, allow for empty prompts to show suggestion action buttons * use null instead of a made up default value * handle edit mode logic on one-click actions (#34584) * AI Assistant: prepare new UI/UX features for merge (#34620) * consolidate changelog entry for ai-client * consolidate changelog entry for Jetpack plugin * add test instructions for the new AI Assistant UI/UX * AI Assistant: change prompt placeholder (#34671) * remove typing effect from prompt placeholders * use a fixed placeholder with suggestions on how to create a prompt * use different placeholders depending on whether there is content or not * move ternary out of jsx chunk * take i18n out of ternary * change placeholder text * remove back to edit button (#34675) * add showRemove attribute to AIControl (#34677) * Cleanup quick wins after feedback (#34679) * clean up changelog entries for ai-client * clean up changelog entries for jetpack plugin * AI assistant: fix positioning (#34700) * remove some confusing 100% widths messing with border alignments * fix colliding bottom directives on assistant bar * Membership services: small refactor (#34635) * Very small clean up * Rename abstract class filename * Create membership-abstract-token-class * Fix path * fix typing * Update class-wpcom-online-subscription-service.php * Update projects/plugins/jetpack/extensions/blocks/premium-content/_inc/subscription-service/class-asbtract-token-subscription-service.php Co-authored-by: Miguel Lezama <miguel@automattic.com> * Update projects/plugins/jetpack/extensions/blocks/premium-content/_inc/subscription-service/class-jetpack-token-subscription-service.php Co-authored-by: Miguel Lezama <miguel@automattic.com> * Rename file * Update class-wpcom-online-subscription-service.php * Rename references to Token_Subscription_Service * Fix naming --------- Co-authored-by: Miguel Lezama <miguel@automattic.com> * Boost: Refactor module, index and more into React (#34662) * Create skeleton for Module component in React * Refactor UpgradeCTA to React * Added a small variant for toggle control * Use small variant of toggle control * Fix onEnable, onMountEnable, and onDisable * Do not pass yearlyPricing * Implement onEnable and onDisable * changelog * Create index component * Make module errors consistent with old design * Fix ISA alignment * Improve alignments and spacing * Add resize unavailable notice * Add fake recommendations meta * Add missing pieces * Cleanup * Remove Index.svelte * Move pricing to ds based config * Remove Module.svelte * Use React DS based moduleState management * Restore tsconfig change * Change interface for useModuleState callbacks * Call useModuleState hook directly on the component * Fix infinite loop on purchase success * Fixup project version * Fix selector in test * Make speed score dependent on useModulesState for auto-refresh to work * Fix isModuleEnabled check * Update modules-state endpoint in tests --------- Co-authored-by: Mark George <thingalon@gmail.com> * Boost: Migrate Tips to react (#34697) * Update Tips to react * add changelog * Backport crm 6.3.2 Changes (#34708) * Fix missing class fatal related to PR #34635 (#34705) * CRM: start 6.3.3-alpha release cycle (#34710) * Fix My plan dashboard js errors due to nested anchor tags (#34707) * Moved href from Button props to ExternalLink props to avoid duplicate anchor tags * Added changelog * Admin Page: avoid react warning with VideoPress card (#34713) This should avoid us getting the following warning: ``` Warning: Failed prop type: Invalid prop `overrideContent` of type `boolean` supplied to `DashItem`, expected a single ReactElement. DashItem@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:36878:1 SettingsForm@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:43524:3 ConnectFunction@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:8870:68 ConnectFunction@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:8870:68 DashVideoPress@wp-content/plugins/jetpack/_inc/build/admin.js?ver=28b3a12169ab227bdcfa:34467:1 ``` * Fix missing class fatal related to PR #34635 (#34718) * Subscriptions: update "verify your email" wall copy (#34716) Co-authored-by: Jeremy Herve <jeremy@jeremy.hu> * Fix sharing buttons window open (#34703) * Contact Form: add extra field settings to base field (#34704) * Contact Form: add extra field settings to base field * Fix package version * Fix the media validation notice shown even when auto conversion is enabled. (#34730) Co-authored-by: Gergely Juhasz <gergely.juhasz@automattic.com> * Add `wpcom_ai_site_prompt` option to the site settings endpoint (#34709) * Social: Fix endpoint backwards compatibility (#34566) * Readd REST controllers with updated logic * Readd class-settings classes for initial state population * changelog * Use depreacted and next_version tags * Fixup versions * Boost: Update Settings Page to react (#34714) * Update Settings Page to react * add changelog * Sharing: update Twitter and X buttons to support official X button (#34719) * Sharing: update Twitter and X buttons to support official X button See #34459 - The official Twitter button is no more; it has been updated to the X design. Let's update our preview Twitter button match. - Since we now have an official X button, let's offer it with the X service. * Adjust official button styles in wp-admin * This method is not needed * Update domain name * Update source name * Bump version by specifying Jetpack version when enqueuing * Update logo * Update icon with more radius * Social | Hide conversion notice for Simple sites (#34733) * Hide notice on simple sites * changelog * Make auto-conversion disabled if not available * Fixup versions * Sharing buttons block alternate settings screen (#34673) * build: Use a GitHub webhook to trigger the betadownload site (#34604) Once Automattic/jetpack-builder#36 is deployed, we can update our build script to produce the artifact for forked PRs and set up a GitHub webhook for the `workflow_run` event to support testing with PRs from forked repositories. This requires the GitHub "Fork pull request workflows from outside collaborators" setting to be set to "Require approval for all outside contributors" to avoid unreviewed code potentially producing malicious zips for the betadownload server. We've had that set since March 2023 (p9dueE-6Rp-p2). This also updates the Jetpack Live Branches script to remove the check for a forked PR, since we can now test with them. * Contact Form: minify stylesheets in prod (#34672) * Contact Form: minify stylesheets in prod * Update registered styles paths * Fix package version * Tools: Add the Readme to the release script (#34722) * Make sure the readme.txt file gets updated after saving changelog edits * Fix command being run * comment out a check * pass the correct flag * Undo comments * Update the next steps at the end * Fix token subscription service name (#34723) * Rename Token_Subscript_Service to Abstract_Token_Subscription_Service * changelog * Allow old class just in case * `use` classes at the top to shorten up the class check. * Content Lens: move feature to `beta` (#34740) * move `content-lens` feature to beta * changelog * Newsletter prepublish panel: update toggle appearance (#34724) * Contact Form: add accessible name to form (#34667) * Contact Form: add accessible name to form * Update accessible name on content change * Remove unused code * Fix package version * Add warning notice * Backport mu-wpcom-plugin 2.0.8, jetpack 13.0-a.7 Changes (#34742) * Changelog and readme.txt edits. * Init new cycle * Fix the stable tag * [Boost] Fix importmap deferral (#34746) * Add importmap to the set of script types we exclude from deferral * changelog * Fix versions in packages/forms * changelog --------- Co-authored-by: Mark George <thingalon@gmail.com> * Update changelog (#34747) * Admin page: remove alt attribute from decorative icon (#34715) The Alt value isn't necessary here, since the icon doesn't bring any additional info on the page for folks using screen readers. This has the added benefit of getting rid of a React warning: ``` Warning: Failed prop type: Invalid prop `alt` of type `object` supplied to `PlanIcon`, expected `string`. PlanIcon@wp-content/plugins/jetpack/_inc/build/admin.js?ver=15a830895a6f6d1e3c39:44686:1 MyPlanCard@wp-content/plugins/jetpack/_inc/build/admin.js?ver=15a830895a6f6d1e3c39:51709:20 ``` * Add/fix typo (#34712) * Fix typo * Chnagelog --------- Co-authored-by: Fabien MILLERAND <fab.millerand@automattic.com> * Boost: Refactor navigation into react (#34731) * Use react router * Add redirects * Fix typo * Add dummy ISA page * Add tracks * Restore getting started functionality * Move props to DS * Move connection to DS and cleanup props * Remove connection from JS constants * Improve getting started handling * Remove wrapping individual components with `DataSyncProvider` * Only start ISA if ISA is active * changelog * Use hook and component provided by react-router-dom * Remove data-sync provider wrapping from settings-page * Remove jetpack connection prop from analytics Analytics isn't collected while there is no connection. So, this prop is unnecessary anyway. * Pop bubbles for performanceHistoryNeedsUpdate * Fix priority support * Cast wpcom blogId into integer * Fix getting started with free * Fix getting started for real * Show index for missing routes * Stats: add passing select UTM parameters (#34431) This commit adds select UTM parameters to the pixel requests send to wp.com, so that we can show more statistics to site owners. --------- Co-authored-by: Gergely Márk Juhász <36671565+gmjuhasz@users.noreply.github.com> Co-authored-by: valterlorran <valterlorran@hotmail.com> Co-authored-by: Valter Lorran <valter.lorran@automattic.com> Co-authored-by: Andrii Lysenko <60262784+andrii-lysenko@users.noreply.github.com> Co-authored-by: Steve D <33553323+sdixon194@users.noreply.github.com> Co-authored-by: Kev <kevin.zoschke@automattic.com> Co-authored-by: arthur791004 <arthur.chu@automattic.com> Co-authored-by: Mikael Korpela <mikael@ihminen.org> Co-authored-by: Juanma Rodriguez Escriche <juanma.rodriguez.escriche@automattic.com> Co-authored-by: Tim Broddin <tim@wannabes.be> Co-authored-by: Samiff <samiff@users.noreply.github.com> Co-authored-by: Karen Attfield <karenlattfield@gmail.com> Co-authored-by: Calypso Bot <sysops+ghmatticbot@automattic.com> Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com> Co-authored-by: Chris McCluskey <chris.mccluskey@automattic.com> Co-authored-by: tbradsha <32492176+tbradsha@users.noreply.github.com> Co-authored-by: Christian Gastrell <cgastrell@gmail.com> Co-authored-by: MILLER/F <millerf@automattic.com> Co-authored-by: Miguel Lezama <miguel@automattic.com> Co-authored-by: Adnan Haque <3737780+haqadn@users.noreply.github.com> Co-authored-by: Mark George <thingalon@gmail.com> Co-authored-by: Peter Petrov <peter.petrov89@gmail.com> Co-authored-by: Jeremy Herve <jeremy@jeremy.hu> Co-authored-by: Manzoor Wani <manzoorwani.jk@gmail.com> Co-authored-by: Gergely Juhasz <gergely.juhasz@automattic.com> Co-authored-by: Griffith Chen <cferrios@gmail.com> Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com> Co-authored-by: Christopher Smith <8002138+chrisfromthelc@users.noreply.github.com> Co-authored-by: Damián Suárez <rdsuarez@gmail.com> Co-authored-by: thingalon <mark@thingalon.com> Co-authored-by: Fabien MILLERAND <fab.millerand@automattic.com> Co-authored-by: Piotr Stankowski <6437642+trakos@users.noreply.github.com> * Revert "Catch up your branch (#2)" (#3) This reverts commit 2434b7a. * Try force conflict * Try force conflict again * Remove forced conflict * Fix tests * Fix tests * Update composer.lock * Resolve conflicts * Specific class names * Update projects/packages/stats/src/class-wpcom-stats.php * Avoid caching error messages * Revert caching change Co-authored-by: Jasper Kang <kangzjnet@gmail.com>

github-actions bot added [Feature] Google Fonts [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Dec 13, 2023

github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Dec 13, 2023

arthur791004 self-assigned this Dec 13, 2023

arthur791004 force-pushed the fix/google-fonts-exclude-theme-fonts branch from f904ea0 to 1a197b6 Compare December 13, 2023 06:59

arthur791004 added 2 commits December 13, 2023 15:28

Google Fonts: Ignore the fonts that are provied by the active theme

cbdfacd

changelog

4c957a1

arthur791004 force-pushed the fix/google-fonts-exclude-theme-fonts branch from 1a197b6 to 4c957a1 Compare December 13, 2023 07:28

arthur791004 added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Dec 13, 2023

arthur791004 requested a review from a team December 13, 2023 07:43

arthur791004 mentioned this pull request Dec 13, 2023

☂️ Jetpack Google Fonts module with the new Font Library Automattic/wp-calypso#82226

Closed

23 tasks

fushar requested a review from mreishus December 13, 2023 08:15

jeherve reviewed Dec 13, 2023

View reviewed changes

Update syntax

d38d291

mreishus mentioned this pull request Dec 13, 2023

Heading Font Weight Not Applying in Adventurer Automattic/wp-calypso#84590

Closed

taipeicoder approved these changes Dec 14, 2023

View reviewed changes

Merge branch 'trunk' into fix/google-fonts-exclude-theme-fonts

6f5137b

arthur791004 merged commit 93aa805 into trunk Dec 18, 2023
54 checks passed

arthur791004 deleted the fix/google-fonts-exclude-theme-fonts branch December 18, 2023 07:52

github-actions bot added this to the jetpack/13.0 milestone Dec 18, 2023

github-actions bot removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Dec 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Jetpack Google Fonts: Fix the fonts provided by theme are still added #34608

Jetpack Google Fonts: Fix the fonts provided by theme are still added #34608

arthur791004 commented Dec 13, 2023 •

edited

Loading

github-actions bot commented Dec 13, 2023 •

edited

Loading

github-actions bot commented Dec 13, 2023 •

edited

Loading

jeherve left a comment

jeherve Dec 13, 2023

arthur791004 Dec 13, 2023

mreishus commented Dec 13, 2023 •

edited

Loading

arthur791004 commented Dec 14, 2023

taipeicoder left a comment

arthur791004 commented Dec 14, 2023

taipeicoder commented Dec 14, 2023

mreishus commented Dec 14, 2023

Jetpack Google Fonts: Fix the fonts provided by theme are still added #34608

Jetpack Google Fonts: Fix the fonts provided by theme are still added #34608

Conversation

arthur791004 commented Dec 13, 2023 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Dec 13, 2023 • edited Loading

github-actions bot commented Dec 13, 2023 • edited Loading

jeherve left a comment

Choose a reason for hiding this comment

jeherve Dec 13, 2023

Choose a reason for hiding this comment

arthur791004 Dec 13, 2023

Choose a reason for hiding this comment

mreishus commented Dec 13, 2023 • edited Loading

arthur791004 commented Dec 14, 2023

taipeicoder left a comment

Choose a reason for hiding this comment

arthur791004 commented Dec 14, 2023

taipeicoder commented Dec 14, 2023

mreishus commented Dec 14, 2023

arthur791004 commented Dec 13, 2023 •

edited

Loading

github-actions bot commented Dec 13, 2023 •

edited

Loading

github-actions bot commented Dec 13, 2023 •

edited

Loading

mreishus commented Dec 13, 2023 •

edited

Loading