Search: Migrate Classic Search, Instant Search, and Customberg to package

projects/packages/search/.eslintrc.js

@@ -3,6 +3,7 @@ module.exports = {
 	// JavaScript files inside this folder are meant to be transpiled by Webpack.
 	root: true,
 	extends: [ '../../../.eslintrc.react.js' ],
+	ignorePatterns: [ '**/external/*.js' ],
 	parserOptions: {
 		babelOptions: {
 			configFile: require.resolve( './babel.config.js' ),

projects/packages/search/.size-limit.js

@@ -0,0 +1,12 @@
+module.exports = [
+	{
+		path: 'build/instant-search/jp-search.js',
+		running: false,
+		limit: '4 KiB',
+	},
+	{
+		path: 'build/instant-search/jp-search.chunk-main-payload.js',
+		running: false,
+		limit: '50 KiB',
+	},
+];

projects/packages/search/changelog/update-move-classic-and-instant-search-to-package

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Search: Migrated Classic and Instant Search code from Jetpack plugin.

projects/packages/search/composer.json

@@ -36,6 +36,10 @@
 			"@composer install",
 			"phpdbg -d memory_limit=2048M -d max_execution_time=900 -qrr ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
 		],
+		"test-js": [
+			"Composer\\Config::disableProcessTimeout",
+			"pnpm run test"
+		],
 		"test-php": [
 			"@composer install",
 			"@composer phpunit"

projects/packages/search/package.json

@@ -10,8 +10,8 @@
 		"build": "pnpm run clean && pnpm run install-if-deps-outdated && pnpm run build-instant && pnpm run build-customberg && pnpm run build-dashboard",
 		"build-production": "NODE_ENV=production BABEL_ENV=production pnpm run build && pnpm run validate && pnpm run build-production-php",
 		"build-development": "NODE_ENV=development BABEL_ENV=development pnpm run build && pnpm run build-php",
-		"build-instant": "echo 'Not yet implemented.'",
-		"build-customberg": "echo 'Not yet implemented.'",
+		"build-instant": "webpack --config ./tools/webpack.instant.config.js",
+		"build-customberg": "webpack --config ./tools/webpack.customberg.config.js",
 		"build-dashboard": "echo 'Not yet implemented.'",
 		"build-php": "composer install --ignore-platform-reqs",
 		"build-production-php": "COMPOSER_MIRROR_PATH_REPOS=1 COMPOSER_ROOT_VERSION=dev-master composer install -o --no-dev --classmap-authoritative --prefer-dist",
@@ -20,7 +20,7 @@
 		"install-if-deps-outdated": "pnpm install --no-prod --frozen-lockfile",
 		"test": "pnpx concurrently 'pnpm:test-scripts' 'pnpm:test-size'",
 		"test-scripts": "jest --passWithNoTests",
-		"test-size": "echo 'Not yet implemented.'",
+		"test-size": "NODE_ENV=production BABEL_ENV=production pnpm run build-instant && size-limit",
 		"validate": "pnpm exec validate-es --no-error-on-unmatched-pattern build/"
 	},
 	"repository": {
@@ -56,8 +56,8 @@
 		"preact": "10.5.15",
 		"q-flat": "1.0.7",
 		"qss": "2.0.3",
-		"react": "16.14.0",
-		"react-dom": "16.14.0",
+		"react": "17.0.2",
+		"react-dom": "17.0.2",
 		"react-redux": "7.2.6",
 		"redux": "4.1.1",
 		"refx": "3.1.1",

projects/packages/search/src/class-helper.php

@@ -650,7 +650,7 @@ public static function ensure_post_types_on_remove_url( $filters, $post_types )
 	public static function are_filters_by_widget_disabled() {
 		/**
 		 * Allows developers to disable filters being set by widget, in favor of manually
-		 * setting filters via `Jetpack_Search::set_filters()`.
+		 * setting filters via `Classic_Search::set_filters()`.
 		 *
 		 * @module search
 		 *
@@ -863,9 +863,7 @@ public static function generate_initial_javascript_state() {
 			'postsPerPage'          => $posts_per_page,
 			'siteId'                => class_exists( 'Jetpack' ) && method_exists( 'Jetpack', 'get_option' ) ? Jetpack::get_option( 'id' ) : get_current_blog_id(),
 			'postTypes'             => $post_type_labels,
-			// TODO: Enable this once instant search build pipeline has been moved to the Search package.
-			// 'webpackPublicPath'     => plugins_url( '/build/instant-search/', __DIR__ ).
-			'webpackPublicPath'     => plugins_url( '_inc/build/instant-search/', JETPACK__PLUGIN_FILE ),
+			'webpackPublicPath'     => plugins_url( '/build/instant-search/', __DIR__ ),
 			'isPhotonEnabled'       => ( $is_wpcom || $is_jetpack_photon_enabled ) && ! $is_private_site,
 
 			// config values related to private site support.
@@ -905,4 +903,26 @@ public static function print_instant_search_sidebar() {
 		</div>
 		<?php
 	}
+
+	/**
+	 * Gets all of the active plugins via site options.
+	 * Forked from Jetpack::get_active_plugins from the Jetpack plugin.
+	 *
+	 * @return string[]
+	 */
+	public static function get_active_plugins() {
+		// active_plugins plugins as values.
+		$active_plugins = (array) get_option( 'active_plugins', array() );
+
+		// active_sitewide_plugins stores plugins as keys.
+		if ( is_multisite() ) {
+			$network_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
+			if ( $network_plugins ) {
+				$active_plugins = array_merge( $active_plugins, $network_plugins );
+			}
+		}
+
+		sort( $active_plugins );
+		return array_unique( $active_plugins );
+	}
 }

projects/packages/search/src/class-template-tags.php

@@ -29,8 +29,7 @@ class Template_Tags {
 	 */
 	public static function render_available_filters( $filters = null, $post_types = null ) {
 		if ( is_null( $filters ) ) {
-			// TODO: Must be migrated to use Classic_Search once the migration is underway.
-			$filters = \Jetpack_Search::instance()->get_filters();
+			$filters = Classic_Search::instance()->get_filters();
 		}
 
 		if ( is_null( $post_types ) ) {
@@ -44,8 +43,7 @@ public static function render_available_filters( $filters = null, $post_types =
 		$active_post_types = array();
 		if ( Helper::post_types_differ_searchable( $post_types ) ) {
 			// get the active filter buckets from the query.
-			// TODO: Must be migrated to use Classic_Search once the migration is underway.
-			$active_buckets          = \Jetpack_Search::instance()->get_active_filter_buckets();
+			$active_buckets          = Classic_Search::instance()->get_active_filter_buckets();
 			$post_types_differ_query = Helper::post_types_differ_query( $post_types );
 
 			// remove any post_type filters from display if the current query
@@ -84,8 +82,7 @@ public static function render_available_filters( $filters = null, $post_types =
 	 */
 	public static function render_instant_filters( $filters = null ) {
 		if ( is_null( $filters ) ) {
-			// TODO: Must be migrated to use Classic_Search once the migration is underway.
-			$filters = \Jetpack_Search::instance()->get_filters();
+			$filters = Classic_Search::instance()->get_filters();
 		}
 
 		foreach ( (array) $filters as $filter ) {