@backstage/plugin-search 1.4.31-next.1 → 1.4.32-next.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @backstage/plugin-search
 
+## 1.4.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.9.6-next.0
+  - @backstage/plugin-catalog-react@1.21.3-next.0
+  - @backstage/core-plugin-api@1.11.2-next.0
+  - @backstage/core-components@0.18.3-next.0
+  - @backstage/frontend-plugin-api@0.12.2-next.0
+  - @backstage/core-compat-api@0.5.4-next.0
+  - @backstage/errors@1.2.7
+  - @backstage/types@1.2.2
+  - @backstage/version-bridge@1.0.11
+  - @backstage/plugin-search-common@1.2.21-next.0
+
+## 1.4.31
+
+### Patch Changes
+
+- 67a3e1a: Implemented AbortController request cancellation for overlapping search requests. This change ensures that when users type quickly, previous search requests are properly canceled before new ones start.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.21.2
+  - @backstage/core-components@0.18.2
+  - @backstage/frontend-plugin-api@0.12.1
+  - @backstage/plugin-search-react@1.9.5
+  - @backstage/core-compat-api@0.5.3
+  - @backstage/core-plugin-api@1.11.1
+  - @backstage/plugin-search-common@1.2.20
+
 ## 1.4.31-next.1
 
 ### Patch Changes

package/dist/apis.esm.js

@@ -8,12 +8,14 @@ class SearchClient {
     this.discoveryApi = options.discoveryApi;
     this.fetchApi = options.fetchApi;
   }
-  async query(query) {
+  async query(query, options) {
     const queryString = qs.stringify(query);
     const url = `${await this.discoveryApi.getBaseUrl(
       "search"
     )}/query?${queryString}`;
-    const response = await this.fetchApi.fetch(url);
+    const response = await this.fetchApi.fetch(url, {
+      signal: options?.signal
+    });
     if (!response.ok) {
       throw await ResponseError.fromResponse(response);
     }

package/dist/apis.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"apis.esm.js","sources":["../src/apis.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';\nimport { ResponseError } from '@backstage/errors';\nimport { SearchApi } from '@backstage/plugin-search-react';\nimport { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';\n\nimport qs from 'qs';\n\nexport class SearchClient implements SearchApi {\n  private readonly discoveryApi: DiscoveryApi;\n  private readonly fetchApi: FetchApi;\n\n  constructor(options: { discoveryApi: DiscoveryApi; fetchApi: FetchApi }) {\n    this.discoveryApi = options.discoveryApi;\n    this.fetchApi = options.fetchApi;\n  }\n\n  async query(query: SearchQuery): Promise<SearchResultSet> {\n    const queryString = qs.stringify(query);\n    const url = `${await this.discoveryApi.getBaseUrl(\n      'search',\n    )}/query?${queryString}`;\n    const response = await this.fetchApi.fetch(url);\n\n    if (!response.ok) {\n      throw await ResponseError.fromResponse(response);\n    }\n\n    return response.json();\n  }\n}\n"],"names":[],"mappings":";;;AAuBO,MAAM,YAAA,CAAkC;AAAA,EAC5B,YAAA;AAAA,EACA,QAAA;AAAA,EAEjB,YAAY,OAAA,EAA6D;AACvE,IAAA,IAAA,CAAK,eAAe,OAAA,CAAQ,YAAA;AAC5B,IAAA,IAAA,CAAK,WAAW,OAAA,CAAQ,QAAA;AAAA,EAC1B;AAAA,EAEA,MAAM,MAAM,KAAA,EAA8C;AACxD,IAAA,MAAM,WAAA,GAAc,EAAA,CAAG,SAAA,CAAU,KAAK,CAAA;AACtC,IAAA,MAAM,GAAA,GAAM,CAAA,EAAG,MAAM,IAAA,CAAK,YAAA,CAAa,UAAA;AAAA,MACrC;AAAA,KACD,UAAU,WAAW,CAAA,CAAA;AACtB,IAAA,MAAM,QAAA,GAAW,MAAM,IAAA,CAAK,QAAA,CAAS,MAAM,GAAG,CAAA;AAE9C,IAAA,IAAI,CAAC,SAAS,EAAA,EAAI;AAChB,MAAA,MAAM,MAAM,aAAA,CAAc,YAAA,CAAa,QAAQ,CAAA;AAAA,IACjD;AAEA,IAAA,OAAO,SAAS,IAAA,EAAK;AAAA,EACvB;AACF;;;;"}
+{"version":3,"file":"apis.esm.js","sources":["../src/apis.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';\nimport { ResponseError } from '@backstage/errors';\nimport { SearchApi } from '@backstage/plugin-search-react';\nimport { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';\n\nimport qs from 'qs';\n\nexport class SearchClient implements SearchApi {\n  private readonly discoveryApi: DiscoveryApi;\n  private readonly fetchApi: FetchApi;\n\n  constructor(options: { discoveryApi: DiscoveryApi; fetchApi: FetchApi }) {\n    this.discoveryApi = options.discoveryApi;\n    this.fetchApi = options.fetchApi;\n  }\n\n  async query(\n    query: SearchQuery,\n    options?: { signal?: AbortSignal },\n  ): Promise<SearchResultSet> {\n    const queryString = qs.stringify(query);\n    const url = `${await this.discoveryApi.getBaseUrl(\n      'search',\n    )}/query?${queryString}`;\n    const response = await this.fetchApi.fetch(url, {\n      signal: options?.signal,\n    });\n\n    if (!response.ok) {\n      throw await ResponseError.fromResponse(response);\n    }\n\n    return response.json();\n  }\n}\n"],"names":[],"mappings":";;;AAuBO,MAAM,YAAA,CAAkC;AAAA,EAC5B,YAAA;AAAA,EACA,QAAA;AAAA,EAEjB,YAAY,OAAA,EAA6D;AACvE,IAAA,IAAA,CAAK,eAAe,OAAA,CAAQ,YAAA;AAC5B,IAAA,IAAA,CAAK,WAAW,OAAA,CAAQ,QAAA;AAAA,EAC1B;AAAA,EAEA,MAAM,KAAA,CACJ,KAAA,EACA,OAAA,EAC0B;AAC1B,IAAA,MAAM,WAAA,GAAc,EAAA,CAAG,SAAA,CAAU,KAAK,CAAA;AACtC,IAAA,MAAM,GAAA,GAAM,CAAA,EAAG,MAAM,IAAA,CAAK,YAAA,CAAa,UAAA;AAAA,MACrC;AAAA,KACD,UAAU,WAAW,CAAA,CAAA;AACtB,IAAA,MAAM,QAAA,GAAW,MAAM,IAAA,CAAK,QAAA,CAAS,MAAM,GAAA,EAAK;AAAA,MAC9C,QAAQ,OAAA,EAAS;AAAA,KAClB,CAAA;AAED,IAAA,IAAI,CAAC,SAAS,EAAA,EAAI;AAChB,MAAA,MAAM,MAAM,aAAA,CAAc,YAAA,CAAa,QAAQ,CAAA;AAAA,IACjD;AAEA,IAAA,OAAO,SAAS,IAAA,EAAK;AAAA,EACvB;AACF;;;;"}

package/dist/components/SearchType/SearchType.Accordion.esm.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useEffect, Fragment, cloneElement } from 'react';
+import { useState, useRef, useEffect, Fragment, cloneElement } from 'react';
 import { useApi } from '@backstage/core-plugin-api';
 import { useSearch, searchApiRef } from '@backstage/plugin-search-react';
 import Accordion from '@material-ui/core/Accordion';
@@ -56,6 +56,7 @@ const SearchTypeAccordion = (props) => {
   const [expanded, setExpanded] = useState(true);
   const { defaultValue, name, showCounts, types: givenTypes } = props;
   const { t } = useTranslationRef(searchTranslationRef);
+  const abortControllerRef = useRef(null);
   const toggleExpanded = () => setExpanded((prevState) => !prevState);
   const handleClick = (type) => {
     return () => {
@@ -81,14 +82,22 @@ const SearchTypeAccordion = (props) => {
     if (!showCounts) {
       return {};
     }
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort();
+    }
+    const controller = new AbortController();
+    abortControllerRef.current = controller;
     const counts = await Promise.all(
       definedTypes.map((type) => type.value).map(async (type) => {
-        const { numberOfResults } = await searchApi.query({
-          term,
-          types: type ? [type] : [],
-          filters: types.includes(type) || !types.length && !type ? filters : {},
-          pageLimit: 0
-        });
+        const { numberOfResults } = await searchApi.query(
+          {
+            term,
+            types: type ? [type] : [],
+            filters: types.includes(type) || !types.length && !type ? filters : {},
+            pageLimit: 0
+          },
+          { signal: controller.signal }
+        );
         return [
           type,
           numberOfResults !== void 0 ? t("searchType.accordion.numberOfResults", {
@@ -99,6 +108,13 @@ const SearchTypeAccordion = (props) => {
     );
     return Object.fromEntries(counts);
   }, [filters, showCounts, term, types]);
+  useEffect(() => {
+    return () => {
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+    };
+  }, []);
   return /* @__PURE__ */ jsxs(Box, { children: [
     /* @__PURE__ */ jsx(Typography, { variant: "body2", component: "h2", children: name }),
     /* @__PURE__ */ jsxs(

package/dist/components/SearchType/SearchType.Accordion.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchType.Accordion.esm.js","sources":["../../../src/components/SearchType/SearchType.Accordion.tsx"],"sourcesContent":["/*\n * Copyright 2021 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { cloneElement, Fragment, useEffect, useState } from 'react';\nimport { useApi } from '@backstage/core-plugin-api';\nimport { searchApiRef, useSearch } from '@backstage/plugin-search-react';\nimport Accordion from '@material-ui/core/Accordion';\nimport AccordionSummary from '@material-ui/core/AccordionSummary';\nimport AccordionDetails from '@material-ui/core/AccordionDetails';\nimport Box from '@material-ui/core/Box';\nimport Divider from '@material-ui/core/Divider';\nimport List from '@material-ui/core/List';\nimport ListItem from '@material-ui/core/ListItem';\nimport ListItemIcon from '@material-ui/core/ListItemIcon';\nimport ListItemText from '@material-ui/core/ListItemText';\nimport { makeStyles } from '@material-ui/core/styles';\nimport ExpandMoreIcon from '@material-ui/icons/ExpandMore';\nimport Typography from '@material-ui/core/Typography';\nimport AllIcon from '@material-ui/icons/FontDownload';\nimport useAsync from 'react-use/esm/useAsync';\nimport { useTranslationRef } from '@backstage/frontend-plugin-api';\nimport { searchTranslationRef } from '../../translation';\n\nconst useStyles = makeStyles(theme => ({\n  icon: {\n    color: theme.palette.text.primary,\n  },\n  list: {\n    width: '100%',\n  },\n  listItemIcon: {\n    width: '24px',\n    height: '24px',\n  },\n  accordion: {\n    backgroundColor: theme.palette.background.paper,\n  },\n  accordionSummary: {\n    minHeight: 'auto',\n    '&.Mui-expanded': {\n      minHeight: 'auto',\n    },\n  },\n  accordionSummaryContent: {\n    margin: theme.spacing(2, 0),\n    '&.Mui-expanded': {\n      margin: theme.spacing(2, 0),\n    },\n  },\n  accordionDetails: {\n    padding: theme.spacing(0, 0, 1),\n  },\n}));\n\n/**\n * @public\n */\nexport type SearchTypeAccordionProps = {\n  name: string;\n  types: Array<{\n    value: string;\n    name: string;\n    icon: JSX.Element;\n  }>;\n  defaultValue?: string;\n  showCounts?: boolean;\n};\n\nexport const SearchTypeAccordion = (props: SearchTypeAccordionProps) => {\n  const classes = useStyles();\n  const { filters, setPageCursor, setTypes, term, types } = useSearch();\n  const searchApi = useApi(searchApiRef);\n  const [expanded, setExpanded] = useState(true);\n  const { defaultValue, name, showCounts, types: givenTypes } = props;\n  const { t } = useTranslationRef(searchTranslationRef);\n\n  const toggleExpanded = () => setExpanded(prevState => !prevState);\n  const handleClick = (type: string) => {\n    return () => {\n      setTypes(type !== '' ? [type] : []);\n      setPageCursor(undefined);\n    };\n  };\n\n  // Handle any provided defaultValue\n  useEffect(() => {\n    if (defaultValue) {\n      setTypes([defaultValue]);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n\n  const definedTypes = [\n    {\n      value: '',\n      name: t('searchType.accordion.allTitle'),\n      icon: <AllIcon />,\n    },\n    ...givenTypes,\n  ];\n  const selected = types[0] || '';\n\n  const { value: resultCounts } = useAsync(async () => {\n    if (!showCounts) {\n      return {};\n    }\n\n    const counts = await Promise.all(\n      definedTypes\n        .map(type => type.value)\n        .map(async type => {\n          const { numberOfResults } = await searchApi.query({\n            term,\n            types: type ? [type] : [],\n            filters:\n              types.includes(type) || (!types.length && !type) ? filters : {},\n            pageLimit: 0,\n          });\n\n          return [\n            type,\n            numberOfResults !== undefined\n              ? t('searchType.accordion.numberOfResults', {\n                  number:\n                    numberOfResults >= 10000 ? `>10000` : `${numberOfResults}`,\n                })\n              : ' -- ',\n          ];\n        }),\n    );\n\n    return Object.fromEntries(counts);\n  }, [filters, showCounts, term, types]);\n\n  return (\n    <Box>\n      <Typography variant=\"body2\" component=\"h2\">\n        {name}\n      </Typography>\n      <Accordion\n        className={classes.accordion}\n        expanded={expanded}\n        onChange={toggleExpanded}\n      >\n        <AccordionSummary\n          classes={{\n            root: classes.accordionSummary,\n            content: classes.accordionSummaryContent,\n          }}\n          expandIcon={<ExpandMoreIcon className={classes.icon} />}\n          IconButtonProps={{ size: 'small' }}\n        >\n          {expanded\n            ? t('searchType.accordion.collapse')\n            : definedTypes.filter(type => type.value === selected)[0]!.name}\n        </AccordionSummary>\n        <AccordionDetails classes={{ root: classes.accordionDetails }}>\n          <List\n            className={classes.list}\n            component=\"nav\"\n            aria-label=\"filter by type\"\n            disablePadding\n            dense\n          >\n            {definedTypes.map(type => (\n              <Fragment key={type.value}>\n                <Divider />\n                <ListItem\n                  selected={\n                    types[0] === type.value ||\n                    (types.length === 0 && type.value === '')\n                  }\n                  onClick={handleClick(type.value)}\n                  button\n                >\n                  <ListItemIcon>\n                    {cloneElement(type.icon, {\n                      className: classes.listItemIcon,\n                    })}\n                  </ListItemIcon>\n                  <ListItemText\n                    primary={type.name}\n                    secondary={resultCounts && resultCounts[type.value]}\n                  />\n                </ListItem>\n              </Fragment>\n            ))}\n          </List>\n        </AccordionDetails>\n      </Accordion>\n    </Box>\n  );\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"SearchType.Accordion.esm.js","sources":["../../../src/components/SearchType/SearchType.Accordion.tsx"],"sourcesContent":["/*\n * Copyright 2021 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { cloneElement, Fragment, useEffect, useRef, useState } from 'react';\nimport { useApi } from '@backstage/core-plugin-api';\nimport { searchApiRef, useSearch } from '@backstage/plugin-search-react';\nimport Accordion from '@material-ui/core/Accordion';\nimport AccordionSummary from '@material-ui/core/AccordionSummary';\nimport AccordionDetails from '@material-ui/core/AccordionDetails';\nimport Box from '@material-ui/core/Box';\nimport Divider from '@material-ui/core/Divider';\nimport List from '@material-ui/core/List';\nimport ListItem from '@material-ui/core/ListItem';\nimport ListItemIcon from '@material-ui/core/ListItemIcon';\nimport ListItemText from '@material-ui/core/ListItemText';\nimport { makeStyles } from '@material-ui/core/styles';\nimport ExpandMoreIcon from '@material-ui/icons/ExpandMore';\nimport Typography from '@material-ui/core/Typography';\nimport AllIcon from '@material-ui/icons/FontDownload';\nimport useAsync from 'react-use/esm/useAsync';\nimport { useTranslationRef } from '@backstage/frontend-plugin-api';\nimport { searchTranslationRef } from '../../translation';\n\nconst useStyles = makeStyles(theme => ({\n  icon: {\n    color: theme.palette.text.primary,\n  },\n  list: {\n    width: '100%',\n  },\n  listItemIcon: {\n    width: '24px',\n    height: '24px',\n  },\n  accordion: {\n    backgroundColor: theme.palette.background.paper,\n  },\n  accordionSummary: {\n    minHeight: 'auto',\n    '&.Mui-expanded': {\n      minHeight: 'auto',\n    },\n  },\n  accordionSummaryContent: {\n    margin: theme.spacing(2, 0),\n    '&.Mui-expanded': {\n      margin: theme.spacing(2, 0),\n    },\n  },\n  accordionDetails: {\n    padding: theme.spacing(0, 0, 1),\n  },\n}));\n\n/**\n * @public\n */\nexport type SearchTypeAccordionProps = {\n  name: string;\n  types: Array<{\n    value: string;\n    name: string;\n    icon: JSX.Element;\n  }>;\n  defaultValue?: string;\n  showCounts?: boolean;\n};\n\nexport const SearchTypeAccordion = (props: SearchTypeAccordionProps) => {\n  const classes = useStyles();\n  const { filters, setPageCursor, setTypes, term, types } = useSearch();\n  const searchApi = useApi(searchApiRef);\n  const [expanded, setExpanded] = useState(true);\n  const { defaultValue, name, showCounts, types: givenTypes } = props;\n  const { t } = useTranslationRef(searchTranslationRef);\n  const abortControllerRef = useRef<AbortController | null>(null);\n\n  const toggleExpanded = () => setExpanded(prevState => !prevState);\n  const handleClick = (type: string) => {\n    return () => {\n      setTypes(type !== '' ? [type] : []);\n      setPageCursor(undefined);\n    };\n  };\n\n  // Handle any provided defaultValue\n  useEffect(() => {\n    if (defaultValue) {\n      setTypes([defaultValue]);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n\n  const definedTypes = [\n    {\n      value: '',\n      name: t('searchType.accordion.allTitle'),\n      icon: <AllIcon />,\n    },\n    ...givenTypes,\n  ];\n  const selected = types[0] || '';\n\n  const { value: resultCounts } = useAsync(async () => {\n    if (!showCounts) {\n      return {};\n    }\n    // Here we cancel the previous requests before making a new one\n    // All requests are made with a new AbortController signal\n    if (abortControllerRef.current) {\n      abortControllerRef.current.abort();\n    }\n\n    const controller = new AbortController();\n    abortControllerRef.current = controller;\n\n    const counts = await Promise.all(\n      definedTypes\n        .map(type => type.value)\n        .map(async type => {\n          const { numberOfResults } = await searchApi.query(\n            {\n              term,\n              types: type ? [type] : [],\n              filters:\n                types.includes(type) || (!types.length && !type) ? filters : {},\n              pageLimit: 0,\n            },\n            { signal: controller.signal },\n          );\n\n          return [\n            type,\n            numberOfResults !== undefined\n              ? t('searchType.accordion.numberOfResults', {\n                  number:\n                    numberOfResults >= 10000 ? `>10000` : `${numberOfResults}`,\n                })\n              : ' -- ',\n          ];\n        }),\n    );\n\n    return Object.fromEntries(counts);\n  }, [filters, showCounts, term, types]);\n\n  useEffect(() => {\n    return () => {\n      if (abortControllerRef.current) {\n        abortControllerRef.current.abort();\n      }\n    };\n  }, []);\n\n  return (\n    <Box>\n      <Typography variant=\"body2\" component=\"h2\">\n        {name}\n      </Typography>\n      <Accordion\n        className={classes.accordion}\n        expanded={expanded}\n        onChange={toggleExpanded}\n      >\n        <AccordionSummary\n          classes={{\n            root: classes.accordionSummary,\n            content: classes.accordionSummaryContent,\n          }}\n          expandIcon={<ExpandMoreIcon className={classes.icon} />}\n          IconButtonProps={{ size: 'small' }}\n        >\n          {expanded\n            ? t('searchType.accordion.collapse')\n            : definedTypes.filter(type => type.value === selected)[0]!.name}\n        </AccordionSummary>\n        <AccordionDetails classes={{ root: classes.accordionDetails }}>\n          <List\n            className={classes.list}\n            component=\"nav\"\n            aria-label=\"filter by type\"\n            disablePadding\n            dense\n          >\n            {definedTypes.map(type => (\n              <Fragment key={type.value}>\n                <Divider />\n                <ListItem\n                  selected={\n                    types[0] === type.value ||\n                    (types.length === 0 && type.value === '')\n                  }\n                  onClick={handleClick(type.value)}\n                  button\n                >\n                  <ListItemIcon>\n                    {cloneElement(type.icon, {\n                      className: classes.listItemIcon,\n                    })}\n                  </ListItemIcon>\n                  <ListItemText\n                    primary={type.name}\n                    secondary={resultCounts && resultCounts[type.value]}\n                  />\n                </ListItem>\n              </Fragment>\n            ))}\n          </List>\n        </AccordionDetails>\n      </Accordion>\n    </Box>\n  );\n};\n"],"names":[],"mappings":"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"}

package/dist/package.json.esm.js

@@ -1,5 +1,5 @@
 var name = "@backstage/plugin-search";
-var version = "1.4.31-next.1";
+var version = "1.4.32-next.0";
 var description = "The Backstage plugin that provides your backstage app with search";
 var backstage = {
 	role: "frontend-plugin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "1.4.31-next.1",
+  "version": "1.4.32-next.0",
   "description": "The Backstage plugin that provides your backstage app with search",
   "backstage": {
     "role": "frontend-plugin",
@@ -70,14 +70,14 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/core-compat-api": "0.5.3-next.1",
-    "@backstage/core-components": "0.18.2-next.1",
-    "@backstage/core-plugin-api": "1.11.1-next.0",
+    "@backstage/core-compat-api": "0.5.4-next.0",
+    "@backstage/core-components": "0.18.3-next.0",
+    "@backstage/core-plugin-api": "1.11.2-next.0",
     "@backstage/errors": "1.2.7",
-    "@backstage/frontend-plugin-api": "0.12.1-next.1",
-    "@backstage/plugin-catalog-react": "1.21.2-next.1",
-    "@backstage/plugin-search-common": "1.2.20-next.0",
-    "@backstage/plugin-search-react": "1.9.5-next.1",
+    "@backstage/frontend-plugin-api": "0.12.2-next.0",
+    "@backstage/plugin-catalog-react": "1.21.3-next.0",
+    "@backstage/plugin-search-common": "1.2.21-next.0",
+    "@backstage/plugin-search-react": "1.9.6-next.0",
     "@backstage/types": "1.2.2",
     "@backstage/version-bridge": "1.0.11",
     "@material-ui/core": "^4.12.2",
@@ -86,10 +86,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "0.34.4-next.1",
-    "@backstage/core-app-api": "1.19.1-next.0",
-    "@backstage/dev-utils": "1.1.15-next.1",
-    "@backstage/test-utils": "1.7.12-next.0",
+    "@backstage/cli": "0.34.5-next.0",
+    "@backstage/core-app-api": "1.19.2-next.0",
+    "@backstage/dev-utils": "1.1.17-next.0",
+    "@backstage/test-utils": "1.7.13-next.0",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",