Skip to content

Commit

Permalink
Task/composer required package installs update (#1076)
Browse files Browse the repository at this point in the history
* Remove Gravity Forms as a composer dependency.
* Update ACF Pro Composer install configuration to modern standards.
  • Loading branch information
dpellenwood authored Sep 3, 2024
1 parent 461c4df commit 9546bd5
Show file tree
Hide file tree
Showing 5 changed files with 6,900 additions and 3,368 deletions.
8 changes: 3 additions & 5 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Find API keys in 1Password, in the Square One vault under "Square One .env"
# Direct 1password link: https://m.tri.be/soenv10
WP_PLUGIN_ACF_KEY=''
WP_PLUGIN_GF_KEY=''
WP_PLUGIN_GF_TOKEN=''
# Not currently used.
# ACF Pro uses auth.json instead.
# Gravity Forms does not support composer installations. The plugin files should be checked into the repo directly.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ wp-content/themes/core/reports
#######################
/.garden-*
/.env
/auth.json
/vendor
dev/docker/composer/
dev/docker/composer-config.json
Expand Down
8 changes: 8 additions & 0 deletions auth-sample.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"http-basic": {
"connect.advancedcustomfields.com": {
"username": "ACF License Key",
"password": "https://square1.tribe"
}
}
}
40 changes: 6 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/installers": true,
"ffraenz/private-composer-installer": true,
"johnpbloch/wordpress-core-installer": true,
"cweagans/composer-patches": true,
"phpstan/extension-installer": true,
Expand All @@ -28,6 +27,10 @@
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "composer",
"url": "https://connect.advancedcustomfields.com"
},
{
"type": "composer",
"url": "https://wpackagist.org"
Expand All @@ -43,36 +46,6 @@
{
"type": "vcs",
"url": "[email protected]:bordoni/phpass.git"
},
{
"type": "package",
"package": {
"name": "gravityforms/gravityforms",
"version": "2.7.13",
"type": "wordpress-plugin",
"dist": {
"type": "zip",
"url": "https://composer.utility.mtribe.site/gravityforms/?key={%WP_PLUGIN_GF_KEY}&token={%WP_PLUGIN_GF_TOKEN}&t={%VERSION}"
},
"require": {
"ffraenz/private-composer-installer": "^5.0"
}
}
},
{
"type": "package",
"package": {
"name": "advanced-custom-fields/advanced-custom-fields-pro",
"version": "6.2.0",
"type": "wordpress-plugin",
"dist": {
"type": "zip",
"url": "https://connect.advancedcustomfields.com/index.php?a=download&p=pro&k={%WP_PLUGIN_ACF_KEY}&t={%VERSION}"
},
"require": {
"ffraenz/private-composer-installer": "^5.0"
}
}
}
],
"require": {
Expand All @@ -82,8 +55,6 @@
"ext-imagick": "*",
"ext-intl": "*",
"ext-json": "*",
"advanced-custom-fields/advanced-custom-fields-pro": "*",
"gravityforms/gravityforms": "*",
"guzzlehttp/psr7": "^1.4",
"http-interop/http-factory-guzzle": "^1.2",
"humanmade/s3-uploads": "3.0.4",
Expand All @@ -109,7 +80,8 @@
"wpackagist-plugin/regenerate-thumbnails": "3.1.6",
"wpackagist-plugin/user-switching": "1.7.0",
"wpackagist-plugin/wordpress-seo": "21.0",
"wpackagist-plugin/wp-tota11y": "1.2.0"
"wpackagist-plugin/wp-tota11y": "1.2.0",
"wpengine/advanced-custom-fields-pro": "6.2.0"
},
"require-dev": {
"brain/monkey": "2.*",
Expand Down
Loading

0 comments on commit 9546bd5

Please sign in to comment.