studio-engine 0.93.0 → 0.94.0

data/config/importmap.rb

@@ -1,13 +1,24 @@
 # The engine's importmap pins, drawn into every host by the studio.importmap
 # initializer (lib/studio/engine.rb) before the host's own config/importmap.rb.
 #
-# One `pin` per module under app/javascript/studio, named "studio/<name>", and
-# none preloaded: a page fetches a module only when something imports it.
+# One `pin` per module under app/javascript/studio, named "studio/<name>". Only
+# the boot graph is preloaded (Studio::Engine.javascript_boot_graph: the modules
+# studio/application imports, which every page runs); any other module is
+# fetched only when something imports it.
+#
+# A vendored library (studio/vendor/) is pinned under its package name only:
+# "@hotwired/stimulus" is the engine's Stimulus. A host that pins its own
+# (stimulus-rails) wins, and the engine's controllers run on that copy.
 #
 # `pin`, not `pin_all_from`, so a host can override one: importmap-rails expands
 # a pin_all_from directory AFTER every plain pin, so a directory pin would beat
 # the host's own `pin` of the same name. Plain pins are last-drawn-wins, and the
 # host's map is drawn last.
+boot = Studio::Engine.javascript_boot_graph
 Studio::Engine.javascript_module_logical_paths.each do |logical_path|
-  pin logical_path.delete_suffix(".js"), to: logical_path, preload: false
+  next if logical_path.start_with?("studio/vendor/")
+
+  name = logical_path.delete_suffix(".js")
+  pin name, to: logical_path, preload: boot.include?(name)
 end
+pin "@hotwired/stimulus", to: "studio/vendor/stimulus.js", preload: true

data/lib/studio/engine.rb

@@ -165,6 +165,32 @@ module Studio
         .sort
     end
 
+    # The engine's browser boot, which layouts/studio/_head imports on every page.
+    JAVASCRIPT_BOOT_MODULE = "studio/application"
+
+    # A static `import ... from "x"` or `import "x"`, across lines.
+    JAVASCRIPT_STATIC_IMPORT = /^\s*import\s+(?:[\w$*{}\s,]+?\s+from\s+)?["']([^"']+)["']/
+
+    # Every "studio/<name>" module the boot imports statically, followed through
+    # their own imports. config/importmap.rb preloads exactly these, so the boot
+    # costs one round trip and a page still fetches no other engine module until
+    # it imports one. Derived from the import statements, so a controller the boot
+    # registers is preloaded by being imported.
+    def self.javascript_boot_graph
+      base = File.expand_path("../../app/javascript", __dir__)
+      graph = []
+      queue = [JAVASCRIPT_BOOT_MODULE]
+      while (name = queue.shift)
+        path = File.join(base, "#{name}.js")
+        next if graph.include?(name) || !File.file?(path)
+
+        graph << name
+        imports = File.read(path).scan(JAVASCRIPT_STATIC_IMPORT).flatten
+        queue.concat(imports.select { |dependency| dependency.start_with?("studio/") })
+      end
+      graph.sort
+    end
+
     # Logical asset paths ("studio/local_path.js") for every ES module the
     # engine pins (config/importmap.rb).
     def self.javascript_module_logical_paths

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.93.0"
+  VERSION = "0.94.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Alex McRitchie
@@ -409,7 +409,15 @@ files:
 - app/helpers/studio_navbar_helper.rb
 - app/helpers/studio_sidebar_helper.rb
 - app/helpers/studio_theme_helper.rb
+- app/javascript/studio/alpine_shims.js
+- app/javascript/studio/alpine_stores.js
+- app/javascript/studio/application.js
+- app/javascript/studio/controllers/nav_collapse_controller.js
+- app/javascript/studio/head_chrome.js
 - app/javascript/studio/local_path.js
+- app/javascript/studio/nav_collapse.js
+- app/javascript/studio/pinned_stack.js
+- app/javascript/studio/vendor/stimulus.js
 - app/jobs/error_log_cleanup_job.rb
 - app/jobs/studio/email_delivery_job.rb
 - app/mailers/application_mailer.rb