Skip to content

Commit

Permalink
Fixed versioning for node 8
Browse files Browse the repository at this point in the history
  • Loading branch information
bsekachev committed Apr 25, 2020
1 parent 176dc71 commit fc0c118
Show file tree
Hide file tree
Showing 5 changed files with 345 additions and 154 deletions.
8 changes: 6 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ Next steps should work on clear Ubuntu 18.04.

- Install necessary dependencies:
```sh
$ sudo apt-get update && sudo apt-get --no-install-recommends install -y ffmpeg build-essential nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
$ sudo apt-get update && sudo apt-get --no-install-recommends install -y ffmpeg build-essential curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
```
Also please make sure that you have installed ffmpeg with all necessary libav* libraries and pkg-config package.
```sh
# Node and npm (you can use default versions of these packages from apt (8.*, 3.*), but we would recommend to use newer versions)
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
sudo apt-get install -y nodejs
# General dependencies
sudo apt-get install -y pkg-config
Expand Down Expand Up @@ -56,7 +60,7 @@ for development

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

Expand Down
6 changes: 4 additions & 2 deletions cvat-core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "cvat-core.js",
"name": "cvat-core",
"version": "1.0.0",
"description": "Part of Computer Vision Tool which presents an interface for client-side integration",
"main": "babel.config.js",
Expand Down Expand Up @@ -34,13 +34,15 @@
"dependencies": {
"axios": "^0.18.0",
"browser-or-node": "^1.2.1",
"cvat-data": "../cvat-data",
"detect-browser": "^5.0.0",
"error-stack-parser": "^2.0.2",
"form-data": "^2.5.0",
"jest-config": "^24.8.0",
"js-cookie": "^2.2.0",
"jsonpath": "^1.0.2",
"platform": "^1.3.5",
"store": "^2.0.12"
"store": "^2.0.12",
"worker-loader": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion cvat-core/src/frames.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

(() => {
const cvatData = require('../../cvat-data');
const cvatData = require('cvat-data');
const PluginRegistry = require('./plugins');
const serverProxy = require('./server-proxy');
const { isBrowser, isNode } = require('browser-or-node');
Expand Down
Loading

0 comments on commit fc0c118

Please sign in to comment.