From 5004e6c2d84f9a19446a5a6498a50afbfbeb6846 Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Mon, 13 Jan 2020 15:55:05 +0000 Subject: [PATCH 01/10] Update uglifier gem --- Gemfile | 2 +- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 6c466d709..c2d319073 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'elasticsearch', '~> 7.2.0' gem 'sass-rails', '~> 5.0.7' gem 'sprockets-rails', '~> 3.2.1' -gem 'uglifier', '~> 2.7.2' +gem 'uglifier', '~> 4.1.17' gem 'coffee-rails', '~> 4.2.2' gem "autoprefixer-rails" gem "exception_notification", '~> 4.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index bef8a4066..6b4f11a59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -903,7 +903,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.2.0) + json (2.3.0) kramdown (2.1.0) levenshtein (0.2.2) loofah (2.4.0) @@ -1079,9 +1079,8 @@ GEM tilt (>= 1.4, < 3) tzinfo (1.2.6) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) version (1.0.0) vuejs-rails (2.3.2) warden (1.2.8) @@ -1163,7 +1162,7 @@ DEPENDENCIES timecop (~> 0.7.1) tinymce-rails (~> 4.3.2) turnout (~> 2.5.0) - uglifier (~> 2.7.2) + uglifier (~> 4.1.17) vuejs-rails (~> 2.3.2) webmock (~> 1.22.0) webpacker (~> 4.0.2) From 9ecf618ba4ef97a9bb28a651fc56582d8e108dda Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Mon, 13 Jan 2020 16:07:41 +0000 Subject: [PATCH 02/10] Set harmony mode to true to uglifier --- config/environments/staging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 6c2ee0bff..ddfdaf810 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -35,7 +35,7 @@ config.serve_static_files = false # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier + config.assets.js_compressor = Uglifier.new(:harmony => true) # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. From 6581fb0392c17f4d83c50fac6362418a9ca56a16 Mon Sep 17 00:00:00 2001 From: Ferdinando Primerano Date: Mon, 13 Jan 2020 18:09:57 +0000 Subject: [PATCH 03/10] Comment bourbon import --- app/assets/stylesheets/application.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 28a27a23f..d01edb833 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,8 +15,9 @@ */ // grids -@import 'bourbon/core/bourbon'; -@import 'bourbon-neat/app/assets/stylesheets/neat'; +// Temporarily comment bourbon +//@import 'bourbon/core/bourbon'; +//@import 'bourbon-neat/app/assets/stylesheets/neat'; // // maps @import 'leaflet/dist/leaflet'; @@ -171,4 +172,4 @@ @import './styles/components/vue-agile'; @import './styles/pages/*'; -@import 'utilities/u-classes'; \ No newline at end of file +@import 'utilities/u-classes'; From 452313a2345ef4d6e64ca7d7bfdc130fbcb9a9fa Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 10:25:09 +0000 Subject: [PATCH 04/10] Add leaflet to package.json --- app/assets/stylesheets/application.scss | 6 +- config/deploy/staging.rb | 2 +- package.json | 3 +- yarn.lock | 92 +++++++++++++++++++++++-- 4 files changed, 93 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d01edb833..4f14408e2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,10 +16,10 @@ // grids // Temporarily comment bourbon -//@import 'bourbon/core/bourbon'; -//@import 'bourbon-neat/app/assets/stylesheets/neat'; +@import 'bourbon/core/bourbon'; +@import 'bourbon-neat/app/assets/stylesheets/neat'; -// // maps +// maps @import 'leaflet/dist/leaflet'; @import './resources/mixins/rem-calc'; diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index 0763af9f5..fecca0959 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,5 +1,5 @@ set :stage, :staging -set :branch, "develop" +set :branch, "fix/js-compilation" server 'new-web.pp-staging.linode.protectedplanet.net', user: 'wcmc', roles: %w{web app db} diff --git a/package.json b/package.json index ad3c118f7..979189e9e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "d3": "^5.9.2", "es6-object-assign": "^1.1.0", "es6-promise": "^4.2.6", - "leaflet": "^1.4.0", + "leaflet": "^1.6.0", + "save": "^2.4.0", "scrollmagic": "^2.0.6", "vue": "^2.6.10", "vue-agile": "^1.0.11", diff --git a/yarn.lock b/yarn.lock index a9caa0d35..08cf7ef23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1137,6 +1137,13 @@ async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= +async@^2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2644,6 +2651,11 @@ dot-prop@^4.1.1: dependencies: is-obj "^1.0.0" +duplexer@^0.1.1, duplexer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -2824,6 +2836,19 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +event-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65" + integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA== + dependencies: + duplexer "^0.1.1" + from "^0.1.7" + map-stream "0.0.7" + pause-stream "^0.0.11" + split "^1.0.1" + stream-combiner "^0.2.2" + through "^2.3.8" + eventemitter3@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" @@ -3132,6 +3157,11 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +from@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -4148,10 +4178,10 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -leaflet@^1.4.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf" - integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w== +leaflet@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.6.0.tgz#aecbb044b949ec29469eeb31c77a88e2f448f308" + integrity sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ== load-json-file@^1.0.0: version "1.1.0" @@ -4191,6 +4221,11 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.assign@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" + integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= + lodash.get@^4.0: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -4226,7 +4261,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.5, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -4296,6 +4331,11 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= +map-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8" + integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg= + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -4444,6 +4484,11 @@ mimic-fn@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mingo@1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546" + integrity sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY= + mini-css-extract-plugin@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0" @@ -5139,6 +5184,13 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +pause-stream@^0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + dependencies: + through "~2.3" + pbkdf2@^3.0.3: version "3.0.17" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" @@ -6348,6 +6400,16 @@ sass-loader@^7.1.0: pify "^4.0.1" semver "^6.3.0" +save@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/save/-/save-2.4.0.tgz#af93ff9b3d7a41d0aff49a23433870613a460f9b" + integrity sha512-wd5L2uVnsKYkIUaK6i8Ie66IOHaI328gMF0MPuTJtYOjXgUolC33LSIk7Qr8WVA55QHaGwfiVS8a7EFIeGOR3w== + dependencies: + async "^2.6.2" + event-stream "^4.0.1" + lodash.assign "^4.2.0" + mingo "1" + sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -6677,6 +6739,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -6737,6 +6806,14 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" +stream-combiner@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" + integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg= + dependencies: + duplexer "~0.1.1" + through "~2.3.4" + stream-each@^1.1.0: version "1.2.3" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -6981,6 +7058,11 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through@2, through@^2.3.8, through@~2.3, through@~2.3.4: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + thunky@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826" From 3d5c414eda5909148e2efbfac44c44c6858e0512 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 10:41:22 +0000 Subject: [PATCH 05/10] Update path no bourbon and leaflet stylesheets --- app/assets/stylesheets/application.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4f14408e2..c3671a7ab 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,11 +16,11 @@ // grids // Temporarily comment bourbon -@import 'bourbon/core/bourbon'; -@import 'bourbon-neat/app/assets/stylesheets/neat'; +@import '../../../node_modules/bourbon/core/bourbon'; +@import '../../../node_modules/bourbon-neat/app/assets/stylesheets/neat'; // maps -@import 'leaflet/dist/leaflet'; +@import '../../../node_modules/leaflet/dist/leaflet'; @import './resources/mixins/rem-calc'; @import './resources/mixins/media-queries'; From 3559698af103b5c747b757943cada0de85f4ae1a Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 10:45:02 +0000 Subject: [PATCH 06/10] Add file extensions --- app/assets/stylesheets/application.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c3671a7ab..35eaa2d90 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,11 +16,11 @@ // grids // Temporarily comment bourbon -@import '../../../node_modules/bourbon/core/bourbon'; -@import '../../../node_modules/bourbon-neat/app/assets/stylesheets/neat'; +@import '../../../node_modules/bourbon/core/bourbon.scss'; +@import '../../../node_modules/bourbon-neat/app/assets/stylesheets/neat.scss'; // maps -@import '../../../node_modules/leaflet/dist/leaflet'; +@import '../../../node_modules/leaflet/dist/leaflet.css'; @import './resources/mixins/rem-calc'; @import './resources/mixins/media-queries'; From 42a57144ec86e226ae81d2bb1036edfb648a0527 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 13:14:13 +0000 Subject: [PATCH 07/10] Install bourbon via gem --- Gemfile | 3 +++ Gemfile.lock | 8 +++++++ app/assets/stylesheets/application.scss | 27 ++++++--------------- config/application.rb | 2 +- config/initializers/assets.rb | 1 + package.json | 1 - yarn.lock | 32 +++++++++++++++++++------ 7 files changed, 45 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index c2d319073..6a14bb5ec 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,9 @@ source 'https://rubygems.org' gem 'rails', '5.2.0' gem 'webpacker', '~> 4.0.2' +gem 'bourbon' +gem "neat" + gem 'pg', '~> 0.21' gem 'activerecord-postgis-adapter', '5.1.0' gem 'dbf', '~> 2.0.7' diff --git a/Gemfile.lock b/Gemfile.lock index 6b4f11a59..4fb6cf932 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -771,6 +771,9 @@ GEM best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) + bourbon (4.2.3) + sass (~> 3.4) + thor builder (3.2.4) byebug (9.1.0) capistrano (3.11.0) @@ -929,6 +932,9 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.3) + neat (1.7.4) + bourbon (>= 4.0) + sass (>= 3.3) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) @@ -1111,6 +1117,7 @@ DEPENDENCIES autoprefixer-rails aws-sdk (= 3.0.1) best_in_place (~> 3.0.1) + bourbon byebug (~> 9.0, >= 9.0.5) bystander (= 2.0.0)! capistrano (= 3.11.0) @@ -1142,6 +1149,7 @@ DEPENDENCIES levenshtein (~> 0.2.2) minitest (~> 5.10, != 5.10.2) mocha (~> 1.0.0) + neat nokogiri (~> 1.10.4) pg (~> 0.21) phantompdf (~> 1.2.2) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 35eaa2d90..0883b8436 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,26 +1,13 @@ -/* - - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - * *= require_self - */ - // grids // Temporarily comment bourbon -@import '../../../node_modules/bourbon/core/bourbon.scss'; -@import '../../../node_modules/bourbon-neat/app/assets/stylesheets/neat.scss'; +@import 'bourbon'; +@import 'neat'; + +// /core/bourbon'; +// @import 'bourbon-neat/app/assets/stylesheets/neat'; -// maps -@import '../../../node_modules/leaflet/dist/leaflet.css'; +// // // maps +// @import 'leaflet/dist/leaflet'; @import './resources/mixins/rem-calc'; @import './resources/mixins/media-queries'; diff --git a/config/application.rb b/config/application.rb index 144a486c5..4d6138211 100644 --- a/config/application.rb +++ b/config/application.rb @@ -29,7 +29,7 @@ class Application < Rails::Application #{config.root}/app/presenters #{config.root}/app/serializers ) - config.assets.paths << Rails.root.join('node_modules') + # config.assets.paths << Rails.root.join('node_modules') config.assets.precompile += %w(base.js country.js home.js map.js protected_areas.js search.js resources.js content.js marine.js green_list.js region.js target_dashboard.js) config.assets.precompile += %w(d3/d3.js) config.assets.precompile += %w(d3/d3.min.js) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index f62357f39..6d618f188 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,3 +12,4 @@ # Rails.application.config.assets.precompile += %w( pdf.css ) Rails.application.config.assets.paths << Rails.root.join('node_modules') +Rails.application.config.assets.paths << Rails.root.join('node_modules/bourbon') diff --git a/package.json b/package.json index 979189e9e..566cc4550 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "dependencies": { "@rails/webpacker": "^4.0.2", "axios": "^0.19.0", - "bourbon": "^5.1.0", "bourbon-neat": "^1.9.0", "d3": "^5.9.2", "es6-object-assign": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 08cf7ef23..dea76d9d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1313,11 +1313,6 @@ bourbon-neat@^1.9.0: dependencies: node-sass "^4.1.1" -bourbon@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/bourbon/-/bourbon-5.1.0.tgz#84fa10de4c4e837602d8c2ec716d74bcb8915bad" - integrity sha512-rO4rwNAVNuzPmnL+DruxAe7DR2YFFo4nHsgDVRd9URMgDxtHmVBUnvFLXPan6teVe7jkybCyxcnR+CKClotj3g== - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -4261,7 +4256,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.5, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -4733,7 +4728,30 @@ node-releases@^1.1.29: dependencies: semver "^6.3.0" -node-sass@^4.1.1, node-sass@^4.12.0: +node-sass@^4.1.1: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash "^4.17.15" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.13.2" + node-gyp "^3.8.0" + npmlog "^4.0.0" + request "^2.88.0" + sass-graph "^2.2.4" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + +node-sass@^4.12.0: version "4.12.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ== From 0fe54dc0e6249cced7da059cc0f3e82ce51e32a0 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 13:27:02 +0000 Subject: [PATCH 08/10] Update yarn binstubs --- bin/yarn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 bin/yarn diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end From 48ca77f0b6046b7fe658b3f793d27d9410e559e6 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 13:29:03 +0000 Subject: [PATCH 09/10] Remove bourbon neat from package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 566cc4550..e4114380d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "dependencies": { "@rails/webpacker": "^4.0.2", "axios": "^0.19.0", - "bourbon-neat": "^1.9.0", "d3": "^5.9.2", "es6-object-assign": "^1.1.0", "es6-promise": "^4.2.6", From 5fd645a96081461c61d39ff8216b4329a85683c7 Mon Sep 17 00:00:00 2001 From: stacytalbot Date: Tue, 14 Jan 2020 13:32:24 +0000 Subject: [PATCH 10/10] Set staging deployment branch back to develop --- config/deploy/staging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index fecca0959..0763af9f5 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,5 +1,5 @@ set :stage, :staging -set :branch, "fix/js-compilation" +set :branch, "develop" server 'new-web.pp-staging.linode.protectedplanet.net', user: 'wcmc', roles: %w{web app db}