Update dependency local-time to v3 (o19s#939)

* Update dependency local-time to v3 * Now have importmaps! --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Eric Pugh <[email protected]>
drieschel · Feb 1, 2024 · 13dc501 · 13dc501
1 parent 6b63449
commit 13dc501
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -89,3 +89,5 @@ group :test do
   gem 'capybara'
   gem 'selenium-webdriver'
 end
+
+gem 'importmap-rails', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -182,6 +182,10 @@ GEM
       thor
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    importmap-rails (2.0.1)
+      actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      railties (>= 6.0.0)
     intercom-rails (0.4.2)
       activesupport (> 3.0)
     io-console (0.7.2)
@@ -505,6 +509,7 @@ DEPENDENCIES
   devise_invitable (~> 2.0)
   font-awesome-sass
   gabba
+  importmap-rails (~> 2.0)
   intercom-rails
   jbuilder (~> 2.7)
   jquery-rails

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,3 +1,7 @@
 //= link_tree ../images
 //= link application.js
 //= link 'application.css'
+//= link_tree ../../javascript .js
+//= link_tree ../../../vendor/javascript .js
+
+//= link local-time/app/assets/javascripts/local-time.es2017-umd.js
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,6 +11,9 @@
 // about supported directives.
 //
 // The long list of requires for the main Angular 1 application has been moved to core.js.
+// 
+// We have introduced importmaps, which live in application2.js.  This should probably be migrated
+// over to that file assuming import maps works the way we are hoping!
 
 //= require bootstrap/dist/js/bootstrap.bundle
 //= require jquery
@@ -23,5 +26,3 @@
 
 //= require codemirror/lib/codemirror
 //= require codemirror/mode/javascript/javascript
-
-//= require local-time/app/assets/javascripts/local-time
diff --git a/app/javascript/application2.js b/app/javascript/application2.js
@@ -0,0 +1,10 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+// This is a importmap version of the classic application.js so that we can have
+// both sprockets and importmaps at the same time.
+
+
+// Note: the file in vendor/javascript/vendored-local-time.js is the one that was downloaded via
+// importmap pin.  See https://github.com/basecamp/local_time/issues/113 for others who suggested
+// remaining it
+import LocalTime from "local-time"
+LocalTime.start()
diff --git a/app/views/admin/announcements/edit.html.erb b/app/views/admin/announcements/edit.html.erb
@@ -7,7 +7,7 @@
 
   <div class="mb-3">
     <%= form.label :text, class: 'form-label' %>
-    <%= form.text_field :text, required: true, class: 'form-control' %>
+    <%= form.text_area :text, required: true, rows: 5, class: 'form-control' %>
     <div class="form-text">The announcement.  You can use HTML and emojis.</div>
   </div>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
+  <meta charset="utf-8"/>
 
-<%= favicon_link_tag asset_path "favicon.ico" %>
+  <%= favicon_link_tag asset_path "favicon.ico" %>
 
 <% if flash[:unfurl] %>
   <!-- We have unfurl -->
@@ -54,9 +54,11 @@
 
 
 
-<%= stylesheet_link_tag 'application', media: 'all' %>
-<%= csrf_meta_tags %>
-<%= javascript_include_tag 'application' %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= csrf_meta_tags %>
+  <%= javascript_importmap_tags 'application2' %>
+  <%= javascript_include_tag 'application' %>
+
 
 </head>
 

diff --git a/bin/importmap b/bin/importmap
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require_relative "../config/application"
+require "importmap/commands"
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Pin npm packages by running ./bin/importmap
+
+pin 'application2', preload: true
+pin "local-time", to: "vendored-local-time.js"# @3.0.2
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "d3-tip": "~0.9.1",
     "file-saver": "^2.0.5",
     "jquery": "~3.7.0",
-    "local-time": "^2.1.0",
+    "local-time": "^3.0.0",
     "ng-json-explorer": "http://github.com/o19s/ng-json-explorer",
     "ng-tags-input": "3.2.0",
     "ngclipboard": "^2.0.0",

diff --git a/spec/karma/config/unit.js b/spec/karma/config/unit.js
@@ -19,7 +19,7 @@ module.exports = function(config) {
     // to run a single one
     files: [
       'tmp/assets/core*.js',
-      'tmp/assets/application*.js',
+      'tmp/assets/application.js',
       'tmp/assets/application_spec*.js',
       'spec/javascripts/mock/*.js',
       'spec/javascripts/**/*_spec.js',
@@ -28,7 +28,7 @@ module.exports = function(config) {
 
     // list of files to exclude
     exclude: [
-
+      '**/application2.js', // ignore this importmap related file when running core JS app tests
     ],
 
 

diff --git a/vendor/javascript/.keep b/vendor/javascript/.keep
diff --git a/vendor/javascript/vendored-local-time.js b/vendor/javascript/vendored-local-time.js
diff --git a/yarn.lock b/yarn.lock