React UI: Added client versioning (#1448)

* Adjusted antd import

* Wrapped core and canvas

* Added versioning

* Updated changelog, adjusted installation guide a bit

CHANGELOG.md

@@ -6,8 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.0-beta.2] - Unreleased
 ### Added
-- Re-Identification algorithm to merging bounding boxes automatically to the new UI (https://github.com/opencv/cvat/pull/1406)
+- Re-Identification algorithm to merging bounding boxes automatically to the new UI (<https://github.com/opencv/cvat/pull/1406>)
-- Methods ``import`` and ``export`` to import/export raw annotations for Job and Task in ``cvat-core`` (https://github.com/opencv/cvat/pull/1406)
+- Methods ``import`` and ``export`` to import/export raw annotations for Job and Task in ``cvat-core`` (<https://github.com/opencv/cvat/pull/1406>)
+- Versioning of client packages (``cvat-core``, ``cvat-canvas``, ``cvat-ui``). Initial versions are set to 1.0.0  (<https://github.com/opencv/cvat/pull/1448>)
 
 ### Changed
 -

CONTRIBUTING.md

@@ -56,9 +56,7 @@ for development
 
 -   Install npm packages for UI and start UI debug server (run the following command from CVAT root directory):
     ```sh
-    cd cvat-core && npm install && \
+    cd cvat-data && npm install && \
-    cd ../cvat-canvas && npm install && \
-    cd ../cvat-data && npm install && \
     cd ../cvat-ui && npm install && npm start
     ```
 

cvat-canvas/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

cvat-canvas/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core.js",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "babel.config.js",
   "scripts": {

cvat-data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-data",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

cvat-data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-data",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "",
   "main": "src/js/cvat-data.js",
   "devDependencies": {

cvat-ui/index.d.ts

@@ -3,3 +3,4 @@
 // SPDX-License-Identifier: MIT
 
 declare module '*.svg';
+declare module 'cvat-core/src/api';

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
@@ -47,6 +47,8 @@
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
+    "cvat-core": "file:../cvat-core",
+    "cvat-canvas": "file:../cvat-canvas",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
     "@types/react-redux": "^7.1.2",

cvat-ui/src/actions/about-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 

cvat-ui/src/actions/annotation-actions.ts

@@ -22,9 +22,9 @@ import {
     Workspace,
 } from 'reducers/interfaces';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import logger, { LogType } from 'cvat-logger';
-import { RectDrawingMethod } from 'cvat-canvas';
+import { RectDrawingMethod } from 'cvat-canvas-wrapper';
 import { getCVATStore } from 'cvat-store';
 
 interface AnnotationsParameters {

cvat-ui/src/actions/auth-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
 

cvat-ui/src/actions/boundaries-actions.ts

@@ -8,7 +8,7 @@ import {
     ThunkAction,
     ThunkDispatch,
 } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { LogType } from 'cvat-logger';
 import { computeZRange } from './annotation-actions';
 

cvat-ui/src/actions/formats-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
 

cvat-ui/src/actions/models-actions.ts

@@ -10,7 +10,7 @@ import {
     ActiveInference,
     CombinedState,
 } from 'reducers/interfaces';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 export enum PreinstalledModels {
     RCNN = 'RCNN Object Detector',

cvat-ui/src/actions/share-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 import { ShareFileInfo } from 'reducers/interfaces';
 

cvat-ui/src/actions/tasks-actions.ts

@@ -9,7 +9,7 @@ import {
     CombinedState,
 } from 'reducers/interfaces';
 import { getCVATStore } from 'cvat-store';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { getInferenceStatusAsync } from './models-actions';
 
 const cvat = getCore();

cvat-ui/src/actions/users-actions.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 

cvat-ui/src/components/actions-menu/actions-menu.tsx

@@ -4,13 +4,8 @@
 
 import './styles.scss';
 import React from 'react';
-
+import Menu, { ClickParam } from 'antd/lib/menu';
-import {
+import Modal from 'antd/lib/modal';
-    Menu,
-    Modal,
-} from 'antd';
-
-import { ClickParam } from 'antd/lib/menu/index';
 
 import DumpSubmenu from './dump-submenu';
 import LoadSubmenu from './load-submenu';

cvat-ui/src/components/actions-menu/dump-submenu.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Menu from 'antd/lib/menu';
-import {
+import Icon from 'antd/lib/icon';
-    Menu,
-    Icon,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 function isDefaultFormat(dumperName: string, taskMode: string): boolean {

cvat-ui/src/components/actions-menu/export-submenu.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Menu from 'antd/lib/menu';
-import {
+import Icon from 'antd/lib/icon';
-    Menu,
-    Icon,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 interface Props {

cvat-ui/src/components/actions-menu/load-submenu.tsx

@@ -3,14 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Menu from 'antd/lib/menu';
-import {
+import Icon from 'antd/lib/icon';
-    Menu,
+import Upload from 'antd/lib/upload';
-    Icon,
+import Button from 'antd/lib/button';
-    Upload,
-    Button,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 interface Props {

cvat-ui/src/components/annotation-page/annotation-page.tsx

@@ -4,12 +4,9 @@
 
 import './styles.scss';
 import React, { useEffect } from 'react';
-
+import Layout from 'antd/lib/layout';
-import {
+import Spin from 'antd/lib/spin';
-    Layout,
+import Result from 'antd/lib/result';
-    Spin,
-    Result,
-} from 'antd';
 
 import { Workspace } from 'reducers/interfaces';
 import AnnotationTopBarContainer from 'containers/annotation-page/top-bar/top-bar';

cvat-ui/src/components/annotation-page/standard-workspace/canvas-point-context-menu.tsx

@@ -4,10 +4,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-
+import Button from 'antd/lib/button';
-import {
-    Button,
-} from 'antd';
 
 interface Props {
     activatedStateID: number | null;

cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx

@@ -19,8 +19,8 @@ import {
     ShapeType,
 } from 'reducers/interfaces';
 import { LogType } from 'cvat-logger';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import consts from 'consts';
 
 const cvat = getCore();

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx

@@ -7,7 +7,7 @@ import { GlobalHotKeys, ExtendedKeyMapOptions } from 'react-hotkeys';
 import Layout from 'antd/lib/layout';
 
 import { ActiveControl, Rotation } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 import RotateControl from './rotate-control';
 import CursorControl from './cursor-control';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/cursor-control.tsx

@@ -8,7 +8,7 @@ import Tooltip from 'antd/lib/tooltip';
 
 import { CursorIcon } from 'icons';
 import { ActiveControl } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/dextr-plugin.tsx

@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 import Checkbox, { CheckboxChangeEvent } from 'antd/lib/checkbox';
 import Tooltip from 'antd/lib/tooltip';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { CombinedState } from 'reducers/interfaces';
 import { activate as activatePlugin, deactivate as deactivatePlugin } from 'utils/dextr-utils';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-points-control.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PointIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-polygon-control.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PolygonIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-polyline-control.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { PolylineIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-rectangle-control.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { RectangleIcon } from 'icons';
 import { ShapeType } from 'reducers/interfaces';
 

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover.tsx

@@ -11,7 +11,7 @@ import Radio, { RadioChangeEvent } from 'antd/lib/radio';
 import Tooltip from 'antd/lib/tooltip';
 import Text from 'antd/lib/typography/Text';
 
-import { RectDrawingMethod } from 'cvat-canvas';
+import { RectDrawingMethod } from 'cvat-canvas-wrapper';
 import { ShapeType } from 'reducers/interfaces';
 import { clamp } from 'utils/math';
 import DEXTRPlugin from './dextr-plugin';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/fit-control.tsx

@@ -7,7 +7,7 @@ import Icon from 'antd/lib/icon';
 import Tooltip from 'antd/lib/tooltip';
 
 import { FitIcon } from 'icons';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/group-control.tsx

@@ -7,7 +7,7 @@ import Tooltip from 'antd/lib/tooltip';
 import Icon from 'antd/lib/icon';
 
 import { GroupIcon } from 'icons';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { ActiveControl } from 'reducers/interfaces';
 
 interface Props {

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/merge-control.tsx

@@ -3,17 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
+import Tooltip from 'antd/lib/tooltip';
+import Icon from 'antd/lib/icon';
 
-import {
+import { MergeIcon } from 'icons';
-    Tooltip,
+import { Canvas } from 'cvat-canvas-wrapper';
-    Icon,
-} from 'antd';
-
-import {
-    MergeIcon,
-} from 'icons';
-
-import { Canvas } from 'cvat-canvas';
 import { ActiveControl } from 'reducers/interfaces';
 
 interface Props {

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/move-control.tsx

@@ -8,7 +8,7 @@ import Tooltip from 'antd/lib/tooltip';
 
 import { MoveIcon } from 'icons';
 import { ActiveControl } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/resize-control.tsx

@@ -8,7 +8,7 @@ import Tooltip from 'antd/lib/tooltip';
 
 import { ZoomIcon } from 'icons';
 import { ActiveControl } from 'reducers/interfaces';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface Props {
     canvasInstance: Canvas;

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/setup-tag-control.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import Popover from 'antd/lib/popover';
 import Icon from 'antd/lib/icon';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { TagIcon } from 'icons';
 
 import SetupTagPopoverContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/setup-tag-popover';

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/split-control.tsx

@@ -7,7 +7,7 @@ import Tooltip from 'antd/lib/tooltip';
 import Icon from 'antd/lib/icon';
 
 import { SplitIcon } from 'icons';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { ActiveControl } from 'reducers/interfaces';
 
 interface Props {

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/appearance-block.tsx

@@ -3,18 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
-import {
-    Checkbox,
-    Collapse,
-    Slider,
-    Radio,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
-import { RadioChangeEvent } from 'antd/lib/radio';
+import Radio, { RadioChangeEvent } from 'antd/lib/radio';
-import { SliderValue } from 'antd/lib/slider';
+import Slider, { SliderValue } from 'antd/lib/slider';
-import { CheckboxChangeEvent } from 'antd/lib/checkbox';
+import Checkbox, { CheckboxChangeEvent } from 'antd/lib/checkbox';
+import Collapse from 'antd/lib/collapse';
 
 import { ColorBy } from 'reducers/interfaces';
 

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/color-changer.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Button from 'antd/lib/button';
-    Row,
-    Col,
-    Button,
-} from 'antd';
 
 interface Props {
     colors: string[];

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/label-item.tsx

@@ -3,16 +3,12 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Icon from 'antd/lib/icon';
-    Row,
+import Popover from 'antd/lib/popover';
-    Col,
+import Button from 'antd/lib/button';
-    Icon,
-    Popover,
-    Button,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
+
 import ColorChanger from 'components/annotation-page/standard-workspace/objects-side-bar/color-changer';
 
 interface Props {

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list-header.tsx

@@ -7,10 +7,11 @@ import { Row, Col } from 'antd/lib/grid';
 import Icon from 'antd/lib/icon';
 import Select from 'antd/lib/select';
 import Text from 'antd/lib/typography/Text';
+import Tooltip from 'antd/lib/tooltip';
 
 import AnnotationsFiltersInput from 'components/annotation-page/annotations-filters-input';
 import { StatesOrdering } from 'reducers/interfaces';
-import { Tooltip } from 'antd';
+
 
 interface StatesOrderingSelectorComponentProps {
     statesOrdering: StatesOrdering;

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-side-bar.tsx

@@ -4,20 +4,15 @@
 
 import './styles.scss';
 import React from 'react';
-
-import {
-    Icon,
-    Tabs,
-    Layout,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
+import Icon from 'antd/lib/icon';
+import Tabs from 'antd/lib/tabs';
+import Layout from 'antd/lib/layout';
 import { RadioChangeEvent } from 'antd/lib/radio';
 import { SliderValue } from 'antd/lib/slider';
 import { CheckboxChangeEvent } from 'antd/lib/checkbox';
 
 import { ColorBy } from 'reducers/interfaces';
-
 import ObjectsListContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/objects-list';
 import LabelsListContainer from 'containers/annotation-page/standard-workspace/objects-side-bar/labels-list';
 import AppearanceBlock from './appearance-block';

cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx

@@ -4,10 +4,7 @@
 
 import './styles.scss';
 import React from 'react';
-
+import Layout from 'antd/lib/layout';
-import {
-    Layout,
-} from 'antd';
 
 import CanvasWrapperContainer from 'containers/annotation-page/standard-workspace/canvas-wrapper';
 import ControlsSideBarContainer from 'containers/annotation-page/standard-workspace/controls-side-bar/controls-side-bar';

cvat-ui/src/components/create-model-page/create-model-form.tsx

@@ -3,17 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Form, { FormComponentProps } from 'antd/lib/form/Form';
-    Row,
+import Input from 'antd/lib/input';
-    Col,
+import Tooltip from 'antd/lib/tooltip';
-    Form,
+import Checkbox from 'antd/lib/checkbox';
-    Input,
-    Tooltip,
-    Checkbox,
-} from 'antd';
-
-import { FormComponentProps } from 'antd/lib/form/Form';
 import Text from 'antd/lib/typography/Text';
 
 type Props = FormComponentProps;

cvat-ui/src/components/create-model-page/create-model-page.tsx

@@ -4,13 +4,9 @@
 
 import './styles.scss';
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
-    Row,
-    Col,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
+
 import { ModelFiles } from 'reducers/interfaces';
 import CreateModelContent from './create-model-content';
 

cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx

@@ -3,16 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Icon from 'antd/lib/icon';
-    Row,
+import Input from 'antd/lib/input';
-    Col,
+import Checkbox from 'antd/lib/checkbox';
-    Icon,
+import Tooltip from 'antd/lib/tooltip';
-    Input,
-    Checkbox,
-    Tooltip,
-} from 'antd';
-
 import Form, { FormComponentProps } from 'antd/lib/form/Form';
 import Text from 'antd/lib/typography/Text';
 

cvat-ui/src/components/create-task-page/basic-configuration-form.tsx

@@ -3,11 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Input from 'antd/lib/input';
-import {
-    Input,
-} from 'antd';
-
 import Form, { FormComponentProps } from 'antd/lib/form/Form';
 
 export interface BaseConfiguration {

cvat-ui/src/components/create-task-page/create-task-content.tsx

@@ -3,16 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Alert from 'antd/lib/alert';
-    Row,
+import Button from 'antd/lib/button';
-    Col,
+import Collapse from 'antd/lib/collapse';
-    Alert,
+import notification from 'antd/lib/notification';
-    Button,
-    Collapse,
-    notification,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import FileManagerContainer from 'containers/file-manager/file-manager';

cvat-ui/src/components/cvat-app.tsx

@@ -25,7 +25,7 @@ import LoginPageContainer from 'containers/login-page/login-page';
 import RegisterPageContainer from 'containers/register-page/register-page';
 import HeaderContainer from 'containers/header/header';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { NotificationsState } from 'reducers/interfaces';
 
 interface CVATAppProps {

cvat-ui/src/components/labels-editor/constructor-viewer-item.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Icon from 'antd/lib/icon';
-import {
+import Tooltip from 'antd/lib/tooltip';
-    Icon,
-    Tooltip,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import { Label } from './common';

cvat-ui/src/components/labels-editor/constructor-viewer.tsx

@@ -3,11 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Icon from 'antd/lib/icon';
-import {
+import Button from 'antd/lib/button';
-    Icon,
-    Button,
-} from 'antd';
 
 import ConstructorViewerItem from './constructor-viewer-item';
 import { Label } from './common';

cvat-ui/src/components/labels-editor/label-form.tsx

@@ -3,22 +3,17 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Icon from 'antd/lib/icon';
-    Row,
+import Input from 'antd/lib/input';
-    Col,
+import Button from 'antd/lib/button';
-    Icon,
+import Checkbox from 'antd/lib/checkbox';
-    Input,
+import Tooltip from 'antd/lib/tooltip';
-    Button,
+import Select from 'antd/lib/select';
-    Select,
-    Tooltip,
-    Checkbox,
-} from 'antd';
-
 import Form, { FormComponentProps } from 'antd/lib/form/Form';
 import Text from 'antd/lib/typography/Text';
-import patterns from 'utils/validation-patterns';
 
+import patterns from 'utils/validation-patterns';
 import {
     equalArrayHead,
     idGenerator,

cvat-ui/src/components/labels-editor/labels-editor.tsx

@@ -4,17 +4,12 @@
 
 import './styles.scss';
 import React from 'react';
-
+import Tabs from 'antd/lib/tabs';
-import {
+import Icon from 'antd/lib/icon';
-    Tabs,
+import Button from 'antd/lib/button';
-    Icon,
+import Tooltip from 'antd/lib/tooltip';
-    Button,
+import notification from 'antd/lib/notification';
-    Tooltip,
-    notification,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
-
 import copy from 'copy-to-clipboard';
 
 import RawViewer from './raw-viewer';

cvat-ui/src/components/labels-editor/raw-viewer.tsx

@@ -3,17 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Input from 'antd/lib/input';
-    Row,
+import Button from 'antd/lib/button';
-    Col,
+import Tooltip from 'antd/lib/tooltip';
-    Form,
+import Form, { FormComponentProps } from 'antd/lib/form/Form';
-    Input,
-    Button,
-    Tooltip,
-} from 'antd';
-
-import { FormComponentProps } from 'antd/lib/form/Form';
 
 import {
     Label,

cvat-ui/src/components/login-page/login-form.tsx

@@ -3,13 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-import { FormComponentProps } from 'antd/lib/form/Form';
+import Form, { FormComponentProps } from 'antd/lib/form/Form';
-import {
+import Button from 'antd/lib/button';
-    Button,
+import Icon from 'antd/lib/icon';
-    Icon,
+import Input from 'antd/lib/input';
-    Input,
-    Form,
-} from 'antd';
 
 export interface LoginData {
     username: string;

cvat-ui/src/components/login-page/login-page.tsx

@@ -3,16 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
 import { RouteComponentProps } from 'react-router';
 import { Link, withRouter } from 'react-router-dom';
-
 import Title from 'antd/lib/typography/Title';
 import Text from 'antd/lib/typography/Text';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Col,
-    Row,
-} from 'antd';
 
 import LoginForm, { LoginData } from './login-form';
 

cvat-ui/src/components/model-runner-modal/model-runner-modal.tsx

@@ -4,19 +4,15 @@
 
 import './styles.scss';
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Icon from 'antd/lib/icon';
-    Row,
+import Select from 'antd/lib/select';
-    Col,
+import Checkbox from 'antd/lib/checkbox';
-    Tag,
+import Tooltip from 'antd/lib/tooltip';
-    Spin,
+import Modal from 'antd/lib/modal';
-    Icon,
+import Tag from 'antd/lib/tag';
-    Modal,
+import Spin from 'antd/lib/spin';
-    Select,
+import notification from 'antd/lib/notification';
-    Tooltip,
-    Checkbox,
-    notification,
-} from 'antd';
 
 import {
     Model,

cvat-ui/src/components/models-page/built-model-item.tsx

@@ -3,14 +3,9 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Tag from 'antd/lib/tag';
-    Row,
+import Select from 'antd/lib/select';
-    Col,
-    Tag,
-    Select,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import { Model } from 'reducers/interfaces';

cvat-ui/src/components/models-page/built-models-list.tsx

@@ -3,12 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
-    Row,
-    Col,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import { Model } from 'reducers/interfaces';

cvat-ui/src/components/models-page/empty-list.tsx

@@ -3,14 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
 import { Link } from 'react-router-dom';
 import Text from 'antd/lib/typography/Text';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Col,
+import Icon from 'antd/lib/icon';
-    Row,
-    Icon,
-} from 'antd';
 
 import {
     EmptyTasksIcon as EmptyModelsIcon,

cvat-ui/src/components/models-page/models-page.tsx

@@ -4,10 +4,7 @@
 
 import './styles.scss';
 import React from 'react';
-
+import Spin from 'antd/lib/spin';
-import {
-    Spin,
-} from 'antd';
 
 import TopBarComponent from './top-bar';
 import UploadedModelsList from './uploaded-models-list';

cvat-ui/src/components/models-page/top-bar.tsx

@@ -5,13 +5,8 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Button from 'antd/lib/button';
-    Col,
-    Row,
-    Button,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 type Props = {

cvat-ui/src/components/models-page/uploaded-model-item.tsx

@@ -3,17 +3,12 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Tag from 'antd/lib/tag';
-    Row,
+import Select from 'antd/lib/select';
-    Col,
+import Icon from 'antd/lib/icon';
-    Tag,
+import Menu from 'antd/lib/menu';
-    Select,
+import Dropdown from 'antd/lib/dropdown';
-    Menu,
-    Dropdown,
-    Icon,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 import moment from 'moment';
 

cvat-ui/src/components/models-page/uploaded-models-list.tsx

@@ -3,12 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
-    Row,
-    Col,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import { Model } from 'reducers/interfaces';

cvat-ui/src/components/register-page/register-form.tsx

@@ -3,13 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-import { FormComponentProps } from 'antd/lib/form/Form';
+import Form, { FormComponentProps } from 'antd/lib/form/Form';
-import {
+import Button from 'antd/lib/button';
-    Button,
+import Icon from 'antd/lib/icon';
-    Icon,
+import Input from 'antd/lib/input';
-    Input,
-    Form,
-} from 'antd';
 
 import patterns from 'utils/validation-patterns';
 

cvat-ui/src/components/register-page/register-page.tsx

@@ -3,16 +3,11 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
 import { RouteComponentProps } from 'react-router';
 import { Link, withRouter } from 'react-router-dom';
-
 import Title from 'antd/lib/typography/Title';
 import Text from 'antd/lib/typography/Text';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Col,
-    Row,
-} from 'antd';
 
 import RegisterForm, { RegisterData } from './register-form';
 

cvat-ui/src/components/settings-page/settings-page.tsx

@@ -4,14 +4,10 @@
 
 import './styles.scss';
 import React from 'react';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Row,
+import Tabs from 'antd/lib/tabs';
-    Col,
+import Icon from 'antd/lib/icon';
-    Tabs,
+import Button from 'antd/lib/button';
-    Icon,
-    Button,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import { RouteComponentProps } from 'react-router';

cvat-ui/src/components/shortcuts-dialog/shortcuts-dialog.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { getApplicationKeyMap } from 'react-hotkeys';
-import { Modal, Table } from 'antd';
+import Modal from 'antd/lib/modal';
+import Table from 'antd/lib/table';
 import { connect } from 'react-redux';
 
 import { shortcutsActions } from 'actions/shortcuts-actions';

cvat-ui/src/components/task-page/details.tsx

@@ -3,23 +3,17 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Tag from 'antd/lib/tag';
-    Row,
+import Icon from 'antd/lib/icon';
-    Col,
+import Modal from 'antd/lib/modal';
-    Tag,
+import Button from 'antd/lib/button';
-    Icon,
+import notification from 'antd/lib/notification';
-    Modal,
-    Button,
-    notification,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 import Title from 'antd/lib/typography/Title';
-
 import moment from 'moment';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import patterns from 'utils/validation-patterns';
 import { getReposData, syncRepos } from 'utils/git-utils';
 import UserSelector from './user-selector';

cvat-ui/src/components/task-page/job-list.tsx

@@ -3,25 +3,18 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Icon from 'antd/lib/icon';
-    Row,
+import Table from 'antd/lib/table';
-    Col,
+import Button from 'antd/lib/button';
-    Icon,
+import Tooltip from 'antd/lib/tooltip';
-    Table,
-    Button,
-    Tooltip,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
-
 import moment from 'moment';
 import copy from 'copy-to-clipboard';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import UserSelector from './user-selector';
 
 const core = getCore();

cvat-ui/src/components/task-page/task-page.tsx

@@ -6,13 +6,9 @@ import './styles.scss';
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Spin from 'antd/lib/spin';
-    Col,
+import Result from 'antd/lib/result';
-    Row,
-    Spin,
-    Result,
-} from 'antd';
 
 import DetailsContainer from 'containers/task-page/details';
 import JobListContainer from 'containers/task-page/job-list';

cvat-ui/src/components/task-page/top-bar.tsx

@@ -3,15 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Button from 'antd/lib/button';
-    Row,
+import Dropdown from 'antd/lib/dropdown';
-    Col,
+import Icon from 'antd/lib/icon';
-    Button,
-    Dropdown,
-    Icon,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 import ActionsMenuContainer from 'containers/actions-menu/actions-menu';

cvat-ui/src/components/task-page/user-selector.tsx

@@ -3,10 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import Select from 'antd/lib/select';
-import {
-    Select,
-} from 'antd';
 
 interface Props {
     value: string | null;

cvat-ui/src/components/tasks-page/empty-list.tsx

@@ -3,14 +3,10 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
 import { Link } from 'react-router-dom';
 import Text from 'antd/lib/typography/Text';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Col,
+import Icon from 'antd/lib/icon';
-    Row,
-    Icon,
-} from 'antd';
 
 import { EmptyTasksIcon } from 'icons';
 

cvat-ui/src/components/tasks-page/task-item.tsx

@@ -5,19 +5,14 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
 import Text from 'antd/lib/typography/Text';
-import {
+import { Row, Col } from 'antd/lib/grid';
-    Col,
+import Button from 'antd/lib/button';
-    Row,
+import Icon from 'antd/lib/icon';
-    Button,
+import Dropdown from 'antd/lib/dropdown';
-    Icon,
+import Tooltip from 'antd/lib/tooltip';
-    Progress,
+import Modal from 'antd/lib/modal';
-    Dropdown,
+import Progress from 'antd/lib/progress';
-    Tooltip,
-    Modal,
-} from 'antd';
-
 import moment from 'moment';
 
 import ActionsMenuContainer from 'containers/actions-menu/actions-menu';

cvat-ui/src/components/tasks-page/task-list.tsx

@@ -3,12 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Pagination from 'antd/lib/pagination';
-    Col,
-    Row,
-    Pagination,
-} from 'antd';
 
 import ModelRunnerModalContainer from 'containers/model-runner-dialog/model-runner-dialog';
 import TaskItem from 'containers/tasks-page/task-item';

cvat-ui/src/components/tasks-page/tasks-page.tsx

@@ -6,19 +6,12 @@ import './styles.scss';
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
+import Spin from 'antd/lib/spin';
-import {
+import Button from 'antd/lib/button';
-    Spin,
+import message from 'antd/lib/message';
-    Button,
-    message,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
-import {
+import { TasksQuery } from 'reducers/interfaces';
-    TasksQuery,
-} from 'reducers/interfaces';
-
 import FeedbackComponent from 'components/feedback/feedback';
 import TaskListContainer from 'containers/tasks-page/tasks-list';
 import TopBar from './top-bar';

cvat-ui/src/components/tasks-page/top-bar.tsx

@@ -5,14 +5,9 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-
+import { Row, Col } from 'antd/lib/grid';
-import {
+import Button from 'antd/lib/button';
-    Col,
+import Input from 'antd/lib/input';
-    Row,
-    Button,
-    Input,
-} from 'antd';
-
 import Text from 'antd/lib/typography/Text';
 
 interface VisibleTopBarProps {

cvat-ui/src/containers/annotation-page/standard-workspace/canvas-wrapper.tsx

@@ -46,7 +46,7 @@ import {
     ActiveControl,
 } from 'reducers/interfaces';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 
 interface StateToProps {
     sidebarCollapsed: boolean;

cvat-ui/src/containers/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx

@@ -5,7 +5,7 @@
 import { ExtendedKeyMapOptions } from 'react-hotkeys';
 import { connect } from 'react-redux';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import {
     mergeObjects,
     groupObjects,

cvat-ui/src/containers/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover.tsx

@@ -8,7 +8,7 @@ import { RadioChangeEvent } from 'antd/lib/radio';
 
 import { CombinedState, ShapeType, ObjectType } from 'reducers/interfaces';
 import { rememberObject } from 'actions/annotation-actions';
-import { Canvas, RectDrawingMethod } from 'cvat-canvas';
+import { Canvas, RectDrawingMethod } from 'cvat-canvas-wrapper';
 import DrawShapePopoverComponent from 'components/annotation-page/standard-workspace/controls-side-bar/draw-shape-popover';
 
 interface OwnProps {

cvat-ui/src/containers/annotation-page/standard-workspace/controls-side-bar/setup-tag-popover.tsx

@@ -9,8 +9,8 @@ import { CombinedState, ObjectType } from 'reducers/interfaces';
 import { createAnnotationsAsync, rememberObject } from 'actions/annotation-actions';
 import SetupTagPopoverComponent from 'components/annotation-page/standard-workspace/controls-side-bar/setup-tag-popover';
 
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
 interface DispatchToProps {

cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/object-item.tsx

@@ -7,7 +7,7 @@ import copy from 'copy-to-clipboard';
 import { connect } from 'react-redux';
 
 import { LogType } from 'cvat-logger';
-import { Canvas, isAbleToChangeFrame } from 'cvat-canvas';
+import { Canvas, isAbleToChangeFrame } from 'cvat-canvas-wrapper';
 import { ActiveControl, CombinedState, ColorBy } from 'reducers/interfaces';
 import {
     collapseObjectItems,

cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx

@@ -15,7 +15,7 @@ import {
     copyShape as copyShapeAction,
     propagateObject as propagateObjectAction,
 } from 'actions/annotation-actions';
-import { Canvas, isAbleToChangeFrame } from 'cvat-canvas';
+import { Canvas, isAbleToChangeFrame } from 'cvat-canvas-wrapper';
 import { CombinedState, StatesOrdering, ObjectType } from 'reducers/interfaces';
 
 interface StateToProps {

cvat-ui/src/containers/annotation-page/top-bar/top-bar.tsx

@@ -23,7 +23,7 @@ import {
     changeWorkspace as changeWorkspaceAction,
     activateObject,
 } from 'actions/annotation-actions';
-import { Canvas, isAbleToChangeFrame } from 'cvat-canvas';
+import { Canvas, isAbleToChangeFrame } from 'cvat-canvas-wrapper';
 
 import AnnotationTopBarComponent from 'components/annotation-page/top-bar/top-bar';
 import { CombinedState, FrameSpeed, Workspace } from 'reducers/interfaces';

cvat-ui/src/containers/header/header.tsx

@@ -4,7 +4,7 @@
 
 import { connect } from 'react-redux';
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import HeaderComponent from 'components/header/header';
 import { SupportedPlugins, CombinedState } from 'reducers/interfaces';
 import { logoutAsync } from 'actions/auth-actions';

cvat-ui/src/cvat-canvas-wrapper.ts

@@ -7,7 +7,7 @@ import {
     CanvasMode,
     CanvasVersion,
     RectDrawingMethod,
-} from '../../cvat-canvas/src/typescript/canvas';
+} from 'cvat-canvas/src/typescript/canvas';
 
 function isAbleToChangeFrame(canvas: Canvas): boolean {
     return ![CanvasMode.DRAG, CanvasMode.EDIT, CanvasMode.RESIZE]

cvat-ui/src/cvat-core-wrapper.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import _cvat from '../../cvat-core/src/api';
+import _cvat from 'cvat-core/src/api';
 
 const cvat: any = _cvat;
 

cvat-ui/src/cvat-logger.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 const { logger } = core;

cvat-ui/src/reducers/about-reducer.ts

@@ -2,13 +2,12 @@
 //
 // SPDX-License-Identifier: MIT
 
+import getCore from 'cvat-core-wrapper';
+import { CanvasVersion } from 'cvat-canvas-wrapper';
 import { boundariesActions, BoundariesActionTypes } from 'actions/boundaries-actions';
 import { AboutActions, AboutActionTypes } from 'actions/about-actions';
 import { AuthActions, AuthActionTypes } from 'actions/auth-actions';
 import { AboutState } from './interfaces';
-
-import { CanvasVersion } from '../cvat-canvas';
-import getCore from '../cvat-core';
 import pjson from '../../package.json';
 
 const defaultState: AboutState = {

cvat-ui/src/reducers/annotation-reducer.ts

@@ -4,7 +4,7 @@
 
 import { AnyAction } from 'redux';
 
-import { Canvas, CanvasMode } from 'cvat-canvas';
+import { Canvas, CanvasMode } from 'cvat-canvas-wrapper';
 import { AnnotationActionTypes } from 'actions/annotation-actions';
 import { AuthActionTypes } from 'actions/auth-actions';
 import { BoundariesActionTypes } from 'actions/boundaries-actions';

cvat-ui/src/reducers/interfaces.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ExtendedKeyMapOptions } from 'react-hotkeys';
-import { Canvas, RectDrawingMethod } from 'cvat-canvas';
+import { Canvas, RectDrawingMethod } from 'cvat-canvas-wrapper';
 
 export type StringObject = {
     [index: string]: string;

cvat-ui/src/utils/dextr-utils.ts

@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
-import { Canvas } from 'cvat-canvas';
+import { Canvas } from 'cvat-canvas-wrapper';
 import { ShapeType, RQStatus } from 'reducers/interfaces';
 
 const core = getCore();

cvat-ui/src/utils/git-utils.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 
 const core = getCore();
 const baseURL = core.config.backendAPI.slice(0, -7);

cvat-ui/src/utils/plugin-checker.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { SupportedPlugins } from 'reducers/interfaces';
 
 const core = getCore();

cvat-ui/src/utils/reid-utils.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-import getCore from 'cvat-core';
+import getCore from 'cvat-core-wrapper';
 import { ShapeType, RQStatus } from 'reducers/interfaces';