2.5.4

zloirock · May 5, 2018 · 7f048d7 · 7f048d7
1 parent 96ddd81
commit 7f048d7
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 183 deletions.
diff --git a/README.md b/README.md
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "core.js",
   "main": "client/core.js",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "Standard Library",
   "keywords": [
     "ES3",

diff --git a/build/core-js-builder/package.json b/build/core-js-builder/package.json
@@ -1,14 +1,14 @@
 {
   "name": "core-js-builder",
   "description": "core-js builder",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/zloirock/core-js.git"
   },
   "main": "index.js",
   "dependencies": {
-    "core-js": "2.5.3",
+    "core-js": "2.5.4",
     "temp": "^0.8.3",
     "webpack": "^3.11.0"
   },

diff --git a/client/core.js b/client/core.js
@@ -1,8 +1,8 @@
 /**
- * core-js 2.5.3
+ * core-js 2.5.4
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
- * © 2017 Denis Pushkarev
+ * © 2018 Denis Pushkarev
  */
 !function(__e, __g, undefined){
 'use strict';
@@ -390,7 +390,7 @@ module.exports = function (NAME, exec) {
 /* 18 */
 /***/ (function(module, exports) {
 
-var core = module.exports = { version: '2.5.3' };
+var core = module.exports = { version: '2.5.4' };
 if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
 
 
@@ -1573,7 +1573,6 @@ var LIBRARY = __webpack_require__(36);
 var $export = __webpack_require__(0);
 var redefine = __webpack_require__(14);
 var hide = __webpack_require__(13);
-var has = __webpack_require__(12);
 var Iterators = __webpack_require__(40);
 var $iterCreate = __webpack_require__(56);
 var setToStringTag = __webpack_require__(44);
@@ -1600,7 +1599,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
   var VALUES_BUG = false;
   var proto = Base.prototype;
   var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
-  var $default = (!BUGGY && $native) || getMethod(DEFAULT);
+  var $default = $native || getMethod(DEFAULT);
   var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
   var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
   var methods, key, IteratorPrototype;
@@ -1611,7 +1610,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
       // Set @@toStringTag to native iterators
       setToStringTag(IteratorPrototype, TAG, true);
       // fix for some old engines
-      if (!LIBRARY && !has(IteratorPrototype, ITERATOR)) hide(IteratorPrototype, ITERATOR, returnThis);
+      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
     }
   }
   // fix Array#{values, @@iterator}.name in V8 / FF
@@ -6224,7 +6223,7 @@ var notify = function (promise, isReject) {
       var resolve = reaction.resolve;
       var reject = reaction.reject;
       var domain = reaction.domain;
-      var result, then;
+      var result, then, exited;
       try {
         if (handler) {
           if (!ok) {
@@ -6234,8 +6233,11 @@ var notify = function (promise, isReject) {
           if (handler === true) result = value;
           else {
             if (domain) domain.enter();
-            result = handler(value);
-            if (domain) domain.exit();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
+            }
           }
           if (result === reaction.promise) {
             reject(TypeError('Promise-chain cycle'));
@@ -6244,6 +6246,7 @@ var notify = function (promise, isReject) {
           } else resolve(result);
         } else reject(value);
       } catch (e) {
+        if (domain && !exited) domain.exit();
         reject(e);
       }
     };

diff --git a/client/core.min.js b/client/core.min.js
diff --git a/client/core.min.js.map b/client/core.min.js.map
diff --git a/client/library.js b/client/library.js
@@ -1,8 +1,8 @@
 /**
- * core-js 2.5.3
+ * core-js 2.5.4
  * https://github.com/zloirock/core-js
  * License: http://rock.mit-license.org
- * © 2017 Denis Pushkarev
+ * © 2018 Denis Pushkarev
  */
 !function(__e, __g, undefined){
 'use strict';
@@ -79,6 +79,7 @@ var global = __webpack_require__(2);
 var core = __webpack_require__(12);
 var ctx = __webpack_require__(16);
 var hide = __webpack_require__(17);
+var has = __webpack_require__(15);
 var PROTOTYPE = 'prototype';
 
 var $export = function (type, name, source) {
@@ -96,7 +97,7 @@ var $export = function (type, name, source) {
   for (key in source) {
     // contains in native
     own = !IS_FORCED && target && target[key] !== undefined;
-    if (own && key in exports) continue;
+    if (own && has(exports, key)) continue;
     // export native or passed
     out = own ? target[key] : source[key];
     // prevent global pollution for namespaces
@@ -281,7 +282,7 @@ module.exports = function (it) {
 /* 12 */
 /***/ (function(module, exports) {
 
-var core = module.exports = { version: '2.5.3' };
+var core = module.exports = { version: '2.5.4' };
 if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
 
 
@@ -1537,7 +1538,6 @@ var LIBRARY = __webpack_require__(34);
 var $export = __webpack_require__(0);
 var redefine = __webpack_require__(62);
 var hide = __webpack_require__(17);
-var has = __webpack_require__(15);
 var Iterators = __webpack_require__(36);
 var $iterCreate = __webpack_require__(54);
 var setToStringTag = __webpack_require__(41);
@@ -1564,7 +1564,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
   var VALUES_BUG = false;
   var proto = Base.prototype;
   var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
-  var $default = (!BUGGY && $native) || getMethod(DEFAULT);
+  var $default = $native || getMethod(DEFAULT);
   var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
   var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
   var methods, key, IteratorPrototype;
@@ -1575,7 +1575,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
       // Set @@toStringTag to native iterators
       setToStringTag(IteratorPrototype, TAG, true);
       // fix for some old engines
-      if (!LIBRARY && !has(IteratorPrototype, ITERATOR)) hide(IteratorPrototype, ITERATOR, returnThis);
+      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
     }
   }
   // fix Array#{values, @@iterator}.name in V8 / FF
@@ -5800,7 +5800,7 @@ var notify = function (promise, isReject) {
       var resolve = reaction.resolve;
       var reject = reaction.reject;
       var domain = reaction.domain;
-      var result, then;
+      var result, then, exited;
       try {
         if (handler) {
           if (!ok) {
@@ -5810,8 +5810,11 @@ var notify = function (promise, isReject) {
           if (handler === true) result = value;
           else {
             if (domain) domain.enter();
-            result = handler(value);
-            if (domain) domain.exit();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
+            }
           }
           if (result === reaction.promise) {
             reject(TypeError('Promise-chain cycle'));
@@ -5820,6 +5823,7 @@ var notify = function (promise, isReject) {
           } else resolve(result);
         } else reject(value);
       } catch (e) {
+        if (domain && !exited) domain.exit();
         reject(e);
       }
     };

diff --git a/client/library.min.js b/client/library.min.js
diff --git a/client/library.min.js.map b/client/library.min.js.map