Skip to content

Commit

Permalink
Merge pull request #189 from blackcandy-org/propshaft
Browse files Browse the repository at this point in the history
Migrate from Sprockets to Propshaft
  • Loading branch information
aidewoode committed Aug 15, 2022
2 parents ea0fd5e + ea0e8eb commit c97a32d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -4,8 +4,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 7.0.0"

# The original asset pipeline for Rails
gem "sprockets-rails", "~> 3.4.2"
# Deliver assets for Rails
gem "propshaft", "~> 0.6.4"

# Install Turbo on Rails
gem "turbo-rails", "~> 1.0.0"
Expand Down
14 changes: 6 additions & 8 deletions Gemfile.lock
Expand Up @@ -198,6 +198,11 @@ GEM
pg_search (2.3.5)
activerecord (>= 5.2)
activesupport (>= 5.2)
propshaft (0.6.4)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
railties (>= 7.0.0)
public_suffix (4.0.6)
puma (5.6.4)
nio4r (~> 2.0)
Expand Down Expand Up @@ -273,13 +278,6 @@ GEM
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.3)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
standard (1.7.2)
rubocop (= 1.25.1)
Expand Down Expand Up @@ -337,14 +335,14 @@ DEPENDENCIES
pagy (~> 5.6.6)
pg (~> 1.3.2)
pg_search (~> 2.3.2)
propshaft (~> 0.6.4)
puma (~> 5.6.4)
rails (~> 7.0.0)
redis (~> 4.0)
redis-objects (~> 1.5.1)
sidekiq (~> 6.4.0)
simplecov (~> 0.21.2)
simplecov-lcov (~> 0.8.0)
sprockets-rails (~> 3.4.2)
standard (~> 1.7)
stimulus-rails (~> 1.0.2)
turbo-rails (~> 1.0.0)
Expand Down
4 changes: 2 additions & 2 deletions Procfile.dev
@@ -1,5 +1,5 @@
web: rails s -p 3000
sidekiq: sidekiq
js: yarn build --watch
css: yarn build:css --watch
js: yarn build-dev --watch
css: yarn build-dev:css --watch
listen: rails listen_media_changes
1 change: 0 additions & 1 deletion config/application.rb
Expand Up @@ -13,7 +13,6 @@
require "action_view/railtie"
require "action_cable/engine"
require "rails/test_unit/railtie"
require "sprockets/railtie"

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Expand Down
6 changes: 4 additions & 2 deletions package.json
Expand Up @@ -15,8 +15,10 @@
"stylelint-config-standard-scss": "^5.0.0"
},
"scripts": {
"build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds",
"build:css": "sass app/assets/stylesheets/application.scss:app/assets/builds/application.css --no-source-map"
"build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --minify",
"build-dev": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds",
"build:css": "sass app/assets/stylesheets/application.scss:app/assets/builds/application.css --no-source-map --style=compressed",
"build-dev:css": "sass app/assets/stylesheets/application.scss:app/assets/builds/application.css --no-source-map"
},
"standard": {
"globals": [
Expand Down

0 comments on commit c97a32d

Please sign in to comment.