Merge branch 'master' into AMP-99342-Regex-Error

amplitude · Jun 24, 2024 · 7ea50cb · 7ea50cb
2 parents 25deb6d + 3f77ef2
commit 7ea50cb
Show file tree

Hide file tree

Showing 22 changed files with 213 additions and 80 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -16,6 +16,7 @@
     "octopus-orange",
     "popular-spies-fetch",
     "rich-dots-lay",
+    "rotten-spies-enjoy",
     "short-masks-cross"
   ]
 }
diff --git a/.changeset/rotten-spies-enjoy.md b/.changeset/rotten-spies-enjoy.md
@@ -0,0 +1,6 @@
+---
+'@amplitude/rrweb': patch
+---
+
+Ensure :hover works on replayer, even if a rule is behind a media query
+Respect the intent behind max-device-width and min-device-width media queries so that their effects are apparent in the replayer context
diff --git a/packages/rrdom-nodejs/CHANGELOG.md b/packages/rrdom-nodejs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # rrdom-nodejs
 
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @amplitude/rrweb-snapshot@2.0.0-alpha.16
+  - @amplitude/rrdom@2.0.0-alpha.16
+
 ## 2.0.0-alpha.15
 
 ### Patch Changes

diff --git a/packages/rrdom-nodejs/package.json b/packages/rrdom-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/rrdom-nodejs",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "scripts": {
     "dev": "rollup -c -w",
     "bundle": "rollup --config",
@@ -45,8 +45,8 @@
     "ts-jest": "^27.1.3"
   },
   "dependencies": {
-    "@amplitude/rrdom": "^2.0.0-alpha.15",
-    "@amplitude/rrweb-snapshot": "^2.0.0-alpha.15",
+    "@amplitude/rrdom": "^2.0.0-alpha.16",
+    "@amplitude/rrweb-snapshot": "^2.0.0-alpha.16",
     "cssom": "^0.5.0",
     "cssstyle": "^2.3.0",
     "nwsapi": "^2.2.0"

diff --git a/packages/rrdom/CHANGELOG.md b/packages/rrdom/CHANGELOG.md
@@ -1,5 +1,12 @@
 # rrdom
 
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @amplitude/rrweb-snapshot@2.0.0-alpha.16
+
 ## 2.0.0-alpha.15
 
 ### Patch Changes

diff --git a/packages/rrdom/package.json b/packages/rrdom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/rrdom",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/rrdom#readme",
   "license": "MIT",
   "main": "lib/rrdom.cjs",
@@ -31,7 +31,7 @@
     "url": "https://github.com/rrweb-io/rrweb/issues"
   },
   "devDependencies": {
-    "@amplitude/rrweb-types": "^2.0.0-alpha.15",
+    "@amplitude/rrweb-types": "^2.0.0-alpha.16",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@types/jest": "^27.4.1",
     "@types/puppeteer": "^5.4.4",
@@ -47,6 +47,6 @@
     "ts-jest": "^27.1.3"
   },
   "dependencies": {
-    "@amplitude/rrweb-snapshot": "^2.0.0-alpha.15"
+    "@amplitude/rrweb-snapshot": "^2.0.0-alpha.16"
   }
 }
diff --git a/packages/rrvideo/CHANGELOG.md b/packages/rrvideo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # rrvideo
 
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @amplitude/rrweb-player@2.0.0-alpha.16
+
 ## 2.0.0-alpha.15
 
 ### Patch Changes

diff --git a/packages/rrvideo/package.json b/packages/rrvideo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/rrvideo",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "description": "transform rrweb session into video",
   "main": "build/index.js",
   "bin": {
@@ -20,7 +20,7 @@
   "author": "Amplitude Inc",
   "license": "MIT",
   "devDependencies": {
-    "@amplitude/rrweb": "^2.0.0-alpha.15",
+    "@amplitude/rrweb": "^2.0.0-alpha.16",
     "@types/fs-extra": "11.0.1",
     "@types/jest": "^27.4.1",
     "@types/minimist": "^1.2.1",
@@ -29,7 +29,7 @@
     "ts-jest": "^27.1.3"
   },
   "dependencies": {
-    "@amplitude/rrweb-player": "^2.0.0-alpha.15",
+    "@amplitude/rrweb-player": "^2.0.0-alpha.16",
     "@open-tech-world/cli-progress-bar": "^2.0.2",
     "fs-extra": "^11.1.1",
     "minimist": "^1.2.5",

diff --git a/packages/rrweb-player/CHANGELOG.md b/packages/rrweb-player/CHANGELOG.md
@@ -1,5 +1,12 @@
 # rrweb-player
 
+## 2.0.0-alpha.16
+
+### Patch Changes
+
+- Updated dependencies [[`c7dfd53`](https://github.com/amplitude/rrweb/commit/c7dfd538c59dce2e4c3db4085beb2e2cec9168bf)]:
+  - @amplitude/rrweb@2.0.0-alpha.16
+
 ## 2.0.0-alpha.15
 
 ### Patch Changes

diff --git a/packages/rrweb-player/package.json b/packages/rrweb-player/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@amplitude/rrweb-player",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "devDependencies": {
-    "@amplitude/rrweb-types": "^2.0.0-alpha.15",
+    "@amplitude/rrweb-types": "^2.0.0-alpha.16",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-node-resolve": "^13.2.1",
     "@types/offscreencanvas": "^2019.6.4",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@tsconfig/svelte": "^1.0.0",
-    "@amplitude/rrweb": "^2.0.0-alpha.15"
+    "@amplitude/rrweb": "^2.0.0-alpha.16"
   },
   "scripts": {
     "build": "rollup -c",

diff --git a/packages/rrweb-snapshot/CHANGELOG.md b/packages/rrweb-snapshot/CHANGELOG.md
@@ -1,5 +1,7 @@
 # rrweb-snapshot
 
+## 2.0.0-alpha.16
+
 ## 2.0.0-alpha.15
 
 ## 2.0.0-alpha.14

diff --git a/packages/rrweb-snapshot/package.json b/packages/rrweb-snapshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/rrweb-snapshot",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "description": "rrweb's component to take a snapshot of DOM, aka DOM serializer",
   "scripts": {
     "prepare": "npm run prepack",

diff --git a/packages/rrweb-snapshot/src/css.ts b/packages/rrweb-snapshot/src/css.ts
@@ -56,6 +56,11 @@ export interface Node {
   };
 }
 
+export interface NodeWithRules extends Node {
+  /** Array of nodes with the types rule, comment and any of the at-rule types. */
+  rules: Array<Rule | Comment | AtRule>;
+}
+
 export interface Rule extends Node {
   /** The list of selectors of the rule, split on commas. Each selector is trimmed from whitespace and comments. */
   selectors?: string[];
@@ -98,13 +103,11 @@ export interface CustomMedia extends Node {
 /**
  * The @document at-rule.
  */
-export interface Document extends Node {
+export interface Document extends NodeWithRules {
   /** The part following @document. */
   document?: string;
   /** The vendor prefix in @document, or undefined if there is none. */
   vendor?: string;
-  /** Array of nodes with the types rule, comment and any of the at-rule types. */
-  rules?: Array<Rule | Comment | AtRule>;
 }
 
 /**
@@ -118,10 +121,7 @@ export interface FontFace extends Node {
 /**
  * The @host at-rule.
  */
-export interface Host extends Node {
-  /** Array of nodes with the types rule, comment and any of the at-rule types. */
-  rules?: Array<Rule | Comment | AtRule>;
-}
+export type Host = NodeWithRules;
 
 /**
  * The @import at-rule.
@@ -153,11 +153,9 @@ export interface KeyFrame extends Node {
 /**
  * The @media at-rule.
  */
-export interface Media extends Node {
+export interface Media extends NodeWithRules {
   /** The part following @media. */
   media?: string;
-  /** Array of nodes with the types rule, comment and any of the at-rule types. */
-  rules?: Array<Rule | Comment | AtRule>;
 }
 
 /**
@@ -181,11 +179,9 @@ export interface Page extends Node {
 /**
  * The @supports at-rule.
  */
-export interface Supports extends Node {
+export interface Supports extends NodeWithRules {
   /** The part following @supports. */
   supports?: string;
-  /** Array of nodes with the types rule, comment and any of the at-rule types. */
-  rules?: Array<Rule | Comment | AtRule>;
 }
 
 /** All at-rules. */
@@ -205,10 +201,8 @@ export type AtRule =
 /**
  * A collection of rules
  */
-export interface StyleRules {
+export interface StyleRules extends NodeWithRules {
   source?: string;
-  /** Array of nodes with the types rule, comment and any of the at-rule types. */
-  rules: Array<Rule | Comment | AtRule>;
   /** Array of Errors. Errors collected during parsing when option silent is true. */
   parsingErrors?: ParserError[];
 }
@@ -224,7 +218,7 @@ export interface Stylesheet extends Node {
 // https://github.com/visionmedia/css-parse/pull/49#issuecomment-30088027
 const commentre = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g;
 
-export function parse(css: string, options: ParserOptions = {}) {
+export function parse(css: string, options: ParserOptions = {}): Stylesheet {
   /**
    * Positional.
    */
@@ -942,7 +936,7 @@ function trim(str: string) {
  * Adds non-enumerable parent node reference to each node.
  */
 
-function addParent(obj: Stylesheet, parent?: Stylesheet) {
+function addParent(obj: Stylesheet, parent?: Stylesheet): Stylesheet {
   const isNode = obj && typeof obj.type === 'string';
   const childParent = isNode ? obj : parent;
 

diff --git a/packages/rrweb-snapshot/src/index.ts b/packages/rrweb-snapshot/src/index.ts
@@ -11,7 +11,7 @@ import snapshot, {
 } from './snapshot';
 import rebuild, {
   buildNodeWithSN,
-  addHoverClass,
+  adaptCssForReplay,
   createCache,
 } from './rebuild';
 export * from './types';
@@ -22,7 +22,7 @@ export {
   serializeNodeWithId,
   rebuild,
   buildNodeWithSN,
-  addHoverClass,
+  adaptCssForReplay,
   createCache,
   transformAttribute,
   ignoreAttribute,