Fix npm audit CI check (#1196)

* fix: npm audit

* fix: refactor missing line

package.json

@@ -44,7 +44,7 @@
     "@types/faker": "^4.1.12",
     "@types/history": "^4.7.5",
     "@types/linkifyjs": "^2.1.3",
-    "@types/lodash-es": "^4.17.3",
+    "@types/lodash": "^4.14.157",
     "@types/qrcode.react": "^1.0.0",
     "@types/react": "^16.9.19",
     "@types/react-dom": "^16.9.5",
@@ -117,7 +117,7 @@
     "graphql": "^14.6.0",
     "history": "^4.10.1",
     "linkifyjs": "^2.1.9",
-    "lodash-es": "^4.17.15",
+    "lodash": "^4.17.19",
     "pouncejs": "^0.45.2",
     "qrcode.react": "^1.0.0",
     "query-string": "^6.10.1",

web/__tests__/jest.config.js

@@ -27,7 +27,6 @@ module.exports = {
   // This is the only way for jest to detect our custom webpack aliases
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|svg)$': '<rootDir>/__mocks__/file.ts',
-    '^lodash-es/(.*)': 'lodash/$1',
     '^Assets/(.*)': '<rootDir>/../src/assets/$1',
     '^Components/(.*)': '<rootDir>/../src/components/$1',
     '^Generated/(.*)': '<rootDir>/../__generated__/$1',

web/src/components/fields/Editor/Editor.tsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import Editor, { EditorProps } from 'Components/Editor';
 import { FieldConfig } from 'formik';
-import debounce from 'lodash-es/debounce';
+import debounce from 'lodash/debounce';
 import { Box, FormError } from 'pouncejs';
 import useFastField from 'Hooks/useFastField';
 

web/src/components/sidesheets/UpdateDestinationSidesheet/UpdateDestinationSidesheet.tsx

@@ -18,7 +18,7 @@
 
 import React from 'react';
 import { Alert, Heading, SideSheet, useSnackbar, Box, SideSheetProps } from 'pouncejs';
-import pick from 'lodash-es/pick';
+import pick from 'lodash/pick';
 import { Destination, DestinationConfigInput, DestinationTypeEnum } from 'Generated/schema';
 import { BaseDestinationFormValues } from 'Components/forms/BaseDestinationForm';
 import SNSDestinationForm from 'Components/forms/SnsDestinationForm';

web/src/components/utils/GenerateFiltersGroup/GenerateFiltersGroup.tsx

@@ -19,8 +19,8 @@
 import React from 'react';
 import { Formik, Field, Form } from 'formik';
 import { Box, Button, SimpleGrid } from 'pouncejs';
-import mapValues from 'lodash-es/mapValues';
-import map from 'lodash-es/map';
+import mapValues from 'lodash/mapValues';
+import map from 'lodash/map';
 import FormikTextInput from 'Components/fields/TextInput';
 import FormikTextArea from 'Components/fields/TextArea';
 import FormikCombobox from 'Components/fields/ComboBox';

web/src/helpers/utils.tsx

@@ -35,8 +35,8 @@ import {
   CHECK_IF_HASH_REGEX,
   SOURCE_LABEL_REGEX,
 } from 'Source/constants';
-import mapValues from 'lodash-es/mapValues';
-import sum from 'lodash-es/sum';
+import mapValues from 'lodash/mapValues';
+import sum from 'lodash/sum';
 import { ErrorResponse } from 'apollo-link-error';
 import { ApolloError } from '@apollo/client';
 

web/src/hooks/useFormSessionRestoration.tsx

@@ -17,7 +17,7 @@
  */
 import React from 'react';
 import { useFormikContext } from 'formik';
-import debounce from 'lodash-es/debounce';
+import debounce from 'lodash/debounce';
 import storage from 'Helpers/storage';
 
 export interface UseFormSessionRestorationProps {

web/src/hooks/useUrlParams.tsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import useRouter from 'Hooks/useRouter';
 import queryString from 'query-string';
-import omitBy from 'lodash-es/omitBy';
+import omitBy from 'lodash/omitBy';
 
 const queryStringOptions = {
   arrayFormat: 'bracket' as const,

web/src/pages/ComplianceOverview/PoliciesBySeverityChart/PoliciesBySeverityChart.tsx

@@ -18,9 +18,9 @@
 
 import React from 'react';
 import { Flex, theme } from 'pouncejs';
-import sum from 'lodash-es/sum';
+import sum from 'lodash/sum';
 import { capitalize, countPoliciesBySeverityAndStatus } from 'Helpers/utils';
-import map from 'lodash-es/map';
+import map from 'lodash/map';
 import { OrganizationReportBySeverity } from 'Generated/schema';
 import BarChart from 'Components/charts/BarChart';
 import ChartSummary from 'Components/charts/ChartSummary';

web/src/pages/ComplianceOverview/PoliciesByStatusChart/PoliciesByStatusChart.tsx

@@ -18,8 +18,8 @@
 
 import React from 'react';
 import { capitalize, countPoliciesBySeverityAndStatus } from 'Helpers/utils';
-import map from 'lodash-es/map';
-import sum from 'lodash-es/sum';
+import map from 'lodash/map';
+import sum from 'lodash/sum';
 import { OrganizationReportBySeverity } from 'Generated/schema';
 import { theme, Flex } from 'pouncejs';
 import BarChart from 'Components/charts/BarChart';

web/src/pages/ComplianceOverview/PoliciesOverviewChart/PoliciesOverviewChart.tsx

@@ -18,7 +18,7 @@
 
 import React from 'react';
 import { countPoliciesBySeverityAndStatus } from 'Helpers/utils';
-import sum from 'lodash-es/sum';
+import sum from 'lodash/sum';
 import { OrganizationReportBySeverity } from 'Generated/schema';
 import { Flex } from 'pouncejs';
 import BarChart from 'Components/charts/BarChart';

web/src/pages/ListAlerts/ListAlerts.tsx

@@ -25,7 +25,7 @@ import useInfiniteScroll from 'Hooks/useInfiniteScroll';
 import useRequestParamsWithoutPagination from 'Hooks/useRequestParamsWithoutPagination';
 import TablePlaceholder from 'Components/TablePlaceholder';
 import ErrorBoundary from 'Components/ErrorBoundary';
-import isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 import withSEO from 'Hoc/withSEO';
 import { useListAlerts } from './graphql/listAlerts.generated';
 import ListAlertsTable from './ListAlertsTable';

web/src/pages/ListAlerts/ListAlertsActions/ListAlertsActions.tsx

@@ -24,9 +24,9 @@ import FormikTextInput from 'Components/fields/TextInput';
 import useRequestParamsWithoutPagination from 'Hooks/useRequestParamsWithoutPagination';
 import { Box, Button, Card, Collapse, Flex } from 'pouncejs';
 import ErrorBoundary from 'Components/ErrorBoundary';
-import isEmpty from 'lodash-es/isEmpty';
-import isNumber from 'lodash-es/isNumber';
-import pick from 'lodash-es/pick';
+import isEmpty from 'lodash/isEmpty';
+import isNumber from 'lodash/isNumber';
+import pick from 'lodash/pick';
 import FormikMultiCombobox from 'Components/fields/MultiComboBox';
 
 const severityOptions = Object.values(SeverityEnum);

web/src/pages/ListPolicies/ListPolicies.tsx

@@ -23,7 +23,7 @@ import { ListPoliciesInput, SortDirEnum, ListPoliciesSortFieldsEnum } from 'Gene
 import { TableControlsPagination } from 'Components/utils/TableControls';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
 import ErrorBoundary from 'Components/ErrorBoundary';
-import isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 import withSEO from 'Hoc/withSEO';
 import ListPoliciesTable from './ListPoliciesTable';
 import ListPoliciesActions from './ListPoliciesActions';

web/src/pages/ListPolicies/ListPoliciesActions/ListPoliciesActions.tsx

@@ -28,8 +28,8 @@ import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination
 import { Box, Button, Card, Collapse, Flex } from 'pouncejs';
 import CreateButton from 'Pages/ListPolicies/CreateButton';
 import ErrorBoundary from 'Components/ErrorBoundary';
-import isEmpty from 'lodash-es/isEmpty';
-import pick from 'lodash-es/pick';
+import isEmpty from 'lodash/isEmpty';
+import pick from 'lodash/pick';
 
 const severityOptions = Object.values(SeverityEnum);
 const statusOptions = Object.values(ComplianceStatusEnum);

web/src/pages/ListResources/ListResources.tsx

@@ -27,7 +27,7 @@ import {
   extractErrorMessage,
 } from 'Helpers/utils';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
-import isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 import withSEO from 'Hoc/withSEO';
 import ErrorBoundary from 'Components/ErrorBoundary';
 import ListResourcesActions from './ListResourcesActions';

web/src/pages/ListResources/ListResourcesActions/ListResourcesActions.tsx

@@ -26,9 +26,9 @@ import FormikTextInput from 'Components/fields/TextInput';
 import FormikCombobox from 'Components/fields/ComboBox';
 import FormikMultiCombobox from 'Components/fields/MultiComboBox';
 import ErrorBoundary from 'Components/ErrorBoundary';
-import pick from 'lodash-es/pick';
+import pick from 'lodash/pick';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
-import isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 import { useListAccountIds } from './graphql/listAccountIds.generated';
 
 const statusOptions = Object.values(ComplianceStatusEnum);

web/src/pages/ListRules/ListRules.tsx

@@ -22,7 +22,7 @@ import { convertObjArrayValuesToCsv, extractErrorMessage, encodeParams } from 'H
 import { ListRulesInput, SortDirEnum, ListRulesSortFieldsEnum } from 'Generated/schema';
 import { TableControlsPagination } from 'Components/utils/TableControls';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
-import isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 import ErrorBoundary from 'Components/ErrorBoundary';
 import withSEO from 'Hoc/withSEO';
 import ListRulesTable from './ListRulesTable';

web/src/pages/ListRules/ListRulesActions/ListRulesActions.tsx

@@ -28,8 +28,8 @@ import { Box, Button, Card, Collapse, Flex } from 'pouncejs';
 import CreateButton from 'Pages/ListRules/CreateButton';
 import ErrorBoundary from 'Components/ErrorBoundary';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
-import isEmpty from 'lodash-es/isEmpty';
-import pick from 'lodash-es/pick';
+import isEmpty from 'lodash/isEmpty';
+import pick from 'lodash/pick';
 
 const severityOptions = Object.values(SeverityEnum);
 

web/src/pages/PolicyDetails/PolicyDetails.tsx

@@ -31,7 +31,7 @@ import {
   convertObjArrayValuesToCsv,
   extractErrorMessage,
 } from 'Helpers/utils';
-import pick from 'lodash-es/pick';
+import pick from 'lodash/pick';
 import { DEFAULT_SMALL_PAGE_SIZE } from 'Source/constants';
 import useRequestParamsWithPagination from 'Hooks/useRequestParamsWithPagination';
 import withSEO from 'Hoc/withSEO';

web/src/pages/ResourceDetails/ResourceDetails.tsx

@@ -32,7 +32,7 @@ import {
   TableControlsPagination,
   TableControlsComplianceFilter,
 } from 'Components/utils/TableControls';
-import pick from 'lodash-es/pick';
+import pick from 'lodash/pick';
 import ErrorBoundary from 'Components/ErrorBoundary';
 import withSEO from 'Hoc/withSEO';
 import { DEFAULT_SMALL_PAGE_SIZE } from 'Source/constants';