Skip to content

Commit

Permalink
Merge branch 'trunk' into fix/donation-block-translations
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieur-z committed Apr 18, 2024
2 parents c8ec2ea + 5fe8c38 commit 44b1657
Show file tree
Hide file tree
Showing 48 changed files with 855 additions and 108 deletions.
4 changes: 4 additions & 0 deletions .phan/config.base.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* - parse_file_list: (array) Files to parse but not analyze. Equivalent to listing in both 'file_list' and 'exclude_analysis_directory_list'.
* - stubs: (array) Predefined stubs to load. Default is `array( 'wordpress', 'wp-cli', 'wpcom' )`.
* - akismet: Stubs from .phan/stubs/akismet-stubs.php.
* - full-site-editing: Stubs from .phan/stubs/full-site-editing-stubs.php.
* - woocommerce: Stubs from php-stubs/woocommerce.
* - woocommerce-internal: Stubs from .phan/stubs/woocommerce-internal-stubs.php.
* - woocommerce-packages: Stubs from php-stubs/woocommerce.
Expand Down Expand Up @@ -57,6 +58,9 @@ function make_phan_config( $dir, $options = array() ) {
case 'akismet':
$stubs[] = "$root/.phan/stubs/akismet-stubs.php";
break;
case 'full-site-editing':
$stubs[] = "$root/.phan/stubs/full-site-editing-stubs.php";
break;
case 'woocommerce':
$stubs[] = "$root/vendor/php-stubs/woocommerce-stubs/woocommerce-stubs.php";
break;
Expand Down
55 changes: 55 additions & 0 deletions .phan/stubs/full-site-editing-stubs.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php
/**
* Stubs automatically generated from WordPress.com Editing Toolkit 4.19624
* using the definition file `tools/stubs/full-site-editing-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
*/

namespace {
/**
* Limit Global Styles on WP.com to paid plans.
*
* @package full-site-editing-plugin
*/
/**
* Checks if Global Styles should be limited on the given site.
*
* @param int $blog_id Blog ID.
* @return bool Whether Global Styles are limited.
*/
function wpcom_should_limit_global_styles($blog_id = 0)
{
}
/**
* Checks if the current blog has custom styles in use.
*
* @return bool Returns true if custom styles are in use.
*/
function wpcom_global_styles_in_use()
{
}
}
namespace A8C\FSE {
/**
* Whether or not FSE is active.
* If false, FSE functionality should be disabled.
*
* @returns bool True if FSE is active, false otherwise.
* @phan-return mixed Dummy doc for stub.
*/
function is_full_site_editing_active()
{
}
/**
* Whether or not the site is eligible for FSE. This is essentially a feature
* gate to disable FSE on some sites which could theoretically otherwise use it.
*
* By default, sites should not be eligible.
*
* @return bool True if current site is eligible for FSE, false otherwise.
*/
function is_site_eligible_for_full_site_editing()
{
}
}
13 changes: 0 additions & 13 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,6 @@ function fixDeps( pkg ) {
pkg.dependencies[ 'detect-package-manager' ] ??= '*';
}

// Outdated deps.
// https://github.com/linearlabs-workspace/storybook-addon-mock/issues/208
if ( pkg.name === 'storybook-addon-mock' ) {
for ( const [ dep, ver ] of Object.entries( pkg.dependencies ) ) {
if ( ( dep === 'storybook' || dep.startsWith( '@storybook/' ) ) && ver.match( /^\^7\./ ) ) {
pkg.dependencies[ dep ] += ' || ^8';
}
}
if ( pkg.dependencies[ '@storybook/addons' ] ) {
pkg.dependencies[ '@storybook/addons' ] = 'npm:@storybook/manager-api@^8';
}
}

// Types packages have outdated deps. Reset all their `@wordpress/*` deps to star-version,
// which pnpm should 🤞 dedupe to match whatever is in use elsewhere in the monorepo.
// https://github.com/Automattic/jetpack/pull/35904#discussion_r1508681777
Expand Down
Loading

0 comments on commit 44b1657

Please sign in to comment.