lib/ruby2js.rb in ruby2js-4.0.1 vs lib/ruby2js.rb in ruby2js-4.0.2

- old
+ new

@@ -90,12 +90,23 @@ include_all if options[:include_all] include_only(options[:include_only]) if options[:include_only] include(options[:include]) if options[:include] exclude(options[:exclude]) if options[:exclude] + + filters = options[:filters] || DEFAULTS + @modules_enabled = + (defined? Ruby2JS::Filter::ESM and + filters.include? Ruby2JS::Filter::ESM) or + (defined? Ruby2JS::Filter::CJS and + filters.include? Ruby2JS::Filter::CJS) end + def modules_enabled? + @modules_enabled + end + def es2015 @options[:eslevel] >= 2015 end def es2016 @@ -277,10 +288,10 @@ ruby2js end def self.parse(source, file=nil, line=1) buffer = Parser::Source::Buffer.new(file, line) - buffer.source = source.encode('utf-8') + buffer.source = source.encode('UTF-8') parser = Parser::CurrentRuby.new parser.diagnostics.all_errors_are_fatal = true parser.diagnostics.consumer = lambda {|diagnostic| nil} parser.builder.emit_file_line_as_literals = false parser.parse_with_comments(buffer)