opal-optimizer 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6498304a0ea20dac60d150ea41df0876ade32476a48a489daca24396686de528
-  data.tar.gz: e453ead6b82eedb0fd1c03fc38cd2de64a5d1ceda31a55a541e83f50b9ed76d8
+  metadata.gz: 4ee7a8b44f7cab98ff99da447a9b934387c9f2e9533af55bea08edea9cd9cc22
+  data.tar.gz: 7de32b2e91a478e68fc89bdbaa7868b26033fe8f8dca2fcbd489b6777c7d8cbb
 SHA512:
-  metadata.gz: bcbf6fb6a5f209e3cea950be73637504ce830c16a9ef8e7402156b64d82e8905c6406a12e0acbc52feb2a1770a4f869ca1c52b78c6f08b590c6c64df94d7c9c7
-  data.tar.gz: 941e429601ce081347bad1179f152f0dd5aa0f3b20374cf683e021ca1c00e5e078cd63e44476af127fcc8d21eb0f34b35c605df5ae9a129c2e28c3917c970a59
+  metadata.gz: 54374902a29fd0e30c7599f5034ee3d993d94aa294d16899fb2fd53b9ddba19cb0c8d6d1fcc7e83179abc8ebb2e80f75244ad2331868c5fbd4acd7216e474517
+  data.tar.gz: da1bf3efc02c9087da38eb28e771210ba01a148565a9fb98efc0bf18451be9c3d6a3bac1e7353b2b3fb10502677b70a137be72083ffabda339b39f3bce43edb0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.1.8
+
+* Improve interop with Sprockets when non-Opal javascripts are compiled as well
+
+## v0.1.7
+
+* Opal 1.6 compatibility
+
 ## v0.1.6
 
 * Further Opal 1.4 compatibility

data/lib/opal/optimizer/sprockets.rb

@@ -7,6 +7,8 @@ module Opal; class Optimizer
 module Sprockets
   def self.call input
     Opal::Optimizer.new(input[:data]).optimize
+  rescue NonOpalArgumentError
+    input[:data]
   end
 end
 

data/lib/opal/optimizer/version.rb

@@ -1,5 +1,5 @@
 module Opal
   class Optimizer
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/opal/optimizer.rb

@@ -3,10 +3,10 @@ require "rkelly"
 require "opal/optimizer/helpers"
 require "opal/compiler"
 
-require "pry"
-
 module Opal
   class Optimizer
+    class NonOpalArgumentError < ArgumentError; end
+
     include Helpers
 
     attr_accessor :ast, :opal_version, :corelib, :corelib_source, :corelib_calls,
@@ -15,6 +15,12 @@ module Opal
     attr_accessor :exports
 
     def initialize(code, exports: "", force_corelib: true)
+      if force_corelib
+        unless code.include? "//   A few conventions for the documentation of this file:"
+          raise NonOpalArgumentError, "A non-Opal code provided"
+        end
+      end
+
       @ast = parse_js(code)
 
       @corelib = @ast.value.find do |i|
@@ -24,12 +30,15 @@ module Opal
            es.end_with?("TypeError.$$super = Error;\n}).call(this);")
           @opal_version = 1.0
         elsif es.start_with?("(function(global_object) {\n  \"use strict\";\n\n  // @note\n  "\
-                             "//   A few conventions for the documentation of this file:") &&
-              es.end_with?("TypeError.$$super = Error;\n}).call(this);")
-          if es.include? 'function $prop(object,'
-            @opal_version = 1.4
-          else
-            @opal_version = 1.1
+                             "//   A few conventions for the documentation of this file:")
+          if es.end_with?("TypeError.$$super = Error;\n}).call(this);")
+            if es.include? 'function $prop(object,'
+              @opal_version = 1.4
+            else
+              @opal_version = 1.1
+            end
+          elsif es.end_with?("Opal.file_sources = {};\n}).call(this);")
+            @opal_version = 1.6
           end
         end
       end

data/lib/opal-optimizer.rb

@@ -0,0 +1,2 @@
+require "opal/optimizer"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-optimizer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - hmdne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rkelly-turbo
@@ -58,6 +58,7 @@ files:
 - bin/opal-optimizer
 - bin/setup
 - exe/opal-optimizer
+- lib/opal-optimizer.rb
 - lib/opal/optimizer.rb
 - lib/opal/optimizer/helpers.rb
 - lib/opal/optimizer/sprockets.rb
@@ -88,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Optimize Opal's resulting javascript code