@fluid-internal/client-utils - npm Package Compare versions

Comparing version 2.20.0 to 2.21.0

api-report/client-utils.beta.api.md

@@ -9,6 +9,4 @@ ## Beta API Report File for "@fluid-internal/client-utils"
 
-export { performance_2 as performance }
-
 // (No @packageDocumentation comment for this package)
 
 ```

api-report/client-utils.public.api.md

@@ -9,6 +9,4 @@ ## Public API Report File for "@fluid-internal/client-utils"
 
-export { performance_2 as performance }
-
 // (No @packageDocumentation comment for this package)
 
 ```

CHANGELOG.md

 # @fluid-internal/client-utils
 
+## 2.21.0
+
+Dependency updates only.
+
 ## 2.20.0
@@ -4,0 +8,0 @@

dist/indexBrowser.d.ts

@@ -7,10 +7,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileBrowser.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingBrowser.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export { type IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
 export { type EventEmitterEventType, TypedEventEmitter, type TypedEventTransform, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, type LayerCompatCheckResult, type ILayerCompatDetails, type IProvideLayerCompatDetails, type ILayerCompatSupportRequirements, } from "./layerCompat.js";
 //# sourceMappingURL=indexBrowser.d.ts.map

dist/indexBrowser.js

@@ -7,3 +7,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmitter = exports.TypedEventEmitter = exports.Trace = exports.EventEmitter = exports.Uint8ArrayToArrayBuffer = exports.toUtf8 = exports.fromUtf8ToBase64 = exports.fromBase64ToUtf8 = exports.performance = exports.hashFile = exports.gitHashFile = exports.Uint8ArrayToString = exports.stringToBuffer = exports.IsoBuffer = exports.isArrayBuffer = exports.bufferToString = void 0;
+exports.checkLayerCompatibility = exports.createEmitter = exports.TypedEventEmitter = exports.Trace = exports.performanceNow = exports.EventEmitter = exports.Uint8ArrayToArrayBuffer = exports.toUtf8 = exports.fromUtf8ToBase64 = exports.fromBase64ToUtf8 = exports.hashFile = exports.gitHashFile = exports.Uint8ArrayToString = exports.stringToBuffer = exports.IsoBuffer = exports.isArrayBuffer = exports.bufferToString = void 0;
 // Entrypoint for browser-specific code in the package.
@@ -20,4 +20,2 @@ // (See 'Isomorphic Code' section in the package README.md.)
 Object.defineProperty(exports, "hashFile", { enumerable: true, get: function () { return hashFileBrowser_js_1.hashFile; } });
-var performanceIsomorphic_js_1 = require("./performanceIsomorphic.js");
-Object.defineProperty(exports, "performance", { enumerable: true, get: function () { return performanceIsomorphic_js_1.performance; } });
 var base64EncodingBrowser_js_1 = require("./base64EncodingBrowser.js");
@@ -31,2 +29,4 @@ Object.defineProperty(exports, "fromBase64ToUtf8", { enumerable: true, get: function () { return base64EncodingBrowser_js_1.fromBase64ToUtf8; } });
 Object.defineProperty(exports, "EventEmitter", { enumerable: true, get: function () { return eventEmitter_cjs_1.EventEmitter; } });
+var performanceIsomorphic_js_1 = require("./performanceIsomorphic.js");
+Object.defineProperty(exports, "performanceNow", { enumerable: true, get: function () { return performanceIsomorphic_js_1.performanceNow; } });
 var trace_js_1 = require("./trace.js");
@@ -38,2 +38,4 @@ Object.defineProperty(exports, "Trace", { enumerable: true, get: function () { return trace_js_1.Trace; } });
 Object.defineProperty(exports, "createEmitter", { enumerable: true, get: function () { return index_js_1.createEmitter; } });
+var layerCompat_js_1 = require("./layerCompat.js");
+Object.defineProperty(exports, "checkLayerCompatibility", { enumerable: true, get: function () { return layerCompat_js_1.checkLayerCompatibility; } });
 //# sourceMappingURL=indexBrowser.js.map

dist/indexNode.d.ts

@@ -8,10 +8,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileNode.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingNode.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export type { IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
 export { type EventEmitterEventType, TypedEventEmitter, type TypedEventTransform, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, type LayerCompatCheckResult, type ILayerCompatDetails, type IProvideLayerCompatDetails, type ILayerCompatSupportRequirements, } from "./layerCompat.js";
 //# sourceMappingURL=indexNode.d.ts.map

dist/indexNode.js

@@ -7,3 +7,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmitter = exports.TypedEventEmitter = exports.Trace = exports.EventEmitter = exports.Uint8ArrayToArrayBuffer = exports.toUtf8 = exports.fromUtf8ToBase64 = exports.fromBase64ToUtf8 = exports.performance = exports.hashFile = exports.gitHashFile = exports.Uint8ArrayToString = exports.stringToBuffer = exports.IsoBuffer = exports.bufferToString = void 0;
+exports.checkLayerCompatibility = exports.createEmitter = exports.TypedEventEmitter = exports.Trace = exports.performanceNow = exports.EventEmitter = exports.Uint8ArrayToArrayBuffer = exports.toUtf8 = exports.fromUtf8ToBase64 = exports.fromBase64ToUtf8 = exports.hashFile = exports.gitHashFile = exports.Uint8ArrayToString = exports.stringToBuffer = exports.IsoBuffer = exports.bufferToString = void 0;
 var bufferNode_js_1 = require("./bufferNode.js");
@@ -17,4 +17,2 @@ Object.defineProperty(exports, "bufferToString", { enumerable: true, get: function () { return bufferNode_js_1.bufferToString; } });
 Object.defineProperty(exports, "hashFile", { enumerable: true, get: function () { return hashFileNode_js_1.hashFile; } });
-var performanceIsomorphic_js_1 = require("./performanceIsomorphic.js");
-Object.defineProperty(exports, "performance", { enumerable: true, get: function () { return performanceIsomorphic_js_1.performance; } });
 var base64EncodingNode_js_1 = require("./base64EncodingNode.js");
@@ -28,2 +26,4 @@ Object.defineProperty(exports, "fromBase64ToUtf8", { enumerable: true, get: function () { return base64EncodingNode_js_1.fromBase64ToUtf8; } });
 Object.defineProperty(exports, "EventEmitter", { enumerable: true, get: function () { return eventEmitter_cjs_1.EventEmitter; } });
+var performanceIsomorphic_js_1 = require("./performanceIsomorphic.js");
+Object.defineProperty(exports, "performanceNow", { enumerable: true, get: function () { return performanceIsomorphic_js_1.performanceNow; } });
 var trace_js_1 = require("./trace.js");
@@ -35,2 +35,4 @@ Object.defineProperty(exports, "Trace", { enumerable: true, get: function () { return trace_js_1.Trace; } });
 Object.defineProperty(exports, "createEmitter", { enumerable: true, get: function () { return index_js_1.createEmitter; } });
+var layerCompat_js_1 = require("./layerCompat.js");
+Object.defineProperty(exports, "checkLayerCompatibility", { enumerable: true, get: function () { return layerCompat_js_1.checkLayerCompatibility; } });
 //# sourceMappingURL=indexNode.js.map

dist/performanceIsomorphic.d.ts

@@ -6,17 +6,13 @@ /*!
 /**
- * This type contains all browser performance properties as optional, and some
- * of the intersecting properties of node and browser performance as required.
+ * Exposes `Performance.now()` in both Node and browser environments.
  *
- * @internal
- */
-export type IsomorphicPerformance = Partial<Performance> & Pick<Performance, "clearMarks" | "mark" | "measure" | "now">;
-/**
- * This exported "performance" member masks the built-in globalThis.performance object
- * as an IsomorphicPerformance, which hides all of its features that aren't compatible
- * between Node and browser implementations.  Anything exposed on this performance object
- * is considered safe to use regarless of the environment it runs in.
+ * @remarks
  *
+ * The performance API is available as an attribute on the `WindowOrWorkerGlobalScope` object which `globalThis` points to.
+ * - The [global `performance` attribute](https://w3c.github.io/hr-time/#the-performance-attribute)
+ * - [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis)
+ *
  * @internal
  */
-export declare const performance: IsomorphicPerformance;
+export declare const performanceNow: () => number;
 //# sourceMappingURL=performanceIsomorphic.d.ts.map

dist/performanceIsomorphic.js

@@ -7,12 +7,16 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.performance = void 0;
+exports.performanceNow = void 0;
 /**
- * This exported "performance" member masks the built-in globalThis.performance object
- * as an IsomorphicPerformance, which hides all of its features that aren't compatible
- * between Node and browser implementations.  Anything exposed on this performance object
- * is considered safe to use regarless of the environment it runs in.
+ * Exposes `Performance.now()` in both Node and browser environments.
  *
+ * @remarks
+ *
+ * The performance API is available as an attribute on the `WindowOrWorkerGlobalScope` object which `globalThis` points to.
+ * - The [global `performance` attribute](https://w3c.github.io/hr-time/#the-performance-attribute)
+ * - [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis)
+ *
  * @internal
  */
-exports.performance = globalThis.performance;
+const performanceNow = () => globalThis.performance.now();
+exports.performanceNow = performanceNow;
 //# sourceMappingURL=performanceIsomorphic.js.map

dist/trace.js

@@ -17,3 +17,3 @@ "use strict";
     static start() {
-        const startTick = performanceIsomorphic_js_1.performance.now();
+        const startTick = (0, performanceIsomorphic_js_1.performanceNow)();
         return new Trace(startTick);
@@ -26,3 +26,3 @@ }
     trace() {
-        const tick = performanceIsomorphic_js_1.performance.now();
+        const tick = (0, performanceIsomorphic_js_1.performanceNow)();
         const event = {
@@ -29,0 +29,0 @@ totalTimeElapsed: tick - this.startTick,

lib/indexBrowser.d.ts

@@ -7,10 +7,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileBrowser.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingBrowser.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export { type IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
 export { type EventEmitterEventType, TypedEventEmitter, type TypedEventTransform, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, type LayerCompatCheckResult, type ILayerCompatDetails, type IProvideLayerCompatDetails, type ILayerCompatSupportRequirements, } from "./layerCompat.js";
 //# sourceMappingURL=indexBrowser.d.ts.map

lib/indexBrowser.js

@@ -9,9 +9,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileBrowser.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingBrowser.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { Trace } from "./trace.js";
 export { TypedEventEmitter, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, } from "./layerCompat.js";
 //# sourceMappingURL=indexBrowser.js.map

lib/indexNode.d.ts

@@ -8,10 +8,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileNode.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingNode.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export type { IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
 export { type EventEmitterEventType, TypedEventEmitter, type TypedEventTransform, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, type LayerCompatCheckResult, type ILayerCompatDetails, type IProvideLayerCompatDetails, type ILayerCompatSupportRequirements, } from "./layerCompat.js";
 //# sourceMappingURL=indexNode.d.ts.map

lib/indexNode.js

@@ -7,9 +7,10 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileNode.js";
-export { performance } from "./performanceIsomorphic.js";
 export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingNode.js";
 export { Uint8ArrayToArrayBuffer } from "./bufferShared.js";
 export { EventEmitter } from "./eventEmitter.cjs";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { Trace } from "./trace.js";
 export { TypedEventEmitter, } from "./typedEventEmitter.js";
 export { createEmitter } from "./events/index.js";
+export { checkLayerCompatibility, } from "./layerCompat.js";
 //# sourceMappingURL=indexNode.js.map

lib/performanceIsomorphic.d.ts

@@ -6,17 +6,13 @@ /*!
 /**
- * This type contains all browser performance properties as optional, and some
- * of the intersecting properties of node and browser performance as required.
+ * Exposes `Performance.now()` in both Node and browser environments.
  *
- * @internal
- */
-export type IsomorphicPerformance = Partial<Performance> & Pick<Performance, "clearMarks" | "mark" | "measure" | "now">;
-/**
- * This exported "performance" member masks the built-in globalThis.performance object
- * as an IsomorphicPerformance, which hides all of its features that aren't compatible
- * between Node and browser implementations.  Anything exposed on this performance object
- * is considered safe to use regarless of the environment it runs in.
+ * @remarks
  *
+ * The performance API is available as an attribute on the `WindowOrWorkerGlobalScope` object which `globalThis` points to.
+ * - The [global `performance` attribute](https://w3c.github.io/hr-time/#the-performance-attribute)
+ * - [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis)
+ *
  * @internal
  */
-export declare const performance: IsomorphicPerformance;
+export declare const performanceNow: () => number;
 //# sourceMappingURL=performanceIsomorphic.d.ts.map

lib/performanceIsomorphic.js

@@ -6,10 +6,13 @@ /*!
 /**
- * This exported "performance" member masks the built-in globalThis.performance object
- * as an IsomorphicPerformance, which hides all of its features that aren't compatible
- * between Node and browser implementations.  Anything exposed on this performance object
- * is considered safe to use regarless of the environment it runs in.
+ * Exposes `Performance.now()` in both Node and browser environments.
  *
+ * @remarks
+ *
+ * The performance API is available as an attribute on the `WindowOrWorkerGlobalScope` object which `globalThis` points to.
+ * - The [global `performance` attribute](https://w3c.github.io/hr-time/#the-performance-attribute)
+ * - [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis)
+ *
  * @internal
  */
-export const performance = globalThis.performance;
+export const performanceNow = () => globalThis.performance.now();
 //# sourceMappingURL=performanceIsomorphic.js.map

lib/trace.js

@@ -5,3 +5,3 @@ /*!
  */
-import { performance } from "./performanceIsomorphic.js";
+import { performanceNow } from "./performanceIsomorphic.js";
 /**
@@ -15,3 +15,3 @@ * Helper class for tracing performance of events
     static start() {
-        const startTick = performance.now();
+        const startTick = performanceNow();
         return new Trace(startTick);
@@ -24,3 +24,3 @@ }
     trace() {
-        const tick = performance.now();
+        const tick = performanceNow();
         const event = {
@@ -27,0 +27,0 @@ totalTimeElapsed: tick - this.startTick,

package.json

 {
   "name": "@fluid-internal/client-utils",
-  "version": "2.20.0",
+  "version": "2.21.0",
   "description": "Not intended for use outside the Fluid Framework.",
@@ -72,4 +72,4 @@ "homepage": "https://fluidframework.com",
   "dependencies": {
-    "@fluidframework/core-interfaces": "~2.20.0",
-    "@fluidframework/core-utils": "~2.20.0",
+    "@fluidframework/core-interfaces": "~2.21.0",
+    "@fluidframework/core-utils": "~2.21.0",
     "@types/events_pkg": "npm:@types/events@^3.0.0",
@@ -84,12 +84,12 @@ "base64-js": "^1.5.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/client-utils-previous": "npm:@fluid-internal/client-utils@2.13.0",
-    "@fluid-internal/mocha-test-setup": "~2.20.0",
+    "@fluid-internal/client-utils-previous": "npm:@fluid-internal/client-utils@2.20.0",
+    "@fluid-internal/mocha-test-setup": "~2.21.0",
     "@fluid-tools/build-cli": "^0.51.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.51.0",
-    "@fluidframework/eslint-config-fluid": "^5.6.0",
+    "@fluidframework/eslint-config-fluid": "^5.7.3",
     "@microsoft/api-extractor": "7.47.8",
     "@types/base64-js": "^1.3.0",
     "@types/jest": "29.5.3",
-    "@types/jest-environment-puppeteer": "~2.20.0",
+    "@types/jest-environment-puppeteer": "~2.21.0",
     "@types/mocha": "^10.0.10",
@@ -194,3 +194,11 @@ "@types/node": "^18.19.0",
   "typeValidation": {
-    "broken": {},
+    "broken": {
+      "Variable_performance": {
+        "backCompat": false
+      },
+      "TypeAlias_IsomorphicPerformance": {
+        "forwardCompat": false,
+        "backCompat": false
+      }
+    },
     "entrypoint": "public"
@@ -245,3 +253,3 @@ },
     "test:coverage": "c8 npm test",
-    "test:jest": "jest",
+    "test:jest": "jest --ci",
     "test:mocha": "npm run test:mocha:esm && npm run test:mocha:cjs",
@@ -248,0 +256,0 @@ "test:mocha:cjs": "mocha --recursive \"dist/test/mocha/**/*.spec.*js\" --exit",

src/indexBrowser.ts

@@ -17,3 +17,2 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileBrowser.js";
-export { performance } from "./performanceIsomorphic.js";
 
@@ -23,3 +22,3 @@ export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingBrowser.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export { type IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
@@ -33,1 +32,9 @@ export {
 export { createEmitter } from "./events/index.js";
+
+export {
+	checkLayerCompatibility,
+	type LayerCompatCheckResult,
+	type ILayerCompatDetails,
+	type IProvideLayerCompatDetails,
+	type ILayerCompatSupportRequirements,
+} from "./layerCompat.js";

src/indexNode.ts

@@ -17,3 +17,2 @@ /*!
 export { gitHashFile, hashFile } from "./hashFileNode.js";
-export { performance } from "./performanceIsomorphic.js";
 
@@ -23,3 +22,3 @@ export { fromBase64ToUtf8, fromUtf8ToBase64, toUtf8 } from "./base64EncodingNode.js";
 export { EventEmitter } from "./eventEmitter.cjs";
-export type { IsomorphicPerformance } from "./performanceIsomorphic.js";
+export { performanceNow } from "./performanceIsomorphic.js";
 export { type ITraceEvent, Trace } from "./trace.js";
@@ -33,1 +32,9 @@ export {
 export { createEmitter } from "./events/index.js";
+
+export {
+	checkLayerCompatibility,
+	type LayerCompatCheckResult,
+	type ILayerCompatDetails,
+	type IProvideLayerCompatDetails,
+	type ILayerCompatSupportRequirements,
+} from "./layerCompat.js";

src/performanceIsomorphic.ts

@@ -7,18 +7,12 @@ /*!
 /**
- * This type contains all browser performance properties as optional, and some
- * of the intersecting properties of node and browser performance as required.
+ * Exposes `Performance.now()` in both Node and browser environments.
  *
- * @internal
- */
-export type IsomorphicPerformance = Partial<Performance> &
-	Pick<Performance, "clearMarks" | "mark" | "measure" | "now">;
-
-/**
- * This exported "performance" member masks the built-in globalThis.performance object
- * as an IsomorphicPerformance, which hides all of its features that aren't compatible
- * between Node and browser implementations.  Anything exposed on this performance object
- * is considered safe to use regarless of the environment it runs in.
+ * @remarks
  *
+ * The performance API is available as an attribute on the `WindowOrWorkerGlobalScope` object which `globalThis` points to.
+ * - The [global `performance` attribute](https://w3c.github.io/hr-time/#the-performance-attribute)
+ * - [`globalThis`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis)
+ *
  * @internal
  */
-export const performance: IsomorphicPerformance = globalThis.performance;
+export const performanceNow: () => number = () => globalThis.performance.now();

src/trace.ts

@@ -6,3 +6,3 @@ /*!
 
-import { performance } from "./performanceIsomorphic.js";
+import { performanceNow } from "./performanceIsomorphic.js";
 
@@ -17,3 +17,3 @@ /**
 	public static start(): Trace {
-		const startTick = performance.now();
+		const startTick = performanceNow();
 		return new Trace(startTick);
@@ -28,3 +28,3 @@ }
 	public trace(): ITraceEvent {
-		const tick = performance.now();
+		const tick = performanceNow();
 		const event = {
@@ -31,0 +31,0 @@ totalTimeElapsed: tick - this.startTick,

No alert changes

Improved metrics

Total package byte prevSize

324265

increased by10.37%

Number of package files

185

increased by5.11%

Lines of code

4178

increased by10.56%

Dependency changes

• + Added@fluidframework/core-interfaces@2.21.0(transitive)

• + Added@fluidframework/core-utils@2.21.0(transitive)

• - Removed@fluidframework/core-interfaces@2.20.0(transitive)

• - Removed@fluidframework/core-utils@2.20.0(transitive)

• Updated@fluidframework/core-interfaces@~2.21.0

• Updated@fluidframework/core-utils@~2.21.0