OCPBUGS-79315: fix treeshaking of pf/react-icons

analyze.sh

@@ -8,20 +8,13 @@ ARTIFACT_DIR=${ARTIFACT_DIR:=/tmp/artifacts}
 
 cd frontend
 echo "Analyzing Webpack bundles..."
-yarn run analyze
+ANALYZE_RC=0
+yarn run analyze || ANALYZE_RC=$?
 if [ -d "$ARTIFACT_DIR" ]; then
   echo "Copying the Webpack Bundle Analyzer report to $ARTIFACT_DIR..."
   cp public/dist/report.html "${ARTIFACT_DIR}"
 fi
-
-MAX_BYTES=3879731 # ~3.7 MiB
-VENDORS_MAIN_BYTES=$(du -b `find public/dist -type f -name 'vendors~main-chunk*js'` | cut -f1)
-DISPLAY_VALUE=$(awk "BEGIN {printf \"%.2f\n\", $VENDORS_MAIN_BYTES/1024/1024}")
-MAX_DISPLAY_VALUE=$(awk "BEGIN {printf \"%.2f\n\", $MAX_BYTES/1024/1024}")
-
-echo "Main vendor bundle size: $DISPLAY_VALUE MiB"
-if (( VENDORS_MAIN_BYTES > MAX_BYTES )); then
-  echo "FAILURE: Main vendor bundle is larger than the $MAX_DISPLAY_VALUE MiB limit."
+if [ $ANALYZE_RC -ne 0 ]; then
   echo "If you haven't added a new dependency, an import might have accidentally pulled an existing dependency into the main vendor bundle."
   echo "If adding a large dependency, consider lazy loading the component with AsyncComponent."
   exit 1

frontend/package.json

@@ -90,7 +90,7 @@
     "transform": {
       "get-local-plugins\\.js$": "./scripts/jest-transform-local-plugins.js",
       "^.+\\.(gql|graphql)$": "./scripts/jest-transform-graphql.js",
-      "^.+\\.(ts|tsx|js|jsx)$": [
+      "^.+\\.(ts|tsx|js|jsx|mjs)$": [
         "@swc/jest",
         {
           "module": {

frontend/packages/console-app/src/components/cluster-configuration/ClusterConfigurationPage.tsx

@@ -11,8 +11,7 @@ import {
   TabTitleText,
   PageSection,
 } from '@patternfly/react-core';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import { LockIcon } from '@patternfly/react-icons/dist/esm/icons/lock-icon';
+import { ExclamationTriangleIcon, LockIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { useParams, useNavigate } from 'react-router';
 import { LoadingBox } from '@console/internal/components/utils/status-box';

frontend/packages/console-app/src/components/console-operator/ConsoleOperatorConfig.tsx

@@ -2,7 +2,7 @@ import type { FC, ComponentProps } from 'react';
 import { useMemo, useState, useCallback } from 'react';
 import type { PluginInfoEntry } from '@openshift/dynamic-plugin-sdk';
 import { Alert, Button } from '@patternfly/react-core';
-import { PencilAltIcon } from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
+import { PencilAltIcon } from '@patternfly/react-icons';
 import type { ISortBy, OnSort } from '@patternfly/react-table';
 import { SortByDirection, Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 import { useTranslation } from 'react-i18next';

frontend/packages/console-app/src/components/data-view/ConsoleDataView.tsx

@@ -13,7 +13,7 @@ import {
   DataViewTable,
   DataViewToolbar,
 } from '@patternfly/react-data-view';
-import DataViewFilters from '@patternfly/react-data-view/dist/cjs/DataViewFilters';
+import DataViewFilters from '@patternfly/react-data-view/dist/esm/DataViewFilters';
 import { ColumnsIcon, UndoIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { InnerScrollContainer, Tbody, Td, Tr } from '@patternfly/react-table';

frontend/packages/console-app/src/components/nav/NavHeader.tsx

@@ -2,7 +2,7 @@ import type { FC, MouseEvent, Ref } from 'react';
 import { useMemo, lazy, useState, useCallback, Suspense } from 'react';
 import type { MenuToggleElement } from '@patternfly/react-core';
 import { MenuToggle, Select, SelectList, SelectOption, Title } from '@patternfly/react-core';
-import { CogsIcon } from '@patternfly/react-icons/dist/esm/icons/cogs-icon';
+import { CogsIcon } from '@patternfly/react-icons';
 import { t } from 'i18next';
 import type { Perspective } from '@console/dynamic-plugin-sdk';
 import { useActivePerspective } from '@console/dynamic-plugin-sdk';

frontend/packages/console-app/src/components/nav/PinnedResource.tsx

@@ -1,7 +1,6 @@
 import type { FC, MouseEvent, ReactElement } from 'react';
 import { Button } from '@patternfly/react-core';
-import { GripVerticalIcon } from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
-import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
+import { GripVerticalIcon, MinusCircleIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { debounce } from 'lodash';
 import { useDrag, useDrop } from 'react-dnd';

frontend/packages/console-app/src/components/nodes/NodeDetailsOverview.tsx

@@ -8,7 +8,7 @@ import {
   Grid,
   GridItem,
 } from '@patternfly/react-core';
-import { PencilAltIcon } from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
+import { PencilAltIcon } from '@patternfly/react-icons';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import {

frontend/packages/console-app/src/components/nodes/NodesPage.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { useMemo, useCallback, useEffect, Suspense } from 'react';
 import { DataViewCheckboxFilter } from '@patternfly/react-data-view';
-import type { DataViewFilterOption } from '@patternfly/react-data-view/dist/cjs/DataViewFilters';
+import type { DataViewFilterOption } from '@patternfly/react-data-view/dist/esm/DataViewFilters';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import {

frontend/packages/console-app/src/components/nodes/status/CSRStatus.tsx

@@ -9,7 +9,7 @@ import {
   SplitItem,
   ExpandableSection,
 } from '@patternfly/react-core';
-import { AddCircleOIcon } from '@patternfly/react-icons/dist/esm/icons/add-circle-o-icon';
+import { AddCircleOIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import type {
   CertificateSigningRequestKind,

frontend/packages/console-app/src/components/quick-starts/QuickStartEmptyState.tsx

@@ -7,8 +7,7 @@ import {
   EmptyStateVariant,
   Skeleton,
 } from '@patternfly/react-core';
-import { CubesIcon } from '@patternfly/react-icons/dist/esm/icons/cubes-icon';
-import { WrenchIcon } from '@patternfly/react-icons/dist/esm/icons/wrench-icon';
+import { CubesIcon, WrenchIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { QuickStartModel } from '@console/app/src/models';
 import { useAccessReview } from '@console/dynamic-plugin-sdk/src/app/components/utils/rbac';

frontend/packages/console-app/src/components/user-preferences/namespace/NamespaceDropdown.tsx

@@ -10,7 +10,7 @@ import {
   MenuContent,
   MenuList,
 } from '@patternfly/react-core';
-import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import fuzzysearch from 'fuzzysearch';
 import { useTranslation } from 'react-i18next';
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';

frontend/packages/console-app/src/components/volume-snapshot/volume-snapshot.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { useMemo, useCallback, Suspense } from 'react';
 import { DataViewCheckboxFilter } from '@patternfly/react-data-view';
-import type { DataViewFilterOption } from '@patternfly/react-data-view/dist/cjs/DataViewFilters';
+import type { DataViewFilterOption } from '@patternfly/react-data-view/dist/esm/DataViewFilters';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
 import {

frontend/packages/console-app/src/utils/perspective.tsx

@@ -1,4 +1,4 @@
-import { CogsIcon } from '@patternfly/react-icons/dist/esm/icons/cogs-icon';
+import { CogsIcon } from '@patternfly/react-icons';
 import type { Perspective, ResolvedExtension } from '@console/dynamic-plugin-sdk';
 import { FLAGS } from '@console/shared/src/constants/common';
 

frontend/packages/console-shared/src/components/Tooltip/Tooltip.tsx

@@ -5,8 +5,8 @@
  * Remove this component once https://github.com/patternfly/patternfly-react/issues/5620 is fixed.
  */
 import type { ReactNode, FC } from 'react';
-import { TooltipArrow } from '@patternfly/react-core/dist/js/components/Tooltip/TooltipArrow';
-import { TooltipContent } from '@patternfly/react-core/dist/js/components/Tooltip/TooltipContent';
+import { TooltipArrow } from '@patternfly/react-core/dist/esm/components/Tooltip/TooltipArrow';
+import { TooltipContent } from '@patternfly/react-core/dist/esm/components/Tooltip/TooltipContent';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
 import { Tippy } from '../popper/Tippy';

frontend/packages/console-shared/src/components/actions/menu/ActionMenuToggle.tsx

@@ -1,7 +1,7 @@
 import type { RefObject, SetStateAction, FC } from 'react';
 import { useEffect } from 'react';
 import { MenuToggle } from '@patternfly/react-core';
-import { EllipsisVIcon } from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
+import { EllipsisVIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { ActionMenuVariant } from '../types';
 

frontend/packages/console-shared/src/components/alerts/AlertSeverityIcon.tsx

@@ -1,6 +1,5 @@
 import type { FC, ReactElement } from 'react';
-import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+import { ExclamationCircleIcon, ExclamationTriangleIcon } from '@patternfly/react-icons';
 import { AlertSeverity } from '@console/dynamic-plugin-sdk';
 
 interface AlertSeverityIconProps {

frontend/packages/console-shared/src/components/catalog/catalog-view/CatalogEmptyState.tsx

@@ -7,7 +7,7 @@ import {
   EmptyStateActions,
   EmptyStateFooter,
 } from '@patternfly/react-core';
-import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon';
+import { SearchIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 
 type CatalogEmptyStateProps = {

frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityBody.tsx

@@ -1,8 +1,7 @@
 import type { FC, ReactNode } from 'react';
 import { useRef, useEffect, useState, useCallback } from 'react';
 import { Accordion, Button } from '@patternfly/react-core';
-import { PauseIcon } from '@patternfly/react-icons/dist/esm/icons/pause-icon';
-import { PlayIcon } from '@patternfly/react-icons/dist/esm/icons/play-icon';
+import { PauseIcon, PlayIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { useTranslation } from 'react-i18next';
 import type {

frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityItem.tsx

@@ -1,6 +1,6 @@
 import type { FC, ReactNode } from 'react';
 import { Progress, ProgressSize } from '@patternfly/react-core';
-import { InProgressIcon } from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
+import { InProgressIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import type { ActivityItemProps } from '@console/dynamic-plugin-sdk/src/api/internal-types';
 

frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx

@@ -6,8 +6,7 @@ import {
   AccordionToggle,
   AccordionContent,
 } from '@patternfly/react-core';
-import { InProgressIcon } from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
-import { QuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/question-circle-icon';
+import { InProgressIcon, QuestionCircleIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router';
 import type { DashboardsInventoryItemGroup } from '@console/dynamic-plugin-sdk';

frontend/packages/console-shared/src/components/dashboard/status-card/AlertsBody.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { Children } from 'react';
 import { EmptyState, EmptyStateVariant, EmptyStateBody } from '@patternfly/react-core';
-import { UnknownIcon } from '@patternfly/react-icons/dist/esm/icons/unknown-icon';
+import { UnknownIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import type { AlertsBodyProps } from '@console/dynamic-plugin-sdk/src/api/internal-types';
 

frontend/packages/console-shared/src/components/dashboard/status-card/states.tsx

@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react';
-import { InProgressIcon } from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
+import { InProgressIcon } from '@patternfly/react-icons';
 import type { TFunction } from 'i18next';
 import { HealthState } from '@console/dynamic-plugin-sdk/src/extensions/console-types';
 import {

frontend/packages/console-shared/src/components/datetime/Timestamp.tsx

@@ -1,5 +1,5 @@
 import { Tooltip } from '@patternfly/react-core';
-import { GlobeAmericasIcon } from '@patternfly/react-icons/dist/esm/icons/globe-americas-icon';
+import { GlobeAmericasIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { getLastLanguage } from '@console/app/src/components/user-preferences/language/getLastLanguage';
 import type { TimestampProps } from '@console/dynamic-plugin-sdk';

frontend/packages/console-shared/src/components/dynamic-form/templates.tsx

@@ -1,8 +1,7 @@
 import type { FC } from 'react';
 import { useState, useEffect } from 'react';
 import { Button, Alert, Divider, FormHelperText } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
-import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
+import { MinusCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
 import type {
   ArrayFieldTemplateProps,
   FieldTemplateProps,

frontend/packages/console-shared/src/components/form-utils/ActionGroupWithIcons.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { CloseButton } from '@patternfly/react-component-groups';
 import { ActionGroup, Button, ButtonVariant } from '@patternfly/react-core';
-import { CheckIcon } from '@patternfly/react-icons/dist/esm/icons/check-icon';
+import { CheckIcon } from '@patternfly/react-icons';
 import type { ActionGroupWithIconsProps } from './form-utils-types';
 
 const ActionGroupWithIcons: FC<ActionGroupWithIconsProps> = ({ onSubmit, onClose, isDisabled }) => {

frontend/packages/console-shared/src/components/form-utils/FormFooter.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import { ActionGroup, Alert, Button, ButtonVariant } from '@patternfly/react-core';
-import { DownloadIcon } from '@patternfly/react-icons/dist/esm/icons/download-icon';
+import { DownloadIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import { useTranslation } from 'react-i18next';
 import { ButtonBar } from '@console/internal/components/utils/button-bar';

frontend/packages/console-shared/src/components/formik-fields/MultiTypeaheadField.tsx

@@ -17,7 +17,7 @@ import {
   TextInputGroupUtilities,
   Button,
 } from '@patternfly/react-core';
-import { TimesIcon } from '@patternfly/react-icons/dist/esm/icons/times-icon';
+import { TimesIcon } from '@patternfly/react-icons';
 import type { FormikValues } from 'formik';
 import { useField, useFormikContext } from 'formik';
 import * as _ from 'lodash';

frontend/packages/console-shared/src/components/formik-fields/item-selector-field/SelectorCard.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import { Card, CardBody, CardTitle } from '@patternfly/react-core';
-import { StarIcon } from '@patternfly/react-icons/dist/esm/icons/star-icon';
+import { StarIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import './SelectorCard.scss';
 

frontend/packages/console-shared/src/components/formik-fields/key-value-file-input-field/KeyValueFileInputField.tsx

@@ -10,8 +10,7 @@ import {
   HelperText,
   HelperTextItem,
 } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
-import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
+import { MinusCircleIcon, PlusCircleIcon } from '@patternfly/react-icons';
 import type { FormikValues } from 'formik';
 import { FieldArray, useField, useFormikContext } from 'formik';
 import { get, uniqueId } from 'lodash';

frontend/packages/console-shared/src/components/formik-fields/multi-column-field/MultiColumnFieldFooter.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
 import { Button, Tooltip } from '@patternfly/react-core';
-import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
+import { PlusCircleIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 
 export interface MultiColumnFieldFooterProps {

frontend/packages/console-shared/src/components/formik-fields/multi-column-field/MultiColumnFieldRow.tsx

@@ -2,7 +2,7 @@ import type { ReactNode, ReactElement, FC } from 'react';
 import { Children, cloneElement } from 'react';
 import type { gridItemSpanValueShape } from '@patternfly/react-core';
 import { Tooltip, Button, ButtonVariant, ButtonType, GridItem, Grid } from '@patternfly/react-core';
-import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
+import { MinusCircleIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import './MultiColumnField.scss';
 

frontend/packages/console-shared/src/components/formik-fields/text-column-field/TextColumnItemContent.tsx

@@ -8,8 +8,7 @@ import {
   ButtonType,
   Tooltip,
 } from '@patternfly/react-core';
-import { GripVerticalIcon } from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
-import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
+import { GripVerticalIcon, MinusCircleIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import InputField from '../InputField';
 import type {

frontend/packages/console-shared/src/components/getting-started/GettingStartedExpandableGrid.tsx

@@ -8,8 +8,7 @@ import {
   CardExpandableContent,
   Popover,
 } from '@patternfly/react-core';
-import { TimesIcon } from '@patternfly/react-icons';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon';
+import { TimesIcon, OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { GettingStartedShowState } from './useGettingStartedShowState';
 

frontend/packages/console-shared/src/components/getting-started/QuickStartGettingStartedCard.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import type { AllQuickStartStates, QuickStart } from '@patternfly/quickstarts';
 import { QuickStartStatus, getQuickStartStatus } from '@patternfly/quickstarts';
-import { RouteIcon } from '@patternfly/react-icons/dist/esm/icons/route-icon';
+import { RouteIcon } from '@patternfly/react-icons';
 import { useTranslation } from 'react-i18next';
 import { QuickStartsLoader } from '@console/app/src/components/quick-starts/loader/QuickStartsLoader';
 import { useQuickStartContext } from '@console/shared/src/hooks/useQuickStartContext';

frontend/packages/console-shared/src/components/pod/PodRing.tsx

@@ -1,9 +1,7 @@
 import type { FC } from 'react';
 import { useState, useEffect } from 'react';
 import { Button, Split, SplitItem, Bullseye } from '@patternfly/react-core';
-import { AngleDownIcon } from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
-import { AngleUpIcon } from '@patternfly/react-icons/dist/esm/icons/angle-up-icon';
-import { AutomationIcon } from '@patternfly/react-icons/dist/esm/icons/automation-icon';
+import { AngleDownIcon, AngleUpIcon, AutomationIcon } from '@patternfly/react-icons';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import type { ImpersonateKind } from '@console/dynamic-plugin-sdk';

frontend/packages/console-shared/src/components/pod/PodRingSet.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { useMemo } from 'react';
 import { Split, SplitItem, Bullseye, Icon } from '@patternfly/react-core';
-import { LongArrowAltRightIcon } from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-right-icon';
+import { LongArrowAltRightIcon } from '@patternfly/react-icons';
 import { t_color_gray_50 as color200 } from '@patternfly/react-tokens';
 import type { PodRingSetProps } from '@console/dynamic-plugin-sdk/src/extensions/topology-types';
 import { LoadingInline } from '@console/internal/components/utils/status-box';

frontend/packages/console-shared/src/components/pod/__tests__/PodRingSet.spec.tsx

@@ -1,4 +1,4 @@
-import { LongArrowAltRightIcon } from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-right-icon';
+import { LongArrowAltRightIcon } from '@patternfly/react-icons';
 import { DeploymentConfigModel } from '@console/internal/models';
 import type { K8sResourceKind, PodKind } from '@console/internal/module/k8s';
 import * as usePodsWatcherModule from '../../../hooks/usePodsWatcher';
@@ -12,7 +12,8 @@ jest.mock('../PodRing', () => ({
   default: jest.fn(() => null),
 }));
 
-jest.mock('@patternfly/react-icons/dist/esm/icons/long-arrow-alt-right-icon', () => ({
+jest.mock('@patternfly/react-icons', () => ({
+  ...jest.requireActual('@patternfly/react-icons'),
   LongArrowAltRightIcon: jest.fn(() => null),
 }));
 

frontend/packages/console-shared/src/components/popover/Popover.tsx

@@ -1,10 +1,10 @@
 import type { ReactNode, FC } from 'react';
 import { FocusTrap, TitleSizes, Title } from '@patternfly/react-core';
-import { PopoverArrow } from '@patternfly/react-core/dist/js/components/Popover/PopoverArrow';
-import { PopoverBody } from '@patternfly/react-core/dist/js/components/Popover/PopoverBody';
-import { PopoverCloseButton } from '@patternfly/react-core/dist/js/components/Popover/PopoverCloseButton';
-import { PopoverContent } from '@patternfly/react-core/dist/js/components/Popover/PopoverContent';
-import { PopoverFooter } from '@patternfly/react-core/dist/js/components/Popover/PopoverFooter';
+import { PopoverArrow } from '@patternfly/react-core/dist/esm/components/Popover/PopoverArrow';
+import { PopoverBody } from '@patternfly/react-core/dist/esm/components/Popover/PopoverBody';
+import { PopoverCloseButton } from '@patternfly/react-core/dist/esm/components/Popover/PopoverCloseButton';
+import { PopoverContent } from '@patternfly/react-core/dist/esm/components/Popover/PopoverContent';
+import { PopoverFooter } from '@patternfly/react-core/dist/esm/components/Popover/PopoverFooter';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { useTranslation } from 'react-i18next';

frontend/packages/console-shared/src/components/query-browser/QueryBrowser.tsx

@@ -26,7 +26,7 @@ import {
   TextInput,
   InputGroupItem,
 } from '@patternfly/react-core';
-import { ChartLineIcon } from '@patternfly/react-icons/dist/esm/icons/chart-line-icon';
+import { ChartLineIcon } from '@patternfly/react-icons';
 import { css } from '@patternfly/react-styles';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';