Skip to content

Commit 58f0b05

Browse files
committed
webpack working but no asset pipeline sprockets-rails
1 parent 29f7962 commit 58f0b05

28 files changed

+390
-382
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ storage
4545

4646
/config/master.key
4747
config/credentials.yml.enc
48+
49+
/app/assets/builds/*
50+
!/app/assets/builds/.keep

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ gem 'sendgrid-ruby' # Sending emails
2929
gem 'sitemap_generator' # generate sitemaps for submitting to search engines
3030
gem 'slim' # view templating
3131
gem 'uglifier'
32-
gem 'shakapacker', '~> 8'
3332
gem 'webrick' # web server for capybara and local dev
33+
gem 'jsbundling-rails'
3434

3535
group :development do
3636
gem 'better_errors' # improved error pages

Gemfile.lock

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ GEM
242242
character_set (~> 1.4)
243243
regexp_parser (>= 2.6.2, < 3.0.0)
244244
regexp_property_values (~> 1.0)
245+
jsbundling-rails (1.3.0)
246+
railties (>= 6.0.0)
245247
json (2.7.1)
246248
kaminari (1.2.2)
247249
activesupport (>= 4.1.0)
@@ -307,7 +309,6 @@ GEM
307309
nenv (~> 0.1)
308310
shellany (~> 0.0)
309311
orm_adapter (0.5.0)
310-
package_json (0.1.0)
311312
parallel (1.24.0)
312313
parser (3.3.0.5)
313314
ast (~> 2.4.1)
@@ -329,8 +330,6 @@ GEM
329330
pygments.rb (2.4.1)
330331
racc (1.8.0)
331332
rack (3.0.11)
332-
rack-proxy (0.7.7)
333-
rack
334333
rack-session (2.0.0)
335334
rack (>= 3.0.0)
336335
rack-test (2.1.0)
@@ -459,15 +458,8 @@ GEM
459458
rexml (~> 3.2, >= 3.2.5)
460459
rubyzip (>= 1.2.2, < 3.0)
461460
websocket (~> 1.0)
462-
semantic_range (3.0.0)
463461
sendgrid-ruby (6.7.0)
464462
ruby_http_client (~> 3.4)
465-
shakapacker (8.0.0)
466-
activesupport (>= 5.2)
467-
package_json
468-
rack-proxy (>= 0.6.1)
469-
railties (>= 5.2)
470-
semantic_range (>= 2.3.0)
471463
shellany (0.0.1)
472464
sitemap_generator (6.3.0)
473465
builder (~> 3.0)
@@ -539,6 +531,7 @@ DEPENDENCIES
539531
humanize
540532
image_processing
541533
jbuilder
534+
jsbundling-rails
542535
kaminari
543536
launchy
544537
mail_form
@@ -563,7 +556,6 @@ DEPENDENCIES
563556
rubocop-rails
564557
rubocop-rspec
565558
sendgrid-ruby
566-
shakapacker (~> 8)
567559
sitemap_generator
568560
slim
569561
spring

Procfile.dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
web: env RUBY_DEBUG_OPEN=true bin/rails server
2+
js: yarn build --watch

app/assets/builds/application.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/builds/application.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/assets/builds/application.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/config/manifest.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//= link_tree ../builds

app/javascript/application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Entry point for the build script in your package.json

app/javascript/packs/application.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
// Uncomment to copy all static images under ../images to the output folder and reference
12-
// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
12+
// them with the image_tag helper in views (e.g <%= image_tag 'rails.png' %>)
1313
// or the `imagePath` JavaScript helper below.
1414
//
1515
const images = require.context('../images', true);
@@ -21,8 +21,8 @@ const videoPath = (name) => videos(name, true);
2121

2222
import 'core-js/stable';
2323
import 'regenerator-runtime/runtime';
24-
import "application.css";
25-
import "_pygment_monokai.sass";
24+
import "./application.css";
25+
import "./_pygment_monokai.sass";
2626
import * as Turbo from "@hotwired/turbo";
2727

2828
// temporarily disable turbo until we can resolve page scrolling bug on iPadOS

0 commit comments

Comments
 (0)