ci-test: apply #61157 (comment)

Author: LiviaMedeiros

lib/buffer.js

@@ -54,6 +54,10 @@ const {
   Uint8Array,
 } = primordials;
 
+// TODO(LiviaMedeiros): replace with primordial once `--js-base-64` is not optional
+// eslint-disable-next-line node-core/prefer-primordials
+const { fromHex: Uint8ArrayFromHex, fromBase64: Uint8ArrayFromBase64 } = Uint8Array;
+
 const {
   byteLengthUtf8,
   compare: _compare,
@@ -336,81 +340,40 @@ Buffer.from = function from(value, encodingOrOffset, length) {
   );
 };
 
-/**
- * Same as Uint8Array.fromHex(hexstring), but returns instance of Buffer.
- * Not same as Buffer.from(hexstring), as it performs different validations.
- * @function Buffer.fromHex
- * @param {string} str
- * @returns {Buffer}
- */
-ObjectDefineProperty(Buffer, 'fromHex', {
-  __proto__: null,
-  configurable: true,
-  enumerable: false,
-  get() {
-    // TODO(LiviaMedeiros): make unconditional and use primordial once `--js-base-64` is not optional
-    // eslint-disable-next-line node-core/prefer-primordials
-    const Uint8ArrayFromHex = Uint8Array.fromHex;
-    const value = Uint8ArrayFromHex === undefined ?
-      undefined :
-      function fromHex(str) {
-        const buf = Uint8ArrayFromHex(str);
-        return fromArrayBuffer(
-          TypedArrayPrototypeGetBuffer(buf),
-          TypedArrayPrototypeGetByteOffset(buf),
-          TypedArrayPrototypeGetByteLength(buf),
-        );
-      };
-
-    ObjectDefineProperty(Buffer, 'fromHex', {
-      __proto__: null,
-      value,
-      configurable: true,
-      enumerable: false,
-      writable: true,
-    });
-
-    return value;
-  },
-});
+// eslint-disable-next-line node-core/prefer-primordials
+if (Uint8ArrayFromHex) {
+  /**
+   * Same as Uint8Array.fromHex(hexstring), but returns instance of Buffer.
+   * Not same as Buffer.from(hexstring), as it performs different validations.
+   * @param {string} str
+   * @returns {Buffer}
+   */
+  Buffer.fromHex = function fromHex(str) {
+    const buf = Uint8ArrayFromHex(str);
+    return fromArrayBuffer(
+      TypedArrayPrototypeGetBuffer(buf),
+      TypedArrayPrototypeGetByteOffset(buf),
+      TypedArrayPrototypeGetByteLength(buf));
+  };
+}
+
+// eslint-disable-next-line node-core/prefer-primordials
+if (Uint8ArrayFromBase64) {
+  /**
+   * Same as Uint8Array.fromBase64(base64string, options), but returns instance of Buffer.
+   * @param {string} str
+   * @param {object} [options]
+   * @returns {Buffer}
+   */
+  Buffer.fromBase64 = function fromBase64(str, options) {
+    const buf = Uint8ArrayFromBase64(str, options);
+    return fromArrayBuffer(
+      TypedArrayPrototypeGetBuffer(buf),
+      TypedArrayPrototypeGetByteOffset(buf),
+      TypedArrayPrototypeGetByteLength(buf));
+  };
+}
 
-/**
- * Same as Uint8Array.fromBase64(base64string, options), but returns instance of Buffer.
- * @function Buffer.fromBase64
- * @param {string} str
- * @param {object} [options]
- * @returns {Buffer}
- */
-ObjectDefineProperty(Buffer, 'fromBase64', {
-  __proto__: null,
-  configurable: true,
-  enumerable: false,
-  get() {
-    // TODO(LiviaMedeiros): make unconditional and use primordial once `--js-base-64` is not optional
-    // eslint-disable-next-line node-core/prefer-primordials
-    const Uint8ArrayFromBase64 = Uint8Array.fromBase64;
-    const value = Uint8ArrayFromBase64 === undefined ?
-      undefined :
-      function fromBase64(str, options) {
-        const buf = Uint8ArrayFromBase64(str, options);
-        return fromArrayBuffer(
-          TypedArrayPrototypeGetBuffer(buf),
-          TypedArrayPrototypeGetByteOffset(buf),
-          TypedArrayPrototypeGetByteLength(buf),
-        );
-      };
-
-    ObjectDefineProperty(Buffer, 'fromBase64', {
-      __proto__: null,
-      value,
-      configurable: true,
-      enumerable: false,
-      writable: true,
-    });
-
-    return value;
-  },
-});
 
 /**
  * Creates the Buffer as a copy of the underlying ArrayBuffer of the view