uglifier 4.1.20 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80ba00a3806f9848b926823cd7cee1d7f6fd72a050c8b17f5dd084f45a1ed39
-  data.tar.gz: 32f396008cd005a2725b698b55a9167872c13b5334e637801ca725ba7049fcc5
+  metadata.gz: d93953baa3d4cf3d30b44e0a0f90dc3b57162aa62283d53213e1647d3de236f3
+  data.tar.gz: 647b93d713f352702df61de8a4bcec00dc3a659d81f5a0ff5a6bac6ecfa39895
 SHA512:
-  metadata.gz: 464ea32ccd16245306fcc71c575580890d0590dd61e913b1c8b10496dd80c1f6d44d1f3716a06fa4a9d145bca75243e880f466b63e9f07719c02962b8667f9c4
-  data.tar.gz: 3b5a4997bcf52bc6fa0670fab41a187eeff8e716a579309a2949b1b2677334e4298cb6358e8359c3597f34126a3c13b2e1929cf40db99d798cfc5c0357af6522
+  metadata.gz: e5a9c7445f6f385a4ed0117badd20011e75da0aaf2df4ca8102b2d5c33ad9c14651d2d33dc14b7b5bc9be9b4400623a851176ac993fa54663c0edb68a723f0e9
+  data.tar.gz: 5762685023380924279b268fab8c6e2de4c91c18ee45a613b344a937b3743e4b50cf73d8f259b73d99aaee71911e2e3be0608aa165e016b5a03061fa9f9ffd00

data/.github/workflows/ruby.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: >-
+      Test (${{ matrix.ruby }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [Gemfile]
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - jruby
+          - truffleruby
+        include:
+          - ruby: 2.5
+            gemfile: gemfiles/rubyracer
+          - ruby: jruby
+            gemfile: gemfiles/rubyrhino
+          - ruby: 2.5
+            gemfile: gemfiles/alaska
+            alaska: 1
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      ALASKA: ${{ matrix.alaska}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+          bundler-cache: true
+      - run: bundle exec rubocop --format github

data/.rubocop.yml

@@ -1,11 +1,17 @@
 AllCops:
   DisplayCopNames: true
+  SuggestExtensions: false
+  NewCops: disable
+  TargetRubyVersion: 2.4
   Exclude:
     - uglifier.gemspec
     - lib/uglifier/version.rb
     - "vendor/**/*"
     - "gemfiles/vendor/**/*"
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   Enabled: true
   Exclude:
@@ -14,7 +20,7 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 
 Metrics/MethodLength:
@@ -49,3 +55,9 @@ Style/MutableConstant:
 
 Style/ExpandPathArguments:
   Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/StringConcatenation:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 4.2.1 (22 September 2024)
+
+- fix Ruby 3.4 compatiblity, drop Ruby 2.3 and older support (#195)
+- fix typos (#194)
+
+## 4.2.0 (25 September 2019)
+
+- show code context for error messages (#167)
+- defer initialisation of ExecJS context to fix #165
+
 ## 4.1.20 (17 November 2018)
 
 - update UglifyJS to [3.4.8](https://github.com/mishoo/UglifyJS2/compare/v3.4.9...v3.4.8)

data/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rubocop', '~> 0.57.0', :group => [:development] if RUBY_VERSION >= '2.1'
+gem 'rubocop', '~> 1.7.0', :group => [:development] if RUBY_VERSION >= '2.5'

data/README.md

@@ -3,27 +3,7 @@
 Ruby wrapper for [UglifyJS](https://github.com/mishoo/UglifyJS2) JavaScript
 compressor.
 
-UglifyJS currently is extensively tested with ES5, but also includes experimental ES6/ES2015+/Harmony support.
-
-More stable alternatives for working with ES6 code is to first transpile to ES5 with e.g. [babel-transpiler](https://github.com/babel/ruby-babel-transpiler) or using [Closure Compiler](https://github.com/documentcloud/closure-compiler) to directly minify ES6 code.
-
-[![Build Status](https://travis-ci.org/lautis/uglifier.svg?branch=master)](https://travis-ci.org/lautis/uglifier)
-
-## ES6 / ES2015+ / Harmony mode
-
-When using Uglifier with ES6 syntax without any options, an error will be
-thrown.
-
-```
-Uglifier::Error: Unexpected token: punc ((). To use ES6 syntax, harmony mode must be enabled with Uglifier.new(:harmony => true).
-```
-
-The experimental ES6 syntax support can be enabled by passing `:harmony => true`
-option to Uglifier.
-
-```ruby
-Uglifier.compile(js, harmony: true)
-```
+UglifyJS only works with ES5. If you need to compress ES6, [ruby-terser](https://github.com/ahorek/terser-ruby) is a better option.
 
 ### Rails
 
@@ -48,7 +28,7 @@ Uglifier is available as a ruby gem.
     $ gem install uglifier
 
 Ensure that your environment has a JavaScript interpreter supported by
-[ExecJS](https://github.com/sstephenson/execjs). Using `therubyracer` gem
+[ExecJS](https://github.com/rails/execjs). Using `therubyracer` gem
 is a safe choice if a runtime isn't already present. Note that while JScript built-in Windows 7 and older works, it is extremely slow.
 
 ## Usage
@@ -96,8 +76,8 @@ Available options and their defaults are
     :indent_start => 0,         # Starting indent level
     :width => 80,               # Specify line width when beautifier is used (only with beautifier)
     :preamble => nil,           # Preamble for the generated JS file. Can be used to insert any code or comment.
-    :wrap_iife => false         # Wrap IIFEs in parenthesis. Note: this disables the negate_iife compression option.
-    :shebang => true            # Preserve shebang (#!) in preamble (shell scripts)
+    :wrap_iife => false,        # Wrap IIFEs in parenthesis. Note: this disables the negate_iife compression option.
+    :shebang => true,           # Preserve shebang (#!) in preamble (shell scripts)
     :quote_style => 0,          # Quote style, possible values :auto (default), :single, :double, :original
     :keep_quoted_props => false # Keep quotes property names
   },
@@ -113,7 +93,7 @@ Available options and their defaults are
     :regex => nil,              # A regular expression to filter property names to be mangled
     :ignore_quoted => false,    # Only mangle unquoted property names
     :debug => false,            # Mangle names with the original name still present
-  }                             # Mangle property names, disabled by default
+  },                            # Mangle property names, disabled by default
   :compress => {
     :sequences => true,         # Allow statements to be joined by commas
     :properties => true,        # Rewrite property access using the dot notation
@@ -168,6 +148,7 @@ Available options and their defaults are
     :output_filename => nil,    # The filename or URL where the minified output can be found
     :input_source_map => nil    # The contents of the source map describing the input
   },
+  :error_context_lines => 8,    # How many context lines surrounding the error line. Env var ERROR_CONTEXT_LINES overrides this option
   :harmony => false             # Enable ES6/Harmony mode (experimental). Disabling mangling and compressing is recommended with Harmony mode.
 }
 ```

data/lib/uglifier/version.rb

@@ -1,4 +1,4 @@
 class Uglifier
   # Current version of Uglifier.
-  VERSION = "4.1.20"
+  VERSION = "4.2.1"
 end

data/lib/uglifier.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 require "json"
-require "base64"
 require "execjs"
 require "uglifier/version"
 
@@ -25,9 +24,9 @@ class Uglifier
 
   # Default options for compilation
   DEFAULTS = {
-    # rubocop:disable LineLength
+    # rubocop:disable Layout/LineLength
     :output => {
-      :ascii_only => true, # Escape non-ASCII characterss
+      :ascii_only => true, # Escape non-ASCII characters
       :comments => :copyright, # Preserve comments (:all, :jsdoc, :copyright, :none)
       :inline_script => false, # Escape occurrences of </script in strings
       :quote_keys => false, # Quote keys in object literals
@@ -49,7 +48,7 @@ class Uglifier
       :eval => false, # Mangle names when eval of when is used in scope
       :reserved => ["$super"], # Argument names to be excluded from mangling
       :properties => false, # Mangle property names
-      :toplevel => false, # Mangle names declared in the toplevel scope
+      :toplevel => false # Mangle names declared in the toplevel scope
     }, # Mangle variable and function names, set to false to skip mangling
     :compress => {
       :sequences => true, # Allow statements to be joined by commas
@@ -84,7 +83,7 @@ class Uglifier
       :passes => 1, # Number of times to run compress. Raising the number of passes will increase compress time, but can produce slightly smaller code.
       :keep_infinity => false, # Prevent compression of Infinity to 1/0
       :side_effects => true, # Pass false to disable potentially dropping functions marked as "pure" using pure comment annotation. See UglifyJS documentation for details.
-      :switches => true, # de-duplicate and remove unreachable switch branches
+      :switches => true # de-duplicate and remove unreachable switch branches
     }, # Apply transformations to code, set to false to skip
     :parse => {
       :bare_returns => false, # Allow top-level return statements.
@@ -98,8 +97,10 @@ class Uglifier
     :toplevel => false,
     :ie8 => true, # Generate safe code for IE8
     :source_map => false, # Generate source map
+    :error_context_lines => 8, # How many lines surrounding the error line
     :harmony => false # Enable ES6/Harmony mode (experimental). Disabling mangling and compressing is recommended with Harmony mode.
   }
+  # rubocop:enable Layout/LineLength
 
   EXTRA_OPTIONS = [:comments, :mangle_properties]
 
@@ -108,7 +109,7 @@ class Uglifier
     :regex => nil, # A regular expression to filter property names to be mangled
     :keep_quoted => false, # Keep quoted property names
     :reserved => [], # List of properties that should not be mangled
-    :builtins => false, # Mangle properties that overlap with standard JS globals
+    :builtins => false # Mangle properties that overlap with standard JS globals
   }
 
   SOURCE_MAP_DEFAULTS = {
@@ -121,8 +122,6 @@ class Uglifier
     :input_source_map => nil # The contents of the source map describing the input
   }
 
-  # rubocop:enable LineLength
-
   # Minifies JavaScript code using implicit context.
   #
   # @param source [IO, String] valid JS source code.
@@ -145,13 +144,12 @@ class Uglifier
   #
   # @param options [Hash] optional overrides to +Uglifier::DEFAULTS+
   def initialize(options = {})
+    # rubocop:disable Lint/UnreachableLoop
     (options.keys - DEFAULTS.keys - EXTRA_OPTIONS)[0..1].each do |missing|
       raise ArgumentError, "Invalid option: #{missing}"
     end
+    # rubocop:enable Lint/UnreachableLoop
     @options = options
-
-    source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
-    @context = ExecJS.compile(source)
   end
 
   # Minifies JavaScript code
@@ -161,7 +159,7 @@ class Uglifier
   def compile(source)
     if @options[:source_map]
       compiled, source_map = run_uglifyjs(source, true)
-      source_map_uri = Base64.strict_encode64(source_map)
+      source_map_uri = [source_map].pack('m0')
       source_map_mime = "application/json;charset=utf-8;base64"
       compiled + "\n//# sourceMappingURL=data:#{source_map_mime},#{source_map_uri}"
     else
@@ -180,6 +178,13 @@ class Uglifier
 
   private
 
+  def context
+    @context ||= begin
+      source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
+      ExecJS.compile(source)
+    end
+  end
+
   def source_map_comments
     return '' unless @options[:source_map].respond_to?(:[])
 
@@ -213,25 +218,77 @@ class Uglifier
       :ie8 => ie8?
     }
 
-    parse_result(@context.call("uglifier", options), generate_map)
+    parse_result(context.call("uglifier", options), generate_map, options)
   end
 
   def harmony?
     @options[:harmony]
   end
 
-  def error_message(result)
-    result['error']['message'] +
-      if result['error']['message'].start_with?("Unexpected token") && !harmony?
-        ". To use ES6 syntax, harmony mode must be enabled with " \
-        "Uglifier.new(:harmony => true)."
+  def harmony_error_message(message)
+    if message.start_with?("Unexpected token")
+      ". To use ES6 syntax, harmony mode must be enabled with " \
+      "Uglifier.new(:harmony => true)."
+    else
+      ""
+    end
+  end
+
+  def error_context_lines
+    @options.fetch(:error_context_lines, DEFAULTS[:error_context_lines]).to_i
+  end
+
+  def error_context_format_options(low, high, line_index, column)
+    line_width = high.to_s.size
+    {
+      :line_index => line_index,
+      :base_index => low,
+      :line_width => line_width,
+      :line_format => "\e[36m%#{line_width + 1}d\e[0m ", # cyan
+      :col => column
+    }
+  end
+
+  def format_error_line(line, options)
+    # light red
+    indicator = ' => '.rjust(options[:line_width] + 2)
+    colored_line = "#{line[0...options[:col]]}\e[91m#{line[options[:col]..-1]}"
+    "\e[91m#{indicator}\e[0m#{colored_line}\e[0m"
+  end
+
+  def format_lines(lines, options)
+    lines.map.with_index do |line, index|
+      if options[:base_index] + index == options[:line_index]
+        format_error_line(line, options)
       else
-        ""
+        "#{options[:line_format] % (options[:base_index] + index + 1)}#{line}"
       end
+    end
   end
 
-  def parse_result(result, generate_map)
-    raise Error, error_message(result) if result.has_key?('error')
+  def context_lines_message(source, line_number, column)
+    return if line_number.nil?
+
+    line_index = line_number - 1
+    lines = source.split("\n")
+
+    first_line = [line_index - error_context_lines, 0].max
+    last_line = [line_number + error_context_lines, lines.size].min
+    options = error_context_format_options(first_line, last_line, line_index, column)
+    context_lines = lines[first_line...last_line]
+
+    "--\n#{format_lines(context_lines, options).join("\n")}\n=="
+  end
+
+  def error_message(result, options)
+    err = result['error']
+    harmony_msg = harmony? ? '' : harmony_error_message(err['message'].to_s)
+    src_ctx = context_lines_message(options[:source], err['line'], err['col'])
+    "#{err['message']}#{harmony_msg}\n#{src_ctx}"
+  end
+
+  def parse_result(result, generate_map, options)
+    raise Error, error_message(result, options) if result.has_key?('error')
 
     if generate_map
       [result['code'] + source_map_comments, result['map']]
@@ -450,10 +507,11 @@ class Uglifier
 
   def input_source_map(source, generate_map)
     return nil unless generate_map
+
     source_map_options = @options[:source_map].is_a?(Hash) ? @options[:source_map] : {}
     sanitize_map_root(source_map_options.fetch(:input_source_map) do
       url = extract_source_mapping_url(source)
-      Base64.strict_decode64(url.split(",", 2)[-1]) if url && url.start_with?("data:")
+      url.split(",", 2)[-1].unpack1('m0') if url && url.start_with?("data:")
     end)
   rescue ArgumentError, JSON::ParserError
     nil

data/uglifier.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |spec|
   spec.version = Uglifier::VERSION
   spec.authors = ["Ville Lautanala"]
   spec.email = ["lautis@gmail.com"]
-  spec.homepage = "http://github.com/lautis/uglifier"
+  spec.homepage = "https://github.com/lautis/uglifier"
   spec.summary = "Ruby wrapper for UglifyJS JavaScript compressor"
   spec.description = "Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby"
   spec.license = "MIT"
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.extra_rdoc_files = [
     "LICENSE.txt",
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "execjs", [">= 0.3.0", "< 3"]
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "sourcemap", "~> 0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 4.1.20
+  version: 4.2.1
 platform: ruby
 authors:
 - Ville Lautanala
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -62,14 +62,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -99,11 +99,11 @@ extra_rdoc_files:
 - CONTRIBUTING.md
 files:
 - ".document"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -120,11 +120,11 @@ files:
 - lib/uglify-harmony.js
 - lib/uglify.js
 - uglifier.gemspec
-homepage: http://github.com/lautis/uglifier
+homepage: https://github.com/lautis/uglifier
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,16 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for UglifyJS JavaScript compressor
 test_files: []

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - ruby-head
-  - jruby-9.2.0.0
-before_install:
-  - gem install bundler -v 1.16.1
-git:
-  submodules: false
-gemfile:
-  - Gemfile
-matrix:
-  include:
-    - rvm: 2.5.1
-      gemfile: gemfiles/rubyracer
-    - rvm: jruby-9.2.0.0
-      gemfile: gemfiles/rubyrhino
-    - rvm: 2.5.1
-      gemfile: gemfiles/alaska
-      env: ALASKA=1
-  allow_failures:
-    - rvm: 2.5.1
-      gemfile: gemfiles/alaska
-      env: ALASKA=1
-    - rvm: ruby-head
-  fast_finish: true