diff --git a/patches/@rrweb__record@2.0.0-alpha.17.patch b/patches/@rrweb__record@2.0.0-alpha.17.patch index c3b75e0cd..0d54d7bff 100644 --- a/patches/@rrweb__record@2.0.0-alpha.17.patch +++ b/patches/@rrweb__record@2.0.0-alpha.17.patch @@ -1,37 +1,32 @@ diff --git a/dist/record.js b/dist/record.js -index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974f56f3c65 100644 +index 46ec389fefb698243008b39db65470dbdf0a3857..a18724d8b6ba43a30935daf257127fbb0c898541 100644 --- a/dist/record.js +++ b/dist/record.js -@@ -26,6 +26,19 @@ const testableMethods$1 = { +@@ -26,6 +26,14 @@ const testableMethods$1 = { Element: [], MutationObserver: ["constructor"] }; -+const isFunction = (x) => typeof x === 'function'; -+const isAngularZonePatchedFunction = (x) => { ++ ++const isAngularZonePresent = () => { + try { -+ if (!isFunction(x)) { -+ return false; -+ } -+ const prototypeKeys = Object.getOwnPropertyNames(x.prototype || {}); -+ return prototypeKeys.some((key) => key.indexOf('__zone')); ++ return !!globalThis.Zone + } catch { -+ // we've seen some intermittent problems in Safari since introducing this check + return false + } +} const untaintedBasePrototype$1 = {}; function getUntaintedPrototype$1(key) { if (untaintedBasePrototype$1[key]) -@@ -54,7 +67,7 @@ function getUntaintedPrototype$1(key) { +@@ -54,7 +62,7 @@ function getUntaintedPrototype$1(key) { } ) ); - if (isUntaintedAccessors && isUntaintedMethods) { -+ if (isUntaintedAccessors && isUntaintedMethods && !isAngularZonePatchedFunction(defaultObj)) { ++ if (isUntaintedAccessors && isUntaintedMethods && !isAngularZonePresent()) { untaintedBasePrototype$1[key] = defaultObj.prototype; return defaultObj.prototype; } -@@ -65,10 +78,10 @@ function getUntaintedPrototype$1(key) { +@@ -65,10 +73,10 @@ function getUntaintedPrototype$1(key) { if (!win) return defaultObj.prototype; const untaintedObject = win[key].prototype; document.body.removeChild(iframeEl); @@ -44,7 +39,7 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 } } const untaintedAccessorCache$1 = {}; -@@ -246,6 +259,9 @@ function isCSSImportRule(rule2) { +@@ -246,6 +254,9 @@ function isCSSImportRule(rule2) { function isCSSStyleRule(rule2) { return "selectorText" in rule2; } @@ -54,7 +49,7 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 class Mirror { constructor() { __publicField$1(this, "idNodeMap", /* @__PURE__ */ new Map()); -@@ -809,9 +825,14 @@ function serializeElementNode(n2, options) { +@@ -809,9 +820,14 @@ function serializeElementNode(n2, options) { } } if (tagName === "link" && inlineStylesheet) { @@ -72,7 +67,7 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 let cssText = null; if (stylesheet) { cssText = stringifyStylesheet(stylesheet); -@@ -855,7 +876,15 @@ function serializeElementNode(n2, options) { +@@ -855,7 +871,15 @@ function serializeElementNode(n2, options) { } } if (tagName === "dialog" && n2.open) { @@ -89,7 +84,7 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 } if (tagName === "canvas" && recordCanvas) { if (n2.__context === "2d") { -@@ -1116,7300 +1145,227 @@ function serializeNodeWithId(n2, options) { +@@ -1116,7300 +1140,227 @@ function serializeNodeWithId(n2, options) { keepIframeSrcFn }; if (serializedNode.type === NodeType$2.Element && serializedNode.tagName === "textarea" && serializedNode.attributes.value !== void 0) ; @@ -7599,16 +7594,16 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 class BaseRRNode { // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any constructor(..._args) { -@@ -8507,7 +1463,7 @@ function getUntaintedPrototype(key) { +@@ -8507,7 +1458,7 @@ function getUntaintedPrototype(key) { } ) ); - if (isUntaintedAccessors && isUntaintedMethods) { -+ if (isUntaintedAccessors && isUntaintedMethods && !isAngularZonePatchedFunction(defaultObj)) { ++ if (isUntaintedAccessors && isUntaintedMethods && !isAngularZonePresent()) { untaintedBasePrototype[key] = defaultObj.prototype; return defaultObj.prototype; } -@@ -11382,11 +4338,19 @@ class CanvasManager { +@@ -11382,11 +4333,19 @@ class CanvasManager { let rafId; const getCanvas = () => { const matchedCanvas = []; @@ -7633,7 +7628,7 @@ index 46ec389fefb698243008b39db65470dbdf0a3857..70db907755d68b08232e25e1b255a974 return matchedCanvas; }; const takeCanvasSnapshots = (timestamp) => { -@@ -11407,13 +4371,20 @@ class CanvasManager { +@@ -11407,13 +4366,20 @@ class CanvasManager { context.clear(context.COLOR_BUFFER_BIT); } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa8253331..c8f1cf03f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: patchedDependencies: '@rrweb/record@2.0.0-alpha.17': - hash: viz5vmxcmz5nggemb4cjgrd3iy + hash: wvznj3762vyf2y3azxobt3dlz4 path: patches/@rrweb__record@2.0.0-alpha.17.patch '@rrweb/rrweb-plugin-console-record@2.0.0-alpha.17': hash: ytsspyi7p3hvqcq64vqb7wb6bu @@ -74,7 +74,7 @@ devDependencies: version: 12.1.1(rollup@4.24.0)(tslib@2.5.0)(typescript@5.5.4) '@rrweb/record': specifier: 2.0.0-alpha.17 - version: 2.0.0-alpha.17(patch_hash=viz5vmxcmz5nggemb4cjgrd3iy) + version: 2.0.0-alpha.17(patch_hash=wvznj3762vyf2y3azxobt3dlz4) '@rrweb/rrweb-plugin-console-record': specifier: 2.0.0-alpha.17 version: 2.0.0-alpha.17(patch_hash=ytsspyi7p3hvqcq64vqb7wb6bu)(rrweb@2.0.0-alpha.17) @@ -2870,7 +2870,7 @@ packages: dev: true optional: true - /@rrweb/record@2.0.0-alpha.17(patch_hash=viz5vmxcmz5nggemb4cjgrd3iy): + /@rrweb/record@2.0.0-alpha.17(patch_hash=wvznj3762vyf2y3azxobt3dlz4): resolution: {integrity: sha512-Je+lzjeWMF8/I0IDoXFzkGPKT8j7AkaBup5YcwUHlkp18VhLVze416MvI6915teE27uUA2ScXMXzG0Yiu5VTIw==} dependencies: '@rrweb/types': 2.0.0-alpha.17 diff --git a/src/utils/prototype-utils.ts b/src/utils/prototype-utils.ts index 5a18b8b49..ccdfebcb4 100644 --- a/src/utils/prototype-utils.ts +++ b/src/utils/prototype-utils.ts @@ -5,7 +5,7 @@ */ import { AssignableWindow } from './globals' -import { isAngularZonePatchedFunction, isFunction, isNativeFunction } from './type-utils' +import { isAngularZonePresent, isFunction, isNativeFunction } from './type-utils' import { logger } from './logger' interface NativeImplementationsCache { @@ -25,7 +25,7 @@ export function getNativeImplementation any => { export const isNativeFunction = (x: unknown): x is (...args: any[]) => any => isFunction(x) && x.toString().indexOf('[native code]') !== -1 -// When angular patches functions they pass the above `isNativeFunction` check -export const isAngularZonePatchedFunction = (x: unknown): boolean => { - if (!isFunction(x)) { - return false - } - const prototypeKeys = Object.getOwnPropertyNames(x.prototype || {}) - return prototypeKeys.some((key) => key.indexOf('__zone')) +// When angular patches functions they pass the above `isNativeFunction` check (at least the MutationObserver) +export const isAngularZonePresent = (): boolean => { + return !!(window as any).Zone } // Underscore Addons