Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introducing wpcom site helper plugin into the Monorepo. #37737

Merged
merged 2,291 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
2291 commits
Select commit Hold shift + click to select a range
3b64b01
Adding "reset/data_reset.php" as an incompatible plugin https://githu…
hideandgeek404 Feb 28, 2024
4c5da0b
Blaze: Activate the moule when the site is launching https://github.c…
arthur791004 Feb 29, 2024
953945c
Bump version to 3.14.53 https://github.com/Automattic/wpcomsh/pull/1723
ebinnion Feb 29, 2024
9b8ca88
Update wc-calypso-bridge to 2.3.9 and wpcomsh to 3.14.54 https://gith…
moon0326 Feb 29, 2024
6046151
Update wc-calypso-bridge to 2.3.10 and wpcomsh to 3.14.55 https://gi…
moon0326 Mar 1, 2024
b2e9f99
Switch from legacy image circleci/php to newer cimg/php https://githu…
mreishus Mar 1, 2024
55d8a75
Untangle: add gating for `wpcom_classic_early_release` blog option ht…
fushar Mar 4, 2024
591b1a5
Jetpack Menu: remove Jetpack Manage menu item for Atomic sites with t…
miksansegundo Mar 4, 2024
9061679
Bump version to 3.15.0 https://github.com/Automattic/wpcomsh/pull/1730
fushar Mar 4, 2024
752f708
jetpack-mu-wpcom: use v5.15.1 https://github.com/Automattic/wpcomsh/p…
samiff Mar 5, 2024
ebd300e
Untangle: Don't change homepage when switching theme https://github.c…
fushar Mar 6, 2024
c446b2d
Bump version number to 3.15.2 https://github.com/Automattic/wpcomsh/p…
DustyReagan Mar 6, 2024
da25971
Detect migrate guru start and call WPCOM API https://github.com/Autom…
andres-blanco Mar 7, 2024
8fcc204
jetpack-mu-wpcom: use v5.15.2 https://github.com/Automattic/wpcomsh/p…
zaerl Mar 11, 2024
cea4aa5
Updating jetpack-mu-wpcom to version 5.16.0. https://github.com/Autom…
zinigor Mar 12, 2024
5a1215e
jetpack-mu-wpcom: use v5.16.1 https://github.com/Automattic/wpcomsh/p…
ouikhuan Mar 13, 2024
f48273e
Add a code deployment logs entry endpoint https://github.com/Automatt…
jeroenpf Mar 13, 2024
710a0b4
Update the version for the code deployment endpoint release https://g…
jeroenpf Mar 13, 2024
7ba2655
Untangle: Re-enable Color Schema on Profile for wp-admin interface ht…
lupus2k Mar 13, 2024
c4c82e2
jetpack-mu-wpcom: use v5.17.0 https://github.com/Automattic/wpcomsh/p…
zaerl Mar 15, 2024
22b61a9
Untangle: proxied a12s are no longer auto opted-in https://github.com…
fushar Mar 18, 2024
ccbd858
Bump version to 3.17.2 https://github.com/Automattic/wpcomsh/pull/1743
fushar Mar 18, 2024
f556236
Update wc-calypso-bridge to 2.3.11 and wpcomsh to 3.17.3 https://gith…
arthur791004 Mar 19, 2024
5cd2f99
GitHub Deployments: Remove feature flag call https://github.com/Autom…
zaguiini Mar 19, 2024
98c3b6d
jetpack-mu-wpcom: use v5.18.0 https://github.com/Automattic/wpcomsh/p…
zaerl Mar 20, 2024
69a6b8d
Jetpack: move away from deprecated Jetpack_Client class https://githu…
jeherve Mar 21, 2024
fe560fa
Scheduled Updates: Add menu item for eligible sites https://github.co…
obenland Mar 21, 2024
3e1d0db
jetpack-mu-wpcom: use v5.19.0 https://github.com/Automattic/wpcomsh/…
TimBroddin Mar 22, 2024
150b1e4
Site Migration: Filter migrations started by migrate guru https://git…
gabrielcaires Mar 25, 2024
181a708
Jetpack: replace deprecated build_raw_urls calls https://github.com/A…
samiff Mar 26, 2024
df14653
Bumped version to 3.17.10. https://github.com/Automattic/wpcomsh/pull…
zinigor Mar 26, 2024
da11d95
Update jetpack-mu-wpcom to version 5.20. https://github.com/Automatti…
zinigor Mar 26, 2024
c980daf
Update jetpack-mu-wpcom to version 5.21. https://github.com/Automatti…
zinigor Mar 27, 2024
daef393
Font Library: Enable the feature on atomic sites https://github.com/A…
arthur791004 Apr 1, 2024
5e05759
Bump version to 3.17.13 https://github.com/Automattic/wpcomsh/pull/1759
arthur791004 Apr 1, 2024
d57ce8a
Update jetpack-mu-wpcom to version 5.22 https://github.com/Automattic…
zinigor Apr 1, 2024
3bd314e
GitHub deployments: Remove feature flag https://github.com/Automattic…
zaguiini Apr 4, 2024
e7f0db9
Update/jetpack mu wpcom 5.23.0 https://github.com/Automattic/wpcomsh/…
zaerl Apr 4, 2024
97787cc
Use jetpack-mu-wpcom v5.23.1 https://github.com/Automattic/wpcomsh/pu…
TimBroddin Apr 5, 2024
1eed1cf
Notifications cache buster - define jetpack notes cache buster https:…
Addison-Stavlo Apr 5, 2024
c130817
update version https://github.com/Automattic/wpcomsh/pull/1765
Addison-Stavlo Apr 5, 2024
5889ccf
Update wc-calypso-bridge to 2.3.12 and wpcomsh to 3.17.9 https://gith…
chihsuan Apr 8, 2024
0d112be
Update jetpack-mu-wpcom to 5.23.2 https://github.com/Automattic/wpcom…
ice9js Apr 9, 2024
71d86f7
Update wpcomsh version to 3.17.20 https://github.com/Automattic/wpcom…
ice9js Apr 9, 2024
0dc345b
WPCom Themes on Atomic wp-admin: Fetch and show themes from WPCom htt…
rcrdortiz Apr 10, 2024
8e4d972
updated version to 3.18.0 https://github.com/Automattic/wpcomsh/pull/…
rcrdortiz Apr 10, 2024
02a641e
i18n: Load un-translated strings for jetpack-mu-wpcom from wpcomsh ht…
sixhours Apr 10, 2024
f754be9
Update version for deployment
sixhours Apr 10, 2024
9d5d4cc
Revert "Update version for deployment"
sixhours Apr 10, 2024
85a2446
Update version numbers https://github.com/Automattic/wpcomsh/pull/1774
sixhours Apr 10, 2024
1a355bc
Update wc-calypso-bridge to 2.3.13 and wpcomsh to 3.19.1 https://gith…
okmttdhr Apr 11, 2024
6b851ad
WPCom themes on Atomic wp-admin: WPCom themes Install and Activate ht…
rcrdortiz Apr 11, 2024
8aa8d75
Revert "Notifications cache buster - define jetpack notes cache buste…
Addison-Stavlo Apr 11, 2024
97db02e
WP.com themes: Update mapper to use version and block_theme from API …
mmtr Apr 12, 2024
c33223d
Untangling: Add WP.com themes to search results https://github.com/Au…
mmtr Apr 12, 2024
16511d6
WPCom Themes on Atomic wp-admin: Install WPCom themes through wpcomsh…
rcrdortiz Apr 15, 2024
1f4e838
Bump automattic/jetpack-mu-wpcom to 5.24.0 https://github.com/Automat…
ice9js Apr 16, 2024
52a7ebc
Update wpcomsh version to 3.19.4 https://github.com/Automattic/wpcoms…
ice9js Apr 16, 2024
3563af1
Untangling: Remove `wpcom_themes_on_atomic` check https://github.com/…
mmtr Apr 16, 2024
78a21f7
WPCom Themes on Atomic wp-admin: Add WPCom themes to Latest and Block…
rcrdortiz Apr 16, 2024
6ef5725
WPCom Themes on Atomic wp-admin: Enable WPCom symlinked themes deleti…
rcrdortiz Apr 16, 2024
d09333b
WPCom Themes on Atomic wp-admin: fix install managed themes with no d…
rcrdortiz Apr 16, 2024
3ffd5e3
Fixes a persistent warning on AT sites https://github.com/Automattic/…
andres-blanco Apr 17, 2024
70df592
Staticize the theme source when checking theme https://github.com/Aut…
dsas Apr 18, 2024
9d7be8c
Fix read and write managed themes symlink paths https://github.com/Au…
rcrdortiz Apr 18, 2024
8040ce4
Fix persistent warning on footer-credit/footer-credit-optimizations.p…
andres-blanco Apr 18, 2024
a702395
Fix for warning on color.php https://github.com/Automattic/wpcomsh/pu…
andres-blanco Apr 19, 2024
6a56f89
Sync D146033 - add wpcom_simple_skip_purchase_lookup filter https://g…
mreishus Apr 19, 2024
9083956
Entrepreneur Signup: Redirect to Design With AI on Woo activation. ht…
yansern Apr 22, 2024
cc69cb9
Update jetpack-mu-wpcom to 5.25.0 https://github.com/Automattic/wpcom…
ice9js Apr 23, 2024
6e77157
Update wpcomsh version to 3.19.13 https://github.com/Automattic/wpcom…
ice9js Apr 23, 2024
9c141c2
Revert "Update jetpack-mu-wpcom to 5.25.0 https://github.com/Automatt…
ice9js Apr 23, 2024
55ca871
Update wpcomsh version to 3.19.14 https://github.com/Automattic/wpcom…
ice9js Apr 23, 2024
9ab125c
WPCom Themes on Atomic wp-admin: WPCom themes are filterable by wp-ad…
rcrdortiz Apr 23, 2024
10939a6
[DO NOT MERGE] WPCom Themes on Atomic wp-admin: Launch feature to all…
rcrdortiz Apr 23, 2024
8f37b95
Fix php8 warning on footer-credit.php https://github.com/Automattic/w…
andres-blanco Apr 23, 2024
562c46e
Add Writing features moved notice https://github.com/Automattic/wpcom…
DustyReagan Apr 23, 2024
075e304
Bump version number https://github.com/Automattic/wpcomsh/pull/1812
DustyReagan Apr 23, 2024
705e46c
The tags list of a theme is now always an array instead of either a s…
rcrdortiz Apr 24, 2024
d7c966b
⬆️ Bump wc-calypso-bridge to 2.3.14 and wpcomsh to 3.19.19 https://gi…
waclawjacek Apr 24, 2024
5c7e05f
WPCom themes on Atomic: Fix install and activate delisted themes. htt…
rcrdortiz Apr 24, 2024
ee799be
WPCom Themes on Atomic wp-admin: Prevent plugin upgrades to trigger e…
rcrdortiz Apr 24, 2024
b427805
Added Really Simple SSL Pro to incompatible plugin list https://githu…
villanovachile Apr 24, 2024
b0a8ecf
COLOURlovers: Add Temporary Patterns Tracking https://github.com/Auto…
Copons Apr 25, 2024
fe0626d
WPCom Themes on Atomic: Fix install filter type hint https://github.c…
rcrdortiz Apr 25, 2024
f83f93a
Untangling: temporarily patch Calypso links to point to Horizon inste…
fushar Apr 25, 2024
014ebcf
Bump version number to 3.19.24 https://github.com/Automattic/wpcomsh/…
DustyReagan Apr 25, 2024
67ae23f
Explore: add a new wpcomsh incompatible-plugins list WP-CLI command h…
daledupreez Apr 26, 2024
7195f02
Update jetpack-mu-wpcom to 5.26.1 https://github.com/Automattic/wpcom…
ice9js Apr 26, 2024
c9b7faf
Update wpcomsh version to 3.20.1 https://github.com/Automattic/wpcoms…
ice9js Apr 26, 2024
69bb182
Untangling: temporarily hide Hosting menus already in GSV for proxied…
fushar Apr 26, 2024
eda6523
Bump version to 3.20.2 https://github.com/Automattic/wpcomsh/pull/1830
fushar Apr 26, 2024
83f6b18
Update wpcomsh version to 3.20.3
ivan-ottinger Apr 29, 2024
7ad18e0
Scheduled Updates: Check if Scheduled Updates menu exists before outp…
ouikhuan Apr 29, 2024
3febe64
Update wc-calypso-bridge to 2.3.15 and wpcomsh to 3.20.4 https://gith…
ivan-ottinger Apr 29, 2024
2d213a5
Update jetpack-mu-wpcom go 5.27.0 https://github.com/Automattic/wpcom…
ice9js Apr 30, 2024
2551a31
Update wpcomsh version to 3.20.5 https://github.com/Automattic/wpcoms…
ice9js Apr 30, 2024
a96877a
Update language files https://github.com/Automattic/wpcomsh/pull/1838
DustyReagan Apr 30, 2024
4826953
Entrepreneur Signup: Redirect to Calypso My Home after completing Des…
yansern May 1, 2024
5418e42
Add an upsell to plugin-install.php https://github.com/Automattic/wpc…
dsas May 2, 2024
c997c7d
Apply wpcomsh-notice styles to rtl https://github.com/Automattic/wpco…
DustyReagan May 3, 2024
b573a33
Update wpcomsh version to 3.20.7 https://github.com/Automattic/wpcoms…
candy02058912 May 3, 2024
03bd9ca
Update jetpack-mu-wpcom to 5.28.0 https://github.com/Automattic/wpcom…
ice9js May 6, 2024
7f97eaa
Update wpcomsh version to 3.20.8 https://github.com/Automattic/wpcoms…
ice9js May 6, 2024
ccc84f5
Nav redesign: add Hosting -> Overview menu https://github.com/Automat…
fushar May 7, 2024
99946d6
Bump jetpack-mu-wpcom to 5.28.1 https://github.com/Automattic/wpcomsh…
fushar May 7, 2024
48c8425
Include Atomic platform plugins in incompatible plugin CLI tool https…
daledupreez May 7, 2024
d415d2a
Update language files https://github.com/Automattic/wpcomsh/pull/1853
DustyReagan May 7, 2024
eac07a2
Add "Image CDN LIAR" to features list https://github.com/Automattic/w…
dilirity May 8, 2024
e337181
Bump version to 3.20.12 https://github.com/Automattic/wpcomsh/pull/1856
donnchawp May 8, 2024
dede568
wpcomsh bump to 3.20.13 https://github.com/Automattic/wpcomsh/pull/1859
zaerl May 9, 2024
aff6aee
Media Library: Always show the storage usage, even below 95% https://…
xavier-lc May 10, 2024
f0869ac
Add BackWPup Pro to incompatible plugins list https://github.com/Auto…
villanovachile May 10, 2024
bd79c10
Bump wpcomsh to 3.20.15 and jetpack-mu-wpcom to 5.29.1. https://githu…
yansern May 13, 2024
35e0d57
Fix users entering DesignWithAI during signup getting redirected to M…
yansern May 13, 2024
9056b24
Update translation files https://github.com/Automattic/wpcomsh/pull/1865
DustyReagan May 13, 2024
efe80d2
Removed entrepreneur-my-home feature flag https://github.com/Automatt…
JuanLucha May 14, 2024
e566cd2
Add Breeze and Hide My WP Ghost Lite to Incompatible plugins https://…
villanovachile May 14, 2024
fa6f12a
Bump wpcomsh to 3.20.17 and jetpack-mu-wpcom to 5.30.0 and wc-calypso…
JuanLucha May 14, 2024
fc2f47b
Bump wpcomsh to 3.20.17 and jetpack-mu-wpcom to 5.30.0 and wc-calypso…
JuanLucha May 14, 2024
bdae75f
Bump wpcomsh to 3.20.18 and update language files https://github.com/…
JuanLucha May 14, 2024
037a904
Change /hosting to /overview https://github.com/Automattic/wpcomsh/pu…
DustyReagan May 15, 2024
33ea966
Nav redesign: remove Horizon link overrides https://github.com/Automa…
fushar May 16, 2024
3a776d3
Update jetpack-mu-wpcom 5.31.0 https://github.com/Automattic/wpcomsh/…
ouikhuan May 16, 2024
ca258ae
Social: sync social-connections-management feature. https://github.co…
spsiddarthan May 17, 2024
beed7ea
Feature branch merge: PHPCS pass plus minor refactoring. https://gith…
zinigor May 17, 2024
933bc00
Support Session: Allow manual login if SSO is disabled https://github…
tbradsha May 20, 2024
ade5d0a
Version bump to 3.21.1 https://github.com/Automattic/wpcomsh/pull/1877
tbradsha May 20, 2024
f466cdf
Update `wc-calypso-bridge` to `2.4.1` and `wpcomsh` to `3.21.2` https…
ivan-ottinger May 20, 2024
699216f
Remove the scheduled update menu https://github.com/Automattic/wpcoms…
zaerl May 21, 2024
d81785a
Bump jetpack-mu-wpcom to 5.31.1 https://github.com/Automattic/wpcomsh…
tbradsha May 21, 2024
a205f15
Entrepreneur Signup: Entrepreneur plan no longer redirect to Calypso …
yansern May 21, 2024
4f5f9c4
Bump to version 3.21.3 and wc-calypso-bridge to 2.4.2. https://github…
yansern May 21, 2024
26611ba
Update language files
yansern May 21, 2024
f028945
Bump to version 3.21.4. https://github.com/Automattic/wpcomsh/pull/1883
yansern May 21, 2024
8620544
Update wc-calypso-bridge to 2.5.0 and wpcomsh to 3.22.0 https://githu…
ivan-ottinger May 23, 2024
4dd6ca7
Enable Gutenberg experiments in wpmovies.dev https://github.com/Autom…
mmtr May 27, 2024
4ede766
Version bump to 3.22.2 https://github.com/Automattic/wpcomsh/pull/1886
tbradsha May 27, 2024
d30c094
Missed file for version bump https://github.com/Automattic/wpcomsh/pu…
tbradsha May 27, 2024
8d96e1c
Update final references to old version https://github.com/Automattic/…
tbradsha May 27, 2024
43e13aa
Hosting: Remove the external icon from the Overview item https://gith…
arthur791004 May 29, 2024
6b56d26
Bump version to 3.22.3 https://github.com/Automattic/wpcomsh/pull/1890
arthur791004 May 29, 2024
1cfd108
Update wc-calypso-bridge to 2.5.1 and bump wpcomsh version to to 3.22…
yuliyan May 29, 2024
904ca0d
Social: Sync class-wpcom-features files after adding v1 constants htt…
spsiddarthan May 29, 2024
6272918
Phan pass: feature branch merge. https://github.com/Automattic/wpcoms…
zinigor May 31, 2024
7c369c7
Updated version to 3.22.5. https://github.com/Automattic/wpcomsh/pull…
zinigor May 31, 2024
547830e
Generated package skeleton.
zinigor Feb 20, 2024
9b7c851
Added the first file.
zinigor Feb 20, 2024
b87d215
Removed a duplicate README file.
zinigor Feb 20, 2024
34f1ce9
Adding wpcomsh matrix entry.
zinigor Feb 21, 2024
5b82981
Adding the wpcomsh matrix value to the environment.
zinigor Feb 21, 2024
4eb0189
Fixed the directory.
zinigor Feb 21, 2024
da312eb
Using the branch env variable instead.
zinigor Feb 21, 2024
0927afe
Adding wpcomsh loading.
zinigor Feb 21, 2024
d8e87ff
changelog
zinigor Feb 21, 2024
02a04c3
Properly copy the plugin contents to mu-plugins.
zinigor Feb 21, 2024
161f339
Require the correct path.
zinigor Feb 21, 2024
c40e4ef
Added basic Phan config.
zinigor Apr 18, 2024
59bc35f
Added PHPCS dir specific configs.
zinigor Apr 26, 2024
c055644
Updated phan config.
zinigor May 17, 2024
7f863f8
Moved composer.json.
zinigor May 23, 2024
c8019c0
Git ignore cleanup.
zinigor May 23, 2024
4e0b6d9
Moved Readme.
zinigor May 23, 2024
65e7808
Removed redundant files.
zinigor May 23, 2024
e5c4efe
Removed redundant files.
zinigor May 23, 2024
97800a2
Moved a dir up.
zinigor May 23, 2024
1a4d94b
Fixed composer.json.
zinigor May 23, 2024
435f0ee
Phan finishing touch.
zinigor May 23, 2024
9795684
Updated baseline for tests.
zinigor May 24, 2024
9f21281
Merge remote-tracking branch 'tmp/trunk' into converge/wpcomsh
anomiex Jun 3, 2024
23da14a
Merge remote-tracking branch 'converge/converge/wpcomsh' into add/con…
anomiex Jun 3, 2024
70cd661
Merge branch 'add/wpcomsh-skeleton' into add/converge-wpcomsh
anomiex Jun 3, 2024
7fab7fd
Updated the lock and git ignore file.
zinigor Jun 4, 2024
246d480
Added changelog and fixed versions.
zinigor Jun 4, 2024
f8aac28
Fixes to CI kudos to @anomiex.
zinigor Jun 4, 2024
3c1a51f
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 4, 2024
c5b1c77
Removed build step and added git attributes.
zinigor Jun 5, 2024
7a72d2c
Added mirror repo.
zinigor Jun 5, 2024
521f1c9
Added some excludes that slipped through.
zinigor Jun 5, 2024
3462ba0
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 6, 2024
7a2d6a9
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 7, 2024
a4ee654
Removed a redundant .editorconfig file.
zinigor Jun 7, 2024
93800dd
Removed redundant production include statements.
zinigor Jun 7, 2024
0f5515a
Fixed case in the README.md file.
zinigor Jun 7, 2024
2e20b20
Removed entries handled by global .gitattributes.
zinigor Jun 7, 2024
5d1fb99
Removed files that are already in .gitignore.
zinigor Jun 7, 2024
bfe409a
Removed files specific to the repo if it was in the root.
zinigor Jun 7, 2024
9532e0d
Removed old constant loading mechanism leftover.
zinigor Jun 7, 2024
99a1da8
Removed old npm lockfile.
zinigor Jun 7, 2024
e67cc3b
Update projects/plugins/wpcomsh/composer.json
zinigor Jun 7, 2024
f9bef42
Update projects/plugins/wpcomsh/package.json
zinigor Jun 7, 2024
a425384
Update projects/plugins/wpcomsh/package.json
zinigor Jun 7, 2024
5514da1
Update projects/plugins/wpcomsh/package.json
zinigor Jun 7, 2024
5a9edfb
Update projects/plugins/wpcomsh/package.json
zinigor Jun 7, 2024
4fce17e
Update projects/plugins/wpcomsh/.eslintrc.js
zinigor Jun 7, 2024
934c349
Fixed the pnpm lockfile.
zinigor Jun 7, 2024
726b3f7
Restricted installers to add the wp-content folder.
zinigor Jun 7, 2024
6932eb9
Updated dependencies.
zinigor Jun 7, 2024
8176412
Removed the entry about manual deployments.
zinigor Jun 7, 2024
5ce21cd
Removed old phpcs config file.
zinigor Jun 7, 2024
84ffd16
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 11, 2024
141ec33
Updated wpcomsh lock.
zinigor Jun 11, 2024
3bacaf8
Added explicit version of wordbless.
zinigor Jun 11, 2024
f8cf199
Added autoloader suffix for wpcomsh.
zinigor Jun 11, 2024
3663776
PHPCS fixes.
zinigor Jun 11, 2024
820fe46
Updated composer lock and added platform restrictions for PHP.
zinigor Jun 11, 2024
8ad9c19
Fived autoloader suffix version.
zinigor Jun 11, 2024
575b5fd
Adding compatibility flag to htmlspecialchars.
zinigor Jun 11, 2024
0684c39
Fixed Phan issues.
zinigor Jun 11, 2024
f437bff
Updated wpcomsh baseline.
zinigor Jun 11, 2024
fece2ca
Adding GitHub CI WordPress env compatibility.
zinigor Jun 11, 2024
2be3f17
Fixed phpunit tests include folder path.
zinigor Jun 11, 2024
db07f61
Fixed the options resilience test.
zinigor Jun 11, 2024
559919e
Fixed the eslintrc error.
zinigor Jun 11, 2024
dcbc147
Moved the check-tag-names setting to the base.
zinigor Jun 11, 2024
ac34fb5
Removed the erroneously added base ruleset.
zinigor Jun 11, 2024
1319950
Not loading the mock feature support when testing with Jetpack.
zinigor Jun 11, 2024
36b4334
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 11, 2024
2bff31b
Fixed lockfile.
zinigor Jun 11, 2024
2b8cfc2
Attempting to set the proper environment for 'Atomic' test runs.
zinigor Jun 11, 2024
c5b68f4
Loading mu-wpcom features in the phpunit bootstrap.
zinigor Jun 11, 2024
75cb6be
Used test_add_filter instead to load the code properly.
zinigor Jun 11, 2024
6ccd34c
Restored images from the original source.
zinigor Jun 11, 2024
1635ae8
Update projects/plugins/wpcomsh/composer.json
zinigor Jun 11, 2024
e640cd9
Update .github/files/generate-ci-matrix.php
zinigor Jun 11, 2024
e1a95d7
Update projects/plugins/wpcomsh/.gitattributes
zinigor Jun 11, 2024
87b268a
Removed platform restrictions.
zinigor Jun 11, 2024
b79c93d
Merge remote-tracking branch 'refs/remotes/origin/add/converge-wpcoms…
zinigor Jun 11, 2024
ce4e1e9
Updated wpcomsh lock.
zinigor Jun 11, 2024
3148c75
Update projects/plugins/wpcomsh/logo-tool/js/customizer.js
zinigor Jun 11, 2024
798870f
Un-mangling binaries from 3.22.5.
zinigor Jun 11, 2024
9c06fc1
Un-mangling .po files.
zinigor Jun 11, 2024
a3469b6
Temporarily removing the wpcomsh+jetpack combination.
zinigor Jun 11, 2024
9b65ee7
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 11, 2024
de1f5fe
Added the Jetpack_Mu_Wpcom file to Phan's visibility.
zinigor Jun 12, 2024
7bf4c35
Update projects/plugins/wpcomsh/bin/create-github-release.sh
zinigor Jun 12, 2024
cb613a2
Update projects/plugins/wpcomsh/composer.json
zinigor Jun 12, 2024
2d5ff64
Update projects/plugins/wpcomsh/feature-plugins/hooks.php
zinigor Jun 12, 2024
73c68fa
Update projects/plugins/wpcomsh/frontend-notices/gifting-banner/gifti…
zinigor Jun 12, 2024
75daa5e
Update projects/plugins/wpcomsh/i18n.php
zinigor Jun 12, 2024
2b46227
Update projects/plugins/wpcomsh/plugin-hotfixes.php
zinigor Jun 12, 2024
55c6331
Update projects/plugins/wpcomsh/wpcomsh.php
zinigor Jun 12, 2024
e79719a
Added beta plugin slug, h/t @anomiex.
zinigor Jun 12, 2024
79a3ebb
Merge branch 'trunk' into add/converge-wpcomsh
zinigor Jun 12, 2024
34dbe5a
Updated lockfile.
zinigor Jun 12, 2024
b2ab817
Skipping wpcomsh for plugin update tests, h/t @anomiex.
zinigor Jun 12, 2024
1a8f0f1
Removed wpcomsh from update test.
zinigor Jun 12, 2024
5b4875c
Revert "Removed wpcomsh from update test."
zinigor Jun 12, 2024
0e38e6e
Added a check for WPCOM.
zinigor Jun 12, 2024
0d115b7
Revert "Added a check for WPCOM."
zinigor Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .github/files/generate-ci-matrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@
'with-woocommerce' => true,
);

/**
* Here is the place where wpcomsh tests would be introduced by adding 'with-wpcomsh' property set to true.
* This adds a new run into the matrix that would enable wpcomsh loading with unit tests.
*/

// Add JS tests.
$matrix[] = array(
'name' => 'JS tests',
Expand Down
10 changes: 10 additions & 0 deletions .github/files/setup-wordpress-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ if [[ "$WITH_WOOCOMMERCE" == true ]]; then
echo "::endgroup::"
fi

# Install the wpcomsh plugin used for some Jetpack integration tests.
if [[ "$WITH_WPCOMSH" == true ]]; then
echo "::group::Installing wpcomsh into WordPress"

mkdir "/tmp/wordpress-$WP_BRANCH/src/wp-content/mu-plugins"
cp -r "/tmp/wordpress-$WP_BRANCH/src/wp-content/plugins/wpcomsh" "/tmp/wordpress-$WP_BRANCH/src/wp-content/mu-plugins/wpcomsh"

echo "::endgroup::"
fi

cd "/tmp/wordpress-$WP_BRANCH"

cp wp-tests-config-sample.php wp-tests-config.php
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
NODE_VERSION: ${{ matrix.node }}
MONOREPO_BASE: ${{ github.workspace }}
WITH_WOOCOMMERCE: ${{ matrix.with-woocommerce }}
WITH_WPCOMSH: ${{ matrix.with-wpcomsh }}
strategy:
fail-fast: false
matrix:
Expand Down
24 changes: 24 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions projects/plugins/jetpack/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
__DIR__ . '/../../../plugins/crm/includes/ZeroBSCRM.Core.Extensions.php', // functions zeroBSCRM_isExtensionInstalled, zeroBSCRM_extension_install_jetpackforms

// Make an exception to the above for packages/jetpack-mu-wpcom. Pulling in that whole package here seems more risky than beneficial.
__DIR__ . '/../../../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php', // class Jetpack_Mu_Wpcom
__DIR__ . '/../../../packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php', // function wpcom_launchpad_is_fse_next_steps_modal_hidden
),
)
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/try-wpcomsh-skeleton-ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: other

Added ability to test Jetpack together with wpcomsh.
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/tests/action-test-php.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ if [[ "$WITH_WOOCOMMERCE" == true ]]; then
exit 0
fi

if [[ "$WITH_WPCOMSH" == true ]]; then
export JETPACK_TEST_WPCOMSH=1
fi

echo "::group::Jetpack tests"
phpunit
echo "::endgroup::"
Expand Down
33 changes: 33 additions & 0 deletions projects/plugins/jetpack/tests/php/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
echo "Disregard Core's -c tests/phpunit/multisite.xml notice below." . PHP_EOL;
}

if ( '1' !== getenv( 'JETPACK_TEST_WPCOMSH' ) ) {
echo 'To run tests with the WordPress.com Site Helper plugin activated and Atomic mode enabled,' . PHP_EOL;
echo 'prefix phpunit with JETPACK_TEST_WPCOMSH=1' . PHP_EOL;
}

if ( '1' !== getenv( 'JETPACK_TEST_WOOCOMMERCE' ) ) {
echo 'To run Jetpack woocommerce tests, prefix phpunit with JETPACK_TEST_WOOCOMMERCE=1' . PHP_EOL;
} else {
Expand All @@ -101,6 +106,7 @@ function _manually_load_plugin() {
if ( '1' === getenv( 'JETPACK_TEST_WOOCOMMERCE' ) ) {
require JETPACK_WOOCOMMERCE_INSTALL_DIR . '/woocommerce.php';
}

require __DIR__ . '/../../jetpack.php';
$jetpack = Jetpack::init();
$jetpack->configure();
Expand All @@ -120,9 +126,36 @@ function _manually_install_woocommerce() {
echo 'Installing WooCommerce...' . PHP_EOL;
}

/**
* Loading required mu-wpcom plugin files to be able to test with all required code.
*/
function _manually_load_muplugin() {
if ( getenv( 'GITHUB_ACTIONS' ) ) {

// Using plugin code installed by .github/files/setup-wordpress-env.sh.
require_once __DIR__ . '/../../../../mu-plugins/wpcomsh/wpcomsh.php';
require_once __DIR__ . '/../../../../mu-plugins/wpcomsh/vendor/autoload.php';
} else {
require_once __DIR__ . '/../../../wpcomsh/wpcomsh.php';
require_once __DIR__ . '/../../../wpcomsh/vendor/autoload.php';
}
\Automattic\Jetpack\Jetpack_Mu_Wpcom::init();

defined( 'WPCOMSH_PREMIUM_THEMES_PATH' ) || define( 'WPCOMSH_PREMIUM_THEMES_PATH', sys_get_temp_dir() . '/premium' );
if ( ! is_dir( WPCOMSH_PREMIUM_THEMES_PATH ) ) {
mkdir( WPCOMSH_PREMIUM_THEMES_PATH, 0777 );
}
}

// If we are running the uninstall tests don't load jetpack.
if ( ! ( in_running_uninstall_group() ) ) {
tests_add_filter( 'plugins_loaded', '_manually_load_plugin', 1 );

if ( '1' === getenv( 'JETPACK_TEST_WPCOMSH' ) ) {
define( 'IS_ATOMIC', true );
tests_add_filter( 'muplugins_loaded', '_manually_load_muplugin' );
}

if ( '1' === getenv( 'JETPACK_TEST_WOOCOMMERCE' ) ) {
tests_add_filter( 'setup_theme', '_manually_install_woocommerce' );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
* @package Jetpack
*/

if ( class_exists( 'WPCOM_Features' ) ) {
return;
}

/**
* Class WPCOM_Features.
*/
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/tests/php/lib/mock-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function has_blog_sticker( $sticker ) {
function wp_cache_is_enabled() {}
}

if ( ! function_exists( 'wpcom_site_has_feature' ) ) {
if ( ! function_exists( 'wpcom_site_has_feature' ) && false === getenv( 'JETPACK_TEST_WPCOMSH' ) ) {
/**
* Mock feature support.
*
Expand Down
95 changes: 95 additions & 0 deletions projects/plugins/wpcomsh/.circleci/config.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still useful, or should we delete it?

Copy link
Member Author

@zinigor zinigor Jun 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep it and turn it into a GitHub CI action that tests on a self-hosted runner, but do it in a separate PR.

Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
workflows:
version: 2
main:
jobs:
- php74-build
- php80-build
- php81-build
- public-access
- private-access

version: 2

job-references:
mariadb_image: &mariadb_image
cimg/mariadb:10.11

setup_environment: &setup_environment
name: "Setup Environment Variables"
command: |
echo "export PATH=$HOME/.composer/vendor/bin:$PATH" >> $BASH_ENV
source /home/circleci/.bashrc

install_dependencies: &install_dependencies
name: "Install Dependencies"
command: |
sudo apt-get update && sudo apt-get install subversion mariadb-client rsync

php_job: &php_job
environment:
- WP_TESTS_DIR: "/tmp/wordpress-tests-lib"
- WP_CORE_DIR: "/tmp/wordpress/"
steps:
- checkout
- run: *setup_environment
- run: *install_dependencies
- run:
name: "Run Tests"
command: |
composer global require "phpunit/phpunit=^9.6" --ignore-platform-reqs --dev
composer global require "yoast/phpunit-polyfills" --ignore-platform-reqs --dev
rm -rf $WP_TESTS_DIR $WP_CORE_DIR
bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 latest
echo "Building wpcomsh"
make build
echo "php -l the build/"
find build/ -name "*.php" | xargs -I X php -l X
echo "Copying build to mu-plugins"
mkdir -p ${WP_CORE_DIR}wp-content/mu-plugins/
cp -r ./build/wpcomsh ${WP_CORE_DIR}wp-content/mu-plugins/
echo "Linking the wpcomsh-loader.php file into mu-plugins";
ln -s ${WP_CORE_DIR}wp-content/mu-plugins/wpcomsh/wpcomsh-loader.php ${WP_CORE_DIR}wp-content/mu-plugins/wpcomsh-loader.php
mysql -uroot --protocol=tcp -e "ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password AS '';"
phpunit
WP_MULTISITE=1 phpunit

jobs:
php74-build:
<<: *php_job
docker:
- image: cimg/php:7.4
- image: *mariadb_image

php80-build:
<<: *php_job
docker:
- image: cimg/php:8.0
- image: *mariadb_image

php81-build:
<<: *php_job
docker:
- image: cimg/php:8.1
- image: *mariadb_image

public-access:
docker:
- image: circleci/buildpack-deps:buster
steps:
- run: sudo su -c "apt-get update && apt-get -y upgrade && apt-get -y install composer rsync"
- run: php -v
- add_ssh_keys
- checkout
- setup_remote_docker
- run: make test-public-access

private-access:
docker:
- image: circleci/buildpack-deps:buster
steps:
- run: sudo su -c "apt-get update && apt-get -y upgrade && apt-get -y install composer rsync"
- run: php -v
- add_ssh_keys
- checkout
- setup_remote_docker
- run: make test-private-access
1 change: 1 addition & 0 deletions projects/plugins/wpcomsh/.dockerignore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still useful, or should we delete it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing, this was introduced with docker-based CircleCI tests, let's keep that as a reminder to make it work with GH CI.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
29 changes: 29 additions & 0 deletions projects/plugins/wpcomsh/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const loadIgnorePatterns = require( 'jetpack-js-tools/load-eslint-ignore.js' );

module.exports = {
root: true,
extends: [
require.resolve( 'jetpack-js-tools/eslintrc/jest' ),
require.resolve( 'jetpack-js-tools/eslintrc/prettier' ),
],
ignorePatterns: loadIgnorePatterns( __dirname ),
overrides: [],
env: {
browser: true,
jest: true,
node: true,
},
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
globals: {},
settings: {},
rules: {
'jest/no-disabled-tests': 'warn',
'jest/no-focused-tests': 'error',
'jest/no-identical-title': 'error',
'jest/prefer-to-have-length': 'warn',
'jest/valid-expect': 'error',
},
};
50 changes: 50 additions & 0 deletions projects/plugins/wpcomsh/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Files not needed to be distributed in the package.
.gitattributes export-ignore
.github/ 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.
# /src/js/example.min.js production-include
# Files to include in Automattic/wpcom-site-helper
/vendor/** production-include
/vendor/autoload.php production-include
/vendor/automattic/** production-include
/vendor/composer/** production-include
/vendor/tubalmartin/** production-include

# Files to exclude from the mirror repo, but included in the monorepo.
# Remember to end all directories with `/**` to properly tag every file.
.eslintignore production-exclude
.dockerignore production-exclude
.editorconfig production-exclude
composer.lock production-exclude
/.circleci/** production-exclude
/.gitignore production-exclude
/.phpcsignore production-exclude
/.phpcs.dir.xml production-exclude
/.phpcs.dir.phpcompatibility.xml production-exclude
/changelog/** production-exclude
/jetpack_vendor/automattic/**/README.md production-exclude
/jetpack_vendor/automattic/**/src/css/*.scss production-exclude
/jetpack_vendor/automattic/**/composer.json production-exclude
/node_modules/** production-exclude
/phpunit.xml.dist production-exclude
/README.md production-exclude
/vendor/automattic/**/src/css/*.scss production-exclude
/vendor/automattic/**/composer.json production-exclude
/vendor/automattic/jetpack-autoloader/** production-exclude
/vendor/automattic/jetpack-changelogger/** production-exclude
/vendor/automattic/jetpack-composer-plugin/** production-exclude
/vendor/**/.git* production-exclude
/vendor/**/.git*/** production-exclude
/vendor/**/*.md production-exclude
**/*.md production-exclude
/bin/** production-exclude
/build/** production-exclude
/tests/** production-exclude
/.circleci/** production-exclude
.*ntrc production-exclude
Makefile production-exclude
*.mdown production-exclude
error_log production-exclude
43 changes: 43 additions & 0 deletions projects/plugins/wpcomsh/.github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: PHP Lint

on: pull_request

jobs:
phpcs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Check existence of composer.json & phpcs.xml.dist files
id: check_files
uses: andstor/file-existence-action@v2
with:
files: "composer.json, phpcs.xml.dist"

- name: Set up PHP environment
if: steps.check_files.outputs.files_exists == 'true'
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
tools: cs2pr
env:
COMPOSER_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}

- name: Install Composer dependencies & cache dependencies
if: steps.check_files.outputs.files_exists == 'true'
uses: "ramsey/composer-install@v2"
env:
COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
with:
# Bust the cache at least once a month - output format: YYYY-MM.
custom-cache-suffix: $(date -u "+%Y-%m")

- name: Detect coding standard violations (Expand for details)
# continue-on-error: true
run: composer phpcs --report-full --report-checkstyle=./phpcs-report.xml

- name: Show coding standard violations in PR (Expand above section for details)
run: cs2pr --graceful-warnings ./phpcs-report.xml
Loading
Loading