isomorfeus-preact 22.9.0.rc2 → 22.9.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1941d58313b84f914e1a02af158c082f7db2ff2dc807326937b2278ada18fe26
-  data.tar.gz: c8201b7ee9f43842e5a08cafe1342444d351effc2e14607c8d40b809fee1db7d
+  metadata.gz: 3bba88069414d8ed45e76c087c9f6bb20006fdea62ac0b4769a7a0838d32a037
+  data.tar.gz: 9336d12827cea1fad40fdb178cfe8323758bb4fee4d88c767d7f2249a1e52e13
 SHA512:
-  metadata.gz: eaa0e1d7b8a55ddf4a2df7f1c84b042b5abe5d4be8eb88425fe58accebdea661d877dc7ad4c39d66419ade311951658b99670ba71d271bc5dd00f4f86a90250c
-  data.tar.gz: dc7ec144d1c841d1a95a23b45458bbda2f0ae1ca12e6f516a40024a526be72a5e7b50a18aa0c700808caea085c8399ae1d87e8e1f0c4536fa8ba065830f0ea93
+  metadata.gz: d05800ff4b025c00ea0db26a8e0d463eadcf5811fa95b088b0485f18b311c97c6bdc8483d8af8163404c8326de2a24083b11d9b89cf4692c9d35bb103f4133c3
+  data.tar.gz: f58cc4c176ead2e90b7ab0cdfc3af7080a55266b07fb128c796187ccb06b7000aa5be2fdb64d428fe3357d264ff987204616aaf8f368abe91319bc4efd0b7c1d

data/lib/browser/document.rb

@@ -28,11 +28,4 @@ module Browser
       end
     end
   end
-
-  module_function
-
-  # @return [Document] the browser's document object
-  def document
-    Document
-  end
-end
+end

data/lib/browser/element/canvas.rb

@@ -1,17 +1,17 @@
-module Browser
-  class Element
-    element :canvas do
-      def context(type='2d')
-        Context.new(`#@native.getContext(#{type})`)
-      end
-
-      class Context
-        include DelegateNative
-
-        def initialize native
-          @native = native
-        end
-      end
-    end
-  end
-end
+module Browser
+  class Element
+    element :canvas do
+      def context(type='2d')
+        Context.new(`#@native.getContext(#{type})`)
+      end
+
+      class Context
+        include DelegateNative
+
+        def initialize native
+          @native = native
+        end
+      end
+    end
+  end
+end

data/lib/browser/element/media.rb

@@ -1,78 +1,78 @@
-module Browser
-  class Element
-    element :video, :audio do
-      def buffered
-        TimeRanges.new(`#@native.buffered`)
-      end
-
-      def played
-        TimeRanges.new(`#@native.played`)
-      end
-
-      def seekable
-        TimeRanges.new(`#@native.seekable`)
-      end
-
-      def network_state
-        case `#@native.networkState`
-        when `HTMLMediaElement.NETWORK_EMPTY` then :no_data
-        when `HTMLMediaElement.NETWORK_IDLE` then :idle
-        when `HTMLMediaElement.NETWORK_LOADING` then :loading
-        when `HTMLMediaElement.NETWORK_NO_SOURCE` then :no_source
-        end
-      end
-    end
-
-    element :video do
-      def fullscreen
-        fullscreen = %w(
-          requestFullScreen
-          requestFullscreen
-          webkitRequestFullScreen
-          webkitRequestFullscreen
-          mozRequestFullScreen
-          msRequestFullscreen
-        ).find { |prop| `!!#@native[prop]` }
-
-        if fullscreen
-          `#@native[fullscreen]()`
-        else
-          warn "[#{self.class}] Cannot determine the method to full-screen a video"
-          super
-        end
-      end
-      alias request_fullscreen fullscreen
-    end
-
-    class TimeRanges
-      include Enumerable
-
-      def initialize native
-        @native = native
-      end
-
-      def to_n
-        @native
-      end
-
-      def each
-        `#@native.length`.times do |i|
-          yield TimeRange.new(`#@native.start(i)`, `#@native.end(i)`)
-        end
-
-        self
-      end
-    end
-
-    class TimeRange
-      attr_reader :start, :end
-
-      def initialize start, _end
-        @start = start
-        @end = _end
-      end
-
-      alias begin start
-    end
-  end
-end
+module Browser
+  class Element
+    element :video, :audio do
+      def buffered
+        TimeRanges.new(`#@native.buffered`)
+      end
+
+      def played
+        TimeRanges.new(`#@native.played`)
+      end
+
+      def seekable
+        TimeRanges.new(`#@native.seekable`)
+      end
+
+      def network_state
+        case `#@native.networkState`
+        when `HTMLMediaElement.NETWORK_EMPTY` then :no_data
+        when `HTMLMediaElement.NETWORK_IDLE` then :idle
+        when `HTMLMediaElement.NETWORK_LOADING` then :loading
+        when `HTMLMediaElement.NETWORK_NO_SOURCE` then :no_source
+        end
+      end
+    end
+
+    element :video do
+      def fullscreen
+        fullscreen = %w(
+          requestFullScreen
+          requestFullscreen
+          webkitRequestFullScreen
+          webkitRequestFullscreen
+          mozRequestFullScreen
+          msRequestFullscreen
+        ).find { |prop| `!!#@native[prop]` }
+
+        if fullscreen
+          `#@native[fullscreen]()`
+        else
+          warn "[#{self.class}] Cannot determine the method to full-screen a video"
+          super
+        end
+      end
+      alias request_fullscreen fullscreen
+    end
+
+    class TimeRanges
+      include Enumerable
+
+      def initialize native
+        @native = native
+      end
+
+      def to_n
+        @native
+      end
+
+      def each
+        `#@native.length`.times do |i|
+          yield TimeRange.new(`#@native.start(i)`, `#@native.end(i)`)
+        end
+
+        self
+      end
+    end
+
+    class TimeRange
+      attr_reader :start, :end
+
+      def initialize start, _end
+        @start = start
+        @end = _end
+      end
+
+      alias begin start
+    end
+  end
+end

data/lib/browser/element.rb

@@ -1,6 +1,5 @@
 module Browser
   autoload :FileList, 'browser/file_list'
-  autoload :Iterable, 'browser/iterable'
 
   # Wrap a native DOM element
   class Element

data/lib/browser/event_target.rb

@@ -1,39 +1,39 @@
-module Browser
-  module EventTarget
-    # Add the block as a handler for the specified event name. Will use either
-    # `addEventListener` or `addListener` if they exist.
-    #
-    # @param event_name [String] the name of the event
-    # @return [Proc] the block to pass to `off` to remove this handler
-    # @yieldparam event [Browser::Event] the event object
-    def on event_name, &block
-      wrapper = proc { |event| block.call Event.new(event) }
-
-      if `#@native.addEventListener !== undefined`
-        `#@native.addEventListener(event_name, wrapper)`
-      elsif `#@native.addListener !== undefined`
-        `#@native.addListener(event_name, wrapper)`
-      else
-        warn "[Browser] Not entirely sure how to add an event listener to #{self}"
-      end
-
-      wrapper
-    end
-
-    # Remove an event handler
-    #
-    # @param event_name [String] the name of the event
-    # @block the handler to remove, as returned from `on`
-    def off event_name, &block
-      if `#@native.removeEventListener !== undefined`
-        `#@native.removeEventListener(event_name, block)`
-      elsif `#@native.removeListener !== undefined`
-        `#@native.removeListener(event_name, block)`
-      else
-        warn "[Browser] Not entirely sure how to remove an event listener from #{self}"
-      end
-
-      nil
-    end
-  end
-end
+module Browser
+  module EventTarget
+    # Add the block as a handler for the specified event name. Will use either
+    # `addEventListener` or `addListener` if they exist.
+    #
+    # @param event_name [String] the name of the event
+    # @return [Proc] the block to pass to `off` to remove this handler
+    # @yieldparam event [Browser::Event] the event object
+    def on event_name, &block
+      wrapper = proc { |event| block.call Event.new(event) }
+
+      if `#@native.addEventListener !== undefined`
+        `#@native.addEventListener(event_name, wrapper)`
+      elsif `#@native.addListener !== undefined`
+        `#@native.addListener(event_name, wrapper)`
+      else
+        warn "[Browser] Not entirely sure how to add an event listener to #{self}"
+      end
+
+      wrapper
+    end
+
+    # Remove an event handler
+    #
+    # @param event_name [String] the name of the event
+    # @block the handler to remove, as returned from `on`
+    def off event_name, &block
+      if `#@native.removeEventListener !== undefined`
+        `#@native.removeEventListener(event_name, block)`
+      elsif `#@native.removeListener !== undefined`
+        `#@native.removeListener(event_name, block)`
+      else
+        warn "[Browser] Not entirely sure how to remove an event listener from #{self}"
+      end
+
+      nil
+    end
+  end
+end

data/lib/browser/file_list.rb

@@ -1,125 +1,125 @@
-module Browser
-  class FileList
-    include Enumerable
-
-    # @param native [JS] the native FileList object to wrap
-    def initialize native
-      @native = `#{native} || []`
-      @files = length.times.each_with_object([]) { |index, array|
-        array[index] = File.new(`#@native[index]`)
-      }
-    end
-
-    # @param index [Integer] the index of the file in the list
-    # @return [Browser::FileList::File] the file at the specified index
-    def [] index
-      @files[index]
-    end
-
-    # @return [Integer] the number of files in this list
-    def length
-      `#@native.length`
-    end
-    alias size length
-
-    # Call the given block for each file in the list
-    #
-    # @yieldparam file [Browser::FileList::File]
-    def each &block
-      @files.each do |file|
-        block.call file
-      end
-    end
-
-    # Convert this FileList into an array
-    def to_a
-      @files.dup # Don't return a value that can mutate our internal state
-    end
-    alias to_ary to_a
-
-    # @return [String] a string representation of this FileList
-    def to_s
-      @files.to_s
-    end
-
-    # An individual item in a FileList
-    class File
-      attr_reader :data
-
-      # @param native [JS] the native File object to wrap
-      def initialize native
-        @native = native
-        @data = nil
-      end
-
-      # @return [String] the filename
-      def name
-        `#@native.name`
-      end
-
-      # @return [Integer] the size of this file on disk
-      def size
-        `#@native.size`
-      end
-
-      # @return [String] the MIME type of the file, detected by the browser
-      def type
-        `#@native.type`
-      end
-
-      # @return [Time] the timestamp of the file
-      def last_modified
-        `#@native.lastModifiedDate`
-      end
-
-      # Read the file from disk into memory
-      #
-      # @return [Promise] a promise that resolves when finished loading and
-      #   rejects if an error occurs while loading.
-      def read
-        promise = Promise.new
-        reader = FileReader.new
-        reader.on :load do
-          result = reader.result
-
-          @data = result
-          promise.resolve result
-        end
-
-        reader.on :error do
-          promise.reject reader.result
-        end
-
-        reader.read_as_binary_string self
-
-        promise
-      end
-
-      # Convert to the native object
-      #
-      # @return [JS.HTMLElement] the underlying native element
-      def to_n
-        @native
-      end
-
-      # The object that reads the file from disk.
-      #
-      # @api private
-      class FileReader
-        include EventTarget
-
-        def initialize
-          @native = `new FileReader()`
-        end
-
-        def result
-          `#@native.result`
-        end
-
-        def read_as_binary_string file
-          `#@native.readAsBinaryString(#{file.to_n})`
-        end
-      end
-    end
-  end
-end
+module Browser
+  class FileList
+    include Enumerable
+
+    # @param native [JS] the native FileList object to wrap
+    def initialize native
+      @native = `#{native} || []`
+      @files = length.times.each_with_object([]) { |index, array|
+        array[index] = File.new(`#@native[index]`)
+      }
+    end
+
+    # @param index [Integer] the index of the file in the list
+    # @return [Browser::FileList::File] the file at the specified index
+    def [] index
+      @files[index]
+    end
+
+    # @return [Integer] the number of files in this list
+    def length
+      `#@native.length`
+    end
+    alias size length
+
+    # Call the given block for each file in the list
+    #
+    # @yieldparam file [Browser::FileList::File]
+    def each &block
+      @files.each do |file|
+        block.call file
+      end
+    end
+
+    # Convert this FileList into an array
+    def to_a
+      @files.dup # Don't return a value that can mutate our internal state
+    end
+    alias to_ary to_a
+
+    # @return [String] a string representation of this FileList
+    def to_s
+      @files.to_s
+    end
+
+    # An individual item in a FileList
+    class File
+      attr_reader :data
+
+      # @param native [JS] the native File object to wrap
+      def initialize native
+        @native = native
+        @data = nil
+      end
+
+      # @return [String] the filename
+      def name
+        `#@native.name`
+      end
+
+      # @return [Integer] the size of this file on disk
+      def size
+        `#@native.size`
+      end
+
+      # @return [String] the MIME type of the file, detected by the browser
+      def type
+        `#@native.type`
+      end
+
+      # @return [Time] the timestamp of the file
+      def last_modified
+        `#@native.lastModifiedDate`
+      end
+
+      # Read the file from disk into memory
+      #
+      # @return [Promise] a promise that resolves when finished loading and
+      #   rejects if an error occurs while loading.
+      def read
+        promise = Promise.new
+        reader = FileReader.new
+        reader.on :load do
+          result = reader.result
+
+          @data = result
+          promise.resolve result
+        end
+
+        reader.on :error do
+          promise.reject reader.result
+        end
+
+        reader.read_as_binary_string self
+
+        promise
+      end
+
+      # Convert to the native object
+      #
+      # @return [JS.HTMLElement] the underlying native element
+      def to_n
+        @native
+      end
+
+      # The object that reads the file from disk.
+      #
+      # @api private
+      class FileReader
+        include EventTarget
+
+        def initialize
+          @native = `new FileReader()`
+        end
+
+        def result
+          `#@native.result`
+        end
+
+        def read_as_binary_string file
+          `#@native.readAsBinaryString(#{file.to_n})`
+        end
+      end
+    end
+  end
+end

data/lib/browser/location.rb

@@ -56,4 +56,4 @@ module Browser
       end
     end
   end
-end
+end

data/lib/browser/window.rb

@@ -48,11 +48,4 @@ module Browser
       `window.scrollTo(x, y)`
     end
   end
-
-  module_function
-
-  # return [Window] the browser's Window object
-  def window
-    Window
-  end
 end

data/lib/isomorfeus/preact/config.rb

@@ -41,7 +41,6 @@ module Isomorfeus
   else # RUBY_ENGINE
     class << self
       attr_reader :component_cache_init_block
-      attr_accessor :server_side_rendering
       attr_accessor :ssr_hot_asset_url
 
       def ssr_response_status

data/lib/isomorfeus/preact/ssr.rb

@@ -1,11 +1,6 @@
 module Isomorfeus
   class PreactSSR
-    def self.mount_component(component_name, props, session_id, location, locale = nil)
-      rendered_tree = new(component_name, props, session_id, location, locale).render
-      [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
-    end
-
-    def initialize(component_name, props, session_id, location, locale = nil)
+    def initialize(component_name, props, session_id, location, locale)
       @session_id = session_id
       @component_name = component_name
       @props = props
@@ -13,12 +8,14 @@ module Isomorfeus
       @locale = locale
     end
 
-    def render
+    def render(skip_ssr)
       Isomorfeus.browser_location = Browser::Location.new(@location)
       Isomorfeus.current_locale = @locale
       NanoCSS.instance = NanoCSS.new(given_renderer: NanoCSS.global_instance.renderer.deep_dup)
       Isomorfeus.init_store
       Isomorfeus.store.clear!
+      Isomorfeus.store.dispatch(type: 'I18N_MERGE', data: { locale: @locale, domain: Isomorfeus.i18n_domain })
+      return '' if skip_ssr
       c = Isomorfeus.current_user
       if c.respond_to?(:reload)
         Thread.current[:isomorfeus_user] = LocalSystem.new
@@ -28,7 +25,13 @@ module Isomorfeus
           Thread.current[:isomorfeus_user] = c
         end
       end
-      Isomorfeus::TopLevel.render_component_to_string(@component_name, @props)
+      render_component_to_string(@component_name, @props)
+    end
+
+    def render_component_to_string(component_name, props)
+      component = component_name.is_a?(String) ? self.class.const_get(component_name) : component_name
+      ::Preact._vnode_id = 0
+      ::Preact.render_to_string(::Preact.create_element(component, props))
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '22.9.0.rc2'
+    VERSION = '22.9.0.rc4'
   end
 end

data/lib/isomorfeus/preact/view_helper.rb

@@ -4,46 +4,38 @@ module Preact
       base.include Isomorfeus::AssetManager::ViewHelper
     end
 
-    def cached_mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false, refresh: false)
+    def cached_mount_component(component_name, props = {}, skip_ssr: false, refresh: false)
       key = "#{Isomorfeus.current_user}#{component_name}#{props}"
       if !Isomorfeus.development? && !refresh
         render_result, @_ssr_styles, status = component_cache.fetch(key)
         Isomorfeus.ssr_response_status = status
         return render_result if render_result
       end
-      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr, use_ssr: use_ssr)
+      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr)
       status = ssr_response_status
       component_cache.store(key, render_result, ssr_styles, status) if status >= 200 && status < 300
       render_result
     end
 
-    def mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false)
+    def mount_component(component_name, props = {}, skip_ssr: false)
       ssr_start_time = Time.now if Isomorfeus.development?
       @ssr_styles = nil
+      locale = props.delete(:locale)
       render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
-      if !skip_ssr && (Isomorfeus.server_side_rendering || use_ssr)
-        location_host = props[:location_host] ? props[:location_host] : 'localhost'
-        location = "#{props[:location_scheme] || 'http:'}//#{location_host}#{props[:location]}"
+      location_host = props[:location_host] ? props[:location_host] : 'localhost'
+      location = "#{props[:location_scheme] || 'http:'}//#{location_host}#{props[:location]}"
 
-        rendered_tree, application_state, @_ssr_styles = Isomorfeus::PreactSSR.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, props[:locale])
+      rendered_tree, application_state, @_ssr_styles = Isomorfeus::TopLevel.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, locale, skip_ssr)
 
-        render_result << " data-iso-hydrated='true'" if rendered_tree
-        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
-          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
-        end
-        render_result << " data-iso-nloc='#{props[:locale]}'>"
-        render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
-      else
-        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
-          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
-        end
-        render_result << " data-iso-nloc='#{props[:locale]}'>"
+      render_result << " data-iso-hydrated='true'" unless skip_ssr
+      if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+        render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
       end
+      render_result << '>'
+      render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
       render_result << '</div>'
-      if Isomorfeus.server_side_rendering && !skip_ssr
-        render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
-        puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
-      end
+      render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
+      puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
       render_result
     end
 

data/lib/isomorfeus/top_level.rb

@@ -117,10 +117,9 @@ module Isomorfeus
           Isomorfeus.top_component = top
         end
       else
-        def render_component_to_string(component_name, props)
-          component = component_name.is_a?(String) ? const_get(component_name) : component_name
-          ::Preact._vnode_id = 0
-          ::Preact.render_to_string(::Preact.create_element(component, props))
+        def mount_component(component, props, session_id, location, locale, skip_ssr = false)
+          rendered_tree = Isomorfeus::PreactSSR.new(component, props, session_id, location, locale).render(skip_ssr)
+          [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
         end
       end
     end

data/lib/isomorfeus-preact.rb

@@ -81,7 +81,6 @@ else
     Isomorfeus.ssr_hot_asset_url = 'http://localhost:3036/assets/'
   end
 
-  Isomorfeus.server_side_rendering = true
   NanoCSS.instance = NanoCSS.new(nil)
 
   # cache

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc2
+  version: 22.9.0.rc4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc2
+        version: 22.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,6 @@ files:
 - lib/browser/event_target.rb
 - lib/browser/file_list.rb
 - lib/browser/history.rb
-- lib/browser/iterable.rb
 - lib/browser/location.rb
 - lib/browser/window.rb
 - lib/data_uri.rb

data/lib/browser/iterable.rb

@@ -1,15 +0,0 @@
-module Browser
-  class Iterable
-    include Enumerable
-
-    def initialize js_iterable
-      @js_iterable = js_iterable
-    end
-
-    def each
-      `#@js_iterable.length`.times do |i|
-        yield `#@js_iterable[i]`
-      end
-    end
-  end
-end