[Backport v11-branch] Use ElasticPress package and update to v4.2.2.

Merge pull request #420 from humanmade/backport-419-to-v11-branch
humanmade · Jul 15, 2022 · fb5fd94 · fb5fd94
2 parents 2c267e7 + c5ef496
commit fb5fd94
Show file tree

Hide file tree

Showing 227 changed files with 3 additions and 43,828 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
 	],
 	"require": {
 		"php": ">=7.1",
+		"10up/elasticpress": "~4.2.2",
 		"humanmade/debug-bar-elasticpress": "~1.6.3"
 	},
 	"autoload" : {
@@ -23,6 +24,7 @@
 	"extra": {
 		"altis": {
 			"install-overrides": [
+				"10up/elasticpress",
 				"humanmade/debug-bar-elasticpress"
 			]
 		}

diff --git a/inc/namespace.php b/inc/namespace.php
@@ -164,7 +164,7 @@ function load_elasticpress() {
 		add_filter( 'pre_site_option_ep_last_sync', '__return_false' );
 	}
 
-	require_once dirname( __DIR__ ) . '/lib/elasticpress/elasticpress.php';
+	require_once Altis\ROOT_DIR . '/vendor/10up/elasticpress/elasticpress.php';
 
 	// Now ElasticPress has been included, we can remove some of it's filters.
 

diff --git a/lib/elasticpress/assets/css/autosuggest.css b/lib/elasticpress/assets/css/autosuggest.css
diff --git a/lib/elasticpress/assets/css/comments.css b/lib/elasticpress/assets/css/comments.css