# HG changeset patch # User nanaya # Date 1582456989 -32400 # Node ID 802dcd44188e7e1cf02799d9d5e809653a9e40f0 # Parent fd3078b4d355ac7542c165779bdad6cd2afcfc9e Now with webpacker diff -r fd3078b4d355 -r 802dcd44188e .browserslistrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.browserslistrc Sun Feb 23 20:23:09 2020 +0900 @@ -0,0 +1,1 @@ +defaults diff -r fd3078b4d355 -r 802dcd44188e .hgignore --- a/.hgignore Tue Oct 22 16:17:30 2019 +0900 +++ b/.hgignore Sun Feb 23 20:23:09 2020 +0900 @@ -1,11 +1,13 @@ ^\.bundle$ +^config/config_local_(\w+)\.rb$ ^config/database\.yml$ -^config/config_local_(\w+)\.rb$ ^config/newrelic\.yml$ ^config/unicorn\.rb$ ^log$ +^node_modules$ ^public/assets$ ^public/cache$ +^public/packs$ ^public/robots\.txt$ ^tmp$ ^vendor/bundle$ diff -r fd3078b4d355 -r 802dcd44188e Gemfile --- a/Gemfile Tue Oct 22 16:17:30 2019 +0900 +++ b/Gemfile Sun Feb 23 20:23:09 2020 +0900 @@ -1,14 +1,8 @@ source "https://rubygems.org" gem "rails", "~> 6.0.0" -gem "jquery-rails" -gem "coffee-rails" -gem "bootstrap-sass" - -source "https://rails-assets.org" do - gem "rails-assets-highlightjs" - gem "rails-assets-commonmark" -end +gem "sass-rails" +gem "webpacker" # Bundle edge Rails instead: # gem "rails", :git => "git://github.com/rails/rails.git" @@ -17,10 +11,6 @@ gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby gem "jruby-openssl", :platforms => :jruby -gem "sass-rails" - -gem "uglifier" - gem "therubyrhino", :platforms => :jruby # To use ActiveModel has_secure_password diff -r fd3078b4d355 -r 802dcd44188e Gemfile.lock --- a/Gemfile.lock Tue Oct 22 16:17:30 2019 +0900 +++ b/Gemfile.lock Sun Feb 23 20:23:09 2020 +0900 @@ -1,97 +1,79 @@ GEM remote: https://rubygems.org/ - remote: https://rails-assets.org/ specs: - actioncable (6.0.0) - actionpack (= 6.0.0) + actioncable (6.0.2.1) + actionpack (= 6.0.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + actionmailbox (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) mail (>= 2.7.1) - actionmailer (6.0.0) - actionpack (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) + actionmailer (6.0.2.1) + actionpack (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.0) - actionview (= 6.0.0) - activesupport (= 6.0.0) - rack (~> 2.0) + actionpack (6.0.2.1) + actionview (= 6.0.2.1) + activesupport (= 6.0.2.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.0) - actionpack (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + actiontext (6.0.2.1) + actionpack (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) nokogiri (>= 1.8.5) - actionview (6.0.0) - activesupport (= 6.0.0) + actionview (6.0.2.1) + activesupport (= 6.0.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.0) - activesupport (= 6.0.0) + activejob (6.0.2.1) + activesupport (= 6.0.2.1) globalid (>= 0.3.6) - activemodel (6.0.0) - activesupport (= 6.0.0) - activerecord (6.0.0) - activemodel (= 6.0.0) - activesupport (= 6.0.0) - activerecord-jdbc-adapter (50.0) - activerecord (>= 2.2) - activerecord-jdbcpostgresql-adapter (50.0) - activerecord-jdbc-adapter (~> 50.0) + activemodel (6.0.2.1) + activesupport (= 6.0.2.1) + activerecord (6.0.2.1) + activemodel (= 6.0.2.1) + activesupport (= 6.0.2.1) + activerecord-jdbc-adapter (60.1-java) + activerecord (~> 6.0.0) + activerecord-jdbcpostgresql-adapter (60.1-java) + activerecord-jdbc-adapter (= 60.1) jdbc-postgres (>= 9.4, < 43) - activestorage (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) + activestorage (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) marcel (~> 0.3.1) - activesupport (6.0.0) + activesupport (6.0.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.8) - autoprefixer-rails (9.6.5) - execjs - bootstrap-sass (3.4.1) - autoprefixer-rails (>= 5.2.1) - sassc (>= 2.0.0) - builder (3.2.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - crass (1.0.5) + zeitwerk (~> 2.2) + builder (3.2.4) + concurrent-ruby (1.1.6) + crass (1.0.6) erubi (1.9.0) - execjs (2.7.0) - ffi (1.11.1) - ffi (1.11.1-java) + ffi (1.12.2) + ffi (1.12.2-java) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) jdbc-postgres (42.2.6) - jquery-rails (4.3.5) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jruby-openssl (0.10.2-java) - loofah (2.3.0) + jruby-openssl (0.10.4-java) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -99,53 +81,53 @@ marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) - newrelic_rpm (6.7.0.359) + minitest (5.14.0) + newrelic_rpm (6.9.0.363) nio4r (2.5.2) nio4r (2.5.2-java) - nokogiri (1.10.4) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) - nokogiri (1.10.4-java) - pg (1.1.4) - puma (4.2.1) + nokogiri (1.10.8-java) + pg (1.2.2) + puma (4.3.1) nio4r (~> 2.0) - puma (4.2.1-java) + puma (4.3.1-java) nio4r (~> 2.0) - rack (2.0.7) + rack (2.2.2) + rack-proxy (0.6.5) + rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.0) - actioncable (= 6.0.0) - actionmailbox (= 6.0.0) - actionmailer (= 6.0.0) - actionpack (= 6.0.0) - actiontext (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) - activemodel (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + rails (6.0.2.1) + actioncable (= 6.0.2.1) + actionmailbox (= 6.0.2.1) + actionmailer (= 6.0.2.1) + actionpack (= 6.0.2.1) + actiontext (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + activemodel (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) bundler (>= 1.3.0) - railties (= 6.0.0) + railties (= 6.0.2.1) sprockets-rails (>= 2.0.0) - rails-assets-commonmark (0.29.0) - rails-assets-highlightjs (9.12.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.0) - actionpack (= 6.0.0) - activesupport (= 6.0.0) + railties (6.0.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rake (13.0.0) + rake (13.0.1) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.2.1) @@ -166,20 +148,22 @@ therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) thread_safe (0.3.6-java) tilt (2.0.10) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) + webpacker (4.2.2) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-driver (0.7.1-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) - zeitwerk (2.2.0) + zeitwerk (2.2.2) PLATFORMS java @@ -187,19 +171,14 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter - bootstrap-sass - coffee-rails - jquery-rails jruby-openssl newrelic_rpm pg puma rails (~> 6.0.0) - rails-assets-commonmark! - rails-assets-highlightjs! sass-rails therubyrhino - uglifier + webpacker BUNDLED WITH 1.17.2 diff -r fd3078b4d355 -r 802dcd44188e app/assets/config/manifest.js --- a/app/assets/config/manifest.js Tue Oct 22 16:17:30 2019 +0900 +++ b/app/assets/config/manifest.js Sun Feb 23 20:23:09 2020 +0900 @@ -1,2 +1,1 @@ -//= link_directory ../javascripts .js //= link_directory ../stylesheets .css diff -r fd3078b4d355 -r 802dcd44188e app/assets/javascripts/application.coffee --- a/app/assets/javascripts/application.coffee Tue Oct 22 16:17:30 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -#= require jquery -#= require bootstrap/transition -#= require bootstrap/collapse -#= require bootstrap/modal -#= require bootstrap/tab -#= require highlightjs -#= require commonmark - -$(document).on "click", ".js-paste-clear", (e) -> - e.preventDefault() - $(".js-paste-paste") - .val("") - .focus() - - -loadLanguageItems = -> - $languageSelectBox = $("#paste_language") - return unless $languageSelectBox.length - - for language in hljs.listLanguages().sort() - $languageSelectBox.append $("