propshaft 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7a6dfbec5ee900ab10a5529d4551966a651faa5ce230583835905d081a16a8
-  data.tar.gz: f02416e16d969bfa93ac9a35896f2b0bbfdc613a01e4d3636822ff0d94ebdbc5
+  metadata.gz: 9e427b65e4a2157ef4b03527c3bc11f5e07fa217ee88e0c318c516b34ed22dd7
+  data.tar.gz: 74e7681de5dc22ca15a3e66202e565a8acc64fc7b3c23aea70bf11767d485db0
 SHA512:
-  metadata.gz: 3fd44fff6ed74eeba5dc3817d7fbfa32176f04b10aa5e96d260253429a70960c685fdff036bebfdcd628ba29227437b5ea6dd6ae0f25b92ef37254844ab9527b
-  data.tar.gz: 4f97be12d0adc4255ec615201b2d92c55aed0e6c6d846da2cb9cca9fd993a921ad3c2a7a1f37430bd1cb724957541737c2f177d94b236f122a7458b994f57ad6
+  metadata.gz: d024bc9b15272afde40e4f9b103bf7fb784bc18ec7eb14bd2c8c9e9556496b6d8ce5abc60e92322e706957813358ddb3b6cdaeb9ee29df8f8ee532e7e6a95676
+  data.tar.gz: b729b2abbb7e949e932732e30e6fd74dd11e9aaf7c20f1f9c067caa4f127e54bda0e3ea8f3218aa61d819f724323bdc17742286acaa46734996b6b56ade5f329

data/lib/propshaft/compilers/source_mapping_urls.rb

@@ -3,14 +3,14 @@
 class Propshaft::Compilers::SourceMappingUrls
   attr_reader :assembly
 
-  SOURCE_MAPPING_PATTERN = /\/\/# sourceMappingURL=(.*\.map)/
+  SOURCE_MAPPING_PATTERN = /(\/\/|\/*)# sourceMappingURL=(.*\.map)/
 
   def initialize(assembly)
     @assembly = assembly
   end
 
   def compile(logical_path, input)
-    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(asset_path($1, logical_path)) }
+    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(asset_path($2, logical_path), $1) }
   end
 
   private
@@ -22,9 +22,9 @@ class Propshaft::Compilers::SourceMappingUrls
       end
     end
 
-    def source_mapping_url(resolved_path)
+    def source_mapping_url(resolved_path, comment)
       if asset = assembly.load_path.find(resolved_path)
-        "//# sourceMappingURL=#{assembly.config.prefix}/#{asset.digested_path}"
+        "#{comment}# sourceMappingURL=#{assembly.config.prefix}/#{asset.digested_path}"
       else
         Propshaft.logger.warn "Removed sourceMappingURL comment for missing asset '#{resolved_path}' from #{resolved_path}"
         nil

data/lib/propshaft/processor.rb

@@ -1,6 +1,5 @@
 class Propshaft::Processor
   MANIFEST_FILENAME = ".manifest.json"
-  COMPRESSABLE_CONTENT_TYPES = %i[ js css text json xml html svg otf ttf ].collect { |t| Mime[t] }
 
   attr_reader :load_path, :output_path, :compilers
 
@@ -13,7 +12,6 @@ class Propshaft::Processor
     ensure_output_path_exists
     write_manifest
     output_assets
-    compress_assets
   end
 
   def clobber
@@ -61,19 +59,4 @@ class Propshaft::Processor
     def copy_asset(asset)
       FileUtils.copy asset.path, output_path.join(asset.digested_path)
     end
-
-
-    def compress_assets
-      load_path.assets(content_types: COMPRESSABLE_CONTENT_TYPES).each do |asset|
-        compress_asset output_path.join(asset.digested_path)
-      end if compressor_available?
-    end
-
-    def compress_asset(path)
-      `brotli #{path} -o #{path}.br` unless Pathname.new(path.to_s + ".br").exist?
-    end
-
-    def compressor_available?
-      `which brotli`.present?
-    end
 end

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Heinemeier Hansson