Merge branch 'develop' into trunk

.github/workflows/build-and-tag.yml

@@ -18,10 +18,10 @@ jobs:
         php-version: '8.2'
         coverage: none
 
-    - name: install node v16
+    - name: install node v18
       uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 18
 
     - name: Build
       run: |

.github/workflows/build-with-vendor.yml

@@ -20,10 +20,10 @@ jobs:
         php-version: '8.2'
         coverage: none
 
-    - name: install node v16
+    - name: install node v18
       uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 18
 
     - name: Build
       run: |

.github/workflows/lint.yml

@@ -3,7 +3,7 @@ name: Linting
 env:
   COMPOSER_VERSION: "2"
   COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
-  NODE_VERSION: "16"
+  NODE_VERSION: "18"
   NODE_CACHE: "${{ github.workspace }}/node_modules_cache"
 
 on:
@@ -67,7 +67,7 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.2'
         tools: cs2pr
         coverage: none
 

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Test
 env:
   COMPOSER_VERSION: "2"
   COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
-  NODE_VERSION: "16"
+  NODE_VERSION: "18"
   NODE_CACHE: "${{ github.workspace }}/node_modules_cache"
 
 on:
@@ -39,7 +39,7 @@ jobs:
     - name: Setup Elasticsearch
       uses: getong/elasticsearch-action@v1.2
       with:
-        elasticsearch version: '7.5.0'
+        elasticsearch version: '7.10.1'
 
     - name: Set standard 10up cache directories
       run: |
@@ -56,7 +56,7 @@ jobs:
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.2'
         coverage: none
 
     - name: Install dependencies

.nvmrc

@@ -1 +1 @@
-16
+18

CHANGELOG.md

@@ -13,13 +13,26 @@ All notable changes to this project will be documented in this file, per [the Ke
 ### Security
 -->
 
+## [2.3.0] - 2024-03-04
+
+This version introduces the new *External Content* feature. Check [our blog post](https://www.elasticpress.io/blog/2024/03/pew-research-center-external-files-as-a-source-for-your-search) for more info.
+
+
+### Added
+- New "External Content" feature. Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#94](https://github.com/10up/ElasticPressLabs/pull/94) and [#99](https://github.com/10up/ElasticPressLabs/pull/99).
+
+### Changed
+- Composer packages update. Props [@felipeelia](https://github.com/felipeelia) via [#95](https://github.com/10up/ElasticPressLabs/pull/95).
+- Compatibility with node v18. Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#96](https://github.com/10up/ElasticPressLabs/pull/96).
+
+
 ## [2.2.0] - 2023-11-01
 
 ### Added
-- Compatibility with ElasticPress 5.0.0. Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#81](https://github.com/10up/ElasticPress/pull/81) and [#85](https://github.com/10up/ElasticPress/pull/85).
+- Compatibility with ElasticPress 5.0.0. Props [@felipeelia](https://github.com/felipeelia) and [@burhandodhy](https://github.com/burhandodhy) via [#81](https://github.com/10up/ElasticPressLabs/pull/81) and [#85](https://github.com/10up/ElasticPressLabs/pull/85).
 
 ### Changed
-- Features do not autoactivate anymore. Props [@felipeelia](https://github.com/felipeelia) via [#88](https://github.com/10up/ElasticPress/pull/88).
+- Features do not autoactivate anymore. Props [@felipeelia](https://github.com/felipeelia) via [#88](https://github.com/10up/ElasticPressLabs/pull/88).
 
 ### Security
 - Bumped `@babel/traverse` from 7.19.3 to 7.23.2. Props [@dependabot](https://github.com/dependabot) via [#80](https://github.com/10up/ElasticPressLabs/pull/80).
@@ -28,18 +41,18 @@ All notable changes to this project will be documented in this file, per [the Ke
 ## [2.1.1] - 2023-09-28
 
 ### Added
-- Integrate with WP update system to alert users about new versions. Props [@felipeelia](https://github.com/felipeelia) via [#76](https://github.com/10up/ElasticPress/pull/76).
+- Integrate with WP update system to alert users about new versions. Props [@felipeelia](https://github.com/felipeelia) via [#76](https://github.com/10up/ElasticPressLabs/pull/76).
 
 ### Changed
-- Update the User Indexable files (bringing from the main plugin.) Props [@MARQAS](https://github.com/MARQAS) via [#72](https://github.com/10up/ElasticPress/pull/72) and [#79](https://github.com/10up/ElasticPress/pull/79).
+- Update the User Indexable files (bringing from the main plugin.) Props [@MARQAS](https://github.com/MARQAS) via [#72](https://github.com/10up/ElasticPressLabs/pull/72) and [#79](https://github.com/10up/ElasticPressLabs/pull/79).
 
 ### Removed
-- Remove old Mapping files for Users. Props [@MARQAS](https://github.com/MARQAS) via [#72](https://github.com/10up/ElasticPress/pull/72).
+- Remove old Mapping files for Users. Props [@MARQAS](https://github.com/MARQAS) via [#72](https://github.com/10up/ElasticPressLabs/pull/72).
 
 ### Fixed
-- Boolean Operator (Not) not giving the expected result. Props [@MARQAS](https://github.com/MARQAS) via [#67](https://github.com/10up/ElasticPress/pull/67).
-- Fatal Error in command line. Props [@MARQAS](https://github.com/MARQAS) via [#69](https://github.com/10up/ElasticPress/pull/69).
-- PHP Warnings. Props [@felipeelia](https://github.com/felipeelia) via [#71](https://github.com/10up/ElasticPress/pull/71).
+- Boolean Operator (Not) not giving the expected result. Props [@MARQAS](https://github.com/MARQAS) via [#67](https://github.com/10up/ElasticPressLabs/pull/67).
+- Fatal Error in command line. Props [@MARQAS](https://github.com/MARQAS) via [#69](https://github.com/10up/ElasticPressLabs/pull/69).
+- PHP Warnings. Props [@felipeelia](https://github.com/felipeelia) via [#71](https://github.com/10up/ElasticPressLabs/pull/71).
 
 ### Security
 - Bumped `webpack` from 5.74.0 to 5.76.1. Props [@dependabot](https://github.com/dependabot) via [#64](https://github.com/10up/ElasticPressLabs/pull/64).
@@ -102,6 +115,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial plugin release.
 
 [Unreleased]: https://github.com/10up/ElasticPressLabs/compare/trunk...develop
+[2.3.0]: https://github.com/10up/ElasticPressLabs/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/10up/ElasticPressLabs/compare/2.1.1...2.2.0
 [2.1.1]: https://github.com/10up/ElasticPressLabs/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/10up/ElasticPressLabs/compare/2.0.0...2.1.0

CREDITS.md

@@ -6,7 +6,7 @@ The following acknowledges the Maintainers for this repository, those who have C
 
 The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.
 
-[Felipe Elia (@felipeelia)](https://github.com/felipeelia), [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle).
+[Thorsten Ott (@tott)](https://github.com/tott) and [Felipe Elia (@felipeelia)](https://github.com/felipeelia).
 
 ## Contributors
 

README.md

@@ -37,6 +37,9 @@ This plugin provides a simple interface to enable and disable features.
 4. Settings to change the version of the search algorithm between default, 3.5, and 4.0.
 ![](/.wordpress-org/screenshot-4.png)
 
+5. Settings to index external content.
+![](/.wordpress-org/screenshot-5.png)
+
 ## Support Level
 
 **Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress.  Bug reports, feature requests, questions, and pull requests are welcome.

bin/build-elasticpress.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ $COMPOSER_DEV_MODE == 1 ]; then
+	cd vendor/elasticpress
+	composer install
+	npm pkg set scripts.prepare=" "
+	npm ci
+	npm run build
+fi

composer.json

@@ -29,16 +29,21 @@
   "require-dev": {
     "phpunit/phpunit": "^9",
     "10up/wp_mock": "dev-trunk",
-    "10up/phpcs-composer": "dev-master",
-    "10up/elasticpress": "*",
+    "10up/phpcs-composer": "^3.0",
+    "10up/elasticpress": "dev-develop",
     "yoast/phpunit-polyfills": "^1.0",
-    "wpackagist-plugin/woocommerce": "*"
+    "wpackagist-plugin/woocommerce": "*",
+    "phpcompatibility/phpcompatibility-wp": "*",
+    "phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
   },
   "scripts": {
-    "lint": "phpcs . --runtime-set testVersion 7.0-",
+    "lint": "phpcs . -s --runtime-set testVersion 7.0-",
     "lint-fix": "phpcbf . --runtime-set testVersion 7.0-",
     "test": "phpunit",
-    "setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password 127.0.0.1 latest true"
+    "setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password 127.0.0.1 latest true",
+    "post-autoload-dump": [
+      "./bin/build-elasticpress.sh"
+    ]
   },
   "extra": {
     "installer-paths": {