Skip to content

Commit b9e179c

Browse files
jcoynejcoyne
committed
Switch from webpacker to importmap
1 parent ae7b4b7 commit b9e179c

21 files changed

+220
-8425
lines changed

‎.eslintrc

-34
This file was deleted.

‎.github/workflows/ruby.yml

-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,5 @@ jobs:
3434
run: bundle config path vendor/bundle
3535
- name: Install dependencies
3636
run: bin/setup
37-
- name: Compile webpack assets
38-
run: bundle exec rake webpacker:compile
39-
env:
40-
RAILS_ENV: test
4137
- name: Run tests
4238
run: bundle exec rake

‎Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ gem 'pg'
1414
# Use Puma as the app server
1515
gem 'puma', '~> 5.0'
1616

17-
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
18-
gem 'webpacker', '~> 5.0'
19-
2017
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
2118
gem 'turbolinks', '~> 5'
2219

@@ -117,3 +114,5 @@ gem 'concurrent-ruby'
117114
gem "local_time", "~> 2.1"
118115

119116
gem "cssbundling-rails", "~> 1.1"
117+
118+
gem "importmap-rails", "~> 1.1"

‎Gemfile.lock

+4-9
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ GEM
233233
rails-i18n
234234
rainbow (>= 2.2.2, < 4.0)
235235
terminal-table (>= 1.5.1)
236+
importmap-rails (1.1.5)
237+
actionpack (>= 6.0.0)
238+
railties (>= 6.0.0)
236239
inline_svg (1.8.0)
237240
activesupport (>= 3.0)
238241
nokogiri (>= 1.6)
@@ -310,8 +313,6 @@ GEM
310313
rack (2.2.6.2)
311314
rack-attack (6.6.1)
312315
rack (>= 1.0, < 3)
313-
rack-proxy (0.7.6)
314-
rack
315316
rack-test (2.0.2)
316317
rack (>= 1.3)
317318
rails (7.0.4.2)
@@ -415,7 +416,6 @@ GEM
415416
rexml (~> 3.2, >= 3.2.5)
416417
rubyzip (>= 1.2.2, < 3.0)
417418
websocket (~> 1.0)
418-
semantic_range (3.0.0)
419419
sidekiq (6.5.8)
420420
connection_pool (>= 2.2.5, < 3)
421421
rack (~> 2.0)
@@ -468,11 +468,6 @@ GEM
468468
addressable (>= 2.8.0)
469469
crack (>= 0.3.2)
470470
hashdiff (>= 0.4.0, < 2.0.0)
471-
webpacker (5.4.3)
472-
activesupport (>= 5.2)
473-
rack-proxy (>= 0.6.1)
474-
railties (>= 5.2)
475-
semantic_range (>= 2.3.0)
476471
websocket (1.2.9)
477472
websocket-driver (0.7.5)
478473
websocket-extensions (>= 0.1.0)
@@ -514,6 +509,7 @@ DEPENDENCIES
514509
honeybadger
515510
http
516511
i18n-tasks
512+
importmap-rails (~> 1.1)
517513
inline_svg
518514
jbuilder (~> 2.7)
519515
jwt
@@ -547,7 +543,6 @@ DEPENDENCIES
547543
web-console
548544
webdrivers
549545
webmock
550-
webpacker (~> 5.0)
551546
whenever
552547

553548
BUNDLED WITH

‎app/assets/config/manifest.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
//= link_tree ../images
22
//= link_tree ../builds
3+
//= link_tree ../../javascript .js
4+
//= link_tree ../../../vendor/javascript .js

‎app/javascript/application.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
2+
import Rails from '@rails/ujs';
3+
import Turbolinks from 'turbolinks';
4+
import * as ActiveStorage from "@rails/activestorage";
5+
import LocalTime from "local-time"
6+
Rails.start();
7+
Turbolinks.start();
8+
ActiveStorage.start();
9+
LocalTime.start()
10+
11+
// require('../channels');
12+
import 'direct_uploads';
13+
import "chartkick"
14+
import "Chart.bundle"
15+
import 'pod_console';
16+
import 'copy_to_clipboard';
17+
import 'organizations';
18+
import 'tooltips'

‎app/javascript/packs/application.js

-27
This file was deleted.

‎app/javascript/tooltips.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as bootstrap from 'bootstrap';
2+
13
// Enable bootstrap tooltips, with localized time content if applicable
24
document.addEventListener('turbolinks:load', function() {
35
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))

‎app/views/layouts/application.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<%= csp_meta_tag %>
1111

1212
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
13-
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', nonce: true %>
1413
<%= favicon_link_tag 'favicon.svg' %>
1514
<%= content_for(:head) %>
15+
<%= javascript_importmap_tags %>
1616
</head>
1717

1818
<body class="min-vh-100 d-flex flex-column">

‎bin/importmap

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env ruby
2+
3+
require_relative "../config/application"
4+
require "importmap/commands"

‎bin/webpack

-18
This file was deleted.

‎bin/webpack-dev-server

-18
This file was deleted.

‎config/importmap.rb

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Pin npm packages by running ./bin/importmap
2+
3+
pin "application", preload: true
4+
pin "turbolinks", to: "https://ga.jspm.io/npm:[email protected]/dist/turbolinks.js"
5+
pin "@rails/activestorage", to: "https://ga.jspm.io/npm:@rails/[email protected]/app/assets/javascripts/activestorage.esm.js"
6+
pin "bootstrap", to: "https://ga.jspm.io/npm:[email protected]/dist/js/bootstrap.esm.js", preload: true
7+
pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/[email protected]/lib/index.js", preload: true
8+
pin "chartkick", to: "chartkick.js"
9+
pin "Chart.bundle", to: "Chart.bundle.js"
10+
pin "local-time", to: "https://ga.jspm.io/npm:[email protected]/app/assets/javascripts/local-time.js"
11+
pin_all_from File.expand_path("../app/javascript", __dir__)
12+
pin "@rails/ujs", to: "https://ga.jspm.io/npm:@rails/[email protected]/lib/assets/compiled/rails-ujs.js"

‎config/webpack/development.js

-5
This file was deleted.

‎config/webpack/environment.js

-3
This file was deleted.

‎config/webpack/production.js

-5
This file was deleted.

‎config/webpack/test.js

-5
This file was deleted.

‎config/webpacker.yml

-96
This file was deleted.

‎package.json

-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"@rails/actioncable": "^6.0.0",
77
"@rails/activestorage": "^6.0.0",
88
"@rails/ujs": "^6.0.0",
9-
"@rails/webpacker": "5.4.3",
109
"bootstrap": "^5.0.1",
1110
"bootstrap-icons": "^1.1.0",
1211
"chart.js": "^2.9.4",
@@ -19,18 +18,6 @@
1918
},
2019
"version": "0.1.0",
2120
"devDependencies": {
22-
"babel-eslint": "10.1.0",
23-
"eslint": "^6.0.0",
24-
"eslint-config-airbnb": "^18.2.0",
25-
"eslint-config-react-app": "^3.0.5",
26-
"eslint-import-resolver-webpack": "^0.12.2",
27-
"eslint-loader": "^4.0.2",
28-
"eslint-plugin-flowtype": "^4.7.0",
29-
"eslint-plugin-import": "^2.18.0",
30-
"eslint-plugin-jest": "^23.16.0",
31-
"eslint-plugin-jsx-a11y": "^6.2.3",
32-
"eslint-plugin-react": "^7.14.2",
33-
"webpack-dev-server": "^3.11.0"
3421
},
3522
"scripts": {
3623
"build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"

‎vendor/javascript/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)