Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
IanMitchell committed Jan 15, 2024
1 parent e6e8baa commit 76ea384
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7,960 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ gem 'rails', '~> 7.1.2'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma', '~> 6.4'

gem 'sass-rails', '>= 6'
gem 'webpacker', '~> 5.4'
gem 'turbolinks', '~> 5'

Expand Down Expand Up @@ -61,3 +60,5 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "importmap-rails", "~> 2.0"
26 changes: 6 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ GEM
activesupport (>= 6.1)
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)
io-console (0.7.1)
irb (1.11.1)
rdoc
Expand Down Expand Up @@ -244,16 +248,6 @@ GEM
rexml (3.2.6)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.16.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand All @@ -275,16 +269,8 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.1.0)
thor (1.3.0)
tilt (2.3.0)
timeout (0.4.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand Down Expand Up @@ -330,6 +316,7 @@ DEPENDENCIES
devise
discord-notifier
friendly_id
importmap-rails (~> 2.0)
jbuilder (~> 2.11)
listen (~> 3.2)
local_time
Expand All @@ -338,7 +325,6 @@ DEPENDENCIES
rails (~> 7.1.2)
redis
rexml
sass-rails (>= 6)
selenium-webdriver
sentry-rails
sentry-ruby
Expand All @@ -356,4 +342,4 @@ RUBY VERSION
ruby 3.3.0p0

BUNDLED WITH
2.2.3
2.5.4
17 changes: 0 additions & 17 deletions bin/yarn

This file was deleted.

4 changes: 2 additions & 2 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
# config.assets.debug = true

# Suppress logger output for asset requests.
config.assets.quiet = true
# config.assets.quiet = true

# Raises error for missing translations.
# config.i18n.raise_on_missing_translations = true
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# config.assets.css_compressor = :sass

# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
# config.assets.compile = false

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.asset_host = 'http://assets.example.com'
Expand Down
3 changes: 1 addition & 2 deletions config/webpacker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ development:
compile: true

# Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
check_yarn_integrity: true
check_yarn_integrity: false

# Reference: https://webpack.js.org/configuration/dev-server/
dev_server:
Expand All @@ -75,7 +75,6 @@ development:
watch_options:
ignored: '**/node_modules/**'


test:
<<: *default
compile: true
Expand Down
Loading

0 comments on commit 76ea384

Please sign in to comment.