chore: regenerate yarn.lock (#6341)

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>

packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx

@@ -64,6 +64,18 @@ function ResultsFooter({state, onClose}: ResultsFooterProps) {
   );
 }
 
+type FacetFilters = Required<
+  Required<DocSearchProps>['searchParameters']
+>['facetFilters'];
+
+function mergeFacetFilters(f1: FacetFilters, f2: FacetFilters): FacetFilters {
+  const normalize = (
+    f: FacetFilters,
+  ): readonly string[] | ReadonlyArray<readonly string[]> =>
+    f instanceof Array ? f : [f];
+  return [...normalize(f1), ...normalize(f2)] as FacetFilters;
+}
+
 function DocSearch({
   contextualSearch,
   externalUrlRegex,
@@ -71,18 +83,20 @@ function DocSearch({
 }: DocSearchProps) {
   const {siteMetadata} = useDocusaurusContext();
 
-  const contextualSearchFacetFilters = useAlgoliaContextualFacetFilters();
+  const contextualSearchFacetFilters =
+    useAlgoliaContextualFacetFilters() as FacetFilters;
 
-  const configFacetFilters = props.searchParameters?.facetFilters ?? [];
+  const configFacetFilters: FacetFilters =
+    props.searchParameters?.facetFilters ?? [];
 
-  const facetFilters = contextualSearch
+  const facetFilters: FacetFilters = contextualSearch
     ? // Merge contextual search filters with config filters
-      [...contextualSearchFacetFilters, ...configFacetFilters]
+      mergeFacetFilters(contextualSearchFacetFilters, configFacetFilters)
     : // ... or use config facetFilters
       configFacetFilters;
 
   // we let user override default searchParameters if he wants to
-  const searchParameters = {
+  const searchParameters: DocSearchProps['searchParameters'] = {
     ...props.searchParameters,
     facetFilters,
   };
@@ -167,9 +181,11 @@ function DocSearch({
       }),
   ).current;
 
-  const resultsFooterComponent = useMemo(
+  const resultsFooterComponent: DocSearchProps['resultsFooterComponent'] =
+    useMemo(
+      () =>
         // eslint-disable-next-line react/no-unstable-nested-components
-    () => (footerProps: ResultsFooterProps) =>
+        (footerProps: Omit<ResultsFooterProps, 'onClose'>): JSX.Element =>
           <ResultsFooter {...footerProps} onClose={onClose} />,
       [onClose],
     );

packages/docusaurus-theme-search-algolia/src/types.d.ts

@@ -8,3 +8,7 @@
 /// <reference types="@docusaurus/module-type-aliases" />
 /// <reference types="@docusaurus/theme-common" />
 /// <reference types="@docusaurus/theme-classic" />
+
+export type FacetFilters = Required<
+  Required<DocSearchProps>['searchParameters']
+>['facetFilters'];

packages/docusaurus-utils-validation/src/validationUtils.ts

@@ -63,7 +63,7 @@ export function normalizePluginOptions<T extends {id?: string}>(
     }
   }
 
-  return value;
+  return value!; // TODO remove ! this in TS 4.6, see https://twitter.com/sebastienlorber/status/1481950042277793793
 }
 
 export function normalizeThemeConfig<T>(
@@ -90,7 +90,7 @@ export function normalizeThemeConfig<T>(
       throw error;
     }
   }
-  return value;
+  return value!; // TODO remove ! this in TS 4.6, see https://twitter.com/sebastienlorber/status/1481950042277793793
 }
 
 export function validateFrontMatter<T>(
@@ -120,5 +120,5 @@ ${errorDetails.map(({message}) => message)}
     throw error;
   }
 
-  return value;
+  return value!; // TODO remove ! this in TS 4.6, see https://twitter.com/sebastienlorber/status/1481950042277793793
 }

packages/docusaurus/package.json

@@ -60,7 +60,7 @@
     "copy-webpack-plugin": "^9.0.1",
     "core-js": "^3.18.0",
     "css-loader": "^5.1.1",
-    "css-minimizer-webpack-plugin": "^3.0.2",
+    "css-minimizer-webpack-plugin": "^3.3.1",
     "cssnano": "^5.0.8",
     "del": "^6.0.0",
     "detect-port": "^1.3.0",
@@ -111,7 +111,6 @@
     "@docusaurus/module-type-aliases": "2.0.0-beta.14",
     "@docusaurus/types": "2.0.0-beta.14",
     "@types/copy-webpack-plugin": "^8.0.1",
-    "@types/css-minimizer-webpack-plugin": "^3.0.2",
     "@types/detect-port": "^1.3.0",
     "@types/mini-css-extract-plugin": "^1.4.3",
     "@types/nprogress": "^0.2.0",

packages/docusaurus/src/webpack/utils.ts

@@ -18,6 +18,7 @@ import webpack, {
 } from 'webpack';
 import fs from 'fs-extra';
 import TerserPlugin from 'terser-webpack-plugin';
+import type {CustomOptions, CssNanoOptions} from 'css-minimizer-webpack-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import path from 'path';
 import crypto from 'crypto';
@@ -390,7 +391,6 @@ export function getMinimizer(
         },
         compress: {
           ecma: 5,
-          // @ts-expect-error: API change in new version?
           warnings: false,
         },
         mangle: {
@@ -412,7 +412,7 @@ export function getMinimizer(
     minimizer.push(
       // Using the array syntax to add 2 minimizers
       // see https://github.com/webpack-contrib/css-minimizer-webpack-plugin#array
-      new CssMinimizerPlugin({
+      new CssMinimizerPlugin<[CssNanoOptions, CustomOptions]>({
         minimizerOptions: [
           // CssNano options
           {
@@ -420,7 +420,6 @@ export function getMinimizer(
           },
           // CleanCss options
           {
-            // @ts-expect-error: API change in new version?
             inline: false,
             level: {
               1: {