middleman-core 4.1.0.rc.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d02a12c78f163c9213f8fdfb955ccc033b311e5c
-  data.tar.gz: f832b54139abcf4d4629d436b7007f8f132266a5
+  metadata.gz: c31c9e2ea6918f6d0842f1cb1e04dc8120e4b8c4
+  data.tar.gz: e2f48f74a4a98aafe83b2adaeabf9aeb8eaab409
 SHA512:
-  metadata.gz: 437c1700d0578d22e68c6b153fec52f25fa09add4aba8521ce13d60605c32593ad4754e30f58c682c5b3b81af35497ba0061d65cd56ccc5024c639bb0b549389
-  data.tar.gz: 371e370f1e1aab80b8c1ef4ca6fcaba1f091469a56c6506c23244d8b67ec359c33be317b4a4c1d6b28a94da07ad2826c8a31b105b01d14e4bf1c25dc86b9cb1b
+  metadata.gz: 8a5e0965f5bca9268cdc5f65af629c9e49fff7f7f7df3468f8d3232135d00dbb3d6b9b9f6d73ed3b70d1ca91827aefdcf111a9c9558c7b14c76b7ab19fb0c61d
+  data.tar.gz: b2e0745dc44d43ef904c448347ef46f70f62ad25a241ebd23d7d97c43ea080777a327ee2075dce1f967d83af3528a8b3cebb0d370ff08baf80f917c55f316ca4

data/features/asset_hash.feature

@@ -63,8 +63,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-d2959d87.css"'
-    And I should see 'href="stylesheets/fragment-a06f0dfc.css"'
+    And I should see 'href="stylesheets/site-d1a750ca.css"'
+    And I should see 'href="stylesheets/fragment-99b76247.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
@@ -72,11 +72,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-d2959d87.css"'
+    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-d2959d87.css"'
+    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
@@ -84,8 +84,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-d2959d87.css"
-    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    When I go to "/stylesheets/site-d1a750ca.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg");'
     When I go to "/api.json"
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
@@ -94,11 +94,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
-    When I go to "/stylesheets/fragment-a06f0dfc.css"
-    And I should see 'url("../images/100px-5fd6fb90.jpg")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?test")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?#test")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg#test")'
+    When I go to "/stylesheets/fragment-99b76247.css"
+    And I should see 'url("../images/100px-5fd6fb90.jpg");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Hashed assets work with Slim
     Given the Server is running at "asset-hash-app"
@@ -117,26 +117,26 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-a772891f.css"
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
+    When I go to "/stylesheets/fragment-7000b132.css"
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Enabling an asset host still produces hashed files and references (host first)
     Given a fixture app "asset-hash-host-app"
@@ -148,22 +148,22 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-a772891f.css"
+    When I go to "/stylesheets/fragment-7000b132.css"
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
@@ -177,14 +177,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-44fb2764.css'
+    Then I should see 'href="../stylesheets/uses_partials-4d4e34e6.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-10d8ae33.css'
+    Then I should see 'href="../stylesheets/uses_partials-ec347271.css'
 
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"
@@ -198,12 +198,10 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-30784643.css'
-    When I go to "stylesheets/site-30784643.css"
-    Then I should see 'background-image'
+    Then I should see 'href="stylesheets/site-5ad7def0.css'
+    When I go to "stylesheets/site-5ad7def0.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
     Then I should see 'Added by Rack filter'
-    When I go to "stylesheets/site-7474cadd.css"
-    Then I should see 'Not Found'
 
   Scenario: Hashed-asset files are not produced for ignored paths
     Given a fixture app "asset-hash-app"

data/features/asset_host.feature

@@ -17,6 +17,8 @@ Feature: Alternate between multiple asset hosts
     When I go to "/stylesheets/asset_host.css"
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
+    When I go to "/javascripts/asset_host.js"
+    Then I should not see content matching %r{http://assets1.example.com/}
 
   Scenario: Set proc host with inline-option
     Given a fixture app "asset-host-app"

data/features/gzip.feature

@@ -22,7 +22,7 @@ Feature: GZIP assets during build
     Given a fixture app "gzip-app"
     And a file named "config.rb" with:
       """
-      activate :gzip, exts: %w(.js .html .htm)
+      activate :gzip, exts: %w(.htm .html .js .xhtml)
       """
     And a successfully built app at "gzip-app"
     Then the following files should exist:

data/features/import_files.feature

@@ -13,5 +13,3 @@ Feature: Import files
     Then I should see 'jQuery'
     When I go to "/bower_components2/jquery/dist/jquery.js"
     Then I should see 'jQuery'
-
-

data/features/nested_layouts.feature

@@ -5,37 +5,37 @@ Feature: Allow nesting of layouts
     When I go to "/index.html"
     Then I should see:
     """
-    Master
+    Master Erb
     <h1>Index Title</h1>
-      Outer
-        Inner
+      I am Outer
+        I am Inner
       Template
-    
+
     """
     When I go to "/another.html"
     Then I should see:
     """
-    Master
+    Master Erb
     <h1>New Article Title</h1>
-      Outer
-        Inner
+      I am Outer
+        I am Inner
       <p>The Article Content</p>
     """
-    
+
   Scenario: A page uses an inner layout when uses an outer layout (slim)
     Given the Server is running at "nested-layout-app"
     When I go to "/slim-test.html"
-    Then I should see "<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3><p>The Article Content</p>"
-    
+    Then I should see "<h1>Master Slim</h1><p>New Article Title</p><div><h2>I am Outer</h2><h3>I am Inner</h3><p>The Article Content</p>"
+
   Scenario: A page uses an inner layout when uses an outer layout (haml)
     Given the Server is running at "nested-layout-app"
     When I go to "/haml-test.html"
     Then I should see:
     """
-    Master
+    Master Haml
     <h1>New Article Title</h1>
-    Outer
-    Inner
+    I am Outer
+    I am Inner
     <p>The Article Content</p>
     """
 
@@ -43,13 +43,16 @@ Feature: Allow nesting of layouts
     Given the Server is running at "nested-layout-app"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "Inner"
+    And I should see "Page #1"
+    And I should see "I am Inner"
+    And I should see "I am Outer"
+    And I should see "Master Erb"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "Inner"
+    And I should not see "I am Inner"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "Inner"
+    And I should see "I am Inner"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "Inner"
+    And I should not see "I am Inner"

data/fixtures/asset-host-app/source/javascripts/asset_host.js

@@ -0,0 +1,2 @@
+var a = jQuery.css("h1", "font-size");
+console.log(a);

data/fixtures/frontmatter-neighbor-app/config.rb

@@ -15,7 +15,7 @@ class NeighborFrontmatter < ::Middleman::Extension
 
       next unless file
 
-      fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).first
+      fmdata = ::Middleman::Util::Data.parse(file, app.config[:frontmatter_delims], :yaml).first
       opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type)
       opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options)
       ignored = fmdata.delete(:ignored)

data/fixtures/frontmatter-settings-neighbor-app/config.rb

@@ -26,7 +26,7 @@ class NeighborFrontmatter < ::Middleman::Extension
   end
 
   def apply_neighbor_data(resource, file)
-    fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).first
+    fmdata = ::Middleman::Util::Data.parse(file, app.config[:frontmatter_delims], :yaml).first
     opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type)
     opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options)
     ignored = fmdata.delete(:ignored)

data/fixtures/nested-layout-app/source/layouts/inner.erb

@@ -1,4 +1,7 @@
+---
+inner: true
+---
 <% wrap_layout :outer do %>
-  Inner
+  I am Inner
   <%= yield %>
-<% end %>
+<% end %>

data/fixtures/nested-layout-app/source/layouts/inner_haml.haml

@@ -1,3 +1,7 @@
+---
+inner_haml: true
+---
+
 = wrap_layout :outer_haml do
-  Inner
-  = yield
+  I am Inner
+  = yield

data/fixtures/nested-layout-app/source/layouts/inner_slim.slim

@@ -1,3 +1,7 @@
+---
+inner_slim: true
+---
+
 = wrap_layout :outer_slim do
-  h3 Inner
-  == yield
+  h3 I am Inner
+  == yield

data/fixtures/nested-layout-app/source/layouts/master.erb

@@ -1,3 +1,9 @@
-Master
+---
+master: true
+---
+
+Master Erb
 <h1><%= current_page.data.title %></h1>
 <%= yield %>
+
+Using Inner: <%= current_page.data.inner ? 'true' : 'false' %>

data/fixtures/nested-layout-app/source/layouts/master_haml.haml

@@ -1,3 +1,7 @@
-Master
+---
+master_haml: true
+---
+
+Master Haml
 %h1= current_page.data.title
 = yield

data/fixtures/nested-layout-app/source/layouts/master_slim.slim

@@ -1,3 +1,7 @@
-h1 Master
+---
+master_slim: true
+---
+
+h1 Master Slim
 p== current_page.data.title
 div== yield

data/fixtures/nested-layout-app/source/layouts/outer.erb

@@ -1,4 +1,8 @@
+---
+outer: true
+---
+
 <% wrap_layout :master do %>
-  Outer
+  I am Outer
   <%= yield %>
-<% end %>
+<% end %>

data/fixtures/nested-layout-app/source/layouts/outer_haml.haml

@@ -1,3 +1,7 @@
+---
+outer_haml: true
+---
+
 = wrap_layout :master_haml do
-  Outer
+  I am Outer
   = yield

data/fixtures/nested-layout-app/source/layouts/outer_slim.slim

@@ -1,3 +1,7 @@
+---
+outer_slim: true
+---
+
 = wrap_layout :master_slim do
-  h2 Outer
+  h2 I am Outer
   == yield

data/lib/middleman-core.rb

@@ -6,9 +6,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Top-level Middleman namespace
 module Middleman
-  # Backwards compatibility namespace
-  module Features; end
-
   autoload :Application, 'middleman-core/application'
 end
 

data/lib/middleman-core/application.rb

@@ -149,9 +149,13 @@ module Middleman
     define_setting :http_prefix, '/', 'Default prefix for building paths'
 
     # Default layout name
-    # @return [String, Symbold]
+    # @return [String]
     define_setting :layout, :_auto_layout, 'Default layout name'
 
+    # Which file extensions have a layout by default.
+    # @return [Array.<String>]
+    define_setting :extensions_with_layout, %w(.htm .html .xhtml .php), 'Which file extensions have a layout by default.'
+
     # Default string encoding for templates and output.
     # @return [String]
     define_setting :encoding, 'utf-8', 'Default string encoding for templates and output'
@@ -184,13 +188,7 @@ module Middleman
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 
-    # Set textual delimiters that denote the start and end of frontmatter
-    define_setting :frontmatter_delims, {
-      json: [%w(;;; ;;;)],
-      yaml: [%w(--- ---), %w(--- ...)]
-    }, 'Allowed frontmatter delimiters'
-
-    define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| r.match(p) } }, 'Whether some paths should not be removed during a clean build.'
+    define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| p =~ r } }, 'Whether some paths should not be removed during a clean build.'
 
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
@@ -320,7 +318,7 @@ module Middleman
 
     # Clean up missing Tilt exts
     def prune_tilt_templates!
-      ::Tilt.mappings.each do |key, _|
+      ::Tilt.mappings.each_key do |key|
         begin
           ::Tilt[".#{key}"]
         rescue LoadError, NameError

data/lib/middleman-core/builder.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'fileutils'
 require 'tempfile'
+require 'parallel'
 require 'middleman-core/rack'
 require 'middleman-core/callback_manager'
 require 'middleman-core/contracts'
@@ -36,6 +37,7 @@ module Middleman
 
       @glob = opts.fetch(:glob)
       @cleaning = opts.fetch(:clean)
+      @parallel = opts.fetch(:parallel, true)
 
       rack_app = ::Middleman::Rack.new(@app).to_app
       @rack = ::Rack::MockRequest.new(rack_app)
@@ -51,18 +53,33 @@ module Middleman
       @has_error = false
       @events = {}
 
-      @app.execute_callbacks(:before_build, [self])
+      ::Middleman::Util.instrument 'builder.before' do
+        @app.execute_callbacks(:before_build, [self])
+      end
 
-      queue_current_paths if @cleaning
+      ::Middleman::Util.instrument 'builder.queue' do
+        queue_current_paths if @cleaning
+      end
 
-      prerender_css
-      output_files
+      ::Middleman::Util.instrument 'builder.prerender' do
+        prerender_css
+      end
 
-      clean! if @cleaning
+      ::Middleman::Profiling.start
+
+      ::Middleman::Util.instrument 'builder.output' do
+        output_files
+      end
 
       ::Middleman::Profiling.report('build')
 
-      @app.execute_callbacks(:after_build, [self])
+      ::Middleman::Util.instrument 'builder.clean' do
+        clean! if @cleaning
+      end
+
+      ::Middleman::Util.instrument 'builder.after' do
+        @app.execute_callbacks(:after_build, [self])
+      end
 
       !@has_error
     end
@@ -73,14 +90,17 @@ module Middleman
     def prerender_css
       logger.debug '== Prerendering CSS'
 
-      css_files = @app.sitemap.resources
-                      .select { |resource| resource.ext == '.css' }
-                      .each(&method(:output_resource))
+      css_files = ::Middleman::Util.instrument 'builder.prerender.output' do
+        resources = @app.sitemap.resources.select { |resource| resource.ext == '.css' }
+        output_resources(resources)
+      end
 
-      # Double-check for compass sprites
-      if @app.files.find_new_files!.length > 0
-        logger.debug '== Checking for Compass sprites'
-        @app.sitemap.ensure_resource_list_updated!
+      ::Middleman::Util.instrument 'builder.prerender.check-files' do
+        # Double-check for compass sprites
+        if @app.files.find_new_files!.length > 0
+          logger.debug '== Checking for Compass sprites'
+          @app.sitemap.ensure_resource_list_updated!
+        end
       end
 
       css_files
@@ -92,11 +112,43 @@ module Middleman
     def output_files
       logger.debug '== Building files'
 
-      @app.sitemap.resources
-          .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
-          .reject { |resource| resource.ext == '.css' }
-          .select { |resource| !@glob || File.fnmatch(@glob, resource.destination_path) }
-          .each(&method(:output_resource))
+      resources = @app.sitemap.resources
+                      .reject { |resource| resource.ext == '.css' }
+                      .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
+
+      if @glob
+        resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
+      end
+
+      output_resources(resources)
+    end
+
+    Contract ResourceList => ResourceList
+    def output_resources(resources)
+      results = if @parallel
+        ::Parallel.map(resources, &method(:output_resource))
+      else
+        resources.map(&method(:output_resource))
+      end
+
+      @has_error = true if results.any? { |r| r == false }
+
+      if @cleaning && !@has_error
+        results.each do |p|
+          next unless p.exist?
+
+          # handle UTF-8-MAC filename on MacOS
+          cleaned_name = if RUBY_PLATFORM =~ /darwin/
+            p.to_s.encode('UTF-8', 'UTF-8-MAC')
+          else
+            p
+          end
+
+          @to_clean.delete(Pathname(cleaned_name))
+        end
+      end
+
+      resources
     end
 
     # Figure out the correct event mode.
@@ -160,40 +212,32 @@ module Middleman
     # Try to output a resource and capture errors.
     # @param [Middleman::Sitemap::Resource] resource The resource.
     # @return [void]
-    Contract IsA['Middleman::Sitemap::Resource'] => Any
+    Contract IsA['Middleman::Sitemap::Resource'] => Or[Pathname, Bool]
     def output_resource(resource)
-      output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
-
-      begin
-        if resource.binary?
-          export_file!(output_file, resource.file_descriptor[:full_path])
-        else
-          response = @rack.get(::URI.escape(resource.request_path))
+      ::Middleman::Util.instrument 'builder.output.resource', path: File.basename(resource.destination_path) do
+        output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
 
-          # If we get a response, save it to a tempfile.
-          if response.status == 200
-            export_file!(output_file, binary_encode(response.body))
+        begin
+          if resource.binary?
+            export_file!(output_file, resource.file_descriptor[:full_path])
           else
-            @has_error = true
-            trigger(:error, output_file, response.body)
+            response = @rack.get(::URI.escape(resource.request_path))
+
+            # If we get a response, save it to a tempfile.
+            if response.status == 200
+              export_file!(output_file, binary_encode(response.body))
+            else
+              trigger(:error, output_file, response.body)
+              return false
+            end
           end
+        rescue => e
+          trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
+          return false
         end
-      rescue => e
-        @has_error = true
-        trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
-      end
 
-      return unless @cleaning
-      return unless output_file.exist?
-
-      # handle UTF-8-MAC filename on MacOS
-      cleaned_name = if RUBY_PLATFORM =~ /darwin/
-        output_file.to_s.encode('UTF-8', 'UTF-8-MAC')
-      else
         output_file
       end
-
-      @to_clean.delete(Pathname(cleaned_name))
     end
 
     # Get a list of all the paths in the destination folder and save them