proscenium 0.11.0.pre.12-arm64-darwin → 0.12.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ffe99381b81904463f3fd0642fdcfba65ab28a37ac5811cc3dc029421003c0c
-  data.tar.gz: ca30bf741c5ef28730d859427881a3b37c287b02404d67c0150e5951ec683ad6
+  metadata.gz: 1b10bcbd5d5588f7c26365bb4a3408fe4072f2b7f4c7a2cd329f6e59f29f1d33
+  data.tar.gz: 8aa1c7565e35be95469df71860af5227cdc41593be651b1835a69d8a18147079
 SHA512:
-  metadata.gz: 9ab4117f18dbbf34b8c0e7afb591f6f00495753079850f5b2a67c282daed8b09a0d309ca74825b2ab4dae0140581823f0254de13b1b558a6bb903dce8ddf7326
-  data.tar.gz: 460e679b5d5114922d3ecccc3add996438ee0a742f1ab0dcb4df941d8b78b3523f3d5467c98bc19489b197cac24558534221e2a6a1ce6a2bac3f6494c21d13d8
+  metadata.gz: 8460c3654934372c010167d04aa93bc2a8876a600149ff766575c6c3612e68095a0afdabf8306094e35761f8a7cdb9190c01e2fcd3c7945be905f3565a72c00c
+  data.tar.gz: b58d0de7f07490fc5e470b9149dd5994f6a5fafcc9c9fb8bd74c9f54fcdf3fbfade1b87bb91f8773fc59473f1150bb9dc993ab236dc76e8b09bacfe6b29daa61

data/README.md

@@ -46,7 +46,8 @@ Proscenium treats your client-side code as first class citizens of your Rails ap
 - [ViewComponent Support](#viewcomponent-support)
 - [Cache Busting](#cache-busting)
 - [rjs is back!](#rjs-is-back)
-- [Included Paths](#included-paths)
+- [Resolution](#resolution)
+  - [Assets from Rails Engines](#assets-from-rails-engines)
 - [Thanks](#thanks)
 - [Development](#development)
 
@@ -227,6 +228,42 @@ import utils from '/lib/utils'
 import constants from './constants'
 ```
 
+```css /app/views/layouts/application.css
+@import '/lib/reset';
+```
+
+```css /lib/reset.css
+body {
+  /* some styles... */
+}
+```
+
+### Unbundling
+
+Sometimes you don't want to bundle an import. For example, you want to ensure that only one instance of React is loaded. In this cases, you can use the `unbundle` prefix
+
+```js
+import React from 'unbundle:react'
+```
+
+This only works any bare and local imports.
+
+You can also use the `unbundle` prefix in your import map, which ensures that all imports of a particular path is always unbundled:
+
+```json
+{
+  "imports": {
+    "react": "unbundle:react"
+  }
+}
+```
+
+Then just import as normal:
+
+```js
+import React from 'react'
+```
+
 ## Import Maps
 
 > **[WIP]**
@@ -634,6 +671,27 @@ class MyView < Proscenium::Phlex
 end
 ```
 
+In your layouts, include `Proscenium::Phlex::AssetInclusions`, and call the `include_assets` helper.
+
+```ruby
+class ApplicationLayout < Proscenium::Phlex
+  include Proscenium::Phlex::AssetInclusions
+
+  def template(&)
+    doctype
+    html do
+      head do
+        title { 'My Awesome App' }
+        include_assets
+      end
+      body(&)
+    end
+  end
+end
+```
+
+You can specifically include CCS and JS assets using the `include_stylesheets` and `include_javascripts` helpers, allowing you to control where they are included in the HTML.
+
 ### Side-loading
 
 Any Phlex class that inherits `Proscenium::Phlex` will automatically be [side-loaded](#side-loading).

data/lib/proscenium/css_module.rb

@@ -18,10 +18,18 @@ module Proscenium::CssModule
   # Accepts one or more CSS class names, and transforms them into CSS module names.
   #
   # @param name [String,Symbol,Array<String,Symbol>]
+  # @return [String] the transformed CSS module names concatenated as a string.
   def css_module(*names)
     cssm.class_names(*names, require_prefix: false).map { |name, _| name }.join(' ')
   end
 
+  # @param name [String,Symbol,Array<String,Symbol>]
+  # @return [String] the transformed CSS module names concatenated as a string.
+  def class_names(*names)
+    names = names.flatten.compact
+    cssm.class_names(*names).map { |name, _| name }.join(' ') unless names.empty?
+  end
+
   private
 
   def cssm

data/lib/proscenium/importer.rb

@@ -79,14 +79,25 @@ module Proscenium
       def each_stylesheet(delete: false)
         return if imported.blank?
 
-        blk = proc { |key, options| key.end_with?(*CSS_EXTENSIONS) && yield(key, options) }
+        blk = proc do |key, options|
+          if key.end_with?(*CSS_EXTENSIONS)
+            yield(key, options)
+            true
+          end
+        end
+
         delete ? imported.delete_if(&blk) : imported.each(&blk)
       end
 
       def each_javascript(delete: false)
         return if imported.blank?
 
-        blk = proc { |key, options| key.end_with?(*JS_EXTENSIONS) && yield(key, options) }
+        blk = proc do |key, options|
+          if key.end_with?(*JS_EXTENSIONS)
+            yield(key, options)
+            true
+          end
+        end
         delete ? imported.delete_if(&blk) : imported.each(&blk)
       end
 

data/lib/proscenium/phlex/asset_inclusions.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Proscenium::Phlex::AssetInclusions
+  include Phlex::Rails::Helpers::ContentFor
+  include Phlex::Rails::Helpers::StyleSheetPath
+  include Phlex::Rails::Helpers::JavaScriptPath
+
+  def include_stylesheets
+    comment { '[PROSCENIUM_STYLESHEETS]' }
+  end
+
+  def include_javascripts(defer_lazy_scripts: false)
+    comment { '[PROSCENIUM_JAVASCRIPTS]' }
+    !defer_lazy_scripts && include_lazy_javascripts
+  end
+
+  def include_lazy_javascripts
+    comment { '[PROSCENIUM_LAZY_SCRIPTS]' }
+  end
+
+  def include_assets(defer_lazy_scripts: false)
+    include_stylesheets
+    include_javascripts(defer_lazy_scripts: defer_lazy_scripts)
+  end
+
+  def after_template
+    super
+
+    @_buffer.gsub! '<!-- [PROSCENIUM_STYLESHEETS] -->', capture_stylesheets!
+    @_buffer.gsub! '<!-- [PROSCENIUM_JAVASCRIPTS] -->', capture_javascripts!
+
+    if content_for?(:proscenium_lazy_scripts)
+      flush
+      @_buffer.gsub!('<!-- [PROSCENIUM_LAZY_SCRIPTS] -->', capture do
+        content_for(:proscenium_lazy_scripts)
+      end)
+    else
+      @_buffer.gsub! '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->', ''
+    end
+  end
+
+  private
+
+  def capture_stylesheets!
+    capture do
+      Proscenium::Importer.each_stylesheet(delete: true) do |path, _path_options|
+        link rel: 'stylesheet', href: stylesheet_path(path, extname: false)
+      end
+    end
+  end
+
+  def capture_javascripts! # rubocop:disable Metrics/*
+    unless Rails.application.config.proscenium.code_splitting &&
+           Proscenium::Importer.multiple_js_imported?
+      return capture do
+        Proscenium::Importer.each_javascript(delete: true) do |path, _|
+          script(src: javascript_path(path, extname: false), type: :module)
+        end
+      end
+    end
+
+    imports = Proscenium::Importer.imported.dup
+    paths_to_build = []
+    Proscenium::Importer.each_javascript(delete: true) do |x, _|
+      paths_to_build << x.delete_prefix('/')
+    end
+
+    result = Proscenium::Builder.build(paths_to_build.join(';'), base_url: helpers.request.base_url)
+
+    # Remove the react components from the results, so they are not side loaded. Instead they
+    # are lazy loaded by the component manager.
+
+    capture do
+      scripts = {}
+      result.split(';').each do |x|
+        inpath, outpath = x.split('::')
+        inpath.prepend '/'
+        outpath.delete_prefix! 'public'
+
+        next unless imports.key?(inpath)
+
+        if (import = imports[inpath]).delete(:lazy)
+          scripts[inpath] = import.merge(outpath: outpath)
+        else
+          script(src: javascript_path(outpath, extname: false), type: :module)
+        end
+      end
+
+      content_for :proscenium_lazy_scripts do
+        script type: 'application/json', id: 'prosceniumLazyScripts' do
+          unsafe_raw scripts.to_json
+        end
+      end
+    end
+  end
+end

data/lib/proscenium/phlex.rb

@@ -8,19 +8,11 @@ module Proscenium
 
     autoload :CssModules
     autoload :ReactComponent
+    autoload :AssetInclusions
 
-    extend ::Phlex::Rails::HelperMacros
-    include ::Phlex::Rails::Helpers::JavaScriptIncludeTag
-    include ::Phlex::Rails::Helpers::StyleSheetLinkTag
     include Proscenium::SourcePath
     include CssModules
 
-    define_output_helper :side_load_stylesheets # deprecated
-    define_output_helper :include_stylesheets
-    define_output_helper :side_load_javascripts # deprecated
-    define_output_helper :include_javascripts
-    define_output_helper :declare_lazy_scripts
-
     module Sideload
       def before_template
         Proscenium::SideLoad.sideload_inheritance_chain self

data/lib/proscenium/railtie.rb

@@ -46,14 +46,16 @@ module Proscenium
     }
 
     initializer 'proscenium.debugging' do
-      ActionDispatch::DebugView::RESCUES_TEMPLATE_PATHS << root.join('lib', 'proscenium',
-                                                                     'templates').to_s
+      if Rails.gem_version >= Gem::Version.new('7.1.0')
+        tpl_path = root.join('lib', 'proscenium', 'templates').to_s
+        ActionDispatch::DebugView::RESCUES_TEMPLATE_PATHS << tpl_path
+      end
     end
 
     initializer 'proscenium.middleware' do |app|
       app.middleware.insert_after ActionDispatch::Static, Middleware
-      # app.middleware.insert_after ActionDispatch::Static, Rack::ETag, 'no-cache'
-      # app.middleware.insert_after ActionDispatch::Static, Rack::ConditionalGet
+      app.middleware.insert_after ActionDispatch::Static, Rack::ETag, 'no-cache'
+      app.middleware.insert_after ActionDispatch::Static, Rack::ConditionalGet
     end
 
     initializer 'proscenium.monkey_patches' do
@@ -74,3 +76,14 @@ module Proscenium
     end
   end
 end
+
+if Rails.gem_version < Gem::Version.new('7.1.0')
+  class ActionDispatch::DebugView
+    def initialize(assigns)
+      tpl_path = Proscenium::Railtie.root.join('lib', 'proscenium', 'templates').to_s
+      paths = [RESCUES_TEMPLATE_PATH, tpl_path]
+      lookup_context = ActionView::LookupContext.new(paths)
+      super(lookup_context, assigns, nil)
+    end
+  end
+end

data/lib/proscenium/templates/rescues/build_error.html.erb

@@ -1,11 +1,14 @@
 <header>
   <h1>
-    <%= @exception.class.to_s %>
+    <%= Rails.gem_version >= Gem::Version.new('7.1.0') ? @exception_wrapper.exception_class_name : @exception.class.to_s %>
+    <% if params_valid? && @request.parameters['controller'] %>
+      in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %>
+    <% end %>
   </h1>
 </header>
 
 <main role="main" id="container">
-  <%= render "rescues/message_and_suggestions", exception: @exception %>
+  <%= render "rescues/message_and_suggestions", exception: @exception, exception_wrapper: Rails.gem_version >= Gem::Version.new('7.1.0') ? @exception_wrapper : nil %>
 
   <% if @exception.error['location'] %>
     <div class="source">

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.11.0.pre.12'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.12
+  version: 0.12.0
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,6 +111,7 @@ files:
 - lib/proscenium/middleware/url.rb
 - lib/proscenium/monkey.rb
 - lib/proscenium/phlex.rb
+- lib/proscenium/phlex/asset_inclusions.rb
 - lib/proscenium/phlex/css_modules.rb
 - lib/proscenium/phlex/react_component.rb
 - lib/proscenium/railtie.rb
@@ -144,11 +145,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: The engine powering your Rails frontend