[Refactor] use gopd

ljharb · Nov 8, 2022 · 35912aa · 35912aa
1 parent 89916cc
commit 35912aa
Show file tree

Hide file tree

Showing 44 changed files with 45 additions and 54 deletions.
diff --git a/2015/ObjectDefineProperties.js b/2015/ObjectDefineProperties.js
@@ -9,7 +9,7 @@ var ToObject = require('./ToObject');
 var ToPropertyDescriptor = require('./ToPropertyDescriptor');
 
 var forEach = require('../helpers/forEach');
-var getOwnPropertyDescriptor = require('../helpers/getOwnPropertyDescriptor');
+var getOwnPropertyDescriptor = require('gopd');
 var OwnPropertyKeys = require('../helpers/OwnPropertyKeys');
 
 var $push = callBound('Array.prototype.push');

diff --git a/2015/OrdinaryDefineOwnProperty.js b/2015/OrdinaryDefineOwnProperty.js
@@ -2,7 +2,7 @@
 
 var GetIntrinsic = require('get-intrinsic');
 
-var $gOPD = require('../helpers/getOwnPropertyDescriptor');
+var $gOPD = require('gopd');
 var $SyntaxError = GetIntrinsic('%SyntaxError%');
 var $TypeError = GetIntrinsic('%TypeError%');
 

diff --git a/2015/OrdinaryGetOwnProperty.js b/2015/OrdinaryGetOwnProperty.js
@@ -2,7 +2,7 @@
 
 var GetIntrinsic = require('get-intrinsic');
 
-var $gOPD = require('../helpers/getOwnPropertyDescriptor');
+var $gOPD = require('gopd');
 var $TypeError = GetIntrinsic('%TypeError%');
 
 var callBound = require('call-bind/callBound');

diff --git a/2015/SetIntegrityLevel.js b/2015/SetIntegrityLevel.js
@@ -5,7 +5,7 @@ var GetIntrinsic = require('get-intrinsic');
 var $SyntaxError = GetIntrinsic('%SyntaxError%');
 var $TypeError = GetIntrinsic('%TypeError%');
 var $preventExtensions = GetIntrinsic('%Object.preventExtensions%', true);
-var $gOPD = require('../helpers/getOwnPropertyDescriptor');
+var $gOPD = require('gopd');
 var $gOPN = GetIntrinsic('%Object.getOwnPropertyNames%', true);
 
 var forEach = require('../helpers/forEach');

diff --git a/2015/TestIntegrityLevel.js b/2015/TestIntegrityLevel.js
@@ -2,7 +2,7 @@
 
 var GetIntrinsic = require('get-intrinsic');
 
-var $gOPD = require('../helpers/getOwnPropertyDescriptor');
+var $gOPD = require('gopd');
 var $TypeError = GetIntrinsic('%TypeError%');
 
 var every = require('../helpers/every');

diff --git a/2016/ObjectDefineProperties.js b/2016/ObjectDefineProperties.js
diff --git a/2016/OrdinaryDefineOwnProperty.js b/2016/OrdinaryDefineOwnProperty.js
diff --git a/2016/OrdinaryGetOwnProperty.js b/2016/OrdinaryGetOwnProperty.js
diff --git a/2016/SetIntegrityLevel.js b/2016/SetIntegrityLevel.js
diff --git a/2016/TestIntegrityLevel.js b/2016/TestIntegrityLevel.js
diff --git a/2017/ObjectDefineProperties.js b/2017/ObjectDefineProperties.js
diff --git a/2017/OrdinaryDefineOwnProperty.js b/2017/OrdinaryDefineOwnProperty.js
diff --git a/2017/OrdinaryGetOwnProperty.js b/2017/OrdinaryGetOwnProperty.js
diff --git a/2017/SetIntegrityLevel.js b/2017/SetIntegrityLevel.js
diff --git a/2017/TestIntegrityLevel.js b/2017/TestIntegrityLevel.js
diff --git a/2018/ObjectDefineProperties.js b/2018/ObjectDefineProperties.js
diff --git a/2018/OrdinaryDefineOwnProperty.js b/2018/OrdinaryDefineOwnProperty.js
diff --git a/2018/OrdinaryGetOwnProperty.js b/2018/OrdinaryGetOwnProperty.js
diff --git a/2018/SetIntegrityLevel.js b/2018/SetIntegrityLevel.js
diff --git a/2018/TestIntegrityLevel.js b/2018/TestIntegrityLevel.js
diff --git a/2019/ObjectDefineProperties.js b/2019/ObjectDefineProperties.js
diff --git a/2019/OrdinaryDefineOwnProperty.js b/2019/OrdinaryDefineOwnProperty.js
diff --git a/2019/OrdinaryGetOwnProperty.js b/2019/OrdinaryGetOwnProperty.js
diff --git a/2019/SetIntegrityLevel.js b/2019/SetIntegrityLevel.js
diff --git a/2019/TestIntegrityLevel.js b/2019/TestIntegrityLevel.js
diff --git a/2020/ObjectDefineProperties.js b/2020/ObjectDefineProperties.js
diff --git a/2020/OrdinaryDefineOwnProperty.js b/2020/OrdinaryDefineOwnProperty.js
diff --git a/2020/OrdinaryGetOwnProperty.js b/2020/OrdinaryGetOwnProperty.js
diff --git a/2020/SetIntegrityLevel.js b/2020/SetIntegrityLevel.js
diff --git a/2020/TestIntegrityLevel.js b/2020/TestIntegrityLevel.js
diff --git a/2021/ObjectDefineProperties.js b/2021/ObjectDefineProperties.js
diff --git a/2021/OrdinaryDefineOwnProperty.js b/2021/OrdinaryDefineOwnProperty.js
diff --git a/2021/OrdinaryGetOwnProperty.js b/2021/OrdinaryGetOwnProperty.js
diff --git a/2021/SetIntegrityLevel.js b/2021/SetIntegrityLevel.js
diff --git a/2021/TestIntegrityLevel.js b/2021/TestIntegrityLevel.js
diff --git a/2022/ObjectDefineProperties.js b/2022/ObjectDefineProperties.js
diff --git a/2022/OrdinaryDefineOwnProperty.js b/2022/OrdinaryDefineOwnProperty.js
diff --git a/2022/OrdinaryGetOwnProperty.js b/2022/OrdinaryGetOwnProperty.js
diff --git a/2022/SetIntegrityLevel.js b/2022/SetIntegrityLevel.js
diff --git a/2022/TestIntegrityLevel.js b/2022/TestIntegrityLevel.js
diff --git a/helpers/getOwnPropertyDescriptor.js b/helpers/getOwnPropertyDescriptor.js
@@ -1,15 +1,5 @@
 'use strict';
 
-var GetIntrinsic = require('get-intrinsic');
+// TODO: remove, semver-major
 
-var $gOPD = GetIntrinsic('%Object.getOwnPropertyDescriptor%', true);
-if ($gOPD) {
-	try {
-		$gOPD([], 'length');
-	} catch (e) {
-		// IE 8 has a broken gOPD
-		$gOPD = null;
-	}
-}
-
-module.exports = $gOPD;
+module.exports = require('gopd');
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
 		"function.prototype.name": "^1.1.5",
 		"get-intrinsic": "^1.1.3",
 		"get-symbol-description": "^1.0.0",
+		"gopd": "^1.0.1",
 		"has": "^1.0.3",
 		"has-property-descriptors": "^1.0.0",
 		"has-symbols": "^1.0.3",

diff --git a/test/GetIntrinsic.js b/test/GetIntrinsic.js
@@ -12,7 +12,7 @@ var mockProperty = require('mock-property');
 
 var callBound = require('call-bind/callBound');
 var v = require('es-value-fixtures');
-var $gOPD = require('../helpers/getOwnPropertyDescriptor');
+var $gOPD = require('gopd');
 var DefinePropertyOrThrow = require('../2021/DefinePropertyOrThrow');
 
 var $isProto = callBound('%Object.prototype.isPrototypeOf%');