Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: RIP Lodash [Test PR] [Do Not Review / Merge] #1823

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CSSObject } from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { StyledBadgeProps } from './types';

Check failure on line 3 in packages/blade/src/components/Badge/getStyledBadgeStyles.ts

View workflow job for this annotation

GitHub Actions / Validate Source Code

`./types` type import should occur before import of `~utils/lodashButBetter/get`
import { makeBorderSize } from '~utils/makeBorderSize';

const getStyledBadgeStyles = ({ theme, backgroundColor }: StyledBadgeProps): CSSObject => ({
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/components/Box/BaseBox/baseBoxStyles.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type { CSSObject } from 'styled-components';
import getIn from 'lodash/get';
import isEmpty from 'lodash/isEmpty';
import getIn from '~utils/lodashButBetter/get';

Check failure on line 2 in packages/blade/src/components/Box/BaseBox/baseBoxStyles.ts

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/get` import should occur after import of `./getResponsiveValue`
import type {
BaseBoxProps,
MakeValueResponsive,
SpacingValueType,
ArrayOfMaxLength4,
} from './types';
import { getResponsiveValue } from './getResponsiveValue';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { Breakpoints } from '~tokens/global';
import { breakpoints } from '~tokens/global';
import { isReactNative, getMediaQuery } from '~utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';

Check failure on line 1 in packages/blade/src/components/Box/BaseBox/getResponsiveValue.native.ts

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/isEmpty` import should occur after type import of `./types`
import { Animated } from 'react-native';
import type { DimensionValue } from 'react-native';
import type { MakeValueResponsive } from './types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { MakeValueResponsive } from './types';

Check failure on line 2 in packages/blade/src/components/Box/BaseBox/getResponsiveValue.web.ts

View workflow job for this annotation

GitHub Actions / Validate Source Code

`./types` type import should occur before import of `~utils/lodashButBetter/isEmpty`
import type { Breakpoints } from '~tokens/global';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';

Check failure on line 2 in packages/blade/src/components/Button/BaseButton/BaseButton.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/get` import should occur after import of `./buttonTokens`
import React from 'react';
import styled from 'styled-components';
import type { GestureResponderEvent } from 'react-native';
Expand Down Expand Up @@ -38,7 +38,7 @@
} from '~utils/types';
import type { BaseTextProps } from '~components/Typography/BaseText/types';
import { assignWithoutSideEffects } from '~utils/assignWithoutSideEffects';
import { usePrevious } from '~utils/usePrevious';

Check warning on line 41 in packages/blade/src/components/Button/BaseButton/BaseButton.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

Deprecated: This utility will be deprecated in subsequent version
import { makeSize } from '~utils/makeSize';
import { makeBorderSize } from '~utils/makeBorderSize';
import type { AccessibilityProps } from '~utils/makeAccessible';
Expand Down Expand Up @@ -355,7 +355,7 @@
}
}

const prevLoading = usePrevious(isLoading);

Check warning on line 358 in packages/blade/src/components/Button/BaseButton/BaseButton.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

Deprecated: This utility will be deprecated in subsequent version

React.useEffect(() => {
if (isLoading) announce('Started loading');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';

Check failure on line 1 in packages/blade/src/components/Button/BaseButton/StyledBaseButton.native.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/get` import should occur after type import of `./types`
import { Linking, Pressable } from 'react-native';
import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
import styled from 'styled-components/native';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';

Check failure on line 1 in packages/blade/src/components/Button/BaseButton/StyledBaseButton.web.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/get` import should occur after type import of `./types`
import styled from 'styled-components';
import getStyledBaseButtonStyles from './getStyledBaseButtonStyles';
import type { StyledBaseButtonProps } from './types';
Expand Down
6 changes: 3 additions & 3 deletions packages/blade/src/components/Carousel/Carousel.web.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import type { CSSObject } from 'styled-components';
import styled from 'styled-components';
import React from 'react';
import getIn from 'lodash/get';
import throttle from 'lodash/throttle';
import debounce from 'lodash/debounce';
import getIn from '~utils/lodashButBetter/get';

Check failure on line 9 in packages/blade/src/components/Carousel/Carousel.web.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/get` import should occur after import of `./constants`
import throttle from '~utils/lodashButBetter/throttle';

Check failure on line 10 in packages/blade/src/components/Carousel/Carousel.web.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/throttle` import should occur after import of `./constants`
import debounce from '~utils/lodashButBetter/debounce';

Check failure on line 11 in packages/blade/src/components/Carousel/Carousel.web.tsx

View workflow job for this annotation

GitHub Actions / Validate Source Code

`~utils/lodashButBetter/debounce` import should occur after import of `./constants`
import { Indicators } from './Indicators/Indicators';
import { NavigationButton } from './NavigationButton';
import type { CarouselProps } from './types';
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/components/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-shadow */
import React from 'react';
import isUndefined from 'lodash/isUndefined';
import isEmpty from 'lodash/isEmpty';
import isUndefined from '~utils/lodashButBetter/isUndefined';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import { useCheckboxGroupContext } from './CheckboxGroup/CheckboxGroupContext';
import { CheckboxIcon } from './CheckboxIcon';
import { useCheckbox } from './useCheckbox';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
/* eslint-disable @typescript-eslint/explicit-function-return-type */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import { CheckboxIconWrapper } from './CheckboxIconWrapper';
import { Fade } from './Fade';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import { checkboxIconColors, checkboxSizes } from '../checkboxTokens';
import type { CheckboxIconProps } from './CheckboxIcon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import styled from 'styled-components/native';
import Animated, { useAnimatedStyle, withTiming } from 'react-native-reanimated';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Chip/AnimatedChip.web.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import { getAnimatedChipStyles } from './getAnimatedChipStyles';
import type { AnimatedChipProps } from './types';
import { chipMotionTokens } from './chipTokens';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Chip/Chip.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import { useChipGroupContext } from './ChipGroupContext';
import {
chipIconSizes,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components/native';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { StyledChipWrapperProps } from './types';
import BaseBox from '~components/Box/BaseBox';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { StyledChipWrapperProps } from './types';
import { chipMotionTokens, chipColorTokens } from './chipTokens';
import BaseBox from '~components/Box/BaseBox';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { CSSObject } from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { AnimatedChipProps } from './types';
import { makeBorderSize } from '~utils/makeBorderSize';

Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Chip/useChipGroup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import isUndefined from 'lodash/isUndefined';
import isUndefined from '~utils/lodashButBetter/isUndefined';
import type { ChipGroupProps, ChipGroupContextType, State } from './types';
import { useControllableState } from '~utils/useControllable';
import { useId } from '~utils/useId';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import { maxWidth } from './counterTokens';
import type { StyledCounterProps } from './types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/ban-types */
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import React from 'react';
import styled from 'styled-components';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import get from 'lodash/get';
import get from '~utils/lodashButBetter/get';
import type { IconProps } from '..';
import { useTheme } from '~components/BladeProvider';
import { size } from '~tokens/global';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import { BaseInput } from '../BaseInput';
import { InputChevronIcon } from './InputChevronIcon';
import type { BaseDropdownInputTriggerProps } from './types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useImperativeHandle, useState } from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { BaseInputProps } from '../BaseInput';
import { BaseInput } from '../BaseInput';
import { getHintType } from '../BaseInput/BaseInput';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable jsx-a11y/no-autofocus */
import React from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { TextInput as TextInputReactNative } from 'react-native';
import type { BaseInputProps } from '../BaseInput';
import { BaseInput } from '../BaseInput';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { ReactElement, ReactNode } from 'react';
import type { TextInput as TextInputReactNative } from 'react-native';
import type { BaseInputProps } from '../BaseInput';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Link/BaseLink/BaseLink.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
/* eslint-disable @typescript-eslint/ban-ts-comment */
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { SyntheticEvent } from 'react';
import React, { useState } from 'react';
import type { CSSObject } from 'styled-components';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import styled from 'styled-components';
import getStyledLinkStyles from './getStyledLinkStyles';
import type { StyledBaseLinkProps } from './types';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/List/List.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React, { useMemo } from 'react';
import styled from 'styled-components';
import { ListProvider, useListContext } from './ListContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/List/ListItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import { useListContext } from './ListContext';
import { UnorderedItemIcon } from './ListItemIcons';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ReactElement } from 'react';
import clamp from 'lodash/clamp';
import clamp from '~utils/lodashButBetter/clamp';
import { ProgressBarFilled } from './ProgressBarFilled';
import { FormLabel } from '~components/Form';
import { metaAttribute, MetaConstants } from '~utils/metaAttribute';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React, { useEffect } from 'react';
import styled from 'styled-components';
import Animated, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { FlattenSimpleInterpolation } from 'styled-components';
import styled, { css, keyframes } from 'styled-components';
import React from 'react';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Radio/Radio.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-shadow */
import React from 'react';
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { OnChange } from './useRadio';
import { useRadio } from './useRadio';
import { RadioIcon } from './RadioIcon/RadioIcon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import isUndefined from 'lodash/isUndefined';
import isUndefined from '~utils/lodashButBetter/isUndefined';
import type { RadioGroupProps } from './RadioGroup';
import type { RadioGroupContextType } from './RadioContext';
import { useControllableState } from '~utils/useControllable';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import { radioIconColors, radioSizes } from '../radioTokens';
import type { RadioProps } from '../Radio';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import { radioIconColors, radioSizes } from '../radioTokens';
import type { RadioIconProps } from './RadioIcon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import { dimensions } from './spinnerTokens';
import SpinnerIcon from './SpinnerIcon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import type { EasingFactoryFn } from 'react-native-reanimated';
import Animated, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import styled, { css, keyframes } from 'styled-components';
import { motion as spinnerMotion } from './spinnerTokens';
import BaseBox from '~components/Box/BaseBox';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable react-hooks/exhaustive-deps */
import styled from 'styled-components/native';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import React from 'react';
import isNumber from 'lodash/isNumber';
import isNumber from '~utils/lodashButBetter/isNumber';
import Animated, {
interpolate,
useAnimatedStyle,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled, { css } from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import { switchColors, switchMotion } from './switchTokens';
import type { AnimatedThumbProps } from './types';
import { BaseBox } from '~components/Box/BaseBox';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import Animated, {
interpolate,
useAnimatedStyle,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import styled from 'styled-components';
import { switchMotion } from './switchTokens';
import Svg from '~components/Icons/_Svg';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import Animated, {
interpolateColor,
useAnimatedStyle,
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/components/Switch/Thumb.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import isNumber from 'lodash/isNumber';
import getIn from 'lodash/get';
import isNumber from '~utils/lodashButBetter/isNumber';
import getIn from '~utils/lodashButBetter/get';
import styled from 'styled-components';
import type { ThumbProps } from './types';
import { switchSizes } from './switchTokens';
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/components/Switch/ThumbIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isNumber from 'lodash/isNumber';
import getIn from 'lodash/get';
import isNumber from '~utils/lodashButBetter/isNumber';
import getIn from '~utils/lodashButBetter/get';
import type { SwitchProps } from './types';
import { AnimatedThumbIcon } from './AnimatedThumbIcon';
import { switchColors } from './switchTokens';
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/components/Switch/getTrackStyles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isNumber from 'lodash/isNumber';
import getIn from 'lodash/get';
import isNumber from '~utils/lodashButBetter/isNumber';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import type { TrackProps } from './types';
import { switchColors, switchSizes } from './switchTokens';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Tabs/TabItem.native.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
import styled from 'styled-components';
import get from 'lodash/get';
import get from '~utils/lodashButBetter/get';
import React from 'react';
import type { TabItemProps, TabsProps } from './types';
import { paddingX, paddingY } from './tabTokens';
Expand Down
2 changes: 1 addition & 1 deletion packages/blade/src/components/Tabs/TabItem.web.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
import styled from 'styled-components';
import get from 'lodash/get';
import get from '~utils/lodashButBetter/get';
import React from 'react';
import { CompositeItem } from '@floating-ui/react';
import type { TabItemProps, TabsProps } from './types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getIn from 'lodash/get';
import getIn from '~utils/lodashButBetter/get';
import type { CSSObject } from 'styled-components';
import type { StyledBaseTextProps } from './types';
import { makeTypographySize } from '~utils/makeTypographySize';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import debounce from 'lodash/debounce';
import debounce from '~utils/lodashButBetter/debounce';
import { useEffect } from 'react';
import styled from 'styled-components';
import { Box } from '~components/Box';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cloneDeep from 'lodash/cloneDeep';
import cloneDeep from '~utils/lodashButBetter/cloneDeep';
import overrideTheme from '../overrideTheme';
import { paymentTheme, bankingTheme } from '../';
import type { ThemeTokens } from '../../theme';
Expand Down
4 changes: 2 additions & 2 deletions packages/blade/src/tokens/theme/overrideTheme.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cloneDeep from 'lodash/cloneDeep';
import merge from 'lodash/merge';
import cloneDeep from '~utils/lodashButBetter/cloneDeep';
import merge from '~utils/lodashButBetter/merge';
import paymentTheme from './paymentTheme';
import type { ThemeTokens } from './theme';
import { hasSameObjectStructure } from '~utils/hasSameObjectStructure';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isEmpty from 'lodash/isEmpty';
import isEmpty from '~utils/lodashButBetter/isEmpty';
import type { StringChildrenType } from '~utils/types';

const getStringFromReactText = (
Expand Down
Loading
Loading