Skip to content

Commit

Permalink
package.json - merge double dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
himdel committed Aug 3, 2017
1 parent 8dead56 commit 631724b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions tools/ci/setup_js_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 631724b

Please sign in to comment.