Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Use config.assests.js_compressor setting for save original js compressor #206

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/requirejs/rails/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Config < ::ActiveSupport::OrderedOptions
def initialize(application)
super
self.manifest = nil
self.js_compressor = nil

self.logical_asset_filter = [/\.js$/, /\.html$/, /\.txt$/]
self.tmp_dir = application.root + 'tmp'
Expand Down
2 changes: 2 additions & 0 deletions lib/requirejs/rails/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class Engine < ::Rails::Engine

config.assets.precompile += config.requirejs.precompile

config.requirejs.js_compressor ||= config.assets.js_compressor

# Check for the `requirejs:precompile:all` top-level Rake task and run the following initialization code.
if defined?(Rake.application) && Rake.application.top_level_tasks == ["requirejs:precompile:all"]
# Prevent Sprockets from freezing the assets environment, which allows JS compression to be toggled on a per-
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/requirejs-rails_tasks.rake
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ OS X Homebrew users can use 'brew install node'.

# Save the original JS compressor and cache, which will be restored later.

original_js_compressor = requirejs.env.js_compressor
original_js_compressor = requirejs.config.js_compressor
requirejs.env.js_compressor = false

original_cache = requirejs.env.cache
Expand Down