Skip to content

Commit

Permalink
Merge branch 'trunk' into add/protect-fix-threats-status
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottprogrammer committed Dec 19, 2024
2 parents bbe1f2c + ff26ecb commit 84479e2
Show file tree
Hide file tree
Showing 441 changed files with 8,048 additions and 3,761 deletions.
11 changes: 11 additions & 0 deletions .github/files/lint-project-structure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -635,4 +635,15 @@ while IFS= read -r FILE; do
done < <( git grep -h --line-number --column -o "$RE" "$FILE" )
done < <( git -c core.quotepath=off grep -l "$RE" )

# - Check for `random(` in scss files.
debug "Checking for SCSS random."
while IFS= read -r FILE; do
EXIT=1
while IFS=: read -r LINE COL X; do
X=${X%(}
echo "::error file=$FILE,line=$LINE,col=$COL::Do not use SCSS \`$X()\`. It means that every build will have different CSS, dirtying the diffs (and making for redudant Simple deploys if this gets into a relevant plugin)."
done < <( git grep -h --line-number --column -o '\(random\|unique-id\)\s*(' "$FILE" )
done < <( git -c core.quotepath=off grep -l '\(random\|unique-id\)\s*(' '*.sass' '*.scss' )


exit $EXIT
39 changes: 0 additions & 39 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .phan/stubs/phpunit-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from PHPUnit 9.6.21
* Stubs automatically generated from PHPUnit 9.6.22
* using the definition file `tools/stubs/phpunit-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
3 changes: 2 additions & 1 deletion .phan/stubs/woocommerce-internal-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooCommerce 9.4.3
* Stubs automatically generated from WooCommerce 9.5.1
* using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down Expand Up @@ -50,6 +50,7 @@ class CustomOrdersTableController
*/
class OrdersTableDataStore extends \Abstract_WC_Order_Data_Store_CPT implements \WC_Object_Data_Store_Interface, \WC_Order_Data_Store_Interface
{
use \Automattic\WooCommerce\Internal\CostOfGoodsSold\CogsAwareTrait;
/**
* Get the custom orders table name.
*
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-payments-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooPayments 8.6.0
* Stubs automatically generated from WooPayments 8.6.1
* using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
15 changes: 15 additions & 0 deletions .pnpm-patches/@[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Hack for https://github.com/WordPress/gutenberg/issues/67897

diff --git a/package.json b/package.json
index d7af17fea3f59f807a9d7234cf9ce79131538383..c862b012af312c9fc5cf1d2d884ec332ee079d0b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"exports": {
".": {
"types": "./build-types/index.d.ts",
- "import": "./build-module/index.js"
+ "default": "./build/index.js"
},
"./wp": {
"types": "./build-types/index.d.ts",
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,10 @@
"node": "^22.9.0",
"pnpm": "^9.3.0 <9.12.0"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"pnpm": {
"patchedDependencies": {
"@wordpress/[email protected]": ".pnpm-patches/@[email protected]"
}
}
}
Loading

0 comments on commit 84479e2

Please sign in to comment.