Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-26 07:46:17 +01:00
Code Issues Packages Projects Releases Activity

Upgrades propshaft to 1.1.0 (#39111).

Browse Source 
Patch by Takashi Kato (user:tohosaku).


git-svn-id: https://svn.redmine.org/redmine/trunk@23174 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2024-10-31 08:17:01 +00:00
parent 88519264cf
commit 826980bc40
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -14,7 +14,7 @@ gem 'i18n', '~> 1.14.1'
gem 'rbpdf', '~> 1.21.3'
gem 'addressable'
gem 'rubyzip', '~> 2.3.0'
gem 'propshaft', '~> 0.8.0'
gem 'propshaft', '~> 1.1.0'
gem 'rack', '>= 3.1.3'
# Ruby Standard Gems

2
config/initializers/10-patches.rb
View File

@@ -132,7 +132,7 @@ module Propshaft
end
def load_path
@load_path ||= Redmine::AssetLoadPath.new(config)
@load_path ||= Redmine::AssetLoadPath.new(config, compilers)
end
end)

18
lib/redmine/asset_path.rb
View File

@@ -29,14 +29,14 @@ module Redmine
@version = Rails.application.config.assets.version
end
def update(transition_map:, assets:)
def update(transition_map:, assets:, load_path:)
each_file do |file, intermediate_path, logical_path|
@transition.add_src intermediate_path, logical_path
@transition.add_dest intermediate_path, logical_path
asset = if file.extname == '.css'
Redmine::Asset.new(file, logical_path: logical_path, version: version, transition_map: transition_map)
Redmine::Asset.new(file, logical_path: logical_path, load_path: load_path, transition_map: transition_map)
else
Propshaft::Asset.new(file, logical_path: logical_path, version: version)
Propshaft::Asset.new(file, logical_path: logical_path, load_path: load_path)
end
assets[asset.logical_path.to_s] ||= asset
end
@@ -132,10 +132,10 @@ module Redmine
class AssetLoadPath < Propshaft::LoadPath
attr_reader :extension_paths, :default_asset_path, :transition_map
def initialize(config)
def initialize(config, compilers)
@extension_paths = config.redmine_extension_paths
@default_asset_path = config.redmine_default_asset_path
super(config.paths, version: config.version)
super(config.paths, compilers: compilers, version: config.version)
end
def asset_files
@@ -156,13 +156,13 @@ module Redmine
super
if merge_required
@transition_map = {}
default_asset_path.update(assets: @cached_assets_by_path, transition_map: transition_map)
default_asset_path.update(assets: @cached_assets_by_path, transition_map: transition_map, load_path: self)
extension_paths.each do |asset_path|
# Support link from extension assets to assets in the application
default_asset_path.each_file do |file, intermediate_path, logical_path|
asset_path.instance_eval { @transition.add_dest intermediate_path, logical_path }
end
asset_path.update(assets: @cached_assets_by_path, transition_map: transition_map)
asset_path.update(assets: @cached_assets_by_path, transition_map: transition_map, load_path: self)
end
end
@cached_assets_by_path
@@ -189,9 +189,9 @@ module Redmine
end
class Asset < Propshaft::Asset
def initialize(file, logical_path:, version:, transition_map:)
def initialize(file, logical_path:, load_path:, transition_map:)
@transition_map = transition_map
super(file, logical_path: logical_path, version: version)
super(file, logical_path: logical_path, load_path: load_path)
end
def content

2
test/unit/lib/redmine/asset_path_test.rb
View File

@@ -26,7 +26,7 @@ class Redmine::AssetPathTest < ActiveSupport::TestCase
@asset_path = Redmine::AssetPath.new(assets_dir, paths, 'plugin_assets/foo/')
@assets = {}
@transition_map = {}
@asset_path.update(transition_map: @transition_map, assets: @assets)
@asset_path.update(transition_map: @transition_map, assets: @assets, load_path: nil)
end
test "asset path size" do