middleman-core 4.4.0 → 5.0.0.rc.1

data/lib/middleman-core/preview_server.rb

@@ -8,7 +8,6 @@ require 'middleman-core/preview_server/server_information'
 require 'middleman-core/preview_server/server_url'
 require 'middleman-core/preview_server/server_information_callback_proxy'
 
-# rubocop:disable GlobalVars
 module Middleman
   class PreviewServer
     class << self
@@ -18,13 +17,13 @@ module Middleman
 
       # Start an instance of Middleman::Application
       # @return [void]
-      def start(opts={}, cli_options={})
+      def start(options_hash = ::Middleman::EMPTY_HASH, cli_options_hash = ::Middleman::EMPTY_HASH)
         # Do not buffer output, otherwise testing of output does not work
         $stdout.sync = true
         $stderr.sync = true
 
-        @options = opts
-        @cli_options = cli_options
+        @options = options_hash
+        @cli_options = cli_options_hash
         @server_information = ServerInformation.new
         @server_information.https = (@options[:https] == true)
 
@@ -35,7 +34,7 @@ module Middleman
 
         # And now comes the check
         unless server_information.valid?
-          $stderr.puts %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
+          warn %(== Running Middleman failed: #{server_information.reason}. Please fix that and try again.)
           exit 1
         end
 
@@ -43,12 +42,13 @@ module Middleman
 
         app.logger.debug %(== Server information is provided by #{server_information.handler})
         app.logger.debug %(== The Middleman is running in "#{environment}" environment)
-        app.logger.debug format('== The Middleman preview server is bound to %s', ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: server_information.https?).to_bind_addresses.join(', '))
-        app.logger.info format('== View your site at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_urls.join(', '))
-        app.logger.info format('== Inspect your site configuration at %s', ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_config_urls.join(', '))
+        app.logger.debug format('== The Middleman preview server is bound to %<url>s', url: ServerUrl.new(hosts: server_information.listeners, port: server_information.port, https: server_information.https?).to_bind_addresses.join(', '))
+        app.logger.info format('== View your site at %<url>s', url: ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_urls.join(', '))
+        app.logger.info format('== Inspect your site configuration at %<url>s', url: ServerUrl.new(hosts: server_information.site_addresses, port: server_information.port, https: server_information.https?).to_config_urls.join(', '))
 
         @initialized ||= false
         return if @initialized
+
         @initialized = true
 
         register_signal_handlers
@@ -61,7 +61,9 @@ module Middleman
 
         if @options[:daemon]
           # To output the child PID, let's make preview server a daemon by hand
-          if child_pid = fork
+          child_pid = fork
+
+          if child_pid
             app.logger.info "== Middleman preview server is running in background with PID #{child_pid}"
             Process.detach child_pid
             exit 0
@@ -91,7 +93,7 @@ module Middleman
       def stop
         begin
           app.logger.info '== The Middleman is shutting down'
-        rescue
+        rescue StandardError
           # if the user closed their terminal STDOUT/STDERR won't exist
         end
 
@@ -107,8 +109,8 @@ module Middleman
 
         begin
           app = initialize_new_app
-        rescue => e
-          $stderr.puts "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
+        rescue StandardError => e
+          warn "Error reloading Middleman: #{e}\n#{e.backtrace.join("\n")}"
           app.logger.info '== The Middleman is still running the application from before the error'
           return
         end
@@ -149,7 +151,7 @@ module Middleman
           ready do
             unless config[:watcher_disable]
               match_against = [
-                %r{^config\.rb$},
+                /^config\.rb$/,
                 %r{^environments/[^\.](.*)\.rb$},
                 %r{^lib/[^\.](.*)\.rb$},
                 %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
@@ -185,7 +187,13 @@ module Middleman
                                server_name: possible_from_cli(:server_name, app.config),
                                https: possible_from_cli(:https, app.config))
 
-        app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless server_information.port == configured_port
+        unless server_information.port == configured_port
+          app.logger.warn format(
+            '== The Middleman uses a different port "%<new_port>s" then the configured one "%<old_port>s" because some other server is listening on that port.',
+            new_port: server_information.port,
+            old_port: configured_port
+          )
+        end
 
         @environment = possible_from_cli(:environment, app.config)
 
@@ -199,25 +207,21 @@ module Middleman
 
         # Add in the meta pages application
         meta_app = Middleman::MetaPages::Application.new(app)
-        app.map '/__middleman' do
-          run meta_app
+        app.map '/__middleman' do |rack|
+          rack.run meta_app
         end
 
         app
       end
 
       def possible_from_cli(key, config)
-        if @cli_options[key]
-          @cli_options[key]
-        else
-          config[key]
-        end
+        @cli_options[key] || config[key]
       end
 
-      # Trap some interupt signals and shut down smoothly
+      # Trap some interrupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers
-        %w(INT HUP TERM QUIT).each do |sig|
+        %w[INT HUP TERM QUIT].each do |sig|
           next unless Signal.list[sig]
 
           Signal.trap(sig) do
@@ -245,13 +249,14 @@ module Middleman
 
           if ssl_certificate || ssl_private_key
             raise 'You must provide both :ssl_certificate and :ssl_private_key' unless ssl_private_key && ssl_certificate
+
             http_opts[:SSLCertificate] = OpenSSL::X509::Certificate.new ::File.read ssl_certificate
             http_opts[:SSLPrivateKey] = OpenSSL::PKey::RSA.new ::File.read ssl_private_key
           else
             # use a generated self-signed cert
             http_opts[:SSLCertName] = [
-              %w(CN localhost),
-              %w(CN #{host})
+              %w[CN localhost],
+              ['CN', host]
             ].uniq
             cert, key = create_self_signed_cert(1024, [['CN', server_information.server_name]], server_information.site_addresses, 'Middleman Preview Server')
             http_opts[:SSLCertificate] = cert
@@ -260,15 +265,16 @@ module Middleman
         end
 
         http_opts[:Logger] = if is_logging
-          FilteredWebrickLog.new
-        else
-          ::WEBrick::Log.new(nil, 0)
-        end
+                               FilteredWebrickLog.new
+                             else
+                               ::WEBrick::Log.new(nil, 0)
+                             end
 
         begin
           ::WEBrick::HTTPServer.new(http_opts)
         rescue Errno::EADDRINUSE
-          $stderr.puts %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.)
+          port = http_opts[:Port]
+          warn %(== Port #{port} is already in use. This could mean another instance of middleman is already running. Please make sure port #{port} is free and start `middleman server` again, or choose another port by running `middleman server —-port=#{port + 1}` instead.)
         end
       end
 
@@ -331,7 +337,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
+        super(level, data) unless data =~ /Could not determine content-length of response body./
       end
     end
   end

data/lib/middleman-core/rack.rb

@@ -3,7 +3,6 @@ require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
 require 'rack/utils'
-require 'webrick'
 
 require 'middleman-core/util'
 require 'middleman-core/logger'
@@ -87,24 +86,19 @@ module Middleman
     def process_request(env, req, res)
       start_time = Time.now
 
-      request_path = WEBrick::HTTPUtils.unescape(env['PATH_INFO'].dup)
-      if request_path.respond_to? :force_encoding
-        request_path.force_encoding('UTF-8')
-      end
+      request_path = URI.decode(env['PATH_INFO'].dup)
+      request_path.force_encoding('UTF-8') if request_path.respond_to? :force_encoding
       request_path = ::Middleman::Util.full_path(request_path, @middleman)
       full_request_path = File.join(env['SCRIPT_NAME'], request_path) # Path including rack mount
 
-      # Run before callbacks
-      @middleman.execute_callbacks(:before)
-
       # Get the resource object for this path
-      resource = @middleman.sitemap.find_resource_by_destination_path(request_path.gsub(' ', '%20'))
+      resource = @middleman.sitemap.by_destination_path(request_path.gsub(' ', '%20'))
 
       # Return 404 if not in sitemap
       return not_found(res, full_request_path) unless resource && !resource.ignored?
 
       # If this path is a binary file, send it immediately
-      return send_file(resource, env) if resource.binary?
+      return send_file(resource, env) if resource.binary? || resource.static_file?
 
       res['Content-Type'] = resource.content_type || 'text/plain'
 
@@ -144,12 +138,13 @@ module Middleman
         response = file.serving(env)
       end
       status = response[0]
-      response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
+      response[1]['Content-Encoding'] = 'gzip' if %w[.svgz .gz].include?(resource.ext)
       # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
       # Rack will throw an error (500)
       if !(100..199).cover?(status) && ![204, 205, 304].include?(status)
-        response[1]['Content-Type'] = resource.content_type || 'application/octet-stream'
+        response[1]['Content-Type'] = resource.content_type || (resource.binary? ? 'application/octet-stream' : 'text/plain')
       end
+
       halt response
     end
   end

data/lib/middleman-core/renderers/coffee_script.rb

@@ -6,7 +6,7 @@ module Middleman
     # CoffeeScript Renderer
     class CoffeeScript < ::Middleman::Extension
       # Setup extension
-      def initialize(app, options={}, &block)
+      def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
         super
 
         # Tell Tilt to use it as well (for inline scss blocks)
@@ -32,7 +32,7 @@ module Middleman
             super
           rescue ::ExecJS::RuntimeError => e
             e.to_s
-          rescue => e
+          rescue StandardError => e
             e.to_s
           end
         end

data/lib/middleman-core/renderers/erb.rb

@@ -13,7 +13,7 @@ module Middleman
         def precompiled_preamble(locals)
           original = super
           "__in_erb_template = true\n" << original
-          # .rpartition("\n").first << "#{@outvar} = _buf = ActiveSupport::SafeBuffer.new\n"
+          # .rpartition("\n").first << "#{@outvar} = _buf = ::ActiveSupport::SafeBuffer.new\n"
         end
       end
     end

data/lib/middleman-core/renderers/haml.rb

@@ -43,16 +43,12 @@ module Middleman
 
     # Haml Renderer
     class Haml < ::Middleman::Extension
-      def initialize(app, options={}, &block)
+      def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
         super
 
         ::Haml::Options.defaults[:context] = nil
         ::Haml::Options.send :attr_accessor, :context
-        if defined?(::Haml::TempleEngine)
-          ::Haml::TempleEngine.define_options context: nil
-        end
-
-        # rubocop:disable NestedMethodDefinition
+        ::Haml::TempleEngine.define_options context: nil if defined?(::Haml::TempleEngine)
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
             def self.render_with_options(text, compiler_options)
@@ -64,7 +60,6 @@ module Middleman
             end
           end
         end
-        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 

data/lib/middleman-core/renderers/kramdown.rb

@@ -45,10 +45,6 @@ module Middleman
         attr = el.attr.dup
         link = attr.delete('href')
 
-        # options to link_to are expected to be symbols, but in Markdown
-        # everything is a string.
-        attr.transform_keys!(&:to_sym)
-
         scope.link_to(content, link, attr)
       end
     end

data/lib/middleman-core/renderers/less.rb

@@ -6,7 +6,7 @@ module Middleman
     class Less < ::Middleman::Extension
       define_setting :less, {}, 'LESS compiler options'
 
-      def initialize(app, options={}, &block)
+      def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
         super
 
         # Tell Tilt to use it as well (for inline sass blocks)

data/lib/middleman-core/renderers/liquid.rb

@@ -11,25 +11,22 @@ module Middleman
       end
 
       # Called by Liquid to retrieve a template file
-      def read_template_file(template_path, _)
-        file = app.files.find(:source, "_#{template_path}.liquid")
+      def read_template_file(template_path)
+        file = app.files.find(:source, "#{File.dirname(template_path)}/_#{File.basename(template_path)}.liquid")
         raise ::Liquid::FileSystemError, "No such template '#{template_path}'" unless file
+
         file.read
       end
 
-      # @return Array<Middleman::Sitemap::Resource>
-      Contract ResourceList => ResourceList
-      def manipulate_resource_list(resources)
-        return resources unless app.extensions[:data]
-
-        resources.each do |resource|
-          next if resource.file_descriptor.nil?
-          next unless resource.file_descriptor[:full_path].to_s =~ %r{\.liquid$}
+      Contract IsA['Middleman::Sitemap::ResourceListContainer'] => Any
+      def manipulate_resource_list_container!(resource_list)
+        return unless app.extensions[:data]
 
+        resource_list.by_source_extension('.liquid').each do |resource|
           # Convert data object into a hash for liquid
-          resource.add_metadata locals: {
+          resource.add_metadata_locals(
             data: stringify_recursive(app.extensions[:data].data_store.to_h)
-          }
+          )
         end
       end
 

data/lib/middleman-core/renderers/markdown.rb

@@ -7,7 +7,7 @@ module Middleman
 
       # Once configuration is parsed
       def after_configuration
-        markdown_exts = %w(markdown mdown md mkd mkdn)
+        markdown_exts = %w[markdown mdown md mkd mkdn]
 
         begin
           # Look for the user's preferred engine
@@ -20,12 +20,12 @@ module Middleman
           elsif app.config[:markdown_engine]
             # Map symbols to classes
             markdown_engine_klass = if app.config[:markdown_engine].is_a? Symbol
-              engine = app.config[:markdown_engine].to_s
-              engine = engine == 'rdiscount' ? 'RDiscount' : engine.camelize
-              app.config[:markdown_engine_prefix].const_get("#{engine}Template")
-            else
-              app.config[:markdown_engine_prefix]
-            end
+                                      engine = app.config[:markdown_engine].to_s
+                                      engine = engine == 'rdiscount' ? 'RDiscount' : engine.camelize
+                                      app.config[:markdown_engine_prefix].const_get("#{engine}Template")
+                                    else
+                                      app.config[:markdown_engine_prefix]
+                                    end
 
             # Tell tilt to use that engine
             ::Tilt.prefer(markdown_engine_klass, *markdown_exts)
@@ -33,9 +33,7 @@ module Middleman
         rescue LoadError
           # If they just left it at the default engine and don't happen to have it,
           # then they're using middleman-core bare and we shouldn't bother them.
-          if app.config.setting(:markdown_engine).value_set?
-            logger.warn "Requested Markdown engine (#{app.config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
-          end
+          logger.warn "Requested Markdown engine (#{app.config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?" if app.config.setting(:markdown_engine).value_set?
         end
       end
     end

data/lib/middleman-core/renderers/redcarpet.rb

@@ -1,5 +1,4 @@
 require 'redcarpet'
-require 'active_support/core_ext/module/attribute_accessors'
 
 module Middleman
   module Renderers
@@ -35,7 +34,7 @@ module Middleman
         end
 
         # Renderer Options
-        possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml, :prettify, :link_attributes]
+        possible_render_opts = %i[filter_html no_images no_links no_styles safe_links_only with_toc_data hard_wrap xhtml prettify link_attributes]
 
         render_options = possible_render_opts.each_with_object({}) do |opt, sum|
           sum[opt] = options.delete(opt) if options.key?(opt)
@@ -65,8 +64,8 @@ module Middleman
     class MiddlemanRedcarpetHTML < ::Redcarpet::Render::HTML
       cattr_accessor :scope
 
-      def initialize(options={})
-        @local_options = options.dup
+      def initialize(options_hash = ::Middleman::EMPTY_HASH)
+        @local_options = options_hash.dup
 
         super
       end

data/lib/middleman-core/renderers/sass.rb

@@ -1,20 +1,26 @@
+require 'hamster'
 require 'sassc'
+require 'middleman-core/dependencies'
+require 'middleman-core/dependencies/vertices/file_vertex'
 
 module Middleman
   module Renderers
     # Sass renderer
     class Sass < ::Middleman::Extension
+      DEFAULT_SASS_CACHE_LOCATION = './.sass-cache'.freeze
+
       opts = { output_style: :nested }
       opts[:line_comments] = false if ENV['TEST']
       define_setting :sass, opts, 'Sass engine options'
       define_setting :sass_assets_paths, [], 'Paths to extra SASS/SCSS files'
       define_setting :sass_source_maps, nil, 'Whether to inline sourcemap into Sass'
+      define_setting :sass_cache_location, ENV['SASS_CACHE_LOCATION'] || DEFAULT_SASS_CACHE_LOCATION, 'Where to store sass cache files'
 
       # Setup extension
-      def initialize(app, options={}, &block)
+      def initialize(app, options_hash = ::Middleman::EMPTY_HASH, &block)
         super
 
-        app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//
+        app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\// if app.config[:sass_cache_location] == DEFAULT_SASS_CACHE_LOCATION
 
         # Tell Tilt to use it as well (for inline sass blocks)
         ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
@@ -76,6 +82,14 @@ module Middleman
           END
         end
 
+        def vertices
+          @engine.dependencies.reduce(::Hamster::Set.empty) do |sum, d|
+            sum << ::Middleman::Dependencies::FileVertex.new(@context.app.root_path, d.filename.to_sym)
+          end
+        rescue ::SassC::NotRenderedError
+          ::Hamster::Set.empty
+        end
+
         # Change Sass path, for url functions, to the build folder if we're building
         # @return [Hash]
         def sass_options
@@ -83,8 +97,8 @@ module Middleman
 
           preexisting_load_paths = begin
             ::Sass.load_paths
-          rescue
-            []
+                                   rescue StandardError
+                                     []
           end
 
           more_opts = {
@@ -92,6 +106,7 @@ module Middleman
             filename: eval_file,
             line: line,
             syntax: syntax,
+            cache_location: ctx.app.config[:sass_cache_location],
             custom: {}.merge!(options[:custom] || {}).merge!(
               middleman_context: ctx.app,
               current_resource: ctx.current_resource
@@ -104,9 +119,7 @@ module Middleman
             more_opts[:source_map_contents] = true
           end
 
-          if ctx.is_a?(::Middleman::TemplateContext) && file
-            more_opts[:css_filename] = file.sub(/\.s[ac]ss$/, '')
-          end
+          more_opts[:css_filename] = file.sub(/\.s[ac]ss$/, '') if ctx.is_a?(::Middleman::TemplateContext) && file
 
           {}.merge!(options).merge!(more_opts)
         end

data/lib/middleman-core/renderers/sass_functions.rb

@@ -14,8 +14,8 @@ module Middleman
       #   background: url(image-path("image.jpg"));                // background: url("/assets/image.jpg");
       #   background: url(image-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
-      def image_path(source, options={})
-        p = ::Middleman::Util.asset_path(middleman_context, :images, source.value, map_options(options))
+      def image_path(source, options_hash = ::Middleman::EMPTY_HASH)
+        p = ::Middleman::Util.asset_path(middleman_context, :images, source.value, map_options(options_hash))
         ::SassC::Script::Value::String.new p.to_s, :string
       end
 
@@ -28,7 +28,9 @@ module Middleman
       #   background: image-url("image.jpg");                // background: url("/assets/image.jpg");
       #   background: image-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
       #
-      def image_url(source, options={}, _cache_buster=nil)
+      def image_url(source, options_hash = ::Middleman::EMPTY_HASH, _cache_buster = nil)
+        options = options_hash.dup
+
         # Work with the Compass #image_url API
         if options.respond_to? :value
           case options.value
@@ -51,8 +53,8 @@ module Middleman
       #   src: url(font-path("font.ttf"));                // src: url("/assets/font.ttf");
       #   src: url(font-path("font.ttf", $digest: true)); // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
       #
-      def font_path(source, options={})
-        p = ::Middleman::Util.asset_path(middleman_context, :fonts, source.value, map_options(options))
+      def font_path(source, options_hash = ::Middleman::EMPTY_HASH)
+        p = ::Middleman::Util.asset_path(middleman_context, :fonts, source.value, map_options(options_hash))
         ::SassC::Script::Value::String.new p.to_s, :string
       end
 
@@ -65,7 +67,9 @@ module Middleman
       #   src: font-url("font.ttf");                  // src: url("/assets/font.ttf");
       #   src: font-url("image.jpg", $digest: true);  // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
       #
-      def font_url(source, options={})
+      def font_url(source, options_hash = ::Middleman::EMPTY_HASH)
+        options = options_hash.dup
+
         # Work with the Compass #font_url API
         if options.respond_to? :value
           case options.value
@@ -93,8 +97,10 @@ module Middleman
 
       # Returns an options hash where the keys are symbolized
       # and the values are unwrapped Sass literals.
-      def map_options(options={}) # :nodoc:
-        # ::Sass::Util.map_hash(options) do |key, value|
+      def map_options(options_hash = ::Middleman::EMPTY_HASH) # :nodoc:
+        options = options_hash.dup
+
+        # ::SassC::Util.map_hash(options) do |key, value|
         #   [key.to_sym, value.respond_to?(:value) ? value.value : value]
         # end
 

data/lib/middleman-core/renderers/slim.rb

@@ -13,7 +13,7 @@ class ::Slim::Template
   def initialize(file, line, opts, &block)
     if opts.key?(:context)
       ::Slim::Embedded::SassEngine.disable_option_validator!
-      %w(sass scss markdown).each do |engine|
+      %w[sass scss markdown].each do |engine|
         (::Slim::Embedded.options[engine.to_sym] ||= {})[:context] = opts[:context]
       end
     end
@@ -31,7 +31,7 @@ module Middleman
     # Slim renderer
     class Slim < ::Middleman::Extension
       # Setup extension
-      def initialize(_app, _options={}, &_block)
+      def initialize(_app, _options_hash = ::Middleman::EMPTY_HASH, &_block)
         super
 
         # Setup Slim options to work with partials

data/lib/middleman-core/renderers/stylus.rb

@@ -0,0 +1,10 @@
+require 'stylus'
+require 'stylus/tilt'
+
+module Middleman
+  module Renderers
+    class Stylus < ::Middleman::Extension
+      define_setting :styl, {}, 'Stylus config options'
+    end
+  end
+end

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -12,9 +12,7 @@ module Middleman
         # @param [String, Regexp] path Path glob expression, or path regex
         # @return [IgnoreDescriptor]
         Contract Or[String, Regexp, Proc] => RespondTo[:execute_descriptor]
-        def ignore(path=nil, &block)
-          @app.sitemap.invalidate_resources_not_ignored_cache!
-
+        def ignore(path = nil, &block)
           if path.is_a? Regexp
             RegexpIgnoreDescriptor.new(path)
           elsif path.is_a? String
@@ -33,17 +31,15 @@ module Middleman
         end
 
         IgnoreDescriptor = Struct.new(:path, :block) do
-          def execute_descriptor(_app, resources)
-            resources.map do |r|
+          def execute_descriptor(_app, resource_list)
+            resource_list.each do |r|
               # Ignore based on the source path (without template extensions)
               if ignored?(r.normalized_path)
-                r.ignore!
+                resource_list.update!(r, :ignored) { r.ignore! }
               elsif !r.is_a?(ProxyResource) && r.file_descriptor && ignored?(r.file_descriptor.normalized_relative_path)
                 # This allows files to be ignored by their source file name (with template extensions)
-                r.ignore!
+                resource_list.update!(r, :ignored) { r.ignore! }
               end
-
-              r
             end
           end
 

data/lib/middleman-core/sitemap/extensions/import.rb

@@ -11,28 +11,27 @@ module Middleman
         expose_to_config :import_file, :import_path
 
         ImportFileDescriptor = Struct.new(:from, :to) do
-          def execute_descriptor(app, resources)
-            source = ::Middleman::SourceFile.new(Pathname(from).relative_path_from(app.source_dir), Pathname(from), app.source_dir, Set.new([:source, :binary]), 0)
-
-            resources + [
-              ::Middleman::Sitemap::Resource.new(app.sitemap, to, source)
-            ]
+          def execute_descriptor(app, resource_list)
+            source = ::Middleman::SourceFile.new(Pathname(from).relative_path_from(app.source_dir), Pathname(from), app.source_dir, Set.new(%i[source binary]), 0)
+            resource_list.add! ::Middleman::Sitemap::Resource.new(app.sitemap, to, source)
           end
         end
 
         ImportPathDescriptor = Struct.new(:from, :renameProc) do
-          def execute_descriptor(app, resources)
-            resources + ::Middleman::Util.glob_directory(File.join(from, '**/*'))
-                                         .reject { |path| File.directory?(path) }
-                                         .map do |path|
-                          target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
+          def execute_descriptor(app, resource_list)
+            new_resources = ::Middleman::Util.glob_directory(File.join(from, '**/*'))
+                                             .reject { |path| File.directory?(path) }
+                                             .map do |path|
+              target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
+
+              ::Middleman::Sitemap::Resource.new(
+                app.sitemap,
+                renameProc.call(target_path, path),
+                path
+              )
+            end
 
-                          ::Middleman::Sitemap::Resource.new(
-                            app.sitemap,
-                            renameProc.call(target_path, path),
-                            path
-                          )
-                        end
+            resource_list.add!(*new_resources)
           end
         end