From 985cca0d7e7a7f761e2399bf198a733eeb6134b0 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Jul 07 2017 15:45:44 +0000 Subject: Update to Uglifier 3.2.0. --- diff --git a/.gitignore b/.gitignore index 4b07171..74fd10b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /uglifier-3.0.2.gem /uglifier-3.1.11-tests.tgz /uglifier-3.1.11.gem +/uglifier-3.2.0-tests.tgz +/uglifier-3.2.0.gem diff --git a/rubygem-uglifier-3.0.0-unbundle-js-files-for-jscript.patch b/rubygem-uglifier-3.0.0-unbundle-js-files-for-jscript.patch deleted file mode 100644 index d9d411c..0000000 --- a/rubygem-uglifier-3.0.0-unbundle-js-files-for-jscript.patch +++ /dev/null @@ -1,490 +0,0 @@ -From b023cc8166705f8a2c8b8d348ef5d9a663afbb5f Mon Sep 17 00:00:00 2001 -From: Jun Aruga -Date: Wed, 27 Jul 2016 14:30:02 +0200 -Subject: [PATCH] Remove JS files for JS Engine not supporting ECMAScript 5. - ---- - lib/es5.js | 321 -------------------------------------------------------- - lib/split.js | 117 --------------------- - lib/uglifier.rb | 6 +- - 3 files changed, 1 insertion(+), 443 deletions(-) - delete mode 100644 lib/es5.js - delete mode 100644 lib/split.js - -diff --git a/lib/es5.js b/lib/es5.js -deleted file mode 100644 -index b5712b8..0000000 ---- a/lib/es5.js -+++ /dev/null -@@ -1,321 +0,0 @@ --// https://developer.mozilla.org/en/JavaScript/Reference/global_objects/array/foreach -- --if (!Array.prototype.forEach) --{ -- Array.prototype.forEach = function(fun /*, thisp */) -- { -- "use strict"; -- -- if (this === void 0 || this === null) -- throw new TypeError(); -- -- var t = Object(this); -- var len = t.length >>> 0; -- if (typeof fun !== "function") -- throw new TypeError(); -- -- var thisp = arguments[1]; -- for (var i = 0; i < len; i++) -- { -- if (i in t) -- fun.call(thisp, t[i], i, t); -- } -- }; --} -- --// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map --// Production steps of ECMA-262, Edition 5, 15.4.4.19 --// Reference: http://es5.github.com/#x15.4.4.19 --if (!Array.prototype.map) { -- Array.prototype.map = function(callback, thisArg) { -- -- var T, A, k; -- -- if (this == null) { -- throw new TypeError(" this is null or not defined"); -- } -- -- // 1. Let O be the result of calling ToObject passing the |this| value as the argument. -- var O = Object(this); -- -- // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length". -- // 3. Let len be ToUint32(lenValue). -- var len = O.length >>> 0; -- -- // 4. If IsCallable(callback) is false, throw a TypeError exception. -- // See: http://es5.github.com/#x9.11 -- if ({}.toString.call(callback) != "[object Function]") { -- throw new TypeError(callback + " is not a function"); -- } -- -- // 5. If thisArg was supplied, let T be thisArg; else let T be undefined. -- if (thisArg) { -- T = thisArg; -- } -- -- // 6. Let A be a new array created as if by the expression new Array(len) where Array is -- // the standard built-in constructor with that name and len is the value of len. -- A = new Array(len); -- -- // 7. Let k be 0 -- k = 0; -- -- // 8. Repeat, while k < len -- while(k < len) { -- -- var kValue, mappedValue; -- -- // a. Let Pk be ToString(k). -- // This is implicit for LHS operands of the in operator -- // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk. -- // This step can be combined with c -- // c. If kPresent is true, then -- if (k in O) { -- -- // i. Let kValue be the result of calling the Get internal method of O with argument Pk. -- kValue = O[ k ]; -- -- // ii. Let mappedValue be the result of calling the Call internal method of callback -- // with T as the this value and argument list containing kValue, k, and O. -- mappedValue = callback.call(T, kValue, k, O); -- -- // iii. Call the DefineOwnProperty internal method of A with arguments -- // Pk, Property Descriptor {Value: mappedValue, Writable: true, Enumerable: true, Configurable: true}, -- // and false. -- -- // In browsers that support Object.defineProperty, use the following: -- // Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true }); -- -- // For best browser support, use the following: -- A[ k ] = mappedValue; -- } -- // d. Increase k by 1. -- k++; -- } -- -- // 9. return A -- return A; -- }; --} -- --// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/Reduce -- --if (!Array.prototype.reduce) --{ -- Array.prototype.reduce = function(fun /*, initialValue */) -- { -- "use strict"; -- -- if (this === void 0 || this === null) -- throw new TypeError(); -- -- var t = Object(this); -- var len = t.length >>> 0; -- if (typeof fun !== "function") -- throw new TypeError(); -- -- // no value to return if no initial value and an empty array -- if (len == 0 && arguments.length == 1) -- throw new TypeError(); -- -- var k = 0; -- var accumulator; -- if (arguments.length >= 2) -- { -- accumulator = arguments[1]; -- } -- else -- { -- do -- { -- if (k in t) -- { -- accumulator = t[k++]; -- break; -- } -- -- // if array contains no values, no initial value to return -- if (++k >= len) -- throw new TypeError(); -- } -- while (true); -- } -- -- while (k < len) -- { -- if (k in t) -- accumulator = fun.call(undefined, accumulator, t[k], k, t); -- k++; -- } -- -- return accumulator; -- }; --} -- --// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf --if (!Array.prototype.indexOf) { -- Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) { -- "use strict"; -- if (this === void 0 || this === null) { -- throw new TypeError(); -- } -- var t = Object(this); -- var len = t.length >>> 0; -- if (len === 0) { -- return -1; -- } -- var n = 0; -- if (arguments.length > 0) { -- n = Number(arguments[1]); -- if (n !== n) { // shortcut for verifying if it's NaN -- n = 0; -- } else if (n !== 0 && n !== Infinity && n !== -Infinity) { -- n = (n > 0 || -1) * Math.floor(Math.abs(n)); -- } -- } -- if (n >= len) { -- return -1; -- } -- var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0); -- for (; k < len; k++) { -- if (k in t && t[k] === searchElement) { -- return k; -- } -- } -- return -1; -- } --} -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Object/keys --if (!Object.keys) { -- Object.keys = (function () { -- var hasOwnProperty = Object.prototype.hasOwnProperty, -- hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), -- dontEnums = [ -- 'toString', -- 'toLocaleString', -- 'valueOf', -- 'hasOwnProperty', -- 'isPrototypeOf', -- 'propertyIsEnumerable', -- 'constructor' -- ], -- dontEnumsLength = dontEnums.length; -- -- return function (obj) { -- if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object'); -- -- var result = []; -- -- for (var prop in obj) { -- if (hasOwnProperty.call(obj, prop)) result.push(prop); -- } -- -- if (hasDontEnumBug) { -- for (var i=0; i < dontEnumsLength; i++) { -- if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]); -- } -- } -- return result; -- } -- })() --}; -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Object/create --if (!Object.create) { -- Object.create = function (o) { -- if (arguments.length > 1) { -- throw new Error('Object.create implementation only accepts the first parameter.'); -- } -- function F() {} -- F.prototype = o; -- return new F(); -- }; --} -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Array/filter --if (!Array.prototype.filter) --{ -- Array.prototype.filter = function(fun /*, thisp*/) -- { -- "use strict"; -- -- if (this == null) -- throw new TypeError(); -- -- var t = Object(this); -- var len = t.length >>> 0; -- if (typeof fun != "function") -- throw new TypeError(); -- -- var res = []; -- var thisp = arguments[1]; -- for (var i = 0; i < len; i++) -- { -- if (i in t) -- { -- var val = t[i]; // in case fun mutates this -- if (fun.call(thisp, val, i, t)) -- res.push(val); -- } -- } -- -- return res; -- }; --} -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Function/bind --if (!Function.prototype.bind) { -- Function.prototype.bind = function (oThis) { -- if (typeof this !== "function") { -- // closest thing possible to the ECMAScript 5 internal IsCallable function -- throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); -- } -- -- var aArgs = Array.prototype.slice.call(arguments, 1), -- fToBind = this, -- fNOP = function () {}, -- fBound = function () { -- return fToBind.apply(this instanceof fNOP && oThis -- ? this -- : oThis, -- aArgs.concat(Array.prototype.slice.call(arguments))); -- }; -- -- fNOP.prototype = this.prototype; -- fBound.prototype = new fNOP(); -- -- return fBound; -- }; --} -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Array/isArray --if(!Array.isArray) { -- Array.isArray = function (vArg) { -- return Object.prototype.toString.call(vArg) === "[object Array]"; -- }; --} -- --// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/String/trim --if(!String.prototype.trim) { -- String.prototype.trim = function () { -- return this.replace(/^\s+|\s+$/g,''); -- }; --} -- -- --function definePropertyWorks() { -- try { -- Object.defineProperty({}, "property", {}); -- return true; -- } catch (exception) { -- return false; -- } --} -- --if (!definePropertyWorks()) { -- Object.defineProperty = function defineProperty(object) { -- // fail silently -- return object; -- } --} -diff --git a/lib/split.js b/lib/split.js -deleted file mode 100644 -index 8cc2924..0000000 ---- a/lib/split.js -+++ /dev/null -@@ -1,117 +0,0 @@ --/*! -- * Cross-Browser Split 1.1.1 -- * Copyright 2007-2012 Steven Levithan -- * Available under the MIT License -- * ECMAScript compliant, uniform cross-browser split method -- */ -- --/** -- * Splits a string into an array of strings using a regex or string separator. Matches of the -- * separator are not included in the result array. However, if `separator` is a regex that contains -- * capturing groups, backreferences are spliced into the result each time `separator` is matched. -- * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably -- * cross-browser. -- * @param {String} str String to split. -- * @param {RegExp|String} separator Regex or string to use for separating the string. -- * @param {Number} [limit] Maximum number of items to include in the result array. -- * @returns {Array} Array of substrings. -- * @example -- * -- * // Basic use -- * split('a b c d', ' '); -- * // -> ['a', 'b', 'c', 'd'] -- * -- * // With limit -- * split('a b c d', ' ', 2); -- * // -> ['a', 'b'] -- * -- * // Backreferences in result array -- * split('..word1 word2..', /([a-z]+)(\d+)/i); -- * // -> ['..', 'word', '1', ' ', 'word', '2', '..'] -- */ --var split; -- --// Avoid running twice; that would break the `nativeSplit` reference --split = split || function (undef) { -- -- var nativeSplit = String.prototype.split, -- compliantExecNpcg = /()??/.exec("")[1] === undef, // NPCG: nonparticipating capturing group -- self; -- -- self = function (str, separator, limit) { -- // If `separator` is not a regex, use `nativeSplit` -- if (Object.prototype.toString.call(separator) !== "[object RegExp]") { -- return nativeSplit.call(str, separator, limit); -- } -- var output = [], -- flags = (separator.ignoreCase ? "i" : "") + -- (separator.multiline ? "m" : "") + -- (separator.extended ? "x" : "") + // Proposed for ES6 -- (separator.sticky ? "y" : ""), // Firefox 3+ -- lastLastIndex = 0, -- // Make `global` and avoid `lastIndex` issues by working with a copy -- separator = new RegExp(separator.source, flags + "g"), -- separator2, match, lastIndex, lastLength; -- str += ""; // Type-convert -- if (!compliantExecNpcg) { -- // Doesn't need flags gy, but they don't hurt -- separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags); -- } -- /* Values for `limit`, per the spec: -- * If undefined: 4294967295 // Math.pow(2, 32) - 1 -- * If 0, Infinity, or NaN: 0 -- * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296; -- * If negative number: 4294967296 - Math.floor(Math.abs(limit)) -- * If other: Type-convert, then use the above rules -- */ -- limit = limit === undef ? -- -1 >>> 0 : // Math.pow(2, 32) - 1 -- limit >>> 0; // ToUint32(limit) -- while (match = separator.exec(str)) { -- // `separator.lastIndex` is not reliable cross-browser -- lastIndex = match.index + match[0].length; -- if (lastIndex > lastLastIndex) { -- output.push(str.slice(lastLastIndex, match.index)); -- // Fix browsers whose `exec` methods don't consistently return `undefined` for -- // nonparticipating capturing groups -- if (!compliantExecNpcg && match.length > 1) { -- match[0].replace(separator2, function () { -- for (var i = 1; i < arguments.length - 2; i++) { -- if (arguments[i] === undef) { -- match[i] = undef; -- } -- } -- }); -- } -- if (match.length > 1 && match.index < str.length) { -- Array.prototype.push.apply(output, match.slice(1)); -- } -- lastLength = match[0].length; -- lastLastIndex = lastIndex; -- if (output.length >= limit) { -- break; -- } -- } -- if (separator.lastIndex === match.index) { -- separator.lastIndex++; // Avoid an infinite loop -- } -- } -- if (lastLastIndex === str.length) { -- if (lastLength || !separator.test("")) { -- output.push(""); -- } -- } else { -- output.push(str.slice(lastLastIndex)); -- } -- return output.length > limit ? output.slice(0, limit) : output; -- }; -- -- if ("\n".split(/\n/).length == 0) { -- String.prototype.split = function (separator, limit) { -- return self(this, separator, limit); -- }; -- } -- -- return self; -- --}(); -diff --git a/lib/uglifier.rb b/lib/uglifier.rb -index de24e26..431c4b3 100644 ---- a/lib/uglifier.rb -+++ b/lib/uglifier.rb -@@ -14,10 +14,6 @@ class Uglifier - SourcePath = File.expand_path("../uglify.js", __FILE__) - # Source Map path - SourceMapPath = File.expand_path("../source-map.js", __FILE__) -- # ES5 shims source path -- ES5FallbackPath = File.expand_path("../es5.js", __FILE__) -- # String.split shim source path -- SplitFallbackPath = File.expand_path("../split.js", __FILE__) - # UglifyJS wrapper path - UglifyJSWrapperPath = File.expand_path("../uglifier.js", __FILE__) - -@@ -156,7 +152,7 @@ class Uglifier - private - - def uglifyjs_source -- [ES5FallbackPath, SplitFallbackPath, SourceMapPath, SourcePath, -+ [SourceMapPath, SourcePath, - UglifyJSWrapperPath].map do |file| - File.open(file, "r:UTF-8", &:read) - end.join("\n") --- -2.5.5 - diff --git a/rubygem-uglifier-3.2.0-unbundle-js-files-for-jscript.patch b/rubygem-uglifier-3.2.0-unbundle-js-files-for-jscript.patch new file mode 100644 index 0000000..8bdfb82 --- /dev/null +++ b/rubygem-uglifier-3.2.0-unbundle-js-files-for-jscript.patch @@ -0,0 +1,490 @@ +From 7fff56a4311a275e79ffbea3f8db655946ac0290 Mon Sep 17 00:00:00 2001 +From: Jun Aruga +Date: Fri, 7 Jul 2017 16:27:50 +0200 +Subject: [PATCH] Remove JS files for JS Engine not supporting ECMAScript 5. + +--- + lib/es5.js | 321 -------------------------------------------------------- + lib/split.js | 117 --------------------- + lib/uglifier.rb | 6 +- + 3 files changed, 1 insertion(+), 443 deletions(-) + delete mode 100644 lib/es5.js + delete mode 100644 lib/split.js + +diff --git a/lib/es5.js b/lib/es5.js +deleted file mode 100644 +index b5712b8..0000000 +--- a/lib/es5.js ++++ /dev/null +@@ -1,321 +0,0 @@ +-// https://developer.mozilla.org/en/JavaScript/Reference/global_objects/array/foreach +- +-if (!Array.prototype.forEach) +-{ +- Array.prototype.forEach = function(fun /*, thisp */) +- { +- "use strict"; +- +- if (this === void 0 || this === null) +- throw new TypeError(); +- +- var t = Object(this); +- var len = t.length >>> 0; +- if (typeof fun !== "function") +- throw new TypeError(); +- +- var thisp = arguments[1]; +- for (var i = 0; i < len; i++) +- { +- if (i in t) +- fun.call(thisp, t[i], i, t); +- } +- }; +-} +- +-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map +-// Production steps of ECMA-262, Edition 5, 15.4.4.19 +-// Reference: http://es5.github.com/#x15.4.4.19 +-if (!Array.prototype.map) { +- Array.prototype.map = function(callback, thisArg) { +- +- var T, A, k; +- +- if (this == null) { +- throw new TypeError(" this is null or not defined"); +- } +- +- // 1. Let O be the result of calling ToObject passing the |this| value as the argument. +- var O = Object(this); +- +- // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length". +- // 3. Let len be ToUint32(lenValue). +- var len = O.length >>> 0; +- +- // 4. If IsCallable(callback) is false, throw a TypeError exception. +- // See: http://es5.github.com/#x9.11 +- if ({}.toString.call(callback) != "[object Function]") { +- throw new TypeError(callback + " is not a function"); +- } +- +- // 5. If thisArg was supplied, let T be thisArg; else let T be undefined. +- if (thisArg) { +- T = thisArg; +- } +- +- // 6. Let A be a new array created as if by the expression new Array(len) where Array is +- // the standard built-in constructor with that name and len is the value of len. +- A = new Array(len); +- +- // 7. Let k be 0 +- k = 0; +- +- // 8. Repeat, while k < len +- while(k < len) { +- +- var kValue, mappedValue; +- +- // a. Let Pk be ToString(k). +- // This is implicit for LHS operands of the in operator +- // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk. +- // This step can be combined with c +- // c. If kPresent is true, then +- if (k in O) { +- +- // i. Let kValue be the result of calling the Get internal method of O with argument Pk. +- kValue = O[ k ]; +- +- // ii. Let mappedValue be the result of calling the Call internal method of callback +- // with T as the this value and argument list containing kValue, k, and O. +- mappedValue = callback.call(T, kValue, k, O); +- +- // iii. Call the DefineOwnProperty internal method of A with arguments +- // Pk, Property Descriptor {Value: mappedValue, Writable: true, Enumerable: true, Configurable: true}, +- // and false. +- +- // In browsers that support Object.defineProperty, use the following: +- // Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true }); +- +- // For best browser support, use the following: +- A[ k ] = mappedValue; +- } +- // d. Increase k by 1. +- k++; +- } +- +- // 9. return A +- return A; +- }; +-} +- +-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/Reduce +- +-if (!Array.prototype.reduce) +-{ +- Array.prototype.reduce = function(fun /*, initialValue */) +- { +- "use strict"; +- +- if (this === void 0 || this === null) +- throw new TypeError(); +- +- var t = Object(this); +- var len = t.length >>> 0; +- if (typeof fun !== "function") +- throw new TypeError(); +- +- // no value to return if no initial value and an empty array +- if (len == 0 && arguments.length == 1) +- throw new TypeError(); +- +- var k = 0; +- var accumulator; +- if (arguments.length >= 2) +- { +- accumulator = arguments[1]; +- } +- else +- { +- do +- { +- if (k in t) +- { +- accumulator = t[k++]; +- break; +- } +- +- // if array contains no values, no initial value to return +- if (++k >= len) +- throw new TypeError(); +- } +- while (true); +- } +- +- while (k < len) +- { +- if (k in t) +- accumulator = fun.call(undefined, accumulator, t[k], k, t); +- k++; +- } +- +- return accumulator; +- }; +-} +- +-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf +-if (!Array.prototype.indexOf) { +- Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) { +- "use strict"; +- if (this === void 0 || this === null) { +- throw new TypeError(); +- } +- var t = Object(this); +- var len = t.length >>> 0; +- if (len === 0) { +- return -1; +- } +- var n = 0; +- if (arguments.length > 0) { +- n = Number(arguments[1]); +- if (n !== n) { // shortcut for verifying if it's NaN +- n = 0; +- } else if (n !== 0 && n !== Infinity && n !== -Infinity) { +- n = (n > 0 || -1) * Math.floor(Math.abs(n)); +- } +- } +- if (n >= len) { +- return -1; +- } +- var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0); +- for (; k < len; k++) { +- if (k in t && t[k] === searchElement) { +- return k; +- } +- } +- return -1; +- } +-} +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Object/keys +-if (!Object.keys) { +- Object.keys = (function () { +- var hasOwnProperty = Object.prototype.hasOwnProperty, +- hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), +- dontEnums = [ +- 'toString', +- 'toLocaleString', +- 'valueOf', +- 'hasOwnProperty', +- 'isPrototypeOf', +- 'propertyIsEnumerable', +- 'constructor' +- ], +- dontEnumsLength = dontEnums.length; +- +- return function (obj) { +- if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object'); +- +- var result = []; +- +- for (var prop in obj) { +- if (hasOwnProperty.call(obj, prop)) result.push(prop); +- } +- +- if (hasDontEnumBug) { +- for (var i=0; i < dontEnumsLength; i++) { +- if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]); +- } +- } +- return result; +- } +- })() +-}; +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Object/create +-if (!Object.create) { +- Object.create = function (o) { +- if (arguments.length > 1) { +- throw new Error('Object.create implementation only accepts the first parameter.'); +- } +- function F() {} +- F.prototype = o; +- return new F(); +- }; +-} +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Array/filter +-if (!Array.prototype.filter) +-{ +- Array.prototype.filter = function(fun /*, thisp*/) +- { +- "use strict"; +- +- if (this == null) +- throw new TypeError(); +- +- var t = Object(this); +- var len = t.length >>> 0; +- if (typeof fun != "function") +- throw new TypeError(); +- +- var res = []; +- var thisp = arguments[1]; +- for (var i = 0; i < len; i++) +- { +- if (i in t) +- { +- var val = t[i]; // in case fun mutates this +- if (fun.call(thisp, val, i, t)) +- res.push(val); +- } +- } +- +- return res; +- }; +-} +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Function/bind +-if (!Function.prototype.bind) { +- Function.prototype.bind = function (oThis) { +- if (typeof this !== "function") { +- // closest thing possible to the ECMAScript 5 internal IsCallable function +- throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); +- } +- +- var aArgs = Array.prototype.slice.call(arguments, 1), +- fToBind = this, +- fNOP = function () {}, +- fBound = function () { +- return fToBind.apply(this instanceof fNOP && oThis +- ? this +- : oThis, +- aArgs.concat(Array.prototype.slice.call(arguments))); +- }; +- +- fNOP.prototype = this.prototype; +- fBound.prototype = new fNOP(); +- +- return fBound; +- }; +-} +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/Array/isArray +-if(!Array.isArray) { +- Array.isArray = function (vArg) { +- return Object.prototype.toString.call(vArg) === "[object Array]"; +- }; +-} +- +-// https://developer.mozilla.org/en/docs/JavaScript/Reference/Global_Objects/String/trim +-if(!String.prototype.trim) { +- String.prototype.trim = function () { +- return this.replace(/^\s+|\s+$/g,''); +- }; +-} +- +- +-function definePropertyWorks() { +- try { +- Object.defineProperty({}, "property", {}); +- return true; +- } catch (exception) { +- return false; +- } +-} +- +-if (!definePropertyWorks()) { +- Object.defineProperty = function defineProperty(object) { +- // fail silently +- return object; +- } +-} +diff --git a/lib/split.js b/lib/split.js +deleted file mode 100644 +index 8cc2924..0000000 +--- a/lib/split.js ++++ /dev/null +@@ -1,117 +0,0 @@ +-/*! +- * Cross-Browser Split 1.1.1 +- * Copyright 2007-2012 Steven Levithan +- * Available under the MIT License +- * ECMAScript compliant, uniform cross-browser split method +- */ +- +-/** +- * Splits a string into an array of strings using a regex or string separator. Matches of the +- * separator are not included in the result array. However, if `separator` is a regex that contains +- * capturing groups, backreferences are spliced into the result each time `separator` is matched. +- * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably +- * cross-browser. +- * @param {String} str String to split. +- * @param {RegExp|String} separator Regex or string to use for separating the string. +- * @param {Number} [limit] Maximum number of items to include in the result array. +- * @returns {Array} Array of substrings. +- * @example +- * +- * // Basic use +- * split('a b c d', ' '); +- * // -> ['a', 'b', 'c', 'd'] +- * +- * // With limit +- * split('a b c d', ' ', 2); +- * // -> ['a', 'b'] +- * +- * // Backreferences in result array +- * split('..word1 word2..', /([a-z]+)(\d+)/i); +- * // -> ['..', 'word', '1', ' ', 'word', '2', '..'] +- */ +-var split; +- +-// Avoid running twice; that would break the `nativeSplit` reference +-split = split || function (undef) { +- +- var nativeSplit = String.prototype.split, +- compliantExecNpcg = /()??/.exec("")[1] === undef, // NPCG: nonparticipating capturing group +- self; +- +- self = function (str, separator, limit) { +- // If `separator` is not a regex, use `nativeSplit` +- if (Object.prototype.toString.call(separator) !== "[object RegExp]") { +- return nativeSplit.call(str, separator, limit); +- } +- var output = [], +- flags = (separator.ignoreCase ? "i" : "") + +- (separator.multiline ? "m" : "") + +- (separator.extended ? "x" : "") + // Proposed for ES6 +- (separator.sticky ? "y" : ""), // Firefox 3+ +- lastLastIndex = 0, +- // Make `global` and avoid `lastIndex` issues by working with a copy +- separator = new RegExp(separator.source, flags + "g"), +- separator2, match, lastIndex, lastLength; +- str += ""; // Type-convert +- if (!compliantExecNpcg) { +- // Doesn't need flags gy, but they don't hurt +- separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags); +- } +- /* Values for `limit`, per the spec: +- * If undefined: 4294967295 // Math.pow(2, 32) - 1 +- * If 0, Infinity, or NaN: 0 +- * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296; +- * If negative number: 4294967296 - Math.floor(Math.abs(limit)) +- * If other: Type-convert, then use the above rules +- */ +- limit = limit === undef ? +- -1 >>> 0 : // Math.pow(2, 32) - 1 +- limit >>> 0; // ToUint32(limit) +- while (match = separator.exec(str)) { +- // `separator.lastIndex` is not reliable cross-browser +- lastIndex = match.index + match[0].length; +- if (lastIndex > lastLastIndex) { +- output.push(str.slice(lastLastIndex, match.index)); +- // Fix browsers whose `exec` methods don't consistently return `undefined` for +- // nonparticipating capturing groups +- if (!compliantExecNpcg && match.length > 1) { +- match[0].replace(separator2, function () { +- for (var i = 1; i < arguments.length - 2; i++) { +- if (arguments[i] === undef) { +- match[i] = undef; +- } +- } +- }); +- } +- if (match.length > 1 && match.index < str.length) { +- Array.prototype.push.apply(output, match.slice(1)); +- } +- lastLength = match[0].length; +- lastLastIndex = lastIndex; +- if (output.length >= limit) { +- break; +- } +- } +- if (separator.lastIndex === match.index) { +- separator.lastIndex++; // Avoid an infinite loop +- } +- } +- if (lastLastIndex === str.length) { +- if (lastLength || !separator.test("")) { +- output.push(""); +- } +- } else { +- output.push(str.slice(lastLastIndex)); +- } +- return output.length > limit ? output.slice(0, limit) : output; +- }; +- +- if ("\n".split(/\n/).length == 0) { +- String.prototype.split = function (separator, limit) { +- return self(this, separator, limit); +- }; +- } +- +- return self; +- +-}(); +diff --git a/lib/uglifier.rb b/lib/uglifier.rb +index 3e23583..dda5461 100644 +--- a/lib/uglifier.rb ++++ b/lib/uglifier.rb +@@ -16,10 +16,6 @@ class Uglifier + HarmonySourcePath = File.expand_path("../uglify-harmony.js", __FILE__) + # Source Map path + SourceMapPath = File.expand_path("../source-map.js", __FILE__) +- # ES5 shims source path +- ES5FallbackPath = File.expand_path("../es5.js", __FILE__) +- # String.split shim source path +- SplitFallbackPath = File.expand_path("../split.js", __FILE__) + # UglifyJS wrapper path + UglifyJSWrapperPath = File.expand_path("../uglifier.js", __FILE__) + +@@ -170,7 +166,7 @@ class Uglifier + private + + def source_with(path) +- [ES5FallbackPath, SplitFallbackPath, SourceMapPath, path, ++ [SourceMapPath, path, + UglifyJSWrapperPath].map do |file| + File.open(file, "r:UTF-8", &:read) + end.join("\n") +-- +2.9.4 + diff --git a/rubygem-uglifier.spec b/rubygem-uglifier.spec index 1af35f8..18fbb7f 100644 --- a/rubygem-uglifier.spec +++ b/rubygem-uglifier.spec @@ -1,24 +1,28 @@ # Generated from uglifier-1.2.6.gem by gem2rpm -*- rpm-spec -*- %global gem_name uglifier +%global uglify_js_version 2.8.22 +%global source_map_version 0.5.6 + Name: rubygem-%{gem_name} -Version: 3.1.11 +Version: 3.2.0 Release: 1%{?dist} Summary: Ruby wrapper for UglifyJS JavaScript compressor Group: Development/Languages # lib/source-map.js is BSD. # lib/uglify.js is BSD. +# lib/uglify-harmony.js (UglifyJS2 harmony branch) is BSD. License: MIT and BSD URL: http://github.com/lautis/uglifier Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # The uglifier gem doesn't ship with the test suite. # git clone https://github.com/lautis/uglifier.git && cd uglifier -# git checkout v3.1.11 && tar czvf uglifier-3.1.11-tests.tgz spec/ +# git checkout v3.2.0 && tar czvf uglifier-3.2.0-tests.tgz spec/ Source1: %{gem_name}-%{version}-tests.tgz # Unbundling es5.js and split.js files, # since they are needed only by JScript engine, which is not supported on Fedora # https://github.com/lautis/uglifier/issues/99 -Patch1: rubygem-uglifier-3.0.0-unbundle-js-files-for-jscript.patch +Patch1: rubygem-uglifier-3.2.0-unbundle-js-files-for-jscript.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -26,13 +30,13 @@ BuildRequires: ruby BuildRequires: rubygem(execjs) >= 0.3.0 BuildRequires: rubygem(rspec) BuildRequires: %{_bindir}/node -BuildRequires: uglify-js = 2.8.17 +BuildRequires: uglify-js = %{uglify_js_version} # uglify-js does not provide single file uglify-js.js yet => let's # generate and bundle it here. -Provides: bundled(uglify-js) = 2.8.17 +Provides: bundled(uglify-js) = %{uglify_js_version} # There is not included dist/source-map.js yet. # https://bugzilla.redhat.com/show_bug.cgi?id=1358915 -Provides: bundled(nodejs-source-map) = 0.5.6 +Provides: bundled(nodejs-source-map) = %{source_map_version} BuildArch: noarch %description @@ -96,6 +100,7 @@ popd %exclude %{gem_instdir}/.* %license %{gem_instdir}/LICENSE.txt %{gem_libdir} +%exclude %{gem_instdir}/uglifier.gemspec %exclude %{gem_cache} %{gem_spec} @@ -104,11 +109,13 @@ popd %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CONTRIBUTING.md %{gem_instdir}/Gemfile -%{gem_instdir}/Rakefile %doc %{gem_instdir}/README.md -%{gem_instdir}/%{gem_name}.gemspec +%{gem_instdir}/Rakefile %changelog +* Fri Jul 07 2017 Jun Aruga - 3.2.0-1 +- Update to Uglifier 3.2.0. + * Wed Mar 29 2017 Jun Aruga - 3.1.11-1 - Update to Uglifier 3.1.11. diff --git a/sources b/sources index 9e8b5ea..12f2a6c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uglifier-3.1.11-tests.tgz) = 6b26219b1b6eac537533ad3dff8dd1f94fe67eab8695bd2d1eb4e0b019f709f585dd92a967e8acdffe0500d45ee68b1b0d6492cf6b33b926a98547e29e7827c7 -SHA512 (uglifier-3.1.11.gem) = 8746e2257e9f17b985349303ba4fa06b6112b84f52a3b848fd4cd06252de80d639d81293f8d8780018a3b20e968d6775912480b7b6161cc1e148e9ff5a632d80 +SHA512 (uglifier-3.2.0-tests.tgz) = bfeb12827a7c58b23e70094f4030270c1e7f7a62413bd792dada02efb46ccee9eecaf178ed1bd97550204c2de5d93295886ce0233854d35ec53a141d57c47bc0 +SHA512 (uglifier-3.2.0.gem) = 967acc3377c748e467080b7b147ddbfebcfc9d72f4474271d7d25ea3237cce09a986c7bd1040ca88b084b2b6f2845151f703ae5e2b42d251b65e89ade423516c