diff --git a/apps/trading-e2e/src/support/mocks/generate-orders.ts b/apps/trading-e2e/src/support/mocks/generate-orders.ts index 6c7219f62..08ec6ea23 100644 --- a/apps/trading-e2e/src/support/mocks/generate-orders.ts +++ b/apps/trading-e2e/src/support/mocks/generate-orders.ts @@ -1,6 +1,6 @@ import merge from 'lodash/merge'; import type { PartialDeep } from 'type-fest'; -import type { Orders, Orders_party_orders } from '@vegaprotocol/order-list'; +import type { Orders, Orders_party_orders } from '@vegaprotocol/orders'; import { OrderStatus, OrderTimeInForce, diff --git a/apps/trading/pages/markets/trade-grid.tsx b/apps/trading/pages/markets/trade-grid.tsx index 2f150c99a..1aac09459 100644 --- a/apps/trading/pages/markets/trade-grid.tsx +++ b/apps/trading/pages/markets/trade-grid.tsx @@ -6,7 +6,7 @@ import { DealTicketContainer, MarketInfoContainer, } from '@vegaprotocol/deal-ticket'; -import { OrderListContainer } from '@vegaprotocol/order-list'; +import { OrderListContainer } from '@vegaprotocol/orders'; import { TradesContainer } from '@vegaprotocol/trades'; import { PositionsContainer } from '@vegaprotocol/positions'; import { OrderbookContainer } from '@vegaprotocol/market-depth'; diff --git a/apps/trading/pages/portfolio/index.page.tsx b/apps/trading/pages/portfolio/index.page.tsx index 43310c627..8deed921b 100644 --- a/apps/trading/pages/portfolio/index.page.tsx +++ b/apps/trading/pages/portfolio/index.page.tsx @@ -1,7 +1,7 @@ import { Web3Container } from '../../components/web3-container'; import { t } from '@vegaprotocol/react-helpers'; import { PositionsContainer } from '@vegaprotocol/positions'; -import { OrderListContainer } from '@vegaprotocol/order-list'; +import { OrderListContainer } from '@vegaprotocol/orders'; import { AccountsContainer } from '@vegaprotocol/accounts'; import { AnchorButton, Tab, Tabs } from '@vegaprotocol/ui-toolkit'; import { WithdrawalsContainer } from './withdrawals/withdrawals-container'; diff --git a/libs/order-list/README.md b/libs/order-list/README.md deleted file mode 100644 index 0cf83d41e..000000000 --- a/libs/order-list/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# order-list - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test order-list` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/order-list/package.json b/libs/order-list/package.json deleted file mode 100644 index e11fcc705..000000000 --- a/libs/order-list/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@vegaprotocol/order-list", - "version": "0.0.1" -} diff --git a/libs/order-list/.babelrc b/libs/orders/.babelrc similarity index 100% rename from libs/order-list/.babelrc rename to libs/orders/.babelrc diff --git a/libs/order-list/.eslintrc.json b/libs/orders/.eslintrc.json similarity index 100% rename from libs/order-list/.eslintrc.json rename to libs/orders/.eslintrc.json diff --git a/libs/order-list/.storybook/main.js b/libs/orders/.storybook/main.js similarity index 100% rename from libs/order-list/.storybook/main.js rename to libs/orders/.storybook/main.js diff --git a/libs/order-list/.storybook/preview-head.html b/libs/orders/.storybook/preview-head.html similarity index 100% rename from libs/order-list/.storybook/preview-head.html rename to libs/orders/.storybook/preview-head.html diff --git a/libs/order-list/.storybook/preview.js b/libs/orders/.storybook/preview.js similarity index 100% rename from libs/order-list/.storybook/preview.js rename to libs/orders/.storybook/preview.js diff --git a/libs/order-list/.storybook/tsconfig.json b/libs/orders/.storybook/tsconfig.json similarity index 100% rename from libs/order-list/.storybook/tsconfig.json rename to libs/orders/.storybook/tsconfig.json diff --git a/libs/orders/README.md b/libs/orders/README.md new file mode 100644 index 000000000..34c466848 --- /dev/null +++ b/libs/orders/README.md @@ -0,0 +1,7 @@ +# orders + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test orders` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/order-list/jest.config.js b/libs/orders/jest.config.js similarity index 71% rename from libs/order-list/jest.config.js rename to libs/orders/jest.config.js index a3d891f40..7d807008d 100644 --- a/libs/order-list/jest.config.js +++ b/libs/orders/jest.config.js @@ -1,10 +1,10 @@ module.exports = { - displayName: 'order-list', + displayName: 'orders', preset: '../../jest.preset.js', transform: { '^.+\\.[tj]sx?$': 'babel-jest', }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '../../coverage/libs/order-list', + coverageDirectory: '../../coverage/libs/orders', setupFilesAfterEnv: ['./src/setup-tests.ts'], }; diff --git a/libs/orders/package.json b/libs/orders/package.json new file mode 100644 index 000000000..f0edda6c4 --- /dev/null +++ b/libs/orders/package.json @@ -0,0 +1,4 @@ +{ + "name": "@vegaprotocol/orders", + "version": "0.0.1" +} diff --git a/libs/order-list/postcss.config.js b/libs/orders/postcss.config.js similarity index 100% rename from libs/order-list/postcss.config.js rename to libs/orders/postcss.config.js diff --git a/libs/order-list/project.json b/libs/orders/project.json similarity index 65% rename from libs/order-list/project.json rename to libs/orders/project.json index adab0b2c8..5c8a5e1ef 100644 --- a/libs/order-list/project.json +++ b/libs/orders/project.json @@ -1,6 +1,6 @@ { - "root": "libs/order-list", - "sourceRoot": "libs/order-list/src", + "root": "libs/orders", + "sourceRoot": "libs/orders/src", "projectType": "library", "tags": [], "targets": { @@ -8,16 +8,16 @@ "executor": "@nrwl/web:rollup", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/libs/order-list", - "tsConfig": "libs/order-list/tsconfig.lib.json", - "project": "libs/order-list/package.json", - "entryFile": "libs/order-list/src/index.ts", + "outputPath": "dist/libs/orders", + "tsConfig": "libs/orders/tsconfig.lib.json", + "project": "libs/orders/package.json", + "entryFile": "libs/orders/src/index.ts", "external": ["react/jsx-runtime"], "rollupConfig": "@nrwl/react/plugins/bundle-rollup", "compiler": "babel", "assets": [ { - "glob": "libs/order-list/README.md", + "glob": "libs/orders/README.md", "input": ".", "output": "." } @@ -28,14 +28,18 @@ "executor": "@nrwl/linter:eslint", "outputs": ["{options.outputFile}"], "options": { - "lintFilePatterns": ["libs/order-list/**/*.{ts,tsx,js,jsx}"] + "lintFilePatterns": [ + "libs/orders/**/*.{ts,tsx,js,jsx}" + ] } }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/libs/order-list"], + "outputs": [ + "coverage/libs/orders" + ], "options": { - "jestConfig": "libs/order-list/jest.config.js", + "jestConfig": "libs/orders/jest.config.js", "passWithNoTests": true } }, @@ -45,7 +49,7 @@ "uiFramework": "@storybook/react", "port": 4400, "config": { - "configFolder": "libs/order-list/.storybook" + "configFolder": "libs/orders/.storybook" } }, "configurations": { @@ -59,9 +63,9 @@ "outputs": ["{options.outputPath}"], "options": { "uiFramework": "@storybook/react", - "outputPath": "dist/storybook/order-list", + "outputPath": "dist/storybook/orders", "config": { - "configFolder": "libs/order-list/.storybook" + "configFolder": "libs/orders/.storybook" } }, "configurations": { diff --git a/libs/order-list/src/index.ts b/libs/orders/src/index.ts similarity index 100% rename from libs/order-list/src/index.ts rename to libs/orders/src/index.ts diff --git a/libs/order-list/src/lib/components/__generated__/OrderFields.ts b/libs/orders/src/lib/components/__generated__/OrderFields.ts similarity index 100% rename from libs/order-list/src/lib/components/__generated__/OrderFields.ts rename to libs/orders/src/lib/components/__generated__/OrderFields.ts diff --git a/libs/order-list/src/lib/components/__generated__/OrderSub.ts b/libs/orders/src/lib/components/__generated__/OrderSub.ts similarity index 100% rename from libs/order-list/src/lib/components/__generated__/OrderSub.ts rename to libs/orders/src/lib/components/__generated__/OrderSub.ts diff --git a/libs/order-list/src/lib/components/__generated__/Orders.ts b/libs/orders/src/lib/components/__generated__/Orders.ts similarity index 100% rename from libs/order-list/src/lib/components/__generated__/Orders.ts rename to libs/orders/src/lib/components/__generated__/Orders.ts diff --git a/libs/order-list/src/lib/components/__generated__/index.ts b/libs/orders/src/lib/components/__generated__/index.ts similarity index 100% rename from libs/order-list/src/lib/components/__generated__/index.ts rename to libs/orders/src/lib/components/__generated__/index.ts diff --git a/libs/order-list/src/lib/components/cancel-order-dialog/cancel-dialog.spec.tsx b/libs/orders/src/lib/components/cancel-order-dialog/cancel-dialog.spec.tsx similarity index 100% rename from libs/order-list/src/lib/components/cancel-order-dialog/cancel-dialog.spec.tsx rename to libs/orders/src/lib/components/cancel-order-dialog/cancel-dialog.spec.tsx diff --git a/libs/order-list/src/lib/components/cancel-order-dialog/cancel-dialog.tsx b/libs/orders/src/lib/components/cancel-order-dialog/cancel-dialog.tsx similarity index 100% rename from libs/order-list/src/lib/components/cancel-order-dialog/cancel-dialog.tsx rename to libs/orders/src/lib/components/cancel-order-dialog/cancel-dialog.tsx diff --git a/libs/order-list/src/lib/components/cancel-order-dialog/index.ts b/libs/orders/src/lib/components/cancel-order-dialog/index.ts similarity index 100% rename from libs/order-list/src/lib/components/cancel-order-dialog/index.ts rename to libs/orders/src/lib/components/cancel-order-dialog/index.ts diff --git a/libs/order-list/src/lib/components/index.ts b/libs/orders/src/lib/components/index.ts similarity index 100% rename from libs/order-list/src/lib/components/index.ts rename to libs/orders/src/lib/components/index.ts diff --git a/libs/order-list/src/lib/components/mocks/generate-orders.ts b/libs/orders/src/lib/components/mocks/generate-orders.ts similarity index 100% rename from libs/order-list/src/lib/components/mocks/generate-orders.ts rename to libs/orders/src/lib/components/mocks/generate-orders.ts diff --git a/libs/order-list/src/lib/components/mocks/index.ts b/libs/orders/src/lib/components/mocks/index.ts similarity index 100% rename from libs/order-list/src/lib/components/mocks/index.ts rename to libs/orders/src/lib/components/mocks/index.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/__generated__/OrderFields.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/OrderFields.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/__generated__/OrderFields.ts rename to libs/orders/src/lib/components/order-data-provider/__generated__/OrderFields.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/__generated__/OrderSub.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/OrderSub.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/__generated__/OrderSub.ts rename to libs/orders/src/lib/components/order-data-provider/__generated__/OrderSub.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/__generated__/Orders.ts b/libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/__generated__/Orders.ts rename to libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/index.ts b/libs/orders/src/lib/components/order-data-provider/index.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/index.ts rename to libs/orders/src/lib/components/order-data-provider/index.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/order-data-provider.spec.ts b/libs/orders/src/lib/components/order-data-provider/order-data-provider.spec.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/order-data-provider.spec.ts rename to libs/orders/src/lib/components/order-data-provider/order-data-provider.spec.ts diff --git a/libs/order-list/src/lib/components/order-data-provider/order-data-provider.ts b/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts similarity index 100% rename from libs/order-list/src/lib/components/order-data-provider/order-data-provider.ts rename to libs/orders/src/lib/components/order-data-provider/order-data-provider.ts diff --git a/libs/order-list/src/lib/components/order-list-container.tsx b/libs/orders/src/lib/components/order-list-container.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list-container.tsx rename to libs/orders/src/lib/components/order-list-container.tsx diff --git a/libs/order-list/src/lib/components/order-list-manager/index.ts b/libs/orders/src/lib/components/order-list-manager/index.ts similarity index 100% rename from libs/order-list/src/lib/components/order-list-manager/index.ts rename to libs/orders/src/lib/components/order-list-manager/index.ts diff --git a/libs/order-list/src/lib/components/order-list-manager/order-list-manager.spec.tsx b/libs/orders/src/lib/components/order-list-manager/order-list-manager.spec.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list-manager/order-list-manager.spec.tsx rename to libs/orders/src/lib/components/order-list-manager/order-list-manager.spec.tsx diff --git a/libs/order-list/src/lib/components/order-list-manager/order-list-manager.tsx b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list-manager/order-list-manager.tsx rename to libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx diff --git a/libs/order-list/src/lib/components/order-list/index.ts b/libs/orders/src/lib/components/order-list/index.ts similarity index 100% rename from libs/order-list/src/lib/components/order-list/index.ts rename to libs/orders/src/lib/components/order-list/index.ts diff --git a/libs/order-list/src/lib/components/order-list/order-list.spec.tsx b/libs/orders/src/lib/components/order-list/order-list.spec.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list/order-list.spec.tsx rename to libs/orders/src/lib/components/order-list/order-list.spec.tsx diff --git a/libs/order-list/src/lib/components/order-list/order-list.stories.tsx b/libs/orders/src/lib/components/order-list/order-list.stories.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list/order-list.stories.tsx rename to libs/orders/src/lib/components/order-list/order-list.stories.tsx diff --git a/libs/order-list/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx similarity index 100% rename from libs/order-list/src/lib/components/order-list/order-list.tsx rename to libs/orders/src/lib/components/order-list/order-list.tsx diff --git a/libs/order-list/src/lib/index.ts b/libs/orders/src/lib/index.ts similarity index 100% rename from libs/order-list/src/lib/index.ts rename to libs/orders/src/lib/index.ts diff --git a/libs/order-list/src/setup-tests.ts b/libs/orders/src/setup-tests.ts similarity index 100% rename from libs/order-list/src/setup-tests.ts rename to libs/orders/src/setup-tests.ts diff --git a/libs/order-list/src/styles.scss b/libs/orders/src/styles.scss similarity index 100% rename from libs/order-list/src/styles.scss rename to libs/orders/src/styles.scss diff --git a/libs/order-list/tailwind.config.js b/libs/orders/tailwind.config.js similarity index 100% rename from libs/order-list/tailwind.config.js rename to libs/orders/tailwind.config.js diff --git a/libs/order-list/tsconfig.json b/libs/orders/tsconfig.json similarity index 100% rename from libs/order-list/tsconfig.json rename to libs/orders/tsconfig.json diff --git a/libs/order-list/tsconfig.lib.json b/libs/orders/tsconfig.lib.json similarity index 100% rename from libs/order-list/tsconfig.lib.json rename to libs/orders/tsconfig.lib.json diff --git a/libs/order-list/tsconfig.spec.json b/libs/orders/tsconfig.spec.json similarity index 100% rename from libs/order-list/tsconfig.spec.json rename to libs/orders/tsconfig.spec.json diff --git a/tsconfig.base.json b/tsconfig.base.json index c3bdf503e..6a6a607ac 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -26,7 +26,7 @@ "@vegaprotocol/market-depth": ["libs/market-depth/src/index.ts"], "@vegaprotocol/market-list": ["libs/market-list/src/index.ts"], "@vegaprotocol/network-stats": ["libs/network-stats/src/index.ts"], - "@vegaprotocol/order-list": ["libs/order-list/src/index.ts"], + "@vegaprotocol/orders": ["libs/orders/src/index.ts"], "@vegaprotocol/positions": ["libs/positions/src/index.ts"], "@vegaprotocol/react-helpers": ["libs/react-helpers/src/index.ts"], "@vegaprotocol/smart-contracts": ["libs/smart-contracts/src/index.ts"], diff --git a/workspace.json b/workspace.json index 38526f4b7..749f3c871 100644 --- a/workspace.json +++ b/workspace.json @@ -13,7 +13,7 @@ "market-depth": "libs/market-depth", "market-list": "libs/market-list", "network-stats": "libs/network-stats", - "order-list": "libs/order-list", + "orders": "libs/orders", "positions": "libs/positions", "react-helpers": "libs/react-helpers", "simple-trading-app": "apps/simple-trading-app",