proscenium 0.11.0.pre.6-arm64-darwin → 0.11.0.pre.7-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e16c640f7e3f07a1a29698ba0da0788bc05b7da96f77b2dcb052c79cae0c2f6
-  data.tar.gz: cb366a06cd0bed0d24eb846a882a320aca309b3cddf3829678e42b1e80d78f9a
+  metadata.gz: 6d2a8d1e6399504416c64f479d6a8f64a0709ea3de1709f4ac0f810a17f01bfe
+  data.tar.gz: f9b8d09284eedcb5d641e7953f8d0cddb1dae44f861bb1a5c613ad036d956cc4
 SHA512:
-  metadata.gz: 5fe0935ec4a1231e8bc85d2b5598b32f0276bd9bfe15fe027bc0481996eb1e43f3bff6915186f5b1af866562b037add10c671a871e0f3bc22e7bb389645473a6
-  data.tar.gz: dc36da2d9821fcd0590baa0c75e1ea2c0c24cf0c687581ab8f4e954e840f970310de303ce8edd0e2aa9848c0eb26ac9b61fbc73993bee2967cb1c1d48dfdac66
+  metadata.gz: 740af4c4b5b17492e44048ed5d9de7286b8a44f991c226ebb8d6b2b1245561747ba87a29ba6283366893a45457c26ad54a140e7ca462949720fc49226e728ca5
+  data.tar.gz: dce0e163a53a6cafe296cfcceeca3586cb81680de8eb80b0bd1608524759cc7ae5e1a4f5520ab672605ff6f563b223fe7f2ef2be21335bf06917f4c3fa3fa773

data/README.md

@@ -757,19 +757,18 @@ Rails.application.config.proscenium.cache_max_age = 12.months.to_i
 
 Proscenium brings back RJS! Any path ending in .rjs will be served from your Rails app. This allows you to import server rendered javascript.
 
-## Serving from Ruby Gem
-
-*docs needed*
 
 ## Included Paths
 
-By default, Proscenium will serve files ending with any of these extension: `js,mjs,ts,css,jsx,tsx`, and only from `app/assets`, `config`, `app/views`, `lib` and `node_modules` directories.
+Proscenium will serve files ending with any of these extension: `js,mjs,ts,css,jsx,tsx` from the following directories, and their sub-directories: `/app`, `/lib`, `/config`, `/node_modules`, `/vendor`.
 
-However, you can customise these paths with the `include_path` config option...
+So a file at `/app/views/users/index.js` will be served from `https://yourapp.com/app/views/users/index.js`.
 
-```ruby
-Rails.application.config.proscenium.include_paths << 'app/components'
-```
+You can continue to access any file in the `/public` directory as you normally would, but any file ending with a supported extension (`js,mjs,ts,css,jsx,tsx`) will be processed by Proscenium. For example, `/public/some/file.js` will be served from `https://yourapp.com/some/file.js`.
+
+## Serving from Ruby Gems and Rails Engines
+
+Proscenium can serve assets from Ruby Gems and Rails Engines.
 
 ## Thanks
 

data/lib/proscenium/helper.rb

@@ -35,7 +35,14 @@ module Proscenium
     alias side_load_stylesheets include_stylesheets
     deprecate side_load_stylesheets: 'Use `include_stylesheets` instead', deprecator: Deprecator.new
 
-    def include_javascripts(**options) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # Includes all javascripts that have been imported and side loaded.
+    #
+    # @param extract_lazy_scripts [Boolean] if true, any lazy scripts will be extracted using
+    #   `content_for` to `:proscenium_lazy_scripts` for later use. Be sure to include this in your
+    #   page with the `declare_lazy_scripts` helper, or simply
+    #   `content_for :proscenium_lazy_scripts`.
+    # @return [String] the HTML tags for the javascripts.
+    def include_javascripts(extract_lazy_scripts: false, **options) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       out = []
 
       if Rails.application.config.proscenium.code_splitting && Importer.multiple_js_imported?
@@ -66,9 +73,15 @@ module Proscenium
           end
         end
 
-        out << javascript_tag("window.prosceniumLazyScripts = #{scripts.to_json}")
+        if extract_lazy_scripts
+          content_for :proscenium_lazy_scripts do
+            javascript_tag "window.prosceniumLazyScripts = #{scripts.to_json}"
+          end
+        else
+          out << javascript_tag("window.prosceniumLazyScripts = #{scripts.to_json}")
+        end
       else
-        Importer.each_javascript(delete: true) do |path, _path_options|
+        Importer.each_javascript(delete: true) do |path, _|
           out << javascript_include_tag(path, extname: false, **options)
         end
       end
@@ -77,5 +90,9 @@ module Proscenium
     end
     alias side_load_javascripts include_javascripts
     deprecate side_load_javascripts: 'Use `include_javascripts` instead', deprecator: Deprecator.new
+
+    def declare_lazy_scripts
+      content_for :proscenium_lazy_scripts
+    end
   end
 end

data/lib/proscenium/middleware.rb

@@ -43,12 +43,11 @@ module Proscenium
       return Url if request.path.match?(%r{^/https?%3A%2F%2F})
       return Runtime if request.path.match?(%r{^/@proscenium/})
 
-      Esbuild if Pathname.new(request.path).fnmatch?(path_glob, File::FNM_EXTGLOB)
+      Esbuild if Pathname.new(request.path).fnmatch?(app_path_glob, File::FNM_EXTGLOB)
     end
 
-    def path_glob
-      paths = Rails.application.config.proscenium.include_paths.join(',')
-      "/{#{paths}}/**.{#{FILE_EXTENSIONS.join(',')}}"
+    def app_path_glob
+      "/{#{Proscenium::ALLOWED_DIRECTORIES.join(',')}}/**.{#{FILE_EXTENSIONS.join(',')}}"
     end
 
     # TODO: handle precompiled assets

data/lib/proscenium/phlex.rb

@@ -20,6 +20,7 @@ module Proscenium
     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

data/lib/proscenium/railtie.rb

@@ -19,7 +19,6 @@ module Proscenium
     config.proscenium.debug = false
     config.proscenium.side_load = true
     config.proscenium.code_splitting = true
-    config.proscenium.include_paths = Set.new(APPLICATION_INCLUDE_PATHS)
 
     # TODO: implement!
     config.proscenium.cache_query_string = Rails.env.production? && ENV.fetch('REVISION', nil)
@@ -48,11 +47,6 @@ module Proscenium
     #   }
     config.proscenium.side_load_gems = {}
 
-    initializer 'proscenium.configuration' do |app|
-      options = app.config.proscenium
-      options.include_paths = Set.new(APPLICATION_INCLUDE_PATHS) if options.include_paths.blank?
-    end
-
     initializer 'proscenium.middleware' do |app|
       app.middleware.insert_after ActionDispatch::Static, Middleware
       app.middleware.insert_after ActionDispatch::Static, Rack::ETag, 'no-cache'

data/lib/proscenium/version.rb

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

data/lib/proscenium.rb

@@ -8,8 +8,7 @@ module Proscenium
   FILE_EXTENSIONS = ['js', 'mjs', 'ts', 'jsx', 'tsx', 'css', 'js.map', 'mjs.map', 'jsx.map',
                      'ts.map', 'tsx.map', 'css.map'].freeze
 
-  APPLICATION_INCLUDE_PATHS = ['config', 'app/assets', 'app/views', 'app/components', 'lib',
-                               'node_modules'].freeze
+  ALLOWED_DIRECTORIES = %w[app lib config vendor node_modules].freeze
 
   # Environment variables that should always be passed to the builder.
   DEFAULT_ENV_VARS = Set['RAILS_ENV', 'NODE_ENV'].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.11.0.pre.6
+  version: 0.11.0.pre.7
 platform: arm64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport