@@ -98,12 +98,6 @@ OS X Homebrew users can use 'brew install node'.
98
98
original_cache = requirejs . env . cache
99
99
requirejs . env . cache = nil
100
100
101
- if ::Sprockets ::VERSION . split ( "." , -1 ) [ 0 ] . to_i >= 3
102
- js_ext = requirejs . env . mime_types [ "application/javascript" ] [ :extensions ] . first
103
- else
104
- js_ext = requirejs . env . extension_for_mime_type ( "application/javascript" )
105
- end
106
-
107
101
requirejs . env . each_logical_path ( requirejs . config . logical_path_patterns ) do |logical_path |
108
102
m = ::Requirejs ::Rails ::Config ::BOWER_PATH_PATTERN . match ( logical_path )
109
103
@@ -116,7 +110,7 @@ OS X Homebrew users can use 'brew install node'.
116
110
asset . write_to ( file )
117
111
end
118
112
else
119
- bower_logical_path = Pathname . new ( logical_path ) . dirname . sub_ext ( js_ext ) . to_s
113
+ bower_logical_path = Pathname . new ( logical_path ) . dirname . sub_ext ( ".js" ) . to_s
120
114
asset = requirejs . env . find_asset ( bower_logical_path )
121
115
122
116
if asset
@@ -151,8 +145,17 @@ OS X Homebrew users can use 'brew install node'.
151
145
# Copy each built asset, identified by a named module in the
152
146
# build config, to its Sprockets digestified name.
153
147
task digestify_and_compress : [ "requirejs:setup" ] do
154
- requirejs . config . build_config [ 'modules' ] . each do |m |
155
- asset_name = "#{ requirejs . config . module_name_for ( m ) } .js"
148
+ requirejs . config . build_config [ "modules" ] . each do |m |
149
+ module_name = requirejs . config . module_name_for ( m )
150
+ paths = requirejs . config . build_config [ "paths" ] || { }
151
+
152
+ # Is there a `paths` entry for the module?
153
+ if !paths [ module_name ]
154
+ asset_name = Pathname . new ( module_name ) . sub_ext ( ".js" )
155
+ else
156
+ asset_name = Pathname . new ( paths [ module_name ] ) . sub_ext ( ".js" )
157
+ end
158
+
156
159
asset = requirejs . env . find_asset ( asset_name )
157
160
158
161
built_asset_path = requirejs . config . build_dir . join ( asset_name )
0 commit comments