Merge pull request #598 from curvefi/refactor/merge-curve-common-into-curve-ui-kit

refactor: merge curve-common and curve-lib packages

Author: 0xAlunara

.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
   extends: ['custom'],
   settings: {
     next: {
-      rootDir: ['apps/*/', 'packages/ui/*/', 'packages/curve-common/*/']
-    }
-  }
+      rootDir: ['apps/*/', 'packages/ui/*/'],
+    },
+  },
 }

README.md

@@ -54,7 +54,6 @@ This repository is organized as follows:
 - `/apps/lend`: Lend [React](https://react.dev/) application.
 - `/tests`: DApp tests
 - `/packages/curve-ui-kit`: Shared UI kit created using Material UI, mapped as `@ui-kit`
-- `/packages/curve-common`: List of features for the DApps, mapped as `@/common`
 
 ## Development Guide
 

apps/dao/lingui.config.js

@@ -8,15 +8,7 @@ module.exports = {
   catalogs: [
     {
       path: 'src/locales/{locale}/messages',
-      include: [
-        'src/components',
-        'src/hooks',
-        'src/layout',
-        'src/pages',
-        'src/store',
-        '../../packages/curve-ui-kit',
-        '../../packages/curve-common',
-      ],
+      include: ['src/components', 'src/hooks', 'src/layout', 'src/pages', 'src/store', '../../packages/curve-ui-kit'],
     },
   ],
   format: 'po',

apps/dao/next.config.js

@@ -27,7 +27,7 @@ const nextConfiguration = {
     unoptimized: true,
   },
   trailingSlash: true,
-  transpilePackages: ['curve-common', 'curve-ui-kit'],
+  transpilePackages: ['curve-ui-kit'],
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,

apps/dao/package.json

@@ -32,7 +32,6 @@
     "@lingui/react": "^4.6.0",
     "@supercharge/promise-pool": "^2.3.2",
     "bignumber.js": "^9.1.2",
-    "curve-common": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
     "ethers": "^6.13.4",

apps/dao/src/components/PageDisclaimer/Page.tsx

@@ -7,8 +7,8 @@ import Stack from '@mui/material/Stack'
 import DocumentHead from '@/layout/DocumentHead'
 import { scrollToTop } from '@/utils'
 
-import { SizesAndSpaces } from 'curve-ui-kit/src/themes/design/1_sizes_spaces'
-import { Disclaimer } from 'curve-ui-kit/src/widgets/Disclaimer'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+import { Disclaimer } from '@ui-kit/widgets/Disclaimer'
 
 const { Spacing } = SizesAndSpaces
 

apps/dao/src/layout/Header.tsx

@@ -8,8 +8,8 @@ import { getWalletSignerAddress, useConnectWallet } from '@ui-kit/features/conne
 import networks, { visibleNetworksList } from '@/networks'
 import useLayoutHeight from '@/hooks/useLayoutHeight'
 import useStore from '@/store/useStore'
-import { Header as NewHeader, useHeaderHeight } from '@/common/widgets/Header'
-import { NavigationSection } from '@/common/widgets/Header/types'
+import { Header as NewHeader, useHeaderHeight } from '@ui-kit/widgets/Header'
+import { NavigationSection } from '@ui-kit/widgets/Header/types'
 import { APP_LINK } from '@ui-kit/shared/routes'
 import { GlobalBannerProps } from '@/ui/Banner/GlobalBanner'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'

apps/dao/src/layout/index.tsx

@@ -1,4 +1,4 @@
-import { Locale } from '@/common/widgets/Header/types'
+import { Locale } from '@ui-kit/widgets/Header/types'
 
 import React, { useEffect, useMemo, useRef, useState } from 'react'
 import styled from 'styled-components'
@@ -12,7 +12,7 @@ import { useHeightResizeObserver } from '@/ui/hooks'
 import useStore from '@/store/useStore'
 
 import Header from '@/layout/Header'
-import { Footer } from 'curve-ui-kit/src/widgets/Footer'
+import { Footer } from '@ui-kit/widgets/Footer'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'
 
 const BaseLayout = ({ children }: { children: React.ReactNode }) => {

apps/dao/src/pages/_app.tsx

@@ -10,7 +10,7 @@ import delay from 'lodash/delay'
 import 'intersection-observer'
 import 'focus-visible'
 import '@/globals.css'
-import { ThemeProvider } from 'curve-ui-kit/src/shared/ui/ThemeProvider'
+import { ThemeProvider } from '@ui-kit/shared/ui/ThemeProvider'
 
 import { dynamicActivate, initTranslation, updateAppLocale } from '@ui-kit/lib/i18n'
 import { connectWalletLocales, initOnboard } from '@ui-kit/features/connect-wallet'

apps/dao/tsconfig.json

@@ -10,7 +10,6 @@
       "@ui-kit/*": ["../../../packages/curve-ui-kit/src/*"],
       "@/images": ["../../../packages/ui/src/images/index.ts"],
       "@/images/*": ["../../../packages/ui/src/images/*"],
-      "@/common/*": ["../../../packages/curve-common/src/*"],
       "@/shared/external-rewards": ["../../../packages/external-rewards/src/index.ts"]
     }
   },

apps/lend/lingui.config.js

@@ -8,15 +8,7 @@ module.exports = {
   catalogs: [
     {
       path: 'src/locales/{locale}/messages',
-      include: [
-        'src/components',
-        'src/hooks',
-        'src/layout',
-        'src/pages',
-        'src/store',
-        '../../packages/curve-ui-kit',
-        '../../packages/curve-common',
-      ],
+      include: ['src/components', 'src/hooks', 'src/layout', 'src/pages', 'src/store', '../../packages/curve-ui-kit'],
     },
   ],
   format: 'po',

apps/lend/next.config.js

@@ -27,7 +27,7 @@ const nextConfiguration = {
     unoptimized: true,
   },
   trailingSlash: true,
-  transpilePackages: ['curve-common', 'curve-ui-kit'],
+  transpilePackages: ['curve-ui-kit'],
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,

apps/lend/package.json

@@ -32,7 +32,6 @@
     "@supercharge/promise-pool": "^2.3.2",
     "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
-    "curve-common": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
     "ethers": "^6.13.4",

apps/lend/src/components/ChartLiquidationRange/index.tsx

@@ -17,7 +17,7 @@ import styled from 'styled-components'
 import { formatNumber } from '@/ui/utils'
 
 import ChartTooltip, { TipContent, TipIcon, TipTitle } from '@/components/ChartTooltip'
-import type { ThemeKey } from 'curve-ui-kit/src/themes/basic-theme'
+import type { ThemeKey } from '@ui-kit/themes/basic-theme'
 
 interface Props {
   data: { name: string; curr: number[]; new: number[]; oraclePrice: string; oraclePriceBand: number | null }[]

apps/lend/src/components/PageDisclaimer/Page.tsx

@@ -7,8 +7,8 @@ import Stack from '@mui/material/Stack'
 import DocumentHead from '@/layout/DocumentHead'
 import { scrollToTop } from '@/utils/helpers'
 
-import { SizesAndSpaces } from 'curve-ui-kit/src/themes/design/1_sizes_spaces'
-import { Disclaimer } from 'curve-ui-kit/src/widgets/Disclaimer'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+import { Disclaimer } from '@ui-kit/widgets/Disclaimer'
 
 const { Spacing } = SizesAndSpaces
 

apps/lend/src/layout/Header.tsx

@@ -8,10 +8,10 @@ import { getWalletSignerAddress, useConnectWallet } from '@ui-kit/features/conne
 import networks, { visibleNetworksList } from '@/networks'
 import useStore from '@/store/useStore'
 import { useTvl } from '@/entities/chain'
-import { Header as NewHeader, useHeaderHeight } from '@/common/widgets/Header'
+import { Header as NewHeader, useHeaderHeight } from '@ui-kit/widgets/Header'
 import useMediaQuery from '@mui/material/useMediaQuery'
 import { type Theme } from '@mui/material/styles'
-import type { NavigationSection } from '@/common/widgets/Header/types'
+import type { NavigationSection } from '@ui-kit/widgets/Header/types'
 import { APP_LINK } from '@ui-kit/shared/routes'
 import { GlobalBannerProps } from '@/ui/Banner/GlobalBanner'
 

apps/lend/src/layout/index.tsx

@@ -8,10 +8,10 @@ import { isFailure, isLoading } from '@/ui/utils'
 import { getWalletChainId, useConnectWallet } from '@ui-kit/features/connect-wallet'
 import useStore from '@/store/useStore'
 import Header from '@/layout/Header'
-import { Footer } from 'curve-ui-kit/src/widgets/Footer'
+import { Footer } from '@ui-kit/widgets/Footer'
 import { useHeightResizeObserver } from '@/ui/hooks'
 import { t } from '@lingui/macro'
-import { Locale } from '@/common/widgets/Header/types'
+import { Locale } from '@ui-kit/widgets/Header/types'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'
 
 const BaseLayout = ({ children }: { children: React.ReactNode }) => {

apps/lend/src/pages/_app.tsx

@@ -10,7 +10,7 @@ import { HashRouter } from 'react-router-dom'
 import type { AppProps } from 'next/app'
 import { connectWalletLocales, initOnboard } from '@ui-kit/features/connect-wallet'
 import { persister, queryClient } from '@ui-kit/lib/api/query-client'
-import { ThemeProvider } from 'curve-ui-kit/src/shared/ui/ThemeProvider'
+import { ThemeProvider } from '@ui-kit/shared/ui/ThemeProvider'
 import GlobalStyle from '@/globalStyle'
 import Page from '@/layout/index'
 import { dynamicActivate, initTranslation } from '@ui-kit/lib/i18n'

apps/lend/src/store/createAppSlice.ts

@@ -3,10 +3,7 @@ import type { State } from '@/store/useStore'
 import type { ConnectState } from '@/ui/utils'
 import produce from 'immer'
 import { log } from '@ui-kit/lib/logging'
-import { setStorageValue } from '@/utils/utilsStorage'
 import isEqual from 'lodash/isEqual'
-import type { ThemeKey } from 'curve-ui-kit/src/themes/basic-theme'
-import { Locale } from '@ui-kit/lib/i18n'
 import { prefetchMarkets } from '@/entities/chain/chain-query'
 
 export type DefaultStateKeys = keyof typeof DEFAULT_STATE

apps/lend/tsconfig.json

@@ -10,7 +10,6 @@
       "@/ui/*": ["../../../packages/ui/src/*"],
       "@/images": ["../../../packages/ui/src/images/index.ts"],
       "@/images/*": ["../../../packages/ui/src/images/*"],
-      "@/common/*": ["../../../packages/curve-common/src/*"],
       "@/shared/external-rewards": ["../../../packages/external-rewards/src/index.ts"]
     }
   },

apps/loan/lingui.config.js

@@ -8,15 +8,7 @@ module.exports = {
   catalogs: [
     {
       path: 'src/locales/{locale}/messages',
-      include: [
-        'src/components',
-        'src/hooks',
-        'src/layout',
-        'src/pages',
-        'src/store',
-        '../../packages/curve-ui-kit',
-        '../../packages/curve-common',
-      ],
+      include: ['src/components', 'src/hooks', 'src/layout', 'src/pages', 'src/store', '../../packages/curve-ui-kit'],
     },
   ],
   format: 'po',

apps/loan/next.config.js

@@ -27,7 +27,7 @@ const nextConfiguration = {
     unoptimized: true,
   },
   trailingSlash: true,
-  transpilePackages: ['curve-common', 'curve-ui-kit'],
+  transpilePackages: ['curve-ui-kit'],
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,

apps/loan/package.json

@@ -34,7 +34,6 @@
     "@tanstack/react-table": "^8.20.6",
     "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
-    "curve-common": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
     "ethers": "^6.13.4",

apps/loan/src/components/PageDisclaimer/Page.tsx

@@ -7,8 +7,8 @@ import Stack from '@mui/material/Stack'
 import DocumentHead from '@/layout/DocumentHead'
 import { scrollToTop } from '@/utils/helpers'
 
-import { SizesAndSpaces } from 'curve-ui-kit/src/themes/design/1_sizes_spaces'
-import { Disclaimer } from 'curve-ui-kit/src/widgets/Disclaimer'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+import { Disclaimer } from '@ui-kit/widgets/Disclaimer'
 
 const { Spacing } = SizesAndSpaces
 

apps/loan/src/components/PageLlamaMarkets/Page.tsx

@@ -8,7 +8,7 @@ import DocumentHead from '@/layout/DocumentHead'
 import { t } from '@lingui/macro'
 import React from 'react'
 import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
-import { useHeaderHeight } from '@/common/widgets/Header'
+import { useHeaderHeight } from '@ui-kit/widgets/Header'
 import useStore from '@/store/useStore'
 
 const onReload = () => invalidateLendingVaults({})

apps/loan/src/layout/Header.tsx

@@ -8,8 +8,8 @@ import { getWalletSignerAddress, useConnectWallet } from '@ui-kit/features/conne
 import networks, { visibleNetworksList } from '@/networks'
 import useLayoutHeight from '@/hooks/useLayoutHeight'
 import useStore from '@/store/useStore'
-import { Header as NewHeader, useHeaderHeight } from '@/common/widgets/Header'
-import { NavigationSection } from '@/common/widgets/Header/types'
+import { Header as NewHeader, useHeaderHeight } from '@ui-kit/widgets/Header'
+import { NavigationSection } from '@ui-kit/widgets/Header/types'
 import { APP_LINK } from '@ui-kit/shared/routes'
 import { GlobalBannerProps } from '@/ui/Banner/GlobalBanner'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'

apps/loan/src/layout/index.tsx

@@ -10,9 +10,9 @@ import { useConnectWallet } from '@ui-kit/features/connect-wallet'
 import useLayoutHeight from '@/hooks/useLayoutHeight'
 import useStore from '@/store/useStore'
 import Header from '@/layout/Header'
-import { Locale } from '@/common/widgets/Header/types'
+import { Locale } from '@ui-kit/widgets/Header/types'
 import { t } from '@lingui/macro'
-import { Footer } from 'curve-ui-kit/src/widgets/Footer'
+import { Footer } from '@ui-kit/widgets/Footer'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'
 
 const BaseLayout = ({ children }: { children: React.ReactNode }) => {

apps/loan/src/pages/_app.tsx

@@ -20,7 +20,7 @@ import { getPageWidthClassName } from '@/store/createLayoutSlice'
 import useStore from '@/store/useStore'
 import { isMobile, removeExtraSpaces } from '@/utils/helpers'
 import { getLocaleFromUrl } from '@/utils/utilsRouter'
-import { ThemeProvider } from 'curve-ui-kit/src/shared/ui/ThemeProvider'
+import { ThemeProvider } from '@ui-kit/shared/ui/ThemeProvider'
 import { ChadCssProperties } from '@ui-kit/themes/typography'
 import { persister, queryClient } from '@ui-kit/lib/api/query-client'
 import { QueryProvider } from '@/ui/QueryProvider'

apps/loan/tsconfig.json

@@ -10,7 +10,6 @@
       "@ui-kit/*": ["../../../packages/curve-ui-kit/src/*"],
       "@/images": ["../../../packages/ui/src/images/index.ts"],
       "@/images/*": ["../../../packages/ui/src/images/*"],
-      "@/common/*": ["../../../packages/curve-common/src/*"],
       "@/shared/external-rewards": ["../../../packages/external-rewards/src/index.ts"]
     }
   },

apps/main/lingui.config.js

@@ -18,7 +18,6 @@ module.exports = {
         'src/store',
         'src/widgets',
         '../../packages/curve-ui-kit',
-        '../../packages/curve-common',
       ],
     },
   ],

apps/main/next.config.js

@@ -27,7 +27,7 @@ const nextConfiguration = {
     unoptimized: true,
   },
   trailingSlash: true,
-  transpilePackages: ['curve-common', 'curve-ui-kit'],
+  transpilePackages: ['curve-ui-kit'],
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,

apps/main/package.json

@@ -33,7 +33,6 @@
     "@supercharge/promise-pool": "^2.3.2",
     "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
-    "curve-common": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
     "ethers": "^6.13.4",

apps/main/src/components/PageDisclaimer/Page.tsx

@@ -7,8 +7,8 @@ import Stack from '@mui/material/Stack'
 import DocumentHead from '@/layout/default/DocumentHead'
 import { scrollToTop } from '@/utils'
 
-import { SizesAndSpaces } from 'curve-ui-kit/src/themes/design/1_sizes_spaces'
-import { Disclaimer } from 'curve-ui-kit/src/widgets/Disclaimer'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+import { Disclaimer } from '@ui-kit/widgets/Disclaimer'
 
 const { Spacing } = SizesAndSpaces
 

apps/main/src/layout/default/Header.tsx

@@ -6,8 +6,8 @@ import { _parseRouteAndIsActive, FORMAT_OPTIONS, formatNumber, isLoading } from
 import { useParamsFromUrl, useRestPartialPathname } from '@/utils/utilsRouter'
 import { getWalletSignerAddress, useConnectWallet } from '@ui-kit/features/connect-wallet'
 import useStore from '@/store/useStore'
-import { Header as NewHeader, useHeaderHeight } from '@/common/widgets/Header'
-import { NavigationSection } from '@/common/widgets/Header/types'
+import { Header as NewHeader, useHeaderHeight } from '@ui-kit/widgets/Header'
+import { NavigationSection } from '@ui-kit/widgets/Header/types'
 import useLayoutHeight from '@/hooks/useLayoutHeight'
 import { APP_LINK } from '@ui-kit/shared/routes'
 import { GlobalBannerProps } from '@/ui/Banner/GlobalBanner'

apps/main/src/layout/default/index.tsx

@@ -10,9 +10,9 @@ import useLayoutHeight from '@/hooks/useLayoutHeight'
 import useStore from '@/store/useStore'
 
 import Header from '@/layout/default/Header'
-import { Locale } from '@/common/widgets/Header/types'
+import { Locale } from '@ui-kit/widgets/Header/types'
 import { t } from '@lingui/macro'
-import { Footer } from 'curve-ui-kit/src/widgets/Footer'
+import { Footer } from '@ui-kit/widgets/Footer'
 import { layoutHeightKeys } from '@/store/createGlobalSlice'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'
 

apps/main/src/pages/_app.tsx

@@ -11,7 +11,7 @@ import { HashRouter } from 'react-router-dom'
 import type { AppProps } from 'next/app'
 import { connectWalletLocales, initOnboard } from '@ui-kit/features/connect-wallet'
 import { persister, queryClient } from '@ui-kit/lib/api/query-client'
-import { ThemeProvider } from 'curve-ui-kit/src/shared/ui/ThemeProvider'
+import { ThemeProvider } from '@ui-kit/shared/ui/ThemeProvider'
 import { REFRESH_INTERVAL } from '@/constants'
 import GlobalStyle from '@/globalStyle'
 import usePageVisibleInterval from '@/hooks/usePageVisibleInterval'

apps/main/tsconfig.json

@@ -10,7 +10,6 @@
       "@ui-kit/*": ["../../../packages/curve-ui-kit/src/*"],
       "@/images": ["../../../packages/ui/src/images/index.ts"],
       "@/images/*": ["../../../packages/ui/src/images/*"],
-      "@/common/*": ["../../../packages/curve-common/src/*"],
       "@/shared/external-rewards": ["../../../packages/external-rewards/src/index.ts"]
     }
   },