From fcdc790bedb0d87c4145628e70648c61da131222 Mon Sep 17 00:00:00 2001 From: Alessio Caradossi Date: Thu, 29 Aug 2019 17:47:56 +0200 Subject: [PATCH] update some dependencies and optmized the assets pipeline --- .gitignore | 2 ++ Dockerfile | 1 + docker-compose.override.yml | 13 +------------ docker-compose.prod.yml | 1 - package.json | 13 ++++++++----- yarn.lock | 28 +++++++++++++++++++++++----- 6 files changed, 35 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index a517711..03cbd87 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,5 @@ yarn-error.log /node_modules yarn-debug.log* .yarn-integrity + +.DS_Store diff --git a/Dockerfile b/Dockerfile index 4f93df3..2adb56e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,5 @@ RUN gem update bundle RUN bundle install RUN bundle update RUN yarn install +RUN yarn upgrade COPY . /bilancio diff --git a/docker-compose.override.yml b/docker-compose.override.yml index dc8108d..503c88e 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -15,7 +15,7 @@ services: as: build: . - command: /bin/sh -c "rm -f tmp/pids/server.pid && yarn install && rails db:setup && rails s -p 3000 -b '0.0.0.0'" + command: /bin/sh -c "rm -f tmp/pids/server.pid && rails db:setup && rails s -p 3000 -b '0.0.0.0'" restart: "no" volumes: - .:/bilancio @@ -24,16 +24,5 @@ services: ports: - 3000:3000 - # web: - # image: nginx - # restart: "no" - # links: - # - as - # volumes: - # - ./nginx/default.conf:/etc/nginx/conf.d/default.conf - # - .:/bilancio - # ports: - # - 8000:80 - volumes: bilancio: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b5a0173..ba6b5e4 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -17,7 +17,6 @@ services: environment: RAILS_ENV: production volumes: - - assets:/bilancio/public/assets - ../../../shared/log:/bilancio/log dj: diff --git a/package.json b/package.json index 9e6b1c0..1c1612f 100644 --- a/package.json +++ b/package.json @@ -11,13 +11,13 @@ "dependencies": { "@rails/webpacker": "3.5", "actioncable": "^5.1.4", - "angular": "^1.6.8", - "angular-animate": "^1.6.8", + "angular": "^1.6.10", + "angular-animate": "^1.6.10", "angular-chart.js": "^1.1.1", "angular-filter": "^0.5.17", "angular-jwt": "^0.1.9", - "angular-mocks": "^1.6.8", - "angular-route": "^1.6.8", + "angular-mocks": "^1.6.10", + "angular-route": "^1.6.10", "bootstrap": "^4.3.1", "coffee-loader": "^0.9.0", "coffeescript": "1.12.7", @@ -26,7 +26,10 @@ "jshint": "^2.9.5", "jshint-loader": "^0.8.4", "open-iconic": "^1.1.1", - "popper.js": "1.12.3" + "popper.js": "1.12.3", + "lodash": "~4.17.13", + "js-yaml": "~3.13.1", + "set-value": "~2.0.1" }, "devDependencies": { "webpack-dev-server": "3.1.11" diff --git a/yarn.lock b/yarn.lock index 688ec1e..70cfa41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,7 +117,7 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -angular-animate@^1.6.8: +angular-animate@^1.6.10: version "1.7.8" resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.7.8.tgz#c95f237efe7ecfe0e6003adb5e2c7ef0e5a2b9d4" integrity sha512-bINtzizq7TbJzfVrDpwLfTxVl0Qd7fRNWFb5jKYI1vaFZobQNX/QONXlLow6ySsDbZ6eLECycB7mvWtfh1YYaw== @@ -142,17 +142,17 @@ angular-jwt@^0.1.9: resolved "https://registry.yarnpkg.com/angular-jwt/-/angular-jwt-0.1.11.tgz#a72b7583c7cf2f2d7acda169a4114141c83f9c91" integrity sha512-793dv5vXOXaW5/cweMd+sqSf9dPhbazDya3szTVOQ84MDEj1nYLJrixBBa7WNtZeMqz7ylWX7djnFgqLjEWcHw== -angular-mocks@^1.6.8: +angular-mocks@^1.6.10: version "1.7.8" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.8.tgz#95e7887ca91d1a3e176cc22f2d1941d284ce9767" integrity sha512-LB13ESBT0eJrhQhfPXyLR9qm4LI9g44hyBFwUqZKEHEA4DpfxVTu0ONipiNoN0zWtmEAezA8u2gjcoaO2TStig== -angular-route@^1.6.8: +angular-route@^1.6.10: version "1.7.8" resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.7.8.tgz#d502aa605dcbb253a93e844c0adf51c9bc36b9fa" integrity sha512-VVk89PH0fsY5kfbx+N7IVX1IwnaPWYhMGY0uA+rjej2v1sjvrTx1SLkxUK4E0UpW1hXeLJhN7ncBcwoBiPtAtA== -angular@*, angular@1.x, angular@^1.6.8: +angular@*, angular@1.x, angular@^1.6.10: version "1.7.8" resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.8.tgz#b77ede272ce1b261e3be30c1451a0b346905a3c9" integrity sha512-wtef/y4COxM7ZVhddd7JtAAhyYObq9YXKar9tsW7558BImeVYteJiTxCKeJOL45lJ/+7B4wrAC49j8gTFYEthg== @@ -3473,6 +3473,14 @@ js-yaml@^3.12.0, js-yaml@^3.9.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@~3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@~3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" @@ -3757,7 +3765,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== -lodash@^4.17.5: +lodash@^4.17.5, lodash@~4.17.13: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -5964,6 +5972,16 @@ set-value@^2.0.0: is-plain-object "^2.0.3" split-string "^3.0.1" +set-value@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + setimmediate@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"