From d72e9bcfb0bd64ee84d590720e015475b1596289 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Date: Thu, 23 May 2024 12:25:48 +0400 Subject: [PATCH] [COJ]/likhith/[coj-1131]chore: remove account-v2 checks from CI (#15320) * chore: remove account-v2 checks from test.yml and chore/build * chore: removed route check * chore: removed prod and local build and test for account-v2 * chore: added jest config to ignore account-v2 --- .github/workflows/test.yml | 6 ------ analyze.html | 3 --- jest.config.base.js | 2 +- jest.config.js | 2 +- lerna.json | 6 +++--- package.json | 4 ++-- packages/core/build/config.js | 4 ---- packages/core/package.json | 1 - .../App/Components/Routes/route-with-sub-routes.jsx | 6 ++---- packages/core/src/App/Constants/routes-config.js | 13 ------------- packages/core/src/root_files/robots.txt | 1 - packages/shared/src/utils/routes/routes.ts | 3 --- packages/stores/src/stores/FeatureFlagsStore.ts | 1 - packages/tradershub/package.json | 1 - packages/tradershub/tsconfig.json | 4 +--- packages/tradershub/webpack.config.js | 1 - 16 files changed, 10 insertions(+), 48 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3fddd2b24ce5..1d9c48806b34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,22 +37,16 @@ jobs: run: npx tsc --project packages/wallets/tsconfig.json -noEmit - name: Check TypeScript for @deriv/tradershub run: npx tsc --project packages/tradershub/tsconfig.json -noEmit - - name: Check TypeScript for @deriv/account-v2 - run: npx tsc --project packages/account-v2/tsconfig.json -noEmit - name: Check TypeScript for @deriv/cashier-v2 run: npx tsc --project packages/cashier-v2/tsconfig.json -noEmit - name: Check ESLint for @deriv/wallets run: npx eslint --fix --ignore-path packages/wallets/.eslintignore --config packages/wallets/.eslintrc.js packages/wallets - name: Check ESLint for @deriv/tradershub run: npx eslint --fix --ignore-path packages/tradershub/.eslintignore --config packages/tradershub/.eslintrc.js packages/tradershub - - name: Check ESLint for @deriv/account-v2 - run: npx eslint --fix --ignore-path packages/account-v2/.eslintignore --config packages/account-v2/.eslintrc.js packages/account-v2 - name: Check ESLint for @deriv/cashier-v2 run: npx eslint --fix --ignore-path packages/cashier-v2/.eslintignore --config packages/cashier-v2/.eslintrc.js packages/cashier-v2 - name: Check Stylelint for @deriv/wallets run: npx stylelint packages/wallets/**/*.scss - - name: Check Stylelint for @deriv/account-v2 - run: npx stylelint packages/account-v2/**/*.scss - name: Check Stylelint for @deriv/cashier-v2 run: npx stylelint packages/cashier-v2/**/*.scss - name: Check tests for @deriv/hooks diff --git a/analyze.html b/analyze.html index ed275f5f9c0b..078e248e7796 100644 --- a/analyze.html +++ b/analyze.html @@ -57,9 +57,6 @@
- diff --git a/jest.config.base.js b/jest.config.base.js index a9a7339ee322..a11ed875ab29 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -18,5 +18,5 @@ module.exports = { transformIgnorePatterns: ['/node_modules/(?!(@enykeev/react-virtualized|@simplewebauthn/browser)).+\\.js$'], setupFiles: ['/../../jest.setup.js'], setupFilesAfterEnv: ['/../../setupTests.js'], - testPathIgnorePatterns: ['/integration-tests/', '/component-tests/'], + testPathIgnorePatterns: ['/integration-tests/', '/component-tests/', '/account-v2/'], }; diff --git a/jest.config.js b/jest.config.js index da5d1f35c404..acf36a9daf41 100644 --- a/jest.config.js +++ b/jest.config.js @@ -18,5 +18,5 @@ module.exports = { }, testRegex: '(/__tests__/.*|(\\.)(test|spec))\\.(js|jsx|tsx|ts)?$', transformIgnorePatterns: ['/node_modules/(?!(@enykeev/react-virtualized|@simplewebauthn/browser)).+\\.js$'], - testPathIgnorePatterns: ['/integration-tests/'], + testPathIgnorePatterns: ['/integration-tests/', '/account-v2/'], }; diff --git a/lerna.json b/lerna.json index 543c0054dc49..caea8cc43720 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "independent", - "npmClient": "npm", - "packages": ["packages/*", "packages/account-v2/src/modules"] + "version": "independent", + "npmClient": "npm", + "packages": ["packages/*"] } diff --git a/package.json b/package.json index 67b5805f7b53..da4f3d3cc1aa 100644 --- a/package.json +++ b/package.json @@ -58,10 +58,10 @@ "scripts": { "analyze:build": "nx run-many --target=analyze:build", "analyze:stats": "nx run-many --target=analyze:stats", - "build:all": "nx build @deriv/components --skip-nx-cache && nx build @deriv/account --skip-nx-cache && nx build @deriv/bot-web-ui --skip-nx-cache && nx run-many --target=build", + "build:all": "nx build @deriv/components --skip-nx-cache && nx build @deriv/account --skip-nx-cache && nx build @deriv/bot-web-ui --skip-nx-cache && nx run-many --exclude=@deriv/account-v2,@deriv-lib/account-v2-lib --target=build", "build:one": "f () { nx build @deriv/$1 $2 ;}; f", "build:since": "nx affected --target=build", - "test:eslint-all": "nx run-many --target=test:eslint", + "test:eslint-all": "nx run-many --exclude=@deriv/account-v2,@deriv-lib/account-v2-lib --target=test:eslint", "test:eslint-one": "f () { nx test @deriv/$1 --target=test:eslint ;}; f", "test:eslint-since": "f () { nx affected --target=eslint ;}; f", "bootstrap:ci": "f () { lerna link && lerna bootstrap --ci --hoist --strict && lerna link ;}; f", diff --git a/packages/core/build/config.js b/packages/core/build/config.js index eb5bbaadad45..34a27fd373e2 100644 --- a/packages/core/build/config.js +++ b/packages/core/build/config.js @@ -99,10 +99,6 @@ const copyConfig = base => { from: path.resolve(__dirname, '../node_modules/@deriv/tradershub/dist/tradershub'), to: 'tradershub', }, - { - from: path.resolve(__dirname, '../node_modules/@deriv/account-v2/dist/account-v2'), - to: 'account-v2', - }, { from: path.resolve(__dirname, '../node_modules/@deriv/cashier-v2/dist/cashier-v2'), to: 'cashier-v2', diff --git a/packages/core/package.json b/packages/core/package.json index 68d6ea22ba0c..f7d092d4c0c8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -101,7 +101,6 @@ "@deriv-com/translations": "^1.2.3", "@deriv-com/utils": "^0.0.20", "@deriv/account": "^1.0.0", - "@deriv/account-v2": "^1.0.0", "@deriv/api": "^1.0.0", "@deriv/appstore": "^0.0.4", "@deriv/bot-web-ui": "^1.0.0", diff --git a/packages/core/src/App/Components/Routes/route-with-sub-routes.jsx b/packages/core/src/App/Components/Routes/route-with-sub-routes.jsx index 1214b0589cf8..51098e03cbd8 100644 --- a/packages/core/src/App/Components/Routes/route-with-sub-routes.jsx +++ b/packages/core/src/App/Components/Routes/route-with-sub-routes.jsx @@ -9,7 +9,7 @@ import { useFeatureFlags } from '@deriv/hooks'; const RouteWithSubRoutes = observer(route => { const { common } = useStore(); - const { is_next_account_enabled, is_next_cashier_enabled, is_next_tradershub_enabled } = useFeatureFlags(); + const { is_next_cashier_enabled, is_next_tradershub_enabled } = useFeatureFlags(); const { checkAppId } = common; const validateRoute = pathname => { if (pathname.startsWith('/cashier') && !pathname.includes('p2p') && !!route.routes) { @@ -21,9 +21,7 @@ const RouteWithSubRoutes = observer(route => { ? routes.p2p_buy_sell : cashier_subroutes?.routes.find(({ path }) => pathname === path); - return route.path === pathname || !!p2p_subroutes; - } else if (pathname.includes(routes.account_v2) && !is_next_account_enabled) { - return false; + return route.path === pathname || !!p2p_subroutes } else if (pathname.includes(routes.cashier_v2) && !is_next_cashier_enabled) { return false; } else if ( diff --git a/packages/core/src/App/Constants/routes-config.js b/packages/core/src/App/Constants/routes-config.js index 06a047a4ffb9..7f73353de3ea 100644 --- a/packages/core/src/App/Constants/routes-config.js +++ b/packages/core/src/App/Constants/routes-config.js @@ -88,13 +88,6 @@ const P2P_V2 = React.lazy(() => }) ); -const Account_V2 = React.lazy(() => - moduleLoader(() => { - // eslint-disable-next-line import/no-unresolved - return import(/* webpackChunkName: "account-v2" */ '@deriv/account-v2'); - }) -); - const Cashier_V2 = React.lazy(() => moduleLoader(() => { // eslint-disable-next-line import/no-unresolved @@ -307,12 +300,6 @@ const getModules = () => { is_authenticated: true, getTitle: () => localize('Trader’s Hub V2'), }, - { - path: routes.account_v2, - component: Account_V2, - is_authenticated: true, - getTitle: () => localize('Account V2'), - }, { path: routes.cashier_v2, component: Cashier_V2, diff --git a/packages/core/src/root_files/robots.txt b/packages/core/src/root_files/robots.txt index 78dd68c1a820..a3838634c92c 100644 --- a/packages/core/src/root_files/robots.txt +++ b/packages/core/src/root_files/robots.txt @@ -6,6 +6,5 @@ Disallow: */reports/* Disallow: */account/* Disallow: */cashier-v2/* Disallow: */p2p-v2/* -Disallow: */account-v2/* Disallow: */endpoint* Disallow: */tradershub/* diff --git a/packages/shared/src/utils/routes/routes.ts b/packages/shared/src/utils/routes/routes.ts index 789eb267a371..628555cbbd65 100644 --- a/packages/shared/src/utils/routes/routes.ts +++ b/packages/shared/src/utils/routes/routes.ts @@ -90,9 +90,6 @@ export const routes = { traders_hub_v2: '/traders-hub', compare_accounts: '/traders-hub/compare-accounts', - // Account V2 - account_v2: '/account-v2', - // Cashier V2 cashier_v2: '/cashier-v2', }; diff --git a/packages/stores/src/stores/FeatureFlagsStore.ts b/packages/stores/src/stores/FeatureFlagsStore.ts index 6c97902a6f05..f2958a1ecb89 100644 --- a/packages/stores/src/stores/FeatureFlagsStore.ts +++ b/packages/stores/src/stores/FeatureFlagsStore.ts @@ -2,7 +2,6 @@ import BaseStore from './BaseStore'; const FLAGS = { dtrader_v2: false, - next_account: false, next_cashier: false, next_tradershub: false, next_wallet: false, diff --git a/packages/tradershub/package.json b/packages/tradershub/package.json index 87771c8811e3..9b78b815a885 100644 --- a/packages/tradershub/package.json +++ b/packages/tradershub/package.json @@ -16,7 +16,6 @@ }, "dependencies": { "@deriv/api-v2": "^1.0.0", - "@deriv-lib/account-v2-lib": "1.0.0", "@deriv/quill-icons": "^1.22.7", "@deriv-com/ui": "^1.14.5", "@deriv-com/utils": "^0.0.20", diff --git a/packages/tradershub/tsconfig.json b/packages/tradershub/tsconfig.json index 55b726f778c7..8a248c1c6ac0 100644 --- a/packages/tradershub/tsconfig.json +++ b/packages/tradershub/tsconfig.json @@ -6,9 +6,7 @@ "paths": { "@deriv/*": ["../*/src"], "@/*": ["src/*"], - "@cfd/*": ["src/features/cfd/*"], - "@deriv-lib/account-v2-lib": ["../account-v2/src/modules"], - + "@cfd/*": ["src/features/cfd/*"] } }, "include": ["src", "./declarations.d.ts", "../../utils.d.ts"], diff --git a/packages/tradershub/webpack.config.js b/packages/tradershub/webpack.config.js index 4313255c4cdf..6fedc8b19fe9 100644 --- a/packages/tradershub/webpack.config.js +++ b/packages/tradershub/webpack.config.js @@ -186,7 +186,6 @@ module.exports = function (env) { alias: { '@': path.resolve(__dirname, 'src'), '@cfd': path.resolve(__dirname, 'src/features/cfd'), - '@deriv-lib/account-v2-lib': path.resolve(__dirname, '../account-v2/src/modules'), }, extensions: ['.js', '.jsx', '.ts', '.tsx'], },