Updates webpack-dev-server to release 3.1.14; Disables Turbolinks; Up…

…dating Capistrano and SSHKit (please see nov/json-jwt#45 for the error which is raised); Removing the npm_install tasks for staging deployments; Fixing the overflow issue in the navbar header for collection titles; Ensuring that the JavaScript packs are loaded first

Capfile

@@ -3,6 +3,8 @@ require 'capistrano/setup'
 
 # Include default deployment tasks
 require 'capistrano/deploy'
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
 
 require 'capistrano/bundler'
 require 'capistrano/rails/assets'

Gemfile

@@ -27,6 +27,7 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'simplecov', require: false
   gem 'sqlite3'
+  gem 'sshkit', '~> 1.18'
   gem 'vcr'
   gem 'webmock', require: false
 end
@@ -71,7 +72,7 @@ gem 'sprockets', '~> 3.7'
 gem 'sprockets-es6'
 gem 'sprockets-rails'
 gem 'string_rtl'
-gem 'webpacker', '~> 3.5'
+gem 'webpacker', '>= 4.0.x'
 
 # PUL Assets
 gem 'dalli'

Gemfile.lock

@@ -109,7 +109,7 @@ GEM
       activerecord (>= 4.2.8)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    airbrussh (1.1.1)
+    airbrussh (1.3.1)
       sshkit (>= 1.6.1, != 1.7.0)
     almond-rails (0.1.0)
       rails (>= 4.2, < 6)
@@ -164,19 +164,16 @@ GEM
       amq-protocol (~> 2.3.0)
     byebug (9.0.6)
     cancancan (2.1.3)
-    capistrano (3.6.1)
+    capistrano (3.11.0)
       airbrussh (>= 1.0.0)
-      capistrano-harrow
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.2.0)
+    capistrano-bundler (1.5.0)
       capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-harrow (0.5.3)
     capistrano-passenger (0.2.0)
       capistrano (~> 3.0)
-    capistrano-rails (1.1.8)
+    capistrano-rails (1.4.0)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rails-console (2.1.1)
@@ -329,7 +326,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (5.1.0)
     nio4r (2.3.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -525,7 +522,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.12)
-    sshkit (1.11.3)
+    sshkit (1.18.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     sshkit-interactive (0.2.0)
@@ -575,7 +572,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.5.5)
+    webpacker (4.0.0.rc.7)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -650,13 +647,14 @@ DEPENDENCIES
   sprockets-es6
   sprockets-rails
   sqlite3
+  sshkit (~> 1.18)
   string_rtl
   turbolinks
   uglifier (>= 1.3.0)
   vcr
   web-console (~> 2.0)
   webmock
-  webpacker (~> 3.5)
+  webpacker (>= 4.0.x)
 
 BUNDLED WITH
    1.17.2

app/assets/javascripts/application.js

@@ -13,7 +13,6 @@
 
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks//
 // Required by Blacklight
 //= require blacklight/blacklight
 //= require pul-assets

app/assets/stylesheets/header.scss

@@ -27,6 +27,7 @@ header.lux {
         line-height: 36px;
         font-family: "Source Sans Pro", "DejaVu", "HelveticaNeue", Arial, sans-serif;
         border-left-color: #746d54;
+        width: 100%;
       }
     }
   }

app/views/layouts/application.html.erb

@@ -15,10 +15,10 @@
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= current_exhibit ? spotlight.exhibit_opensearch_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= application_name %>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag 'favicon.ico' %>
+    <%= javascript_pack_tag 'application' %>
     <link rel="stylesheet" href="https://use.typekit.net/yhr7zwc.css">
     <%= stylesheet_pack_tag 'application' %>
     <%= stylesheet_link_tag    "application" %>
-    <%= javascript_pack_tag 'application' %>
     <%= javascript_include_tag :modernizr %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>

app/views/layouts/blacklight.html.erb

@@ -15,10 +15,10 @@
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= current_exhibit ? spotlight.exhibit_opensearch_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= application_name %>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag 'favicon.ico' %>
+    <%= javascript_pack_tag 'application' %>
     <link rel="stylesheet" href="https://use.typekit.net/yhr7zwc.css">
     <%= stylesheet_pack_tag 'application' %>
     <%= stylesheet_link_tag    "application" %>
-    <%= javascript_pack_tag 'application' %>
     <%= javascript_include_tag :modernizr %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>

app/views/layouts/spotlight/spotlight.html.erb

@@ -15,10 +15,10 @@
     <title><%= h(@page_title || application_name) %></title>
     <link href="<%= current_exhibit ? spotlight.opensearch_exhibit_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= application_name %>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag 'favicon.ico' %>
+    <%= javascript_pack_tag 'application' %>
     <link rel="stylesheet" href="https://use.typekit.net/yhr7zwc.css">
     <%= stylesheet_pack_tag 'application' %>
     <%= stylesheet_link_tag    "application" %>
-    <%= javascript_pack_tag 'application' %>
     <%= javascript_include_tag :modernizr %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>

bin/webpack

@@ -12,4 +12,8 @@ require "bundler/setup"
 
 require "webpacker"
 require "webpacker/webpack_runner"
-Webpacker::WebpackRunner.run(ARGV)
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end

bin/webpack-dev-server

@@ -12,4 +12,8 @@ require "bundler/setup"
 
 require "webpacker"
 require "webpacker/dev_server_runner"
-Webpacker::DevServerRunner.run(ARGV)
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+end

config/deploy/staging.rb

@@ -9,19 +9,6 @@
 server 'dpul-staging1', user: 'deploy', roles: %w(app db web worker)
 set :deploy_to, '/opt/dpul'
 
-before "deploy:assets:precompile", "deploy:npm_install"
-
-namespace :deploy do
-  desc 'Run rake npm install'
-  task :npm_install do
-    on roles(:web) do
-      within release_path do
-        execute("cd #{release_path} && npm install")
-      end
-    end
-  end
-end
-
 # role-based syntax
 # ==================
 

package.json

@@ -1,12 +1,21 @@
 {
   "dependencies": {
-    "@rails/webpacker": "3.5",
+    "@rails/webpacker": "https://github.com/rails/webpacker",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.7.0",
+    "caniuse-lite": "^1.0.30000936",
+    "css-loader": "^2.1.0",
     "lux-design-system": "^2.0.3",
+    "postcss-cssnext": "^3.1.0",
     "vue": "^2.6.5",
     "vue-loader": "14.2.2",
-    "vue-template-compiler": "^2.6.5"
+    "vue-template-compiler": "^2.6.5",
+    "webpack": "^4.29.3"
   },
   "devDependencies": {
-    "webpack-dev-server": "2.11.2"
+    "webpack-cli": "^3.2.3",
+    "webpack-dev-server": "^3.1.14"
   }
 }