Cleanup

babel.config.js

@@ -12,17 +12,6 @@ module.exports = {
           },
         ],
       ],
-      plugins: [
-        [
-          require.resolve('babel-plugin-module-resolver'),
-          {
-            root: ['.'],
-            alias: {
-              '@synthetixio/v3-theme': './theme/src',
-            },
-          },
-        ],
-      ],
     },
   },
 };

liquidity/components/TermsModal/TermsModal.tsx

@@ -13,7 +13,7 @@ import {
   UnorderedList,
 } from '@chakra-ui/react';
 import { Link as ReactRouterLink } from 'react-router-dom';
-import { theme } from '@synthetixio/v3-theme';
+import { theme } from '@snx-v3/theme';
 import { SESSION_STORAGE_KEYS } from '@snx-v3/constants';
 
 interface TermsModalProps {

liquidity/components/TermsModal/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@chakra-ui/react": "^2.8.2",
     "@snx-v3/constants": "workspace:*",
-    "@synthetixio/v3-theme": "workspace:*",
+    "@snx-v3/theme": "workspace:*",
     "react": "^18.2.0",
     "react-router-dom": "^6.18.0"
   }

liquidity/cypress/cypress/support/component.js

@@ -1,7 +1,7 @@
 import { ChakraProvider } from '@chakra-ui/react';
 import '@cypress/code-coverage/support';
 
-import { theme } from '@synthetixio/v3-theme';
+import { theme } from '@snx-v3/theme';
 import { mount } from 'cypress/react18';
 import { MemoryRouter } from 'react-router-dom';
 

liquidity/cypress/package.json

@@ -17,7 +17,6 @@
     "@snx-cy/printBrowserLogs": "workspace:*",
     "@snx-v3/contracts": "workspace:*",
     "@snx-v3/liquidity": "workspace:*",
-    "@synthetixio/v3-theme": "workspace:*",
     "cypress": "13.11.0",
     "ethers": "^5.7.2",
     "react-router-dom": "^6.18.0",
@@ -27,5 +26,8 @@
     "ignoreMatches": [
       "ts-node"
     ]
+  },
+  "dependencies": {
+    "@snx-v3/theme": "workspace:*"
   }
 }

liquidity/lib/theme/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@snx-v3/theme",
+  "private": true,
+  "main": "index.ts",
+  "version": "0.0.1",
+  "dependencies": {
+    "@chakra-ui/react": "^2.6.1",
+    "@chakra-ui/theme-tools": "^2.1.2",
+    "@emotion/react": "^11.11.0",
+    "@emotion/styled": "^11.11.0",
+    "framer-motion": "^10.12.16",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  }
+}

liquidity/ui/package.json

@@ -37,6 +37,7 @@
     "@snx-v3/formatters": "workspace:*",
     "@snx-v3/icons": "workspace:*",
     "@snx-v3/isBaseAndromeda": "workspace:*",
+    "@snx-v3/theme": "workspace:*",
     "@snx-v3/useAccountCollateral": "workspace:*",
     "@snx-v3/useAccountCollateralUnlockDate": "workspace:*",
     "@snx-v3/useAccountPermissions": "workspace:*",
@@ -85,7 +86,6 @@
     "@snx-v3/useWithdrawTimer": "workspace:*",
     "@snx-v3/validatePosition": "workspace:*",
     "@synthetixio/safe-import": "workspace:*",
-    "@synthetixio/v3-theme": "workspace:*",
     "@synthetixio/wei": "^2.74.4",
     "@tanstack/react-query-devtools": "^5.8.3",
     "@web3-onboard/coinbase": "^2.4.1",

liquidity/ui/src/App.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { HashRouter } from 'react-router-dom';
 import { ChakraProvider, extendTheme, useColorMode } from '@chakra-ui/react';
-import { Fonts, theme } from '@synthetixio/v3-theme';
+import { Fonts, theme } from '@snx-v3/theme';
 import { DEFAULT_QUERY_STALE_TIME } from '@snx-v3/constants';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';

liquidity/ui/webpack.config.js

@@ -145,13 +145,6 @@ module.exports = {
       new webpack.NormalModuleReplacementPlugin(/^bn.js$/, require.resolve('bn.js')),
     ])
 
-    .concat([
-      new webpack.NormalModuleReplacementPlugin(
-        new RegExp(`^@synthetixio/v3-theme$`),
-        path.resolve(path.dirname(require.resolve(`@synthetixio/v3-theme/package.json`)), 'src')
-      ),
-    ])
-
     .concat([
       new webpack.ProvidePlugin({
         Buffer: ['buffer', 'Buffer'],

package.json

@@ -30,6 +30,7 @@
   "devDependencies": {
     "@babel/core": "^7.24.6",
     "@babel/preset-env": "^7.24.6",
+    "@babel/preset-react": "^7.24.6",
     "@babel/preset-typescript": "^7.24.6",
     "@synthetixio/deps": "workspace:*",
     "@synthetixio/download-cci-coverage": "workspace:*",
@@ -38,7 +39,6 @@
     "@typescript-eslint/eslint-plugin": "^6.11.0",
     "@typescript-eslint/parser": "^6.11.0",
     "babel-jest": "^29.7.0",
-    "babel-plugin-module-resolver": "^5.0.0",
     "eslint": "^8.53.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-react": "^7.33.2",