From 631724b5b970a2cae5eafaea81a411801f35bc47 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 3 Aug 2017 10:42:57 +0000 Subject: [PATCH] package.json - merge double dependencies --- package.json | 4 +--- tools/ci/setup_js_env.sh | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d4a40dc957d..f8d0c76dfd8 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@angular/platform-browser-dynamic": "~4.0.3", "core-js": "~2.4.1", "rxjs": "~5.3.0", + "ui-select": "0.19.8", "zone.js": "~0.8.5" }, "devDependencies": { @@ -68,9 +69,6 @@ "webpack-manifest-plugin": "~1.1.0", "webpack-merge": "~4.1.0" }, - "dependencies": { - "ui-select": "0.19.8" - }, "engines": { "node": ">= 6.9.1", "npm": ">= 3.10.3" diff --git a/tools/ci/setup_js_env.sh b/tools/ci/setup_js_env.sh index 18cda7a7346..640e9df9049 100644 --- a/tools/ci/setup_js_env.sh +++ b/tools/ci/setup_js_env.sh @@ -20,6 +20,8 @@ fi # make sure yarn is installed, in the right version bundle exec rake webpacker:check_yarn || npm install -g yarn + +# install npm dependencies yarn # compile webpacker assets