From fab19d87381dc12c9f22d5cd60e96bb3f1708476 Mon Sep 17 00:00:00 2001 From: Murny Date: Tue, 7 Jan 2020 11:00:03 -0700 Subject: [PATCH 1/2] Looks like sprockets v4.0.0 upgrade changed to use manifest file heavily, which was not configured correctly --- Gemfile.lock | 122 +++++++++++++++--------------- app/assets/config/manifest.js | 4 +- app/assets/stylesheets/items.scss | 5 +- config/initializers/assets.rb | 2 +- 4 files changed, 66 insertions(+), 67 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 034c80fd7..759a19a0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,25 +11,25 @@ GEM specs: aasm (5.0.6) concurrent-ruby (~> 1.0) - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -37,20 +37,20 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,13 +59,13 @@ GEM public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) ast (2.4.0) - autoprefixer-rails (9.4.7) + autoprefixer-rails (9.7.3) execjs better_errors (2.5.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindex (0.5.0) + bindex (0.8.1) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) bootsnap (1.4.5) @@ -74,13 +74,13 @@ GEM autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) - brakeman (4.7.1) - builder (3.2.3) + brakeman (4.7.2) + builder (3.2.4) bump (0.8.0) - byebug (11.0.0) + byebug (11.0.1) canonical-rails (0.2.6) rails (>= 4.1, < 6.1) - capybara (3.29.0) + capybara (3.30.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -122,7 +122,7 @@ GEM dropzonejs-rails (0.8.4) rails (> 3.1) erubi (1.9.0) - et-orbi (1.1.8) + et-orbi (1.2.2) tzinfo execjs (2.7.0) ezid-client (1.8.0) @@ -130,14 +130,14 @@ GEM nokogiri faker (2.10.0) i18n (>= 1.6, < 1.8) - faraday (0.12.2) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) ffi (1.11.3) font-awesome-rails (4.7.0.5) railties (>= 3.2, < 6.1) - fugit (1.2.0) + fugit (1.3.3) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) git (1.5.0) @@ -150,9 +150,9 @@ GEM hashie (3.6.0) i18n (1.7.0) concurrent-ruby (~> 1.0) - image_processing (1.9.3) + image_processing (1.10.1) mini_magick (>= 4.9.5, < 5) - ruby-vips (>= 2.0.13, < 3) + ruby-vips (>= 2.0.17, < 3) jaro_winkler (1.5.4) jbuilder (2.9.1) activesupport (>= 4.2.0) @@ -160,7 +160,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.2.0) + json (2.3.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -191,7 +191,7 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_magick (4.9.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) @@ -199,14 +199,15 @@ GEM minitest (> 5.3) msgpack (1.3.1) multipart-post (2.1.1) - mustermann (1.1.0) + mustermann (1.1.1) ruby2_keywords (~> 0.0.1) nap (1.1.0) nio4r (2.5.2) no_proxy_fix (0.1.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - octokit (4.14.0) + octokit (4.15.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -233,7 +234,7 @@ GEM pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.1) + public_suffix (4.0.3) puma (4.3.1) nio4r (~> 2.0) pundit (1.1.0) @@ -244,27 +245,27 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 5.2.4.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -284,10 +285,10 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-vocab (3.1.0) rdf (~> 3.1) - rdoc (6.1.1) + rdoc (6.2.1) redis (4.1.3) regexp_parser (1.6.0) - rollbar (2.22.1) + rollbar (2.23.1) rsolr (2.2.1) builder (>= 2.1.2) faraday (>= 0.9.0) @@ -304,9 +305,9 @@ GEM rack (>= 1.1) rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - ruby-saml (1.9.0) + ruby-saml (1.11.0) nokogiri (>= 1.5.10) - ruby-vips (2.0.14) + ruby-vips (2.0.17) ffi (~> 1.9) ruby2_keywords (0.0.1) rubyzip (2.0.0) @@ -318,9 +319,8 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) + sassc (2.2.1) ffi (~> 1.9) - rake sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) @@ -369,7 +369,7 @@ GEM skylight-core (= 4.2.0) skylight-core (4.2.0) activesupport (>= 4.2.0) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -384,7 +384,7 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index b16e53d6d..bbca92f24 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,3 +1,5 @@ //= link_tree ../images //= link_directory ../javascripts .js -//= link_directory ../stylesheets .css + +//= link application.css +//= link admin.js diff --git a/app/assets/stylesheets/items.scss b/app/assets/stylesheets/items.scss index 0df205e19..a9b8eaec0 100644 --- a/app/assets/stylesheets/items.scss +++ b/app/assets/stylesheets/items.scss @@ -1,9 +1,6 @@ -$cc-background: $gray-100; - .community-collection { .card { - // TODO: have real designer pick this - background-color: $cc-background; + background-color: $gray-100; } } diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 76e8c60cc..9bc7dd7cc 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -11,4 +11,4 @@ # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. -Rails.application.config.assets.precompile += %w[admin.js] +# Rails.application.config.assets.precompile += %w[admin.js] From cc5833b79614419b95bc546fea6e4aafd5b80ac1 Mon Sep 17 00:00:00 2001 From: Murny Date: Tue, 7 Jan 2020 11:12:05 -0700 Subject: [PATCH 2/2] Add changelog entry for change for fixing undefined var issue with Sass/Sprockets --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd46c7641..0bfc3e911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and releases in Jupiter project adheres to [Semantic Versioning](http://semver.o ### Fixed - failing tests [#1376](https://github.com/ualbertalib/jupiter/issues/1376) +- Fix Sprockets v4.0.0 upgrade problem with how Sass Variables were being defined ## [1.2.18] - 2019-10-22 - Removed Rack Attack