From d35f472dbfe9465fa76f9db722ca4f86bb5bb3e3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Tue, 27 Oct 2020 12:19:13 +0300 Subject: [PATCH 1/3] Added usage npm ci --- CONTRIBUTING.md | 6 +++--- Dockerfile.ui | 8 ++++---- cvat-ui/package-lock.json | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bb17d973..277d2bc5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,9 +67,9 @@ patches and features. - Install npm packages for UI and start UI debug server (run the following command from CVAT root directory): ```sh - npm install && \ - cd cvat-core && npm install && \ - cd ../cvat-ui && npm install && npm start + npm ci && \ + cd cvat-core && npm ci && \ + cd ../cvat-ui && npm ci && npm start ``` > Note for Mac users diff --git a/Dockerfile.ui b/Dockerfile.ui index 6af7763c..a12b60d8 100644 --- a/Dockerfile.ui +++ b/Dockerfile.ui @@ -25,19 +25,19 @@ RUN npm config set loglevel info # Install cvat-data dependencies WORKDIR /tmp/cvat-data/ -RUN npm install +RUN npm ci # Install cvat-core dependencies WORKDIR /tmp/cvat-core/ -RUN npm install +RUN npm ci # Install cvat-canvas dependencies WORKDIR /tmp/cvat-canvas/ -RUN npm install +RUN npm ci # Install cvat-ui dependencies WORKDIR /tmp/cvat-ui/ -RUN npm install +RUN npm ci # Build source code COPY cvat-data/ /tmp/cvat-data/ diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 4ed13697..eb1ae134 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -12874,7 +12874,6 @@ "requires": { "axios": "^0.20.0", "browser-or-node": "^1.2.1", - "cvat-data": "file:../cvat-data", "detect-browser": "^5.0.0", "error-stack-parser": "^2.0.2", "form-data": "^2.5.0", From 0baeee7e03a6fc0a5ae0030181f8147ac097847c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 28 Oct 2020 17:42:02 +0300 Subject: [PATCH 2/3] Added CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d49d3b..fd6157ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated `docker-compose` file version from `2.3` to `3.3`() - Added auto inference of url schema from host in CLI, if provided () - Track frames in skips between annotation is presented in MOT and MOTS formats are marked `outside` () +- UI packages installation with `npm ci` instead of `npm install` () ### Deprecated From b4b1971c3e8ad7e93c26ccdf17c906259da44578 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 28 Oct 2020 17:45:00 +0300 Subject: [PATCH 3/3] Fixed README --- cvat-core/README.md | 2 +- cvat-ui/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat-core/README.md b/cvat-core/README.md index 487de911..22d8faa9 100644 --- a/cvat-core/README.md +++ b/cvat-core/README.md @@ -18,7 +18,7 @@ If you make changes in this package, please do following: - Dependencies installation ```bash -npm install +npm ci ``` - Building the module from sources in the `dist` directory: diff --git a/cvat-ui/README.md b/cvat-ui/README.md index d020214a..c32879e6 100644 --- a/cvat-ui/README.md +++ b/cvat-ui/README.md @@ -20,7 +20,7 @@ you also need to do `npm install` to update `package-lock.json` - Installing dependencies: ```bash -cd ../cvat-core && npm install && cd - && npm install +cd ../cvat-core && npm ci && cd - && npm ci ``` - Running development UI server with autorebuild on change