lookbook 2.3.0 → 2.3.12

data/assets/js/app.js

@@ -43,7 +43,9 @@ export default function app() {
       this.debug("Navigating to ", window.location.pathname);
       this.$dispatch("navigation:start");
       this.location = window.location;
-      await this.updateDOM();
+      await this.updateDOM("#app-main", {
+        headers: { "X-Lookbook-Frame": "main" },
+      });
       this.$dispatch("navigation:complete");
     },
 
@@ -65,16 +67,17 @@ export default function app() {
       }
     },
 
-    async updateDOM() {
+    async updateDOM(rootSelector = `#${this.$root.id}`, options = {}) {
       this.debug("Starting DOM update");
       this.$dispatch("dom:update-start");
       this.requestStart();
       try {
         const { fragment, title } = await fetchHTML(
           window.location,
-          `#${this.$root.id}`
+          rootSelector,
+          options
         );
-        morph(this.$root, fragment);
+        morph(document.querySelector(rootSelector), fragment);
         document.title = title;
         this.requestEnd();
         this.$dispatch("dom:update-complete");

data/assets/js/helpers/request.js

@@ -1,5 +1,5 @@
-async function fetchHTML(url, selector) {
-  const response = await fetch(url || window.document.location);
+async function fetchHTML(url, selector, options = {}) {
+  const response = await fetch(url || window.document.location, options);
   const html = await response.text();
   const doc = new DOMParser().parseFromString(html, "text/html");
   return {

data/config/app.yml

@@ -25,6 +25,7 @@ shared:
   preview_type_default: view_component
   preview_sort_scenarios: false
   preview_disable_error_handling: false
+  preview_single_pass_rendering: false
 
   page_collection_label: "Pages"
   page_nav_filter: false
@@ -50,6 +51,7 @@ shared:
   component_paths: [app/views, app/components]
 
   reload_on_change: ~
+  lazy_load_previews_and_pages: false
   live_updates: false
   listen_paths: []
   listen_extensions: [rb, html.*]
@@ -67,7 +69,7 @@ shared:
   links:
     docs: https://v2.lookbook.build
     demo: https://v2-demo.lookbook.build
-    repo: https://github.com/ViewComponent/lookbook/tree/v2
+    repo: https://github.com/lookbook-hq/lookbook/tree/v2
 
 development:
   debug_menu: true

data/lib/lookbook/engine.rb

@@ -14,11 +14,11 @@ module Lookbook
       )
     end
 
-    initializer "lookbook.set_autoload_paths" do
+    initializer "lookbook.set_autoload_paths", before: :set_autoload_paths do |app|
       if opts.autoload_previews && opts.preview_paths.any?
-        paths_to_add = opts.preview_paths - ActiveSupport::Dependencies.autoload_paths
+        paths_to_add = opts.preview_paths - app.config.autoload_paths
         filtered_paths = paths_to_add.filter { |p| !Engine.component_paths.include?(p) }
-        ActiveSupport::Dependencies.autoload_paths.concat(filtered_paths) if filtered_paths.any?
+        app.config.autoload_paths.concat(filtered_paths) if filtered_paths.any?
       end
     end
 
@@ -37,26 +37,50 @@ module Lookbook
       if opts.using_view_component
         vc_config = Engine.host_config.view_component
 
-        opts.preview_paths += vc_config.preview_paths
+        if vc_config.key?(:previews)
+          # New config style (ViewComponent >= 4.0)
+          opts.preview_paths += vc_config.previews.paths
 
-        # sync preview controller and layout setting between Lookbook and ViewComponent
-        if opts.preview_controller == "Lookbook::PreviewController" ||
-            vc_config.preview_controller != ViewComponent::Config.defaults.preview_controller
-          opts.preview_controller = vc_config.preview_controller
-        else
-          vc_config.preview_controller = opts.preview_controller
-        end
+          if opts.preview_controller == "Lookbook::PreviewController" ||
+              vc_config.previews.controller != "ViewComponentsController"
+            opts.preview_controller = vc_config.previews.controller
+          else
+            vc_config.previews.controller = opts.preview_controller
+          end
 
-        if opts.preview_layout.nil? || vc_config.default_preview_layout.present?
-          opts.preview_layout = vc_config.default_preview_layout
-        else
-          vc_config.default_preview_layout = opts.preview_layout
-        end
+          if opts.preview_layout.nil? || vc_config.previews.default_layout.present?
+            opts.preview_layout = vc_config.previews.default_layout
+          else
+            vc_config.previews.default_layout = opts.preview_layout
+          end
 
-        vc_config.show_previews = true
+          vc_config.previews.enabled = true
 
-        if vc_config.view_component_path.present?
-          opts.component_paths << vc_config.view_component_path
+          if vc_config.generate.path.present?
+            opts.component_paths << vc_config.generate.path
+          end
+        else
+          # Legacy config style (ViewComponent < 4.0)
+          opts.preview_paths += vc_config.preview_paths
+
+          if opts.preview_controller == "Lookbook::PreviewController" ||
+              vc_config.preview_controller != ViewComponent::Config.defaults.preview_controller
+            opts.preview_controller = vc_config.preview_controller
+          else
+            vc_config.preview_controller = opts.preview_controller
+          end
+
+          if opts.preview_layout.nil? || vc_config.default_preview_layout.present?
+            opts.preview_layout = vc_config.default_preview_layout
+          else
+            vc_config.default_preview_layout = opts.preview_layout
+          end
+
+          vc_config.show_previews = true
+
+          if vc_config.view_component_path.present?
+            opts.component_paths << vc_config.view_component_path
+          end
         end
 
         ViewComponent::Preview.extend(Lookbook::PreviewAfterRender)
@@ -71,10 +95,12 @@ module Lookbook
       if Engine.reloading?
         reloaders.add(:previews, Engine.preview_watch_paths, opts.listen_extensions, &Engine.method(:load_previews))
         reloaders.add(:pages, Engine.page_watch_paths, opts.page_extensions, &Engine.method(:load_pages))
-        reloaders.execute
+        reloaders.execute unless opts.lazy_load_previews_and_pages
       else
-        Engine.load_previews
-        Engine.load_pages
+        unless opts.lazy_load_previews_and_pages
+          Engine.load_previews
+          Engine.load_pages
+        end
       end
 
       Engine.run_hooks(:after_initialize)
@@ -196,10 +222,34 @@ module Lookbook
 
       def pages
         @_pages ||= PageCollection.new
+
+        if opts.lazy_load_previews_and_pages && !@_loaded_pages
+          @_loaded_pages = true
+
+          if reloading?
+            reloaders.execute(:pages)
+          else
+            load_pages
+          end
+        end
+
+        @_pages
       end
 
       def previews
         @_previews ||= PreviewCollection.new
+
+        if opts.lazy_load_previews_and_pages && !@_loaded_previews
+          @_loaded_previews = true
+
+          if reloading?
+            reloaders.execute(:previews)
+          else
+            load_previews
+          end
+        end
+
+        @_previews
       end
 
       def preview_controller

data/lib/lookbook/preview_controller_actions.rb

@@ -16,8 +16,13 @@ module Lookbook
         @render_args = @preview.render_args(@scenario_name, params: params.permit!)
         template = @render_args[:template]
         locals = @render_args[:locals]
-        opts = {}
-        opts[:layout] = nil
+
+        opts = if Lookbook.config.preview_single_pass_rendering && !scenario.group.present?
+          determine_layout(preview.layout)
+        else
+          {layout: nil}
+        end
+
         opts[:assigns] = @render_args[:assigns] || {}
         opts[:locals] = locals if locals.present?
 

data/lib/lookbook/preview_parser.rb

@@ -6,15 +6,14 @@ module Lookbook
       @paths = paths
       @after_parse_callbacks = []
       @after_parse_once_callbacks = []
-      @parsing = false
+      @parsing = Mutex.new
 
       define_tags(tags)
       YARD::Parser::SourceParser.after_parse_list { run_callbacks }
     end
 
     def parse(files = nil, &block)
-      unless @parsing
-        @parsing = true
+      @parsing.synchronize do
         @after_parse_once_callbacks << block if block
         files_list = files ? files.select { |file| file.to_s.end_with?(".rb") } : paths
 
@@ -43,7 +42,6 @@ module Lookbook
     def run_callbacks
       callbacks.each { |cb| cb.call(YARD::Registry) }
       @after_parse_once_callbacks = []
-      @parsing = false
     end
 
     def define_tags(tags = nil)

data/lib/lookbook/reloaders.rb

@@ -16,10 +16,14 @@ module Lookbook
         Rails.application.reloaders << reloader
         Rails.application.reloader.to_run { reloader.execute_if_updated }
       end
+
+      reloader
     end
 
-    def execute
-      reloaders.each { |reloader| reloader.execute }
+    def execute(name = nil)
+      reloaders.each do |reloader|
+        reloader.execute if name.nil? || name == reloader.name
+      end
     end
 
     def register_changes(changes)

data/lib/lookbook/stores/config_store.rb

@@ -63,6 +63,10 @@ module Lookbook
       store[:preview_disable_error_handling] = value
     end
 
+    def preview_single_pass_rendering=(value)
+      store[:preview_single_pass_rendering] = value
+    end
+
     def ui_theme=(name)
       name = name.to_s
       if Theme.valid_theme?(name)

data/lib/lookbook/support/errors/config_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class ConfigError < Error
     def initialize(msg = nil, scope: "config", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/parser_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class ParserError < Error
     def initialize(msg = nil, scope: "parser", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/preview_template_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class PreviewTemplateError < Error
     def initialize(msg = nil, scope: "preview", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/errors/template_error.rb

@@ -1,7 +1,7 @@
 module Lookbook
   class TemplateError < Error
     def initialize(msg = nil, scope: "template", **kwargs)
-      super(msg, scope: scope, **kwargs)
+      super
     end
   end
 end

data/lib/lookbook/support/store.rb

@@ -27,7 +27,7 @@ module Lookbook
       if name.to_s.end_with?("=")
         args[0] = normalize_value(args[0])
       end
-      super(name, *args)
+      super
     end
 
     def respond_to_missing?(name, include_private)

data/lib/lookbook/support/utils/utils.rb

@@ -12,7 +12,7 @@ module Lookbook
       end
 
       def name(str)
-        str.to_s.parameterize.tr("-", "_")
+        str.to_s.dup.force_encoding("UTF-8").parameterize.tr("-", "_")
       end
 
       def symbolize_name(str)

data/lib/lookbook/tags/param_tag.rb

@@ -28,7 +28,10 @@ module Lookbook
     def value_default
       default_value_parts = object.parameters.find { |parts| parts[0].chomp(":") == name }
       if default_value_parts
-        host_class_instance.instance_eval(default_value_parts[1])
+        # fix issue with YARD argument parser not splitting args correctly (leaving a trailing comma or bracket)
+        # when one or more of the argument values is a negative number.
+        cleaned_value = default_value_parts[1].start_with?("-") ? default_value_parts[1].sub(/[,\)]$/, "") : default_value_parts[1]
+        host_class_instance.instance_eval(cleaned_value)
       else
         raise ParserError.new "Unknown method parameter '#{name}'"
       end

data/lib/lookbook/tags/yard_tag.rb

@@ -5,7 +5,7 @@ module Lookbook
         tag_name = self.class.name.demodulize.underscore.chomp("_tag")
         super(tag_name, args.first, nil, @name)
       else
-        super(*args)
+        super
       end
     end
 

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "2.3.0"
+  VERSION = "2.3.12"
 end