@lwrjs/client-modules 0.12.0-alpha.13 → 0.12.0-alpha.15

package/build/modules/lwr/environment/environment.js

@@ -1,5 +1,4 @@
-const environment = globalThis?.LWR?.env || {};
-export const isServer = environment && (environment.SSR === 'true' || environment.SSR === true);
+const environment = globalThis?.LWR?.env;
 // The baseBath from the config or set from the request (e.g. /shop)
 export const basePath = environment && environment.basePath;
 // The locale set from the request or the defaultLocale from the config (e.g. en-US)
@@ -7,4 +6,9 @@ export const locale = environment && environment.locale;
 // Root base path for static assets (e.g. /shop/mobify/bundle/1234/site)
 export const assetBasePath = environment && environment.assetBasePath;
 // Base path for UI routing (e.g. /shop/en-US)
-export const uiBasePath = environment && environment.uiBasePath;
+export const uiBasePath = environment && environment.uiBasePath;
+// Determines if current environment is executing in SSR or CSR context.
+// This value is dynamic and must be re-evaluated on each request
+export const isServer = () => {
+  return globalThis?.LWR?.env && (globalThis?.LWR?.env.SSR === 'true' || globalThis?.LWR?.env.SSR === true);
+};

package/build/modules/lwr/lockerDefine/lockerDefine.js

@@ -1453,7 +1453,7 @@ const {
 } = PromiseCtor$LWS.prototype;
 const PromiseResolve$LWS = PromiseCtor$LWS.resolve.bind(PromiseCtor$LWS);
 const PromiseReject$LWS = PromiseCtor$LWS.reject.bind(PromiseCtor$LWS);
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2019 salesforce.com, inc.
@@ -2112,7 +2112,7 @@ const {
 const XhrProtoResponseTextGetter$LWS = ObjectLookupOwnGetter$LWS$1(XhrProto$LWS, 'responseText');
 const XhrProtoStatusGetter$LWS = ObjectLookupOwnGetter$LWS$1(XhrProto$LWS, 'status');
 ObjectLookupOwnSetter$LWS(XhrProto$LWS, 'withCredentials');
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2019 salesforce.com, inc.
@@ -2171,7 +2171,7 @@ function sanitizeURLForElement$LWS(url$LWS) {
 function sanitizeURLString$LWS(urlString$LWS) {
   return urlString$LWS === '' ? urlString$LWS : ReflectApply$LWS$1(StringProtoReplace$LWS, urlString$LWS, [newlinesAndTabsRegExp$LWS, '']);
 }
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*! @license DOMPurify 3.0.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.5/LICENSE */
 
@@ -3857,7 +3857,7 @@ try {
   // swallow
 }
 const trusted = createPolicy('trusted', policyOptions);
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2019 salesforce.com, inc.
@@ -4106,7 +4106,7 @@ function blobSanitizer$LWS(sandboxKey$LWS) {
   }
   return getSanitizerForConfig$LWS(sandboxKey$LWS, 'STRING_BLOB_HTML');
 }
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2023 salesforce.com, inc.
@@ -4304,7 +4304,7 @@ function encloseSrcSetter$LWS(targetElement$LWS) {
     ReflectApply$LWS$1(ElementProtoSetAttributeNS$LWS, targetElement$LWS, [attributeNamespaceURI$LWS, attributeName$LWS, src$LWS]);
   };
 }
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2019 salesforce.com, inc.
@@ -9880,7 +9880,7 @@ initDistortionElementAfter$LWS, initDistortionElementAppend$LWS, initDistortionE
 // initDistortionNodeAppendChild,
 initDistortionNodeInsertBefore$LWS]);
 const externalKeyedDistortionFactoryInitializers$LWS = internalKeyedDistortionFactoryInitializers$LWS;
-toSafeMap$LWS$1(new MapCtor$LWS$1([[initDistortionCacheStorageDelete$LWS, 'caches'], [initDistortionCacheStorageHas$LWS, 'caches'], [initDistortionCacheStorageKeys$LWS, 'caches'], [initDistortionCacheStorageMatch$LWS, 'caches'], [initDistortionCacheStorageOpen$LWS, 'caches'], [initDistortionCookieStoreDelete$LWS, 'cookieStore'], [initDistortionCookieStoreGet$LWS, 'cookieStore'], [initDistortionCookieStoreGetAll$LWS, 'cookieStore'], [initDistortionCookieStoreOnChange$LWS, 'cookieStore'], [initDistortionCookieStoreSet$LWS, 'cookieStore'], [initDistortionCSSStyleRuleStyleGetter$LWS, 'style'], [initDistortionDocumentCookieGetter$LWS, 'documentCookie'], [initDistortionDocumentCookieSetter$LWS, 'documentCookie'], [initDistortionDocumentDomainSetter$LWS, 'documentDomain'], [initDistortionDocumentExecCommand$LWS, 'documentExecCommand'], [initDistortionElementAfter$LWS, 'element'], [initDistortionElementAppend$LWS, 'element'], [initDistortionElementAttributesGetter$LWS, 'attributes'], [initDistortionElementBefore$LWS, 'element'], [initDistortionElementGetInnerHTML$LWS, 'innerHTML'], [initDistortionElementInnerHTMLSetter$LWS, 'innerHTML'], [initDistortionElementInsertAdjacentElement$LWS, 'element'], [initDistortionElementInsertAdjacentHTML$LWS, 'element'], [initDistortionElementOuterHTMLSetter$LWS, 'element'], [initDistortionElementPrepend$LWS, 'element'], [initDistortionElementRemove$LWS, 'element'], [initDistortionElementReplaceChildren$LWS, 'element'], [initDistortionElementReplaceWith$LWS, 'element'], [initDistortionElementSetAttribute$LWS, 'attributes'], [initDistortionElementSetAttributeNode$LWS, 'attributes'], [initDistortionElementSetAttributeNodeNS$LWS, 'attributes'], [initDistortionElementSetAttributeNS$LWS, 'attributes'], [initDistortionElementSetHTML$LWS, 'element'], [initDistortionElementToggleAttribute$LWS, 'attributes'], [initDistortionLocalStorage$LWS, 'storage'], [initDistortionMessagePortPostMessage$LWS, 'postMessage'], [initDistortionNavigatorSendBeacon$LWS, 'navigatorSendBeacon'], [initDistortionNodeInsertBefore$LWS, 'node'], [initDistortionNodeRemoveChild$LWS, 'node'], [initDistortionNodeReplaceChild$LWS, 'node'], [initDistortionNodeTextContentGetter$LWS, 'node'], [initDistortionNodeTextContentSetter$LWS, 'node'], [initDistortionNodeValueSetter$LWS, 'node'], [initDistortionPerformanceMark$LWS, 'performance'], [initDistortionPerformanceMarkCtor$LWS, 'performance'], [initDistortionPerformanceMeasure$LWS, 'performance'], [initDistortionRangeCreateContextualFragment$LWS, 'range'], [initDistortionRangeDeleteContents$LWS, 'range'], [initDistortionRangeExtractContents$LWS, 'range'], [initDistortionRangeInsertNode$LWS, 'range'], [initDistortionRangeSelectNode$LWS, 'range'], [initDistortionRangeSelectNodeContents$LWS, 'range'], [initDistortionRangeSetEnd$LWS, 'range'], [initDistortionRangeSetEndAfter$LWS, 'range'], [initDistortionRangeSetEndBefore$LWS, 'range'], [initDistortionRangeSetStart$LWS, 'range'], [initDistortionRangeSetStartAfter$LWS, 'range'], [initDistortionRangeSetStartBefore$LWS, 'range'], [initDistortionRangeSurroundContents$LWS, 'range'], [initDistortionSelectionCollapse$LWS, 'selection'], [initDistortionSelectionExtend$LWS, 'selection'], [initDistortionSelectionSelectAllChildren$LWS, 'selection'], [initDistortionSelectionSetBaseAndExtent$LWS, 'selection'], [initDistortionSelectionSetPosition$LWS, 'selection'], [initDistortionSessionStorage$LWS, 'storage'], [initDistortionShadowRootInnerHTMLSetter$LWS, 'innerHTML'], [initDistortionStorage$LWS, 'storage'], [initDistortionStorageClear$LWS, 'storage'], [initDistortionStorageGetItem$LWS, 'storage'], [initDistortionStorageKey$LWS, 'storage'], [initDistortionStorageLength$LWS, 'storage'], [initDistortionStorageRemoveItem$LWS, 'storage'], [initDistortionStorageSetItem$LWS, 'storage'], [initDistortionWindowPostMessage$LWS, 'postMessage'], [initDistortionWindowSetInterval$LWS, 'setInterval'], [initDistortionWindowSetTimeout$LWS, 'setTimeout']]));
+toSafeMap$LWS$1(new MapCtor$LWS$1([[initDistortionCacheStorageDelete$LWS, 'caches'], [initDistortionCacheStorageHas$LWS, 'caches'], [initDistortionCacheStorageKeys$LWS, 'caches'], [initDistortionCacheStorageMatch$LWS, 'caches'], [initDistortionCacheStorageOpen$LWS, 'caches'], [initDistortionCookieStoreDelete$LWS, 'cookieStore'], [initDistortionCookieStoreGet$LWS, 'cookieStore'], [initDistortionCookieStoreGetAll$LWS, 'cookieStore'], [initDistortionCookieStoreOnChange$LWS, 'cookieStore'], [initDistortionCookieStoreSet$LWS, 'cookieStore'], [initDistortionCSSStyleRuleStyleGetter$LWS, 'style'], [initDistortionCustomElementRegistryDefine$LWS, 'customElements'], [initDistortionCustomElementRegistryGet$LWS, 'customElements'], [initDistortionCustomElementRegistryUpgrade$LWS, 'customElements'], [initDistortionCustomElementRegistryWhenDefined$LWS, 'customElements'], [initDistortionDocumentCookieGetter$LWS, 'documentCookie'], [initDistortionDocumentCookieSetter$LWS, 'documentCookie'], [initDistortionDocumentDomainSetter$LWS, 'documentDomain'], [initDistortionDocumentExecCommand$LWS, 'documentExecCommand'], [initDistortionElementAfter$LWS, 'element'], [initDistortionElementAppend$LWS, 'element'], [initDistortionElementAttributesGetter$LWS, 'attributes'], [initDistortionElementBefore$LWS, 'element'], [initDistortionElementGetInnerHTML$LWS, 'innerHTML'], [initDistortionElementInnerHTMLSetter$LWS, 'innerHTML'], [initDistortionElementInsertAdjacentElement$LWS, 'element'], [initDistortionElementInsertAdjacentHTML$LWS, 'element'], [initDistortionElementOuterHTMLSetter$LWS, 'element'], [initDistortionElementPrepend$LWS, 'element'], [initDistortionElementRemove$LWS, 'element'], [initDistortionElementReplaceChildren$LWS, 'element'], [initDistortionElementReplaceWith$LWS, 'element'], [initDistortionElementSetAttribute$LWS, 'attributes'], [initDistortionElementSetAttributeNode$LWS, 'attributes'], [initDistortionElementSetAttributeNodeNS$LWS, 'attributes'], [initDistortionElementSetAttributeNS$LWS, 'attributes'], [initDistortionElementSetHTML$LWS, 'element'], [initDistortionElementToggleAttribute$LWS, 'attributes'], [initDistortionIDBObjectStoreAdd$LWS, 'indexedDB'], [initDistortionIDBObjectStorePut$LWS, 'indexedDB'], [initDistortionLocalStorage$LWS, 'storage'], [initDistortionMessagePortPostMessage$LWS, 'postMessage'], [initDistortionNamedNodeMapSetNamedItem$LWS, 'attributes'], [initDistortionNamedNodeMapSetNamedItemNS$LWS, 'attributes'], [initDistortionNavigatorSendBeacon$LWS, 'navigatorSendBeacon'], [initDistortionNodeInsertBefore$LWS, 'node'], [initDistortionNodeRemoveChild$LWS, 'node'], [initDistortionNodeReplaceChild$LWS, 'node'], [initDistortionNodeTextContentGetter$LWS, 'node'], [initDistortionNodeTextContentSetter$LWS, 'node'], [initDistortionNodeValueSetter$LWS, 'node'], [initDistortionPerformanceMark$LWS, 'performance'], [initDistortionPerformanceMarkCtor$LWS, 'performance'], [initDistortionPerformanceMeasure$LWS, 'performance'], [initDistortionRangeCreateContextualFragment$LWS, 'range'], [initDistortionRangeDeleteContents$LWS, 'range'], [initDistortionRangeExtractContents$LWS, 'range'], [initDistortionRangeInsertNode$LWS, 'range'], [initDistortionRangeSelectNode$LWS, 'range'], [initDistortionRangeSelectNodeContents$LWS, 'range'], [initDistortionRangeSetEnd$LWS, 'range'], [initDistortionRangeSetEndAfter$LWS, 'range'], [initDistortionRangeSetEndBefore$LWS, 'range'], [initDistortionRangeSetStart$LWS, 'range'], [initDistortionRangeSetStartAfter$LWS, 'range'], [initDistortionRangeSetStartBefore$LWS, 'range'], [initDistortionRangeSurroundContents$LWS, 'range'], [initDistortionSelectionCollapse$LWS, 'selection'], [initDistortionSelectionExtend$LWS, 'selection'], [initDistortionSelectionSelectAllChildren$LWS, 'selection'], [initDistortionSelectionSetBaseAndExtent$LWS, 'selection'], [initDistortionSelectionSetPosition$LWS, 'selection'], [initDistortionSessionStorage$LWS, 'storage'], [initDistortionShadowRootInnerHTMLSetter$LWS, 'innerHTML'], [initDistortionStorage$LWS, 'storage'], [initDistortionStorageClear$LWS, 'storage'], [initDistortionStorageGetItem$LWS, 'storage'], [initDistortionStorageKey$LWS, 'storage'], [initDistortionStorageLength$LWS, 'storage'], [initDistortionStorageRemoveItem$LWS, 'storage'], [initDistortionStorageSetItem$LWS, 'storage'], [initDistortionWindowPostMessage$LWS, 'postMessage'], [initDistortionWindowSetInterval$LWS, 'setInterval'], [initDistortionWindowSetTimeout$LWS, 'setTimeout']]));
 const DocumentBlockedProperties$LWS = ['createProcessingInstruction', 'exitFullscreen', 'fullscreen', 'fullscreenElement', 'fullscreenEnabled', 'mozCancelFullScreen', 'mozFullScreen', 'mozFullScreenElement', 'mozFullScreenEnabled', 'onfullscreenchange', 'onfullscreenerror', 'onmozfullscreenchange', 'onmozfullscreenerror', 'onrejectionhandled', 'onunhandledrejection', 'releaseCapture', 'releaseEvents', 'webkitFullScreenKeyboardInputAllowed', 'write', 'writeln'];
 const ElementBlockedProperties$LWS = ['mozRequestFullScreen', 'onfullscreenchange', 'onfullscreenerror', 'requestFullscreen', 'webkitRequestFullScreen', 'webkitRequestFullscreen'];
 const EventBlockedProperties$LWS = ['originalTarget', 'explicitOriginalTarget'];
@@ -9894,63 +9894,60 @@ const HTMLIFrameElementBlockedProperties$LWS = ['getSVGDocument', 'srcdoc'];
 const HTMLObjectElementBlockedProperties$LWS = ['getSVGDocument'];
 const HTMLScriptElementBlockedAttributes$LWS = ['nonce'];
 const HTMLScriptElementBlockedProperties$LWS = ['nonce'];
-const LightningWebSecurity$LWS = {
-  __proto__: null
-};
-const distortions$LWS = {
-  __proto__: null,
-  attributes: true,
-  caches: true,
-  cookieStore: true,
-  documentCookie: true,
-  documentDomain: true,
-  documentExecCommand: true,
-  element: true,
-  innerHTML: true,
-  navigatorSendBeacon: true,
-  node: true,
-  performance: true,
-  postMessage: true,
-  range: true,
-  selection: true,
-  setInterval: true,
-  setTimeout: true,
-  storage: true,
-  style: true
-};
-ReflectDefineProperty$LWS$1(LightningWebSecurity$LWS, 'distortions', {
-  __proto__: null,
-  enumerable: false,
-  configurable: false,
-  writable: false,
-  value: distortions$LWS
-});
-ReflectDefineProperty$LWS$1(window, '$LWS', {
-  __proto__: null,
-  enumerable: false,
-  configurable: false,
-  writable: false,
-  value: LightningWebSecurity$LWS
-});
-ObjectFreeze$LWS$1(LightningWebSecurity$LWS);
-ObjectPreventExtensions$LWS(distortions$LWS);
 const SVGElementBlockedAttributes$LWS = ['nonce'];
 const SVGElementBlockedProperties$LWS = ['nonce'];
 const UIEventBlockedProperties$LWS = ['rangeParent'];
 const WindowBlockedProperties$LWS = ['find'];
 const XSLTProcessorBlockedProperties$LWS = ['transformToDocument', 'transformToFragment'];
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 /*!
  * Copyright (C) 2019 salesforce.com, inc.
  */
-const distortionFactoryToggleSwitchesCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1());
+const rootSandboxRegistry$LWS = {
+  __proto__: null
+};
+const documentSandboxRegistryCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1([[rootDocument$LWS, rootSandboxRegistry$LWS]]));
+const opaqueWindowSandboxRegistryCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1());
+function getOpaqueSandboxRegistry$LWS(globalObject$LWS) {
+  // Use the `document` as the key because a window object maintains its
+  // identity continuity when its location changes and while the
+  // non-configurable document property does not.
+  let sandboxRegistry$LWS = opaqueWindowSandboxRegistryCache$LWS.get(globalObject$LWS);
+  // istanbul ignore else: current tests have no way of expressing a state that would cause this condition to evaluate false
+  if (sandboxRegistry$LWS === undefined) {
+    sandboxRegistry$LWS = {
+      __proto__: null
+    };
+    opaqueWindowSandboxRegistryCache$LWS.set(globalObject$LWS, sandboxRegistry$LWS);
+  }
+  return sandboxRegistry$LWS;
+}
+function getSandboxRegistry$LWS(document$LWS) {
+  // Use the `document` as the key because a window object maintains its
+  // identity continuity when its location changes and while the
+  // non-configurable document property does not.
+  let sandboxRegistry$LWS = documentSandboxRegistryCache$LWS.get(document$LWS);
+  if (sandboxRegistry$LWS === undefined) {
+    sandboxRegistry$LWS = {
+      __proto__: null
+    };
+    documentSandboxRegistryCache$LWS.set(document$LWS, sandboxRegistry$LWS);
+  }
+  return sandboxRegistry$LWS;
+}
+const LightningWebSecurity$LWS = {
+  __proto__: null
+};
+toSafeMap$LWS$1(new MapCtor$LWS$1());
+ObjectFreeze$LWS$1(LightningWebSecurity$LWS);
 const distortionFactoriesCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1());
 const opaqueWindowPostMessageDistortionFactoryCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1());
 // WebKit based browsers have a bug that prematurely removes distortion entries
 // from the distortions weak map.
 const SUPPORTS_DISTORTIONS_WEAK_MAP$LWS = !IS_WEBKIT_BROWSER$LWS;
 function createDistortionEntries$LWS(record$LWS, factories$LWS) {
+  toSafeMap$LWS$1(new MapCtor$LWS$1());
   const entries$LWS = [];
   for (let i$LWS = 0, {
       length: length$LWS
@@ -9964,11 +9961,12 @@ function createDistortionEntries$LWS(record$LWS, factories$LWS) {
       } = entry$LWS;
       if (typeof originalValue$LWS === 'function') {
         const proxyMaskedFunctionDistortion$LWS = proxyMaskFunctionDistortion$LWS(record$LWS, factory$LWS, distortedValue$LWS, originalValue$LWS);
-        distortionFactoryToggleSwitchesCache$LWS.get(factory$LWS);
         entries$LWS[entries$LWS.length] = [originalValue$LWS, proxyMaskedFunctionDistortion$LWS];
       } else {
         // istanbul ignore else: current tests have no way of expressing a state that would cause this condition to evaluate false
         if (typeof originalValue$LWS === 'object' && originalValue$LWS !== null) {
+          // TODO: we may need to make this assigned value a proxy when ENABLE_DISTORTION_TOGGLE_SWITCHES is true,
+          // allowing us to change which value is provided for the distortion.
           entries$LWS[entries$LWS.length] = entry$LWS;
         }
       }
@@ -10052,18 +10050,13 @@ function getOpaqueWindowPostMessageDistortionFactory$LWS(record$LWS) {
   return opaqueWindowPostMessageDistortionFactory$LWS;
 }
 function proxyMaskFunctionDistortion$LWS({
-  BASIC_INSTRUMENTATION_DATA: BASIC_INSTRUMENTATION_DATA$LWS,
   LOCKER_VERBOSE_INSTRUMENTATION_FLAG: LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS,
   instrumentation: instrumentation$LWS,
   key: sandboxKey$LWS
 }, distortionFactory$LWS, distortionFunc$LWS, maskFunc$LWS) {
   let activityName$LWS;
-  let startActivity$LWS;
   // istanbul ignore if: this is a safety precaution that is unreachable via tests
   if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-    ({
-      startActivity: startActivity$LWS
-    } = instrumentation$LWS);
     const {
       name: factoryName$LWS
     } = distortionFactory$LWS;
@@ -10071,51 +10064,33 @@ function proxyMaskFunctionDistortion$LWS({
   }
   return maskFunction$LWS(distortionFunc$LWS, maskFunc$LWS, {
     apply: function (target$LWS, thisArg$LWS, args$LWS) {
-      let activity$LWS;
-      // istanbul ignore if: this is a safety precaution that is unreachable via tests
-      if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-        activity$LWS = startActivity$LWS(activityName$LWS, BASIC_INSTRUMENTATION_DATA$LWS);
-      }
+      const activity$LWS = LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS ? instrumentation$LWS == null || instrumentation$LWS.startActivity == null ? void 0 : instrumentation$LWS.startActivity(activityName$LWS) : undefined;
       try {
         return ReflectApply$LWS$1(target$LWS, thisArg$LWS, args$LWS);
       } catch (error) {
-        // istanbul ignore if: this is a safety precaution that is unreachable via tests
-        if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-          activity$LWS.error({
-            sandboxKey: sandboxKey$LWS,
-            error
-          });
-        }
+        activity$LWS == null || activity$LWS.error({
+          sandboxKey: sandboxKey$LWS,
+          error
+        });
+        activity$LWS == null || activity$LWS.stop();
         throw error;
       } finally {
-        // istanbul ignore if: this is a safety precaution that is unreachable via tests
-        if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-          activity$LWS.stop();
-        }
+        activity$LWS == null || activity$LWS.stop();
       }
     },
     construct: function (target$LWS, args$LWS, newTarget$LWS) {
-      let activity$LWS;
-      // istanbul ignore if: this is a safety precaution that is unreachable via tests
-      if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-        activity$LWS = startActivity$LWS(activityName$LWS, BASIC_INSTRUMENTATION_DATA$LWS);
-      }
+      const activity$LWS = LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS ? instrumentation$LWS == null || instrumentation$LWS.startActivity == null ? void 0 : instrumentation$LWS.startActivity(activityName$LWS) : undefined;
       try {
         return ReflectConstruct$LWS(target$LWS, args$LWS, newTarget$LWS);
       } catch (error) {
-        // istanbul ignore if: this is a safety precaution that is unreachable via tests
-        if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-          activity$LWS.error({
-            sandboxKey: sandboxKey$LWS,
-            error
-          });
-        }
+        activity$LWS == null || activity$LWS.error({
+          sandboxKey: sandboxKey$LWS,
+          error
+        });
+        activity$LWS == null || activity$LWS.stop();
         throw error;
       } finally {
-        // istanbul ignore if: this is a safety precaution that is unreachable via tests
-        if (LOCKER_VERBOSE_INSTRUMENTATION_FLAG$LWS) {
-          activity$LWS.stop();
-        }
+        activity$LWS == null || activity$LWS.stop();
       }
     }
   });
@@ -15138,44 +15113,12 @@ function toSourceText$LWS(value$LWS, sourceType$LWS) {
   // tools from mistaking the regexp or the replacement string for an
   // actual source mapping URL.
   /\/\/# sandbox(?=MappingURL=.*?\s*$)/, '//# source']);
-  sourceText$LWS = `\n//# LWS Version = "0.21.1"\n${sourceText$LWS}`;
+  sourceText$LWS = `\n//# LWS Version = "0.21.2"\n${sourceText$LWS}`;
   return sourceType$LWS === 1 /* SourceType.Module */ && indexOfPragma$LWS(sourceText$LWS, 'use strict') === -1 ?
   // Append "'use strict'" to the extracted function body so it is
   // evaluated in strict mode.
   `'use strict';${sourceText$LWS}` : sourceText$LWS;
 }
-const rootSandboxRegistry$LWS = {
-  __proto__: null
-};
-const documentSandboxRegistryCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1([[rootDocument$LWS, rootSandboxRegistry$LWS]]));
-const opaqueWindowSandboxRegistryCache$LWS = toSafeWeakMap$LWS$1(new WeakMapCtor$LWS$1());
-function getOpaqueSandboxRegistry$LWS(globalObject$LWS) {
-  // Use the `document` as the key because a window object maintains its
-  // identity continuity when its location changes and while the
-  // non-configurable document property does not.
-  let sandboxRegistry$LWS = opaqueWindowSandboxRegistryCache$LWS.get(globalObject$LWS);
-  // istanbul ignore else: current tests have no way of expressing a state that would cause this condition to evaluate false
-  if (sandboxRegistry$LWS === undefined) {
-    sandboxRegistry$LWS = {
-      __proto__: null
-    };
-    opaqueWindowSandboxRegistryCache$LWS.set(globalObject$LWS, sandboxRegistry$LWS);
-  }
-  return sandboxRegistry$LWS;
-}
-function getSandboxRegistry$LWS(document$LWS) {
-  // Use the `document` as the key because a window object maintains its
-  // identity continuity when its location changes and while the
-  // non-configurable document property does not.
-  let sandboxRegistry$LWS = documentSandboxRegistryCache$LWS.get(document$LWS);
-  if (sandboxRegistry$LWS === undefined) {
-    sandboxRegistry$LWS = {
-      __proto__: null
-    };
-    documentSandboxRegistryCache$LWS.set(document$LWS, sandboxRegistry$LWS);
-  }
-  return sandboxRegistry$LWS;
-}
 
 // Flag whether the iframe should remain connected to the DOM.
 const IFRAME_KEEP_ALIVE_FLAG$LWS = LOCKER_UNMINIFIED_FLAG$LWS$1 && !false;
@@ -15253,7 +15196,6 @@ function createSandboxEvaluator$LWS({
 }
 function createVirtualEnvironment$LWS(record$LWS) {
   const {
-    LOCKER_VERBOSE_INSTRUMENTATION_FLAG: verboseInstrumentation$LWS,
     endowments: endowments$LWS,
     globalObject: globalObject$LWS,
     instrumentation: instrumentation$LWS,
@@ -15352,7 +15294,7 @@ function createVirtualEnvironment$LWS(record$LWS) {
     // and the default endowments descriptors so they can be
     // accessible from inside the sandbox.
     ObjectAssign$LWS$1({}, DEFAULT_ENDOWMENTS_DESCRIPTOR_MAP$LWS, ObjectGetOwnPropertyDescriptors$LWS(endowments$LWS)) : DEFAULT_ENDOWMENTS_DESCRIPTOR_MAP$LWS,
-    instrumentation: verboseInstrumentation$LWS ? instrumentation$LWS : undefined,
+    instrumentation: instrumentation$LWS,
     remapTypedArrays: key$LWS !== 'omnistudio',
     keepAlive: IFRAME_KEEP_ALIVE_FLAG$LWS,
     liveTargetCallback: isTargetLive$LWS,
@@ -15660,7 +15602,6 @@ function internalEvaluateInSandbox$LWS(evaluateOptions$LWS) {
     throw new LockerSecurityError$LWS(ERR_INVALID_SANDBOX_KEY$LWS);
   }
   const {
-    BASIC_INSTRUMENTATION_DATA: BASIC_INSTRUMENTATION_DATA$LWS,
     LOCKER_INSTRUMENTATION_FLAG: LOCKER_INSTRUMENTATION_FLAG$LWS,
     helpers: helpers$LWS,
     virtualEnvironmentEvaluator: virtualEnvironmentEvaluator$LWS
@@ -15688,33 +15629,25 @@ function internalEvaluateInSandbox$LWS(evaluateOptions$LWS) {
   }
   let result$LWS;
   const sourceText$LWS = toSourceText$LWS(source$LWS, sourceType$LWS);
-  const startActivity$LWS = LOCKER_INSTRUMENTATION_FLAG$LWS ? instrumentation$LWS.startActivity : undefined;
-  let activity$LWS;
-  // istanbul ignore else: this is a safety precaution that is unreachable via tests
-  if (LOCKER_INSTRUMENTATION_FLAG$LWS) {
-    activity$LWS = startActivity$LWS('lws.evaluate', BASIC_INSTRUMENTATION_DATA$LWS);
-  }
+  const activity$LWS = LOCKER_INSTRUMENTATION_FLAG$LWS ? instrumentation$LWS == null ? void 0 : instrumentation$LWS.startActivity('lws.evaluate') : undefined;
   try {
     // Protecting against errors during evaluation can guarantee the state
     // of the EvalContext to avoid leaking context values
     result$LWS = virtualEnvironmentEvaluator$LWS(sourceText$LWS);
+    instrumentation$LWS == null || instrumentation$LWS.incrementCounter == null || instrumentation$LWS.incrementCounter('lws.evaluate', 1, false);
   } catch (error) {
-    // istanbul ignore if: this is a safety precaution that is unreachable via tests
-    if (LOCKER_INSTRUMENTATION_FLAG$LWS) {
-      activity$LWS.error({
-        sandboxKey: key$LWS,
-        error
-      });
-    }
+    instrumentation$LWS == null || instrumentation$LWS.incrementCounter == null || instrumentation$LWS.incrementCounter('lws.evaluate', 1, true);
+    activity$LWS == null || activity$LWS.error({
+      sandboxKey: key$LWS,
+      error
+    });
+    activity$LWS == null || activity$LWS.stop();
     throw error;
   } finally {
     clearEvalContext$LWS();
     clearEvalHelpers$LWS();
   }
-  // istanbul ignore else: this is a safety precaution that is unreachable via tests
-  if (LOCKER_INSTRUMENTATION_FLAG$LWS) {
-    activity$LWS.stop();
-  }
+  activity$LWS == null || activity$LWS.stop();
   return result$LWS;
 }
 // istanbul ignore next: currently unreachable via tests, exclusively used in AMD format mode
@@ -15834,7 +15767,7 @@ function wrapPlatformResourceLoader$LWS(dep$LWS, key$LWS) {
   depRegistry$LWS.set(dep$LWS, secureDep$LWS);
   return secureDep$LWS;
 }
-/*! version: 0.21.1 */
+/*! version: 0.21.2 */
 
 const loaderDefine = globalThis.LWR.define;