@automattic/newspack-blocks 1.60.1 → 1.61.0

package/src/components/query-controls.js

@@ -3,15 +3,11 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
-import { Button, QueryControls as BaseControl, ToggleControl } from '@wordpress/components';
+import { Button, QueryControls as BasicQueryControls, ToggleControl } from '@wordpress/components';
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import { decodeEntities } from '@wordpress/html-entities';
 
-/**
- * External dependencies.
- */
-
 /**
  * Internal dependencies.
  */
@@ -170,8 +166,6 @@ class QueryControls extends Component {
 		} );
 	};
 
-	// Linter seems to be confused by returning an array.
-	// eslint-disable-next-line react/require-render-return
 	render = () => {
 		const {
 			specificMode,
@@ -192,93 +186,95 @@ class QueryControls extends Component {
 		} = this.props;
 		const { showAdvancedFilters } = this.state;
 
-		return [
-			enableSpecific && (
-				<ToggleControl
-					key="specificMode"
-					checked={ specificMode }
-					onChange={ onSpecificModeChange }
-					label={ __( 'Choose Specific Posts', 'newspack-blocks' ) }
-				/>
-			),
-			specificMode && (
-				<AutocompleteTokenField
-					key="posts"
-					tokens={ specificPosts || [] }
-					onChange={ onSpecificPostsChange }
-					fetchSuggestions={ this.fetchPostSuggestions }
-					fetchSavedInfo={ this.fetchSavedPosts }
-					label={ __( 'Posts', 'newspack-blocks' ) }
-					help={ __(
-						'Begin typing post title, click autocomplete result to select.',
-						'newspack-blocks'
-					) }
-				/>
-			),
-			! specificMode && <BaseControl key="queryControls" { ...this.props } />,
-			! specificMode && onAuthorsChange && (
-				<AutocompleteTokenField
-					key="authors"
-					tokens={ authors || [] }
-					onChange={ onAuthorsChange }
-					fetchSuggestions={ this.fetchAuthorSuggestions }
-					fetchSavedInfo={ this.fetchSavedAuthors }
-					label={ __( 'Authors', 'newspack-blocks' ) }
-				/>
-			),
-			! specificMode && onCategoriesChange && (
-				<AutocompleteTokenField
-					key="categories"
-					tokens={ categories || [] }
-					onChange={ onCategoriesChange }
-					fetchSuggestions={ this.fetchCategorySuggestions }
-					fetchSavedInfo={ this.fetchSavedCategories }
-					label={ __( 'Categories', 'newspack-blocks' ) }
-				/>
-			),
-			! specificMode && onTagsChange && (
-				<AutocompleteTokenField
-					key="tags"
-					tokens={ tags || [] }
-					onChange={ onTagsChange }
-					fetchSuggestions={ this.fetchTagSuggestions }
-					fetchSavedInfo={ this.fetchSavedTags }
-					label={ __( 'Tags', 'newspack-blocks' ) }
-				/>
-			),
-			! specificMode && onTagExclusionsChange && (
-				<p key="toggle-advanced-filters">
-					<Button
-						isLink
-						onClick={ () => this.setState( { showAdvancedFilters: ! showAdvancedFilters } ) }
-					>
-						{ showAdvancedFilters
-							? __( 'Hide Advanced Filters', 'newspack-blocks' )
-							: __( 'Show Advanced Filters', 'newspack-blocks' ) }
-					</Button>
-				</p>
-			),
-			! specificMode && onTagExclusionsChange && showAdvancedFilters && (
-				<AutocompleteTokenField
-					key="tag-exclusion"
-					tokens={ tagExclusions || [] }
-					onChange={ onTagExclusionsChange }
-					fetchSuggestions={ this.fetchTagSuggestions }
-					fetchSavedInfo={ this.fetchSavedTags }
-					label={ __( 'Excluded Tags', 'newspack-blocks' ) }
-				/>
-			),
-			! specificMode && onCategoryExclusionsChange && showAdvancedFilters && (
-				<AutocompleteTokenField
-					key="category-exclusion"
-					tokens={ categoryExclusions || [] }
-					onChange={ onCategoryExclusionsChange }
-					fetchSuggestions={ this.fetchCategorySuggestions }
-					fetchSavedInfo={ this.fetchSavedCategories }
-					label={ __( 'Excluded Categories', 'newspack-blocks' ) }
-				/>
-			),
-		];
+		return (
+			<>
+				{ enableSpecific && (
+					<ToggleControl
+						checked={ specificMode }
+						onChange={ onSpecificModeChange }
+						label={ __( 'Choose Specific Posts', 'newspack-blocks' ) }
+					/>
+				) }
+				{ specificMode ? (
+					<AutocompleteTokenField
+						tokens={ specificPosts || [] }
+						onChange={ onSpecificPostsChange }
+						fetchSuggestions={ this.fetchPostSuggestions }
+						fetchSavedInfo={ this.fetchSavedPosts }
+						label={ __( 'Posts', 'newspack-blocks' ) }
+						help={ __(
+							'Begin typing post title, click autocomplete result to select.',
+							'newspack-blocks'
+						) }
+					/>
+				) : (
+					<>
+						<BasicQueryControls { ...this.props } />
+						{ onAuthorsChange && (
+							<AutocompleteTokenField
+								tokens={ authors || [] }
+								onChange={ onAuthorsChange }
+								fetchSuggestions={ this.fetchAuthorSuggestions }
+								fetchSavedInfo={ this.fetchSavedAuthors }
+								label={ __( 'Authors', 'newspack-blocks' ) }
+							/>
+						) }
+						{ onCategoriesChange && (
+							<AutocompleteTokenField
+								tokens={ categories || [] }
+								onChange={ onCategoriesChange }
+								fetchSuggestions={ this.fetchCategorySuggestions }
+								fetchSavedInfo={ this.fetchSavedCategories }
+								label={ __( 'Categories', 'newspack-blocks' ) }
+							/>
+						) }
+						{ onTagsChange && (
+							<AutocompleteTokenField
+								tokens={ tags || [] }
+								onChange={ onTagsChange }
+								fetchSuggestions={ this.fetchTagSuggestions }
+								fetchSavedInfo={ this.fetchSavedTags }
+								label={ __( 'Tags', 'newspack-blocks' ) }
+							/>
+						) }
+						{ onTagExclusionsChange && (
+							<p>
+								<Button
+									isLink
+									onClick={ () => this.setState( { showAdvancedFilters: ! showAdvancedFilters } ) }
+								>
+									{ showAdvancedFilters
+										? __( 'Hide Advanced Filters', 'newspack-blocks' )
+										: __( 'Show Advanced Filters', 'newspack-blocks' ) }
+								</Button>
+							</p>
+						) }
+						{ showAdvancedFilters && (
+							<>
+								{ onTagExclusionsChange && (
+									<AutocompleteTokenField
+										tokens={ tagExclusions || [] }
+										onChange={ onTagExclusionsChange }
+										fetchSuggestions={ this.fetchTagSuggestions }
+										fetchSavedInfo={ this.fetchSavedTags }
+										label={ __( 'Excluded Tags', 'newspack-blocks' ) }
+									/>
+								) }
+								{ onCategoryExclusionsChange && (
+									<AutocompleteTokenField
+										tokens={ categoryExclusions || [] }
+										onChange={ onCategoryExclusionsChange }
+										fetchSuggestions={ this.fetchCategorySuggestions }
+										fetchSavedInfo={ this.fetchSavedCategories }
+										label={ __( 'Excluded Categories', 'newspack-blocks' ) }
+									/>
+								) }
+							</>
+						) }
+					</>
+				) }
+			</>
+		);
 	};
 }
 

package/vendor/autoload.php

@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitcf78bb37f80571250abebcf812575eed::getLoader();
+return ComposerAutoloaderInit6c48257b500dde261f28a2d07827bdd6::getLoader();

package/vendor/composer/ClassLoader.php

@@ -42,6 +42,9 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
     /** @var ?string */
     private $vendorDir;
 
@@ -106,6 +109,7 @@ class ClassLoader
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
@@ -149,7 +153,7 @@ class ClassLoader
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {
@@ -425,7 +429,7 @@ class ClassLoader
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            (self::$includeFile)($file);
 
             return true;
         }
@@ -555,18 +559,23 @@ class ClassLoader
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    private static function initializeIncludeClosure(): void
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = static function($file) {
+            include $file;
+        };
+    }
 }

package/vendor/composer/InstalledVersions.php

@@ -21,12 +21,14 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
     /**
      * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
@@ -37,7 +39,7 @@ class InstalledVersions
 
     /**
      * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static $installedByVendor = array();
 
@@ -241,7 +243,7 @@ class InstalledVersions
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
      */
     public static function getRootPackage()
     {
@@ -255,7 +257,7 @@ class InstalledVersions
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
      */
     public static function getRawData()
     {
@@ -278,7 +280,7 @@ class InstalledVersions
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     public static function getAllRawData()
     {
@@ -301,7 +303,7 @@ class InstalledVersions
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
      */
     public static function reload($data)
     {
@@ -311,7 +313,7 @@ class InstalledVersions
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static function getInstalled()
     {

package/vendor/composer/autoload_classmap.php

@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

package/vendor/composer/autoload_namespaces.php

@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

package/vendor/composer/autoload_psr4.php

@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitcf78bb37f80571250abebcf812575eed
+class ComposerAutoloaderInit6c48257b500dde261f28a2d07827bdd6
 {
     private static $loader;
 
@@ -22,31 +22,12 @@ class ComposerAutoloaderInitcf78bb37f80571250abebcf812575eed
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitcf78bb37f80571250abebcf812575eed', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitcf78bb37f80571250abebcf812575eed', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitcf78bb37f80571250abebcf812575eed::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        spl_autoload_register(array('ComposerAutoloaderInit6c48257b500dde261f28a2d07827bdd6', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInit6c48257b500dde261f28a2d07827bdd6', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit6c48257b500dde261f28a2d07827bdd6::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitcf78bb37f80571250abebcf812575eed
+class ComposerStaticInit6c48257b500dde261f28a2d07827bdd6
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitcf78bb37f80571250abebcf812575eed
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitcf78bb37f80571250abebcf812575eed::$classMap;
+            $loader->classMap = ComposerStaticInit6c48257b500dde261f28a2d07827bdd6::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -1,22 +1,22 @@
 <?php return array(
     'root' => array(
+        'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+        'reference' => '9fb95823000c240c7c838087cd464251002801f0',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'b0a62680b729314d9acaff8e85cafcfaf779489c',
-        'name' => 'automattic/newspack-blocks',
         'dev' => false,
     ),
     'versions' => array(
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+            'reference' => '9fb95823000c240c7c838087cd464251002801f0',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'b0a62680b729314d9acaff8e85cafcfaf779489c',
             'dev_requirement' => false,
         ),
     ),