uglifier 4.0.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31b6c34eae2f765af9b53003813f2eb4ae66f65c
-  data.tar.gz: 73fdb0caf90ddec9c11ddcf3e5f4be3d7d1a6e90
+SHA256:
+  metadata.gz: 6eb829d19c603a2d3760e02f0235d9d654f640111734caa9317449378e40fa26
+  data.tar.gz: '0774580cb6353b90d72e5febfdc6777bc05c6d6d773b09e4aab3b82178fe8acd'
 SHA512:
-  metadata.gz: a5c371d6bc95db7bc8eed1a5d1adbdcce11e0b68f6661ab8ce128d6ef61b38aedd01a2add5cd0a91520fe3e181bc22f2964b88dede7ea7c95448dbd20d187fa4
-  data.tar.gz: 8d275b12e85a5643b1a7c5d399bc30d286e81ee112bbb9ce697b61284901ce2b4a85ef8149530f18929c77ac9617dd2c29da41cfb56917d5a38eb62a04dadf8e
+  metadata.gz: 81f5c10b9dd4b9c84a6fe850dfb45b30bb25e0d9b04fa089ff745683028d1733e6b0b1c92846788af96197ee8774d8a7d105b424bc88f38b0c5abab5971bded0
+  data.tar.gz: 3120b0abc086792140a2cdb3a8ecae725327c8c8ea7b55c49d98be196e97de526087583c5bb2b6a0c169e86277474e8ae8a82d6a02cc23cd58cf0276defff03a

data/.github/workflows/ruby.yml

@@ -0,0 +1,14 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: lautis/rubocop-action@master
+        name: Lint
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
     - "vendor/**/*"
     - "gemfiles/vendor/**/*"
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   Enabled: true
   Exclude:
@@ -46,3 +49,6 @@ Style/Alias:
 
 Style/MutableConstant:
   Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false

data/.travis.yml

@@ -5,29 +5,30 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
   - ruby-head
-  - jruby-19mode
-  - jruby-9.1.13.0
+  - jruby-9.2.5.0
 before_install:
-  - gem install bundler -v 1.15.4
+  - gem install bundler -v 1.17.3
 git:
   submodules: false
 gemfile:
   - Gemfile
 matrix:
   include:
-    - rvm: 2.4.2
+    - rvm: 2.5.3
       gemfile: gemfiles/rubyracer
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.5.0
       gemfile: gemfiles/rubyrhino
-    - rvm: 2.4.2
+    - rvm: 2.5.3
       gemfile: gemfiles/alaska
       env: ALASKA=1
   allow_failures:
-    - rvm: 2.4.2
+    - rvm: 2.5.3
       gemfile: gemfiles/alaska
       env: ALASKA=1
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,4 +1,97 @@
-## 4.0.2
+## 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)
+
+## 4.1.19 (11 September 2018)
+
+- update UglifyJS to [3.4.9](https://github.com/mishoo/UglifyJS2/compare/v3.4.7...v3.4.9)
+
+## 4.1.18 (09 August 2018)
+
+- update UglifyJS to [3.4.7](https://github.com/mishoo/UglifyJS2/compare/v3.4.6...v3.4.7)
+
+## 4.1.17 (29 July 2018)
+
+- update UglifyJS to [3.4.6](https://github.com/mishoo/UglifyJS2/compare/v3.4.5...v3.4.6)
+
+## 4.1.16 (22 July 2018)
+
+- update UglifyJS to [3.4.5](https://github.com/mishoo/UglifyJS2/compare/v3.4.4...v3.4.5)
+
+## 4.1.15 (13 July 2018)
+
+- update UglifyJS to [3.4.4](https://github.com/mishoo/UglifyJS2/compare/v3.4.3...v3.4.4)
+
+## 4.1.14 (02 July 2018)
+
+- update UglifyJS to [3.4.3](https://github.com/mishoo/UglifyJS2/compare/v3.4.2...v3.4.3)
+
+## 4.1.13 (30 June 2018)
+
+- update UglifyJS to [3.4.2](https://github.com/mishoo/UglifyJS2/compare/v3.4.1...v3.4.2)
+
+## 4.1.12 (20 June 2018)
+
+- update UglifyJS to [3.4.1](https://github.com/mishoo/UglifyJS2/compare/v3.4.0...v3.4.1)
+
+## 4.1.11 (02 June 2018)
+
+- update UglifyJS to [3.3.28](https://github.com/mishoo/UglifyJS2/compare/v3.3.22...v3.3.28)
+
+## 4.1.10 (21 April 2018)
+
+- update UglifyJS to [3.3.22](https://github.com/mishoo/UglifyJS2/compare/v3.3.20...v3.3.22)
+
+## 4.1.9 (11 April 2018)
+
+- update UglifyJS to [3.3.20](https://github.com/mishoo/UglifyJS2/compare/v3.3.16...v3.3.20)
+
+## 4.1.8 (14 March 2018)
+
+- update UglifyJS to [3.3.15](https://github.com/mishoo/UglifyJS2/compare/v3.3.14...v3.3.15)
+
+## 4.1.7 (11 March 2018)
+
+- update UglifyJS to [3.3.14](https://github.com/mishoo/UglifyJS2/compare/v3.3.10...v3.3.14)
+
+## 4.1.6 (08 February 2018)
+
+- update UglifyJS to [3.3.10](https://github.com/mishoo/UglifyJS2/compare/v3.3.9...v3.3.10)
+- update uglify-es to [3.3.10](https://github.com/mishoo/UglifyJS2/compare/harmony-v3.3.9...harmony-v3.3.10)
+
+## 4.1.5 (28 January 2018)
+
+- update UglifyJS to [3.3.9](https://github.com/mishoo/UglifyJS2/compare/v3.3.8...v3.3.9)
+- update uglify-es to [3.3.9](https://github.com/mishoo/UglifyJS2/compare/harmony-v3.3.8...harmony-v3.3.9)
+
+## 4.1.4 (22 January 2018)
+
+- update UglifyJS to [3.3.8](https://github.com/mishoo/UglifyJS2/compare/v3.3.5...v3.3.8)
+- update uglify-es to [3.3.8](https://github.com/mishoo/UglifyJS2/compare/harmony-v3.3.5...harmony-v3.3.8)
+
+## 4.1.3 (7 January 2018)
+
+- update UglifyJS to 3.3.5
+
+## 4.1.2 (30 December 2017)
+
+- update UglifyJS to 3.3.4
+
+## 4.1.1 (29 December 2017)
+
+- update UglifyJS to 3.3.3
+
+## 4.1.0 (28 December 2017)
+
+- update UglifyJS to 3.3.2
+- `cascade` compress option is merged into `collapse_vars`
+
+## 4.0.2 (10 December 2017)
 
 - update UglifyJS to 3.2.2
 - show harmony suggestion when using for-of loops

data/CONTRIBUTING.md

@@ -28,14 +28,19 @@ Then run tests using rake:
 
     git submodule update --init
 
-After that, UglifyJS and source-map are checked out under `vendor/uglifyjs` and `vendor/source-map`.
+After that, UglifyJS can be updated to a specific version with rake task.
 
-Use Git commands (e.g. git checkout master) to change the included version. You can even write custom code to yourself. After changing the dependencies, compile new version of the bundled JS file using
+    rake uglifyjs:update VERSION=3.3.4
 
-    bundle exec rake js
+To compile JS with dependencies, run
 
-After this, the new JS is used in your development version.
+    rake uglifyjs:build
 
+You can even write custom patches to UglifyJS in `vendor/uglifyjs` and `vendor/uglifyjs-harmony` directories and compile the bundles JS using the command above. However, for the changes to be releasable, they should be in UglifyJS repository.
+
+To automatically update UglifyJS version and commit changes
+
+    rake uglifyjs VERSION=3.3.4
 
 ## Reporting issues
 

data/Gemfile

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

data/README.md

@@ -3,16 +3,44 @@
 Ruby wrapper for [UglifyJS](https://github.com/mishoo/UglifyJS2) JavaScript
 compressor.
 
-UglifyJS currently is known to work quite well with ES5. Experimental
-ES6/Harmony support can be enabled with `:harmony => true` option.
-See [UglifyJS2#448](https://github.com/mishoo/UglifyJS2/issues/448) for more
-details.
+UglifyJS currently is extensively tested with ES5, but also includes experimental ES6/ES2015+/Harmony support.
 
-Transpiling to ES5 (with e.g. [babel-transpiler](https://github.com/babel/ruby-babel-transpiler)) is
-recommended. For directly minifying ES6 code, [Closure Compiler](https://github.com/documentcloud/closure-compiler) is a more suitable option.
+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)
+```
+
+### Rails
+
+When used in Rails, replace
+
+```ruby
+config.assets.js_compressor = :uglifier
+```
+
+with
+
+```ruby
+config.assets.js_compressor = Uglifier.new(harmony: true)
+```
+
+in `config/environments/production.rb`.
+
 ## Installation
 
 Uglifier is available as a ruby gem.
@@ -75,7 +103,7 @@ Available options and their defaults are
   },
   :mangle => {
     :eval => false,             # Mangle names when eval of when is used in scope
-    :except => ["$super"],      # Argument names to be excluded from mangling
+    :reserved => ["$super"],    # Argument names to be excluded from mangling
     :sort => false,             # Assign shorter names to most frequently used variables. Often results in bigger output after gzip.
     :toplevel => false,         # Mangle names declared in the toplevel scope
     :properties => false,       # Mangle property names
@@ -107,7 +135,6 @@ Available options and their defaults are
     :hoist_vars => false,       # Hoist var declarations
     :if_return => true,         # Optimizations for if/return and if/continue
     :join_vars => true,         # Join consecutive var statements
-    :cascade => true,           # Cascade sequences
     :collapse_vars => false,    # Collapse single-use var and const definitions when possible.
     :reduce_funcs => false,     # Inline single-use functions as function expressions. Depends on reduce_vars.
     :reduce_vars => false,      # Collapse variables assigned with and used as constant values.
@@ -141,6 +168,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/Rakefile

@@ -7,34 +7,127 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-desc "Rebuild lib/uglify.js"
-task :js do
-  cd 'vendor/source-map/' do
-    `npm install --no-package-lock --no-save`
+def version
+  ENV.fetch('VERSION')
+end
+
+HEADER = "## next"
+
+def changelog_tail
+  changelog = File.read("CHANGELOG.md")
+  if changelog.start_with?(HEADER)
+    changelog[HEADER.length + 2..-1]
+  else
+    "\n" + changelog
   end
+end
+
+def compare_url(from, to)
+  "https://github.com/mishoo/UglifyJS2/compare/#{from}...#{to}"
+end
+
+def previous_version
+  match = File.read("CHANGELOG.md").scan(/- update UglifyJS to \[(.*)\]\(/)
+  match ? match[0][0].chomp : nil
+end
+
+def git_commit(files, message)
+  `git add #{files.join(' ')}`
+  `git commit -S -m "#{message.gsub('"', "\\\"")}"`
+end
 
-  cd 'vendor/uglifyjs/' do
-    # required to run ./uglifyjs2 --self; not bundled.
-    `npm install --no-package-lock --no-save`
+# rubocop:disable Metrics/BlockLength
+namespace :uglifyjs do
+  desc "Update UglifyJS source to version specified in VERSION environment variable"
+  task :update do
+    cd 'vendor/uglifyjs' do
+      `git fetch && git checkout v#{version}`
+    end
   end
 
-  cd 'vendor/uglifyjs-harmony' do
-    # required to run ./uglifyjs2 --self; not bundled.
-    `npm install --no-package-lock --no-save`
+  desc "Rebuild lib/uglify*.js"
+  task :build do
+    cd 'vendor/source-map/' do
+      `npm install --no-package-lock --no-save`
+    end
+
+    cd 'vendor/uglifyjs/' do
+      # required to run ./uglifyjs2 --self; not bundled.
+      `npm install --no-package-lock --no-save`
+    end
+
+    cd 'vendor/uglifyjs-harmony' do
+      # required to run ./uglifyjs2 --self; not bundled.
+      `npm install --no-package-lock --no-save`
+    end
+
+    FileUtils.cp("vendor/source-map/dist/source-map.js", "lib/source-map.js")
+
+    source = `./vendor/uglifyjs/bin/uglifyjs --self --comments /Copyright/`
+    File.write("lib/uglify.js", source)
+
+    harmony_source = `./vendor/uglifyjs-harmony/bin/uglifyjs --self --comments /Copyright/`
+    File.write("lib/uglify-harmony.js", harmony_source)
+
+    FileUtils.cp("vendor/split/split.js", "lib/split.js")
+    `patch -p1 -i patches/es5-string-split.patch`
   end
 
-  FileUtils.cp("vendor/source-map/dist/source-map.js", "lib/source-map.js")
+  desc "Add UglifyJS version bump to changelog"
+  task :changelog do
+    url = compare_url("v#{previous_version}", "v#{version}")
+    item = "- update UglifyJS to [#{version}](#{url})"
+    changelog = "#{HEADER}\n\n#{item}\n#{changelog_tail}"
+    File.write("CHANGELOG.md", changelog)
+  end
 
-  source = `./vendor/uglifyjs/bin/uglifyjs --self --comments /Copyright/`
-  File.write("lib/uglify.js", source)
+  desc "Commit changes from UglifyJS version bump"
+  task :commit do
+    files = [
+      'CHANGELOG.md',
+      'lib/uglify.js',
+      'lib/uglify-harmony.js',
+      'vendor/uglifyjs',
+      'vendor/uglifyjs-harmony'
+    ]
+    git_commit(files, "Update UglifyJS to #{version}")
+  end
+end
+# rubocop:enable Metrics/BlockLength
+
+desc "Update UglifyJS to version specified in VERSION environment variable"
+task :uglifyjs => ['uglifyjs:update', 'uglifyjs:build', 'uglifyjs:changelog', 'uglifyjs:commit']
 
-  harmony_source = `./vendor/uglifyjs-harmony/bin/uglifyjs --self --comments /Copyright/`
-  File.write("lib/uglify-harmony.js", harmony_source)
+namespace :version do
+  desc "Write version to CHANGELOG.md"
+  task :changelog do
+    content = File.read("CHANGELOG.md")
+    date = Time.now.strftime("%d %B %Y")
+    File.write("CHANGELOG.md", content.gsub("## next", "## #{version} (#{date})"))
+  end
 
-  FileUtils.cp("vendor/split/split.js", "lib/split.js")
-  `patch -p1 -i patches/es5-string-split.patch`
+  desc "Write version to uglifier.rb"
+  task :ruby do
+    file = "lib/uglifier/version.rb"
+    content = File.read("lib/uglifier/version.rb")
+    File.write(file, content.gsub(/VERSION = "(.*)"/, "VERSION = \"#{version}\""))
+  end
+
+  desc "Commit changes from Uglifier version bump"
+  task :commit do
+    files = ["CHANGELOG.md", "lib/uglifier/version.rb"]
+    git_commit(files, "Bump version to #{version}")
+  end
+
+  desc "Create git tag for version"
+  task :tag do
+    `git tag -s -m "Version #{version}" v#{version}`
+  end
 end
 
+desc "Update Uglifier to version specified in VERSION environment variable"
+task :version => ['version:changelog', 'version:ruby', 'version:commit', 'version:tag']
+
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new(:rubocop)

data/lib/uglifier.rb

@@ -72,7 +72,6 @@ class Uglifier
       :hoist_vars => false, # Hoist var declarations
       :if_return => true, # Optimizations for if/return and if/continue
       :join_vars => true, # Join consecutive var statements
-      :cascade => true, # Cascade sequences
       :collapse_vars => true, # Collapse single-use var and const definitions when possible.
       :reduce_funcs => false, # Inline single-use functions as function expressions. Depends on reduce_vars.
       :reduce_vars => false, # Collapse variables assigned with and used as constant values.
@@ -99,6 +98,7 @@ 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.
   }
 
@@ -150,9 +150,6 @@ class Uglifier
       raise ArgumentError, "Invalid option: #{missing}"
     end
     @options = options
-
-    source = harmony? ? source_with(HarmonySourcePath) : source_with(SourcePath)
-    @context = ExecJS.compile(source)
   end
 
   # Minifies JavaScript code
@@ -181,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?(:[])
 
@@ -189,9 +193,7 @@ class Uglifier
       suffix += "\n//# sourceMappingURL=" + @options[:source_map][:map_url]
     end
 
-    if @options[:source_map][:url]
-      suffix += "\n//# sourceURL=" + @options[:source_map][:url]
-    end
+    suffix += "\n//# sourceURL=" + @options[:source_map][:url] if @options[:source_map][:url]
     suffix
   end
 
@@ -216,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 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)
-    raise Error, error_message(result) if result.has_key?('error')
+  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']]
@@ -347,10 +401,16 @@ class Uglifier
   end
 
   def output_options
-    DEFAULTS[:output].merge(@options[:output] || {}).merge(
-      :comments => comment_options,
-      :quote_style => quote_style
-    )
+    migrate_braces(DEFAULTS[:output].merge(@options[:output] || {}))
+      .merge(:comments => comment_options, :quote_style => quote_style)
+  end
+
+  def migrate_braces(options)
+    if harmony?
+      options
+    else
+      options.merge(:braces => options[:bracketize]).delete_if { |key| key == :bracketize }
+    end
   end
 
   def ie8?
@@ -450,9 +510,7 @@ class Uglifier
     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)
-      if url && url.start_with?("data:")
-        Base64.strict_decode64(url.split(",", 2)[-1])
-      end
+      Base64.strict_decode64(url.split(",", 2)[-1]) if url && url.start_with?("data:")
     end)
   rescue ArgumentError, JSON::ParserError
     nil