kotovalexarian-likes-github/middleman--middleman
1
0
Fork 0
mirror of https://github.com/middleman/middleman.git synced 2022-11-09 12:20:27 -05:00
Code Releases Activity

Update uglifier

Browse source
This commit is contained in:
Thomas Reynolds 2018-11-11 15:06:50 -08:00
parent 08dbfb6e32
commit c249105810
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -3,7 +3,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# Build and doc tools # Build and doc tools
gem 'rake', '~> 10.3', require: false gem 'rake', '~> 12.3', require: false
gem 'yard', '~> 0.9.11', require: false gem 'yard', '~> 0.9.11', require: false
# Test tools # Test tools

16
Gemfile.lock
View file

@ -30,7 +30,7 @@ PATH
sassc (~> 1.10) sassc (~> 1.10)
servolux servolux
tilt (~> 2.0) tilt (~> 2.0)
uglifier (~> 3.0) uglifier (~> 4.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
@ -120,7 +120,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
memoist (0.16.0) memoist (0.16.0)
method_source (0.9.1) method_source (0.9.2)
mime-types (3.2.2) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812) mime-types-data (3.2018.0812)
@ -134,7 +134,7 @@ GEM
nio4r (2.3.1) nio4r (2.3.1)
nokogiri (1.8.5) nokogiri (1.8.5)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
oj (3.7.0) oj (3.7.1)
padrino-helpers (0.13.3.4) padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7) i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.4) padrino-support (= 0.13.3.4)
@ -161,7 +161,7 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rainbow (3.0.0) rainbow (3.0.0)
rake (10.5.0) rake (12.3.1)
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2) ffi (>= 0.5.0, < 2)
@ -193,7 +193,7 @@ GEM
celluloid (= 0.16.0) celluloid (= 0.16.0)
celluloid-io (= 0.16.2) celluloid-io (= 0.16.2)
timers (~> 4.0.1) timers (~> 4.0.1)
sass (3.7.1) sass (3.7.2)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -220,14 +220,14 @@ GEM
stylus-source stylus-source
stylus-source (0.54.5) stylus-source (0.54.5)
temple (0.8.0) temple (0.8.0)
thor (0.20.0) thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.8) tilt (2.0.8)
timers (4.0.4) timers (4.0.4)
hitimes hitimes
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.2.0) uglifier (4.1.19)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.0) unicode-display_width (1.4.0)
xpath (2.1.0) xpath (2.1.0)
@ -253,7 +253,7 @@ DEPENDENCIES
pry pry
pry-rescue pry-rescue
pry-stack_explorer pry-stack_explorer
rake (~> 10.3) rake (~> 12.3)
redcarpet (>= 3.1) redcarpet (>= 3.1)
rspec (~> 3.0) rspec (~> 3.0)
rubocop (~> 0.59) rubocop (~> 0.59)

10
middleman-core/features/minify_javascript.feature
View file

@ -131,14 +131,14 @@ Feature: Minify JavaScript
Then I should see: Then I should see:
""" """
<script> <script>
!function(){should(),all.be(),on={one:line}}(); should(),all.be(),on={one:line};
</script> </script>
<script> <script>
!function(){should(),too()}(); should(),too();
</script> </script>
<script type='text/javascript'> <script type='text/javascript'>
//<!-- //<!--
!function(){one,line(),here()}(); one,line(),here();
//--> //-->
</script> </script>
<script type='text/html'> <script type='text/html'>
@ -159,11 +159,11 @@ Feature: Minify JavaScript
<?='Hello'?> <?='Hello'?>
<script> <script>
!function(){should(),all.be(),on={one:line}}(); should(),all.be(),on={one:line};
</script> </script>
<script type='text/javascript'> <script type='text/javascript'>
//<!-- //<!--
!function(){one,line(),here()}(); one,line(),here();
//--> //-->
</script> </script>
<script type='text/html'> <script type='text/html'>

2
middleman-core/middleman-core.gemspec
View file

@ -48,7 +48,7 @@ Gem::Specification.new do |s|
s.add_dependency('sassc', ['~> 1.10']) s.add_dependency('sassc', ['~> 1.10'])
# Minify JS # Minify JS
s.add_dependency('uglifier', ['~> 3.0']) s.add_dependency('uglifier', ['~> 4.1'])
s.add_dependency('execjs', ['~> 2.0']) s.add_dependency('execjs', ['~> 2.0'])
# Perf # Perf