ruby2js 4.0.5 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6728e4201e77b477a9203551b57de3f23b36077f6012061233d4b072d92886b9
-  data.tar.gz: 7d5e6ef7aa5b9add1477b3cc642cc55714a657f7f962dbb6dd7af6688d45cfb0
+  metadata.gz: 46b6cba0b33ebf62cb966def9b680eda35f5e84ff0c3adaea058fc2aae242269
+  data.tar.gz: 6c5843992eccd24e8460b16f805eab16701d70d85e8ef4dcaffee948243666c0
 SHA512:
-  metadata.gz: 321dc88308946ff626914ceb87fa93f93bec4f5cde0b660cab75d7df46b52f9ca63da830e7fab4f070b989586ef468b3cdf9d8f682f64b44ee06fef9df5230f7
-  data.tar.gz: 22f5161f0bc03c294fbfd3f32be407030fea293985e1eff4c7d0fc464bd57aaa6a3cfc70e1bf9ed13e9bbb0dbbac9f394b860e76df52ae236b494accd86c840b
+  metadata.gz: 6910f39474f2c22c321b91ad742ab10f7fff08bc5408e53f9b4d0cdee4f4fead414519a1b31bf7e6f781dc31da71fbda55bc747132c0d78e8eeb62a8693ca419
+  data.tar.gz: 07b1ddbff32682c2ea3fa65570e40f97907eea4765d00ea4b7921bca5156f83f8f855178ab13ed3fc70b9edb8035fc801cdb4031c6f8176e044699099ac7dccd

data/lib/ruby2js/converter/class.rb

@@ -36,7 +36,8 @@ module Ruby2JS
         end
 
         if inheritance
-          init = s(:def, :initialize, s(:args), s(:super))
+          parent = @namespace.find(inheritance)&.[](:constructor)
+          init = s(:def, :initialize, parent || s(:args), s(:zsuper))
         else
           init = s(:def, :initialize, s(:args), nil)
         end
@@ -58,7 +59,7 @@ module Ruby2JS
           m = m.updated(:def, m.children[1..-1])
         end
 
-        node = if m.type == :def
+        node = if m.type == :def or m.type == :defm
           if m.children.first == :initialize and !visible[:initialize]
             # constructor: remove from body and overwrite init function
             init = m
@@ -313,7 +314,7 @@ module Ruby2JS
       # prepend constructor
       if init
         constructor = init.updated(:constructor, [name, *init.children[1..-1]])
-        @comments[constructor] = @comments[init] unless @comments[init].empty?
+        visible[:constructor] = init.children[1]
 
         if @ast.type == :class_extend or extend
           if es2015
@@ -329,6 +330,7 @@ module Ruby2JS
           end
         end
 
+        @comments[constructor] = @comments[init] unless @comments[init].empty?
         body.unshift constructor
       end
 
@@ -349,7 +351,7 @@ module Ruby2JS
         self.ivars = ivars
         @class_name = class_name
         @class_parent = class_parent
-        @rbstack.pop
+        @namespace.defineProps @rbstack.pop
         @namespace.leave unless @ast.type == :class_module
       end
     end

data/lib/ruby2js/converter/class2.rb

@@ -99,7 +99,6 @@ module Ruby2JS
           end
           walk[@ast]
 
-          # process leading initializers in constructor
           while constructor.length == 1 and constructor.first.type == :begin
             constructor = constructor.first.children.dup
           end
@@ -116,6 +115,7 @@ module Ruby2JS
             put 'static #$' + cvar.to_s[2..-1]
           end
 
+          # process leading initializers in constructor
           while constructor.length > 0 and constructor.first.type == :ivasgn
             put(index == 0 ? @nl : @sep)
             index += 1

data/lib/ruby2js/filter/functions.rb

@@ -227,14 +227,19 @@ module Ruby2JS
           if before.type == :regexp
             before = before.updated(:regexp, [*before.children[0...-1],
               s(:regopt, :g, *before.children.last)])
-          elsif before.type == :str
+          elsif before.type == :str and not es2021
             before = before.updated(:regexp,
               [s(:str, Regexp.escape(before.children.first)), s(:regopt, :g)])
           end
           if after.type == :str
             after = s(:str, after.children.first.gsub(/\\(\d)/, "$\\1"))
           end
-          process node.updated nil, [target, :replace, before, after]
+
+          if es2021
+            process node.updated nil, [target, :replaceAll, before, after]
+          else
+            process node.updated nil, [target, :replace, before, after]
+          end
 
         elsif method == :ord and args.length == 0
           if target.type == :str
@@ -767,10 +772,10 @@ module Ruby2JS
             body.any? {|statement| statement.type == :def and
             statement.children.first == :initialize}
           then
-            body.unshift S(:def, :initialize, s(:args, s(:arg, :message)),
-              s(:begin, S(:send, s(:self), :message=, s(:lvar, :message)),
-              S(:send, s(:self), :name=, s(:sym, name.children[1])),
-              S(:send, s(:self), :stack=, s(:send, s(:send, nil, :Error,
+            body.unshift s(:def, :initialize, s(:args, s(:arg, :message)),
+              s(:begin, s(:send, s(:self), :message=, s(:lvar, :message)),
+              s(:send, s(:self), :name=, s(:sym, name.children[1])),
+              s(:send, s(:self), :stack=, s(:attr, s(:send, nil, :Error,
               s(:lvar, :message)), :stack))))
           end
 

data/lib/ruby2js/filter/react.rb

@@ -27,7 +27,11 @@ module Ruby2JS
 
       REACT_IMPORTS = {
         React: s(:import, ['react'], s(:attr, nil, :React)),
-        ReactDOM: s(:import, ['react-dom'], s(:attr, nil, :ReactDOM))
+        ReactDOM: s(:import, ['react-dom'], s(:attr, nil, :ReactDOM)),
+        Preact: s(:import,
+          [s(:pair, s(:sym, :as), s(:const, nil, :Preact)),
+            s(:pair, s(:sym, :from), s(:str, "preact"))],
+            s(:str, '*'))
       }
 
       # the following command can be used to generate ReactAttrs:
@@ -75,7 +79,12 @@ module Ruby2JS
 
       ReactAttrMap = Hash[ReactAttrs.map {|name| [name.downcase, name]}]
       ReactAttrMap['for'] = 'htmlFor'
-      ReactFragment = :'_React.Fragment'
+
+      PreactAttrMap = {
+        htmlFor: 'for',
+        onDoubleClick: 'onDblClick',
+        tabIndex: 'tabindex'
+      }
 
       def initialize(*args)
         @react = nil
@@ -118,12 +127,23 @@ module Ruby2JS
       def on_class(node)
         cname, inheritance, *body = node.children
         return super unless cname.children.first == nil
-        return super unless inheritance == s(:const, nil, :React) or
-          inheritance == s(:const, nil, :Vue) or
+
+        if inheritance == s(:const, nil, :React) or
           inheritance == s(:const, s(:const, nil, :React), :Component) or
           inheritance == s(:send, s(:const, nil, :React), :Component)
 
-        prepend_list << REACT_IMPORTS[:React] if modules_enabled?
+          react = :React
+          prepend_list << REACT_IMPORTS[:React] if modules_enabled?
+
+        elsif inheritance == s(:const, nil, :Preact) or
+          inheritance == s(:const, s(:const, nil, :Preact), :Component) or
+          inheritance == s(:send, s(:const, nil, :Preact), :Component)
+
+          react = :Preact
+          prepend_list << REACT_IMPORTS[:Preact] if modules_enabled?
+        else
+          return super
+        end
 
         # traverse down to actual list of class statements
         if body.length == 1
@@ -141,12 +161,14 @@ module Ruby2JS
         end
 
         begin
-          react, @react = @react, true
+          react, @react = @react, react
           reactClass, @reactClass = @reactClass, true
 
           pairs = []
 
-          unless es2015
+          createClass = (@react == :React and not es2015)
+
+          if createClass
             # automatically capture the displayName for the class
             pairs << s(:pair, s(:sym, :displayName),
               s(:str, cname.children.last.to_s))
@@ -156,9 +178,8 @@ module Ruby2JS
           statics = []
           body.select {|child| child.type == :defs}.each do |child|
             _parent, mname, args, *block = child.children
-            if es2015
-              block = [s(:autoreturn, *block)] unless child.is_method?
-              pairs << s(:defs, s(:self), mname, args, *block)
+            if not createClass
+              pairs << child
             elsif child.is_method?
               statics << s(:pair, s(:sym, mname), process(child.updated(:block,
                 [s(:send, nil, :proc), args, s(:autoreturn, *block)])))
@@ -212,7 +233,7 @@ module Ruby2JS
               scan_events[node.children]
             end
           end
-          scan_events[body] unless es2015
+          scan_events[body] if createClass
 
           # append statics (if any)
           unless statics.empty?
@@ -230,7 +251,7 @@ module Ruby2JS
           then
             @reactIvars = {pre: [], post: [], asgn: [], ref: [], cond: []}
             react_walk(node)
-            if not es2015 and not @reactIvars.values.flatten.empty?
+            if createClass and not @reactIvars.values.flatten.empty?
               body = [s(:def, :getInitialState, s(:args),
                 s(:return, s(:hash))), *body]
             elsif not needs_binding.empty? or not @reactIvars.values.flatten.empty?
@@ -251,7 +272,7 @@ module Ruby2JS
               (@reactIvars[:pre] + @reactIvars[:post]).uniq
 
             if mname == :initialize
-              mname = es2015 ? :initialize : :getInitialState
+              mname = createClass ? :getInitialState : :initialize 
 
               # extract real list of statements
               if block.length == 1
@@ -333,7 +354,7 @@ module Ruby2JS
                 else
                   # wrap multi-line blocks with a React Fragment
                   block = [s(:return,
-                    s(:block, s(:send, nil, ReactFragment), s(:args), *block))]
+                    s(:block, s(:send, nil, :"_#{@react}.Fragment"), s(:args), *block))]
                 end
               end
 
@@ -359,14 +380,14 @@ module Ruby2JS
               type = :begin if block.first.type == :return
             end
 
-            if es2015
+            if createClass
+              pairs << s(:pair, s(:sym, mname), child.updated(:block,
+                [s(:send, nil, :proc), args, process(s(type, *block))]))
+            else
               pairs << child.updated(
                 ReactLifecycle.include?(mname.to_s) ? :defm : :def, 
                 [mname, args, process(s(type, *block))]
               )
-            else
-              pairs << s(:pair, s(:sym, mname), child.updated(:block,
-                [s(:send, nil, :proc), args, process(s(type, *block))]))
             end
 
             # retain comment
@@ -374,38 +395,24 @@ module Ruby2JS
               @comments[pairs.last] = @comments[child]
             end
           end
+
+          if createClass
+            # emit a createClass statement
+            node.updated(:casgn, [nil, cname.children.last,
+              s(:send, s(:const, nil, :React), :createClass, s(:hash, *pairs))])
+          else
+            # emit a class that extends React.Component
+            node.updated(:class, [s(:const, nil, cname.children.last),
+              s(:attr, s(:const, nil, @react), :Component), *pairs])
+          end
         ensure
           @react = react
           @reactClass = reactClass
           @reactMethod = nil
         end
-
-        if es2015
-          # emit a class that extends React.Component
-          node.updated(:class, [s(:const, nil, cname.children.last),
-            s(:attr, s(:const, nil, :React), :Component), *pairs]) 
-        else
-          # emit a createClass statement
-          node.updated(:casgn, [nil, cname.children.last,
-            s(:send, s(:const, nil, :React), :createClass, s(:hash, *pairs))])
-        end
       end
 
       def on_send(node)
-        # convert Vue.utile.defineReactive to class fields or assignments
-        if node.children.first == s(:send, s(:const, nil, :Vue), :util)
-          if node.children[1] == :defineReactive
-            if node.children[2].type == :cvar
-              return process s(:cvasgn, node.children[2].children.first,
-                node.children[3])
-            elsif node.children[2].type == :send
-              assign = node.children[2]
-              return assign.updated(nil, [assign.children[0],
-                assign.children[1].to_s + '=', node.children[3]])
-            end
-          end
-        end
-
         # calls to methods (including getters) defined in this class
         if node.children[0]==nil and Symbol === node.children[1]
           if node.is_method?
@@ -423,16 +430,12 @@ module Ruby2JS
           end
         end
 
-        if node.children.first == s(:const, nil, :Vue)
-          node = node.updated(nil, [s(:const, nil, :React),
-            *node.children[1..-1]])
-        end
-
         if not @react
           # enable React filtering within React class method calls or
           # React component calls
           if \
             node.children.first == s(:const, nil, :React) or
+            node.children.first == s(:const, nil, :Preact) or
             node.children.first == s(:const, nil, :ReactDOM)
           then
             if modules_enabled?
@@ -440,7 +443,8 @@ module Ruby2JS
             end
 
             begin
-              react, @react = @react, true
+              react = @react
+              @react = (node.children.first.children.last == :Preact ? :Preact : :React)
               return on_send(node)
             ensure
               @react = react
@@ -461,13 +465,26 @@ module Ruby2JS
           end
 
         elsif \
-          @reactApply and node.children[1] == :createElement and
-          node.children[0] == s(:const, nil, :React)
+          (@reactApply and node.children[1] == :createElement and
+          node.children[0] == s(:const, nil, :React)) or
+          (@reactApply and node.children[1] == :h and
+          node.children[0] == s(:const, nil, :Preact))
         then
           # push results of explicit calls to React.createElement
           s(:send, s(:gvar, :$_), :push, s(:send, *node.children[0..1],
             *process_all(node.children[2..-1])))
 
+        elsif \
+          @react == :Preact and node.children[1] == :h and node.children[0] == nil
+        then
+          if @reactApply
+            # push results of explicit calls to Preact.h
+            s(:send, s(:gvar, :$_), :push, s(:send, s(:const, nil, :Preact), :h,
+              *process_all(node.children[2..-1])))
+          else
+            node.updated(nil, [s(:const, nil, :Preact), :h, *process_all(node.children[2..-1])])
+          end
+
         elsif !@jsx and node.children[0] == nil and node.children[1] =~ /^_\w/
           # map method calls starting with an underscore to React calls
           # to create an element.
@@ -549,7 +566,12 @@ module Ruby2JS
             else
               value = s(:str, values.join(' '))
             end
-            pairs.unshift s(:pair, s(:sym, :className), value)
+
+            if @react == :Preact
+              pairs.unshift s(:pair, s(:sym, :class), value)
+            else
+              pairs.unshift s(:pair, s(:sym, :className), value)
+            end
           end
 
           # support controlled form components
@@ -559,13 +581,28 @@ module Ruby2JS
               ['value', :value].include? pair.children.first.children.first
             end
 
-            # search for the presence of a 'onChange' attribute
+            event = (@react == :Preact ? :onInput : :onChange)
+
+
+            # search for the presence of a onInput/onChange attribute
             onChange = pairs.find_index do |pair|
-              ['onChange', :onChange].include? pair.children.first.children[0]
+              pair.children.first.children[0].to_s == event.to_s
+            end
+
+            if event == :onInput and not onChange
+              # search for the presence of a 'onChange' attribute
+              onChange = pairs.find_index do |pair|
+                pair.children.first.children[0].to_s == 'onChange'
+              end
+
+              if onChange
+                pairs[onChange] = s(:pair, s(:sym, event),
+                  pairs[onChange].children.last)
+              end
             end
 
             if value and pairs[value].children.last.type == :ivar and !onChange
-              pairs << s(:pair, s(:sym, :onChange),
+              pairs << s(:pair, s(:sym, event),
                 s(:block, s(:send, nil, :proc), s(:args, s(:arg, :event)),
                 s(:ivasgn, pairs[value].children.last.children.first,
                 s(:attr, s(:attr, s(:lvar, :event), :target), :value))))
@@ -578,7 +615,7 @@ module Ruby2JS
               end
 
               if checked and pairs[checked].children.last.type == :ivar
-                pairs << s(:pair, s(:sym, :onChange),
+                pairs << s(:pair, s(:sym, event),
                   s(:block, s(:send, nil, :proc), s(:args),
                   s(:ivasgn, pairs[checked].children.last.children.first,
                   s(:send, pairs[checked].children.last, :!))))
@@ -586,13 +623,25 @@ module Ruby2JS
             end
           end
 
-          # replace attribute names with case-sensitive javascript properties
-          pairs.each_with_index do |pair, index|
-            next if pair.type == :kwsplat
-            name = pair.children.first.children.first.downcase
-            if ReactAttrMap[name] and name.to_s != ReactAttrMap[name]
-              pairs[index] = pairs[index].updated(nil, 
-                [s(:str, ReactAttrMap[name]), pairs[index].children.last])
+          if @react == :Preact
+            # replace selected Reactisms with native HTML
+            pairs.each_with_index do |pair, index|
+              next if pair.type == :kwsplat
+              name = pair.children.first.children.first.to_sym
+              if PreactAttrMap[name]
+                pairs[index] = pairs[index].updated(nil, 
+                  [s(:str, PreactAttrMap[name]), pairs[index].children.last])
+              end
+            end
+          else
+            # replace attribute names with case-sensitive javascript properties
+            pairs.each_with_index do |pair, index|
+              next if pair.type == :kwsplat
+              name = pair.children.first.children.first.downcase
+              if ReactAttrMap[name] and name.to_s != ReactAttrMap[name]
+                pairs[index] = pairs[index].updated(nil, 
+                  [s(:str, ReactAttrMap[name]), pairs[index].children.last])
+              end
             end
           end
 
@@ -654,8 +703,14 @@ module Ruby2JS
               # explicit call to React.createElement
               next true if arg.children[1] == :createElement and
                 arg.children[0] == s(:const, nil, :React)
-              next true if arg.children[1] == :createElement and
-                arg.children[0] == s(:const, nil, :Vue)
+
+              # explicit call to Preact.h
+              next true if arg.children[1] == :h and
+                arg.children[0] == s(:const, nil, :Preact)
+
+              # explicit call to h
+              next true if arg.children[1] == :h and
+                arg.children[0] == nil
 
               # JSX
               next true if arg.type == :xstr
@@ -717,8 +772,13 @@ module Ruby2JS
           params.pop if params.last == s(:nil)
 
           # construct element using params
-          element = node.updated(:send, [s(:const, nil, :React),
-            :createElement, *params])
+          if @react == :Preact
+            element = node.updated(:send, [s(:const, nil, :Preact),
+              :h, *params])
+          else
+            element = node.updated(:send, [s(:const, nil, :React),
+              :createElement, *params])
+          end
 
           if @reactApply
             # if apply is set, emit code that pushes result
@@ -846,8 +906,13 @@ module Ruby2JS
             while node != child
               if node.children[1] !~ /!$/
                 # convert method name to hash {className: name} pair
-                pair = s(:pair, s(:sym, :className),
-                  s(:str, node.children[1].to_s.gsub('_','-')))
+                if @react == :Preact
+                  pair = s(:pair, s(:sym, :class),
+                    s(:str, node.children[1].to_s.gsub('_','-')))
+                else
+                  pair = s(:pair, s(:sym, :className),
+                    s(:str, node.children[1].to_s.gsub('_','-')))
+                end
               else
                 # convert method name to hash {id: name} pair
                 pair = s(:pair, s(:sym, :id),
@@ -917,8 +982,11 @@ module Ruby2JS
         # Base Ruby2JS processing will convert the 'splat' to 'apply'
         child = node.children.first
         if \
-          child.children[1] == :createElement and
-          child.children[0] == s(:const, nil, :React)
+          (child.children[1] == :createElement and
+          child.children[0] == s(:const, nil, :React)) or
+          (child.children[1] == :h and
+          (child.children[0] == s(:const, nil, :Preact) or
+          child.children[0] == nil))
         then
           begin
             reactApply, @reactApply = @reactApply, true
@@ -931,11 +999,13 @@ module Ruby2JS
             @reactApply = reactApply
           end
 
+          target = child.children[0] || s(:const, nil, :Preact)
+
           if reactApply
             return child.updated(:send, [s(:gvar, :$_), :push, 
-              s(:send, *child.children[0..1], *params)])
+              s(:send, target, child.children[1], *params)])
           else
-            return child.updated(:send, [*child.children[0..1], *params])
+            return child.updated(:send, [target, child.children[1], *params])
           end
         end
 
@@ -952,7 +1022,7 @@ module Ruby2JS
           block = s(:block, s(:send, nil, :proc), s(:args),
             *node.children[2..-1])
           return on_send node.children.first.updated(:send,
-            [nil, ReactFragment, block])
+            [nil, :"_#{@react}.Fragment", block])
 
         elsif !@jsx and child.children[0] == nil and child.children[1] =~ /^_\w/
           if node.children[1].children.empty?
@@ -1020,7 +1090,7 @@ module Ruby2JS
           ivar = node.children.first.to_s
           if @reactBlock
             return s(:send, s(:self), :setState, s(:hash, s(:pair,
-              s(:lvar, ivar[1..-1]), process(s(:lvasgn, "$#{ivar[1..-1]}",
+              s(:str, ivar[1..-1]), process(s(:lvasgn, "$#{ivar[1..-1]}",
               *node.children[1..-1])))))
           else
             return s(:lvasgn, "$#{ivar[1..-1]}",
@@ -1075,7 +1145,7 @@ module Ruby2JS
         if @reactMethod and @reactIvars[:capture].include? var
           if @reactBlock
             s(:send, s(:self), :setState, s(:hash, s(:pair,
-              s(:lvar, var[1..-1]), process(s(node.type,
+              s(:str, var[1..-1]), process(s(node.type,
               s(:lvasgn, "$#{var[1..-1]}"), *node.children[1..-1])))))
           else
             process s(node.type, s(:lvasgn, "$#{var[1..-1]}"),
@@ -1118,9 +1188,13 @@ module Ruby2JS
           return true if node.children[1] == :createElement and
             node.children[0] == s(:const, nil, :React)
 
-          # explicit call to Vue.createElement
-          return true if node.children[1] == :createElement and
-            node.children[0] == s(:const, nil, :Vue)
+          # explicit call to Preact.h
+          return true if node.children[1] == :h and
+            node.children[0] == s(:const, nil, :Preact)
+
+          # explicit call to h
+          return true if node.children[1] == :h and
+            node.children[0] == nil
         end
 
         # wunderbar style call
@@ -1280,7 +1354,7 @@ module Ruby2JS
         # update ivars that are set and later referenced
         unless @reactIvars[:post].empty?
           updates = @reactIvars[:post].uniq.sort.reverse.map do |ivar|
-            s(:pair, s(:lvar, ivar.to_s[1..-1]),
+            s(:pair, s(:str, ivar.to_s[1..-1]),
               s(:lvar, "$#{ivar.to_s[1..-1]}"))
           end
           update = s(:send, s(:self), :setState, s(:hash, *updates))

data/lib/ruby2js/version.rb

@@ -1,8 +1,8 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 4
-    MINOR = 0
-    TINY  = 5
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tasks/install/config/webpack/loaders/ruby2js.js

@@ -0,0 +1,20 @@
+const { environment } = require('@rails/webpacker')
+
+module.exports = {
+  test: /\.js\.rb$/,
+  use: [
+    {
+      loader: "babel-loader",
+      options: environment.loaders.get('babel').use[0].options
+    },
+
+    {
+      loader: "@ruby2js/webpack-loader",
+      options: {
+        autoexports: "default",
+        eslevel: 2021,
+        filters: ["esm", "functions"]
+      }
+    }
+  ]
+}

data/lib/tasks/install/preact.rb

@@ -0,0 +1,3 @@
+@ruby2js_options = {filters: ['react']}
+@yarn_add='preact'
+eval IO.read "#{__dir__}/webpacker.rb"

data/lib/tasks/install/webpacker.rb

@@ -27,40 +27,25 @@ insert_into_file Rails.root.join("config/webpacker.yml").to_s,
 # install webpack loader
 run "yarn add @ruby2js/webpack-loader #{@yarn_add}"
 
+target = Rails.root.join("config/webpack/loaders/ruby2js.js").to_s
+
 # default config
-config = <<~CONFIG
-  // Insert rb2js loader at the end of list
-  environment.loaders.append('rb2js', {
-    test: /\.js\.rb$/,
-    use: [
-      {
-        loader: "babel-loader",
-        options: environment.loaders.get('babel').use[0].options
-      },
+if not File.exist? target
+  # may be called via eval, or directly.  Resolve source either way.
+  source_paths.unshift __dir__
+  source_paths.unshift File.dirname(caller.first)
+  directory "config/webpack/loaders", File.dirname(target)
+end
 
-      {
-        loader: "@ruby2js/webpack-loader",
-        options: {
-          autoexports: "default",
-          eslevel: 2021,
-          filters: ["esm", "functions"]
-        }
-      },
-    ]
-  })
-CONFIG
+# load config
+insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
+  "environment.loaders.prepend('ruby2js', require('./loaders/ruby2js'))\n"
 
 # read current configuration
-target = Rails.root.join("config/webpack/environment.js").to_s
 before = IO.read(target)
 
-# extract indentation and options either from the current configuration or the
-# default configuration.
-if before.include? '@ruby2js/webpack-loader'
-  match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
-else
-  match = /^(\s*)options: (\{.*?\n\1\})/m.match(config)
-end
+# extract indentation and options
+match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
 
 # evaluate base options.  Here it is handy that Ruby's syntax for hashes is
 # fairly close to JavaScript's object literals.  May run into problems in the
@@ -90,8 +75,6 @@ replacement =  Ruby2JS.convert(merged.inspect + "\n").to_s.
   gsub(/^/, match[1]).strip
 
 # Update configuration
-if before.include? '@ruby2js/webpack-loader'
+unless before.include? replacement
   gsub_file target, match[2].to_s, replacement
-else
-  append_to_file target, "\n" + config.sub(match[2], replacement)
 end

data/lib/tasks/ruby2js_tasks.rake

@@ -12,6 +12,11 @@ namespace :ruby2js do
       template 'install/litelement.rb'
     end
 
+    desc "Install Ruby2JS with Preact support"
+    task :preact do
+      template 'install/preact.rb'
+    end
+
     desc "Install Ruby2JS with React support"
     task :react do
       template 'install/react.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -159,7 +159,9 @@ files:
 - lib/ruby2js/version.rb
 - lib/tasks/README.md
 - lib/tasks/install/app/javascript/elements/index.js
+- lib/tasks/install/config/webpack/loaders/ruby2js.js
 - lib/tasks/install/litelement.rb
+- lib/tasks/install/preact.rb
 - lib/tasks/install/react.rb
 - lib/tasks/install/stimulus-sprockets.rb
 - lib/tasks/install/stimulus-webpacker.rb