diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman index c635d220..ff61b21c 100755 --- a/middleman-cli/bin/middleman +++ b/middleman-cli/bin/middleman @@ -46,6 +46,7 @@ end ::Middleman::Logger.singleton(3) ::Middleman::Cli.config = ::Middleman::Application.new do + config[:mode] = :config config[:exit_before_ready] = true config[:watcher_disable] = true config[:disable_sitemap] = true diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb index eaa2c6a6..add8730a 100644 --- a/middleman-cli/lib/middleman-cli/config.rb +++ b/middleman-cli/lib/middleman-cli/config.rb @@ -23,6 +23,7 @@ module Middleman::Cli ::Middleman::Logger.singleton(2, false) app = ::Middleman::Application.new do + config[:mode] = :config config[:disable_sitemap] = true config[:watcher_disable] = true config[:exit_before_ready] = true diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb index d4a5aab5..35d95138 100644 --- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb +++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb @@ -10,6 +10,8 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension def initialize(app, config={}, &block) super + return if app.mode?(:config) + require 'thread' @watcher = app.files.watch :source,