Revert "Merge upstream from remote rrweb (#26)"

This reverts commit eb1fb6d.

.changeset/config.json

@@ -9,17 +9,6 @@
   "commit": false,
   "fixed": [
     [
-      "@saola.ai/rrweb-all",
-      "@saola.ai/replay",
-      "@saola.ai/record",
-      "@saola.ai/rrweb-packer",
-      "@saola.ai/rrweb-utils",
-      "@saola.ai/rrweb-plugin-console-record",
-      "@saola.ai/rrweb-plugin-console-replay",
-      "@saola.ai/rrweb-plugin-sequential-id-record",
-      "@saola.ai/rrweb-plugin-sequential-id-replay",
-      "@saola.ai/rrweb-plugin-canvas-webrtc-record",
-      "@saola.ai/rrweb-plugin-canvas-webrtc-replay",
       "@saola.ai/rrweb",
       "@saola.ai/rrweb-snapshot",
       "@saola.ai/rrdom",

.github/workflows/ci-cd.yml.disabled

@@ -41,5 +41,5 @@ jobs:
         if: failure()
         with:
           name: image-diff
-          path: packages/**/__image_snapshots__/__diff_output__/*.png
+          path: packages/rrweb/test/*/__image_snapshots__/__diff_output__/*.png
           if-no-files-found: ignore

.vscode/rrweb-monorepo.code-workspace

@@ -40,10 +40,6 @@
       "name": "@rrweb/types",
       "path": "../packages/types"
     },
-    {
-      "name": "@rrweb/utils",
-      "path": "../packages/utils"
-    },
     {
       "name": "@rrweb/packer",
       "path": "../packages/packer"
@@ -92,14 +88,12 @@
       "@rrweb/record",
       "@rrweb/replay",
       "@rrweb/types",
-      "@rrweb/utils",
       "@rrweb/packer",
       "@rrweb/rrweb-plugin-console-record",
       "@rrweb/rrweb-plugin-console-replay",
       "@rrweb/rrweb-plugin-sequential-id",
       "@rrweb/rrweb-plugin-canvas-webrtc-record",
       "@rrweb/rrweb-plugin-canvas-webrtc-replay"
-    ],
-    "typescript.tsdk": " rrweb monorepo/node_modules/typescript/lib"
+    ]
   }
 }

README.md

@@ -62,7 +62,7 @@ Since we want the record and replay sides to share a strongly typed data structu
 
 1. Fork this repository.
 2. Run `yarn install` in the root to install required dependencies for all sub-packages (note: `npm install` is _not_ recommended).
-3. Run `yarn build:all` to build all packages and get a stable base, then `yarn dev` in the root to get auto-building for all the sub-packages whenever you modify anything.
+3. Run `yarn dev` in the root to get auto-building for all the sub-packages whenever you modify anything.
 4. Navigate to one of the sub-packages (in the `packages` folder) where you'd like to make a change.
 5. Patch the code and run `yarn test` to run the tests, make sure they pass before you commit anything. Add test cases in order to avoid future regression.
 6. If tests are failing, but the change in output is desirable, run `yarn test:update` and carefully commit the changes in test output.

docs/recipes/optimize-storage.md

@@ -49,7 +49,7 @@ rrweb.record({
 rrweb.record({
   emit(event) {},
   sampling: {
-    // Configure which kinds of mouse interaction should be recorded
+    // Configure which kins of mouse interaction should be recorded
     mouseInteraction: {
       MouseUp: false,
       MouseDown: false,
@@ -78,7 +78,7 @@ import { pack } from '@rrweb/packer';
 
 rrweb.record({
   emit(event) {},
-  packFn: pack,
+  packFn: rrweb.pack,
 });
 ```
 
@@ -88,7 +88,7 @@ And you need to pass packer.unpack as the `unpackFn` in replaying.
 import { unpack } from '@rrweb/packer';
 
 const replayer = new rrweb.Replayer(events, {
-  unpackFn: unpack,
+  unpackFn: rrweb.unpack,
 });
 ```
 

guide.md

@@ -47,7 +47,6 @@ Besides the `rrweb` and `@rrweb/record` packages, rrweb also provides other pack
 - [@rrweb/replay](packages/replay): A package for replaying rrweb sessions.
 - [@rrweb/packer](packages/packer): A package for packing and unpacking rrweb data.
 - [@rrweb/types](packages/types): Contains types shared across rrweb packages.
-- [@rrweb/utils](packages/utils): Contains utility functions shared across rrweb packages.
 - [web-extension](packages/web-extension): A web extension for rrweb.
 - [rrvideo](packages/rrvideo): A package for handling video operations in rrweb.
 - [@rrweb/rrweb-plugin-console-record](packages/plugins/rrweb-plugin-console-record): A plugin for recording console logs.

guide.zh_CN.md

@@ -43,8 +43,7 @@ rrweb 代码分为录制和回放两部分，大多数时候用户在被录制
 - [@rrweb/record](packages/record)：一个用于录制 rrweb 会话的包。
 - [@rrweb/replay](packages/replay)：一个用于回放 rrweb 会话的包。
 - [@rrweb/packer](packages/packer)：一个用于打包和解包 rrweb 数据的包。
-- [@rrweb/types](packages/types)：包含 rrweb 包中共享的类型定义。
-- [@rrweb/utils](packages/utils)：包含 rrweb 包中共享的工具函数。
+- [@rrweb/types](packages/types)：包含 rrweb 中使用的类型定义。
 - [web-extension](packages/web-extension)：rrweb 的网页扩展。
 - [rrvideo](packages/rrvideo)：一个用于处理 rrweb 中视频操作的包。
 - [@rrweb/rrweb-plugin-console-record](packages/plugins/rrweb-plugin-console-record)：一个用于记录控制台日志的插件。

package.json

@@ -30,29 +30,26 @@
     "@typescript-eslint/parser": "^5.62.0",
     "browserslist": "^4.22.1",
     "concurrently": "^7.1.0",
-    "cross-env": "^7.0.3",
     "esbuild-plugin-umd-wrapper": "^2.0.0",
     "eslint": "^8.53.0",
-    "eslint-plugin-compat": "^5.0.0",
+    "eslint-plugin-compat": "^4.2.0",
     "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "happy-dom": "^14.12.0",
     "markdownlint": "^0.25.1",
     "markdownlint-cli": "^0.31.1",
     "prettier": "2.8.4",
-    "turbo": "^2.0.4",
-    "typescript": "^5.4.5"
+    "turbo": "^2.0.3",
+    "typescript": "^4.9.5"
   },
   "scripts": {
-    "build:all": "NODE_OPTIONS='--max-old-space-size=4096' yarn turbo run prepublish",
-    "references:update": "yarn workspaces-to-typescript-project-references",
-    "test": "yarn turbo run test --concurrency=1 --continue",
+    "build:all": "NODE_OPTIONS='--max-old-space-size=4096' yarn run concurrently --success=all -r -m=1 'yarn workspaces-to-typescript-project-references' 'yarn turbo run prepublish'",
+    "test": "yarn run concurrently --success=all -r -m=1 'yarn workspaces-to-typescript-project-references --check' 'yarn turbo run test --concurrency=1 --continue'",
     "test:watch": "yarn turbo run test:watch",
     "test:update": "yarn turbo run test:update",
     "check-types": "yarn turbo run check-types --continue",
     "format": "yarn prettier --write '**/*.{ts,md}'",
     "format:head": "git diff --name-only HEAD^ |grep '\\.ts$\\|\\.md$' |xargs yarn prettier --write",
-    "dev": "yarn turbo run dev --concurrency=18",
+    "dev": "CLEAR_DIST_DIR=false yarn turbo run dev --concurrency=17",
     "repl": "cd packages/rrweb && npm run repl",
     "live-stream": "cd packages/rrweb && yarn live-stream",
     "lint": "yarn run concurrently --success=all -r -m=1 'yarn run markdownlint docs' 'yarn eslint packages/*/src --ext .ts,.tsx,.js,.jsx,.svelte'",
@@ -61,8 +58,7 @@
   },
   "resolutions": {
     "**/cssom": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-    "**/@types/dom-webcodecs": "0.1.5",
-    "typescript": "^5.4.5"
+    "**/@types/dom-webcodecs": "0.1.5"
   },
   "browserslist": [
     "defaults",

packages/all/CHANGELOG.md

@@ -1,27 +1,5 @@
 # @rrweb/all
 
-## 2.0.13
-
-### Patch Changes
-
-- Merge from rrweb remote upstream
-
-- Updated dependencies []:
-  - @saola.ai/rrweb-packer@2.0.13
-  - @saola.ai/rrweb@2.0.13
-  - @saola.ai/rrweb-types@2.0.13
-
-## 2.0.0-alpha.17
-
-### Patch Changes
-
-- [`db20184`](https://github.com/rrweb-io/rrweb/commit/db201841accd2b5df3cd7c88779aa62ab158501c) Thanks [@Juice10](https://github.com/Juice10)! - Keep package version in sync with other packages
-
-- Updated dependencies [[`db20184`](https://github.com/rrweb-io/rrweb/commit/db201841accd2b5df3cd7c88779aa62ab158501c), [`40bbc25`](https://github.com/rrweb-io/rrweb/commit/40bbc25fc287badc317a53f2d3f21b1c9f2b211b), [`68076b7`](https://github.com/rrweb-io/rrweb/commit/68076b724ff19d198d4f351a05063b85e1705a8c), [`8059d96`](https://github.com/rrweb-io/rrweb/commit/8059d9695146626b102b2059a3a9b932d5f598f6), [`335639a`](https://github.com/rrweb-io/rrweb/commit/335639af9b0ce7f70eb0f38ce113d877c7325158), [`be6bf52`](https://github.com/rrweb-io/rrweb/commit/be6bf52c248c35de1b3491e3a3440ff61f876414)]:
-  - @rrweb/packer@2.0.0-alpha.17
-  - rrweb@2.0.0-alpha.17
-  - @rrweb/types@2.0.0-alpha.17
-
 ## 2.0.0
 
 ### Major Changes

packages/all/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saola.ai/rrweb-all",
-  "version": "2.0.13",
+  "version": "2.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -10,11 +10,11 @@
   ],
   "scripts": {
     "dev": "vite build --watch",
-    "build": "yarn turbo run prepublish",
+    "build": "tsc -noEmit && vite build",
     "test": "vitest run",
     "test:watch": "vitest watch",
     "check-types": "tsc -noEmit",
-    "prepublish": "tsc -noEmit && vite build",
+    "prepublish": "npm run build",
     "lint": "yarn eslint src/**/*.ts"
   },
   "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/@rrweb/all#readme",
@@ -50,15 +50,15 @@
   ],
   "devDependencies": {
     "puppeteer": "^20.9.0",
-    "vite": "^5.3.1",
-    "vite-plugin-dts": "^3.9.1",
+    "vite": "^5.2.8",
+    "vite-plugin-dts": "^3.8.1",
     "vitest": "^1.4.0",
-    "typescript": "^5.4.5"
+    "typescript": "^4.7.3"
   },
   "dependencies": {
-    "@saola.ai/rrweb-types": "^2.0.13",
-    "@saola.ai/rrweb-packer": "^2.0.13",
-    "@saola.ai/rrweb": "^2.0.13"
+    "@saola.ai/rrweb-types": "^2.0.0",
+    "@saola.ai/rrweb-packer": "^2.0.0",
+    "@saola.ai/rrweb": "^2.0.0"
   },
   "browserslist": [
     "supports es6-class"

packages/all/test/cross-origin-iframe-packer.test.ts

@@ -149,7 +149,7 @@ describe('cross origin iframes & packer', function (this: ISuite) {
         const unpackedSnapshots = packedSnapshots.map((packed) =>
           unpack(packed),
         ) as eventWithTime[];
-        await assertSnapshot(unpackedSnapshots);
+        assertSnapshot(unpackedSnapshots);
       });
     });
   });

packages/packer/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @rrweb/packer
 
-## 2.0.13
-
-### Patch Changes
-
-- Merge from rrweb remote upstream
-
-- Updated dependencies []:
-  - @saola.ai/rrweb-types@2.0.13
-
-## 2.0.0-alpha.17
-
-### Patch Changes
-
-- [`db20184`](https://github.com/rrweb-io/rrweb/commit/db201841accd2b5df3cd7c88779aa62ab158501c) Thanks [@Juice10](https://github.com/Juice10)! - Keep package version in sync with other packages
-
-- Updated dependencies [[`335639a`](https://github.com/rrweb-io/rrweb/commit/335639af9b0ce7f70eb0f38ce113d877c7325158)]:
-  - @rrweb/types@2.0.0-alpha.17
-
 ## 2.0.0
 
 ### Major Changes

packages/packer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saola.ai/rrweb-packer",
-  "version": "2.0.13",
+  "version": "2.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -10,11 +10,11 @@
   ],
   "scripts": {
     "dev": "vite build --watch",
-    "build": "yarn turbo run prepublish",
+    "build": "tsc -noEmit && vite build",
     "test": "vitest run",
     "test:watch": "vitest watch",
     "check-types": "tsc -noEmit",
-    "prepublish": "tsc -noEmit && vite build",
+    "prepublish": "npm run build",
     "lint": "yarn eslint src/**/*.ts"
   },
   "bugs": {
@@ -70,14 +70,14 @@
     "package.json"
   ],
   "devDependencies": {
-    "vite": "^5.3.1",
-    "vite-plugin-dts": "^3.9.1",
+    "vite": "^5.2.8",
+    "vite-plugin-dts": "^3.8.1",
     "vitest": "^1.4.0",
-    "typescript": "^5.4.5"
+    "typescript": "^4.7.3"
   },
   "dependencies": {
     "fflate": "^0.4.4",
-    "@saola.ai/rrweb-types": "^2.0.13"
+    "@saola.ai/rrweb-types": "^2.0.0"
   },
   "browserslist": [
     "supports es6-class"

packages/packer/src/pack.ts

@@ -1,6 +1,6 @@
 import { strFromU8, strToU8, zlibSync } from 'fflate';
 import type { PackFn } from '@saola.ai/rrweb-types';
-import { type eventWithTimeAndPacker, MARK } from './base';
+import { eventWithTimeAndPacker, MARK } from './base';
 
 export const pack: PackFn = (event) => {
   const _e: eventWithTimeAndPacker = {

packages/packer/src/unpack.ts

@@ -1,5 +1,5 @@
 import { strFromU8, strToU8, unzlibSync } from 'fflate';
-import { type eventWithTimeAndPacker, MARK } from './base';
+import { eventWithTimeAndPacker, MARK } from './base';
 import type { UnpackFn, eventWithTime } from '@saola.ai/rrweb-types';
 
 export const unpack: UnpackFn = (raw: string) => {

packages/plugins/rrweb-plugin-canvas-webrtc-record/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @rrweb/rrweb-plugin-canvas-webrtc-record
 
-## 2.0.13
-
-### Patch Changes
-
-- Merge from rrweb remote upstream
-
-- Updated dependencies []:
-  - @saola.ai/rrweb@2.0.13
-
-## 2.0.0-alpha.17
-
-### Patch Changes
-
-- [`db20184`](https://github.com/rrweb-io/rrweb/commit/db201841accd2b5df3cd7c88779aa62ab158501c) Thanks [@Juice10](https://github.com/Juice10)! - Keep package version in sync with other packages
-
-- Updated dependencies [[`40bbc25`](https://github.com/rrweb-io/rrweb/commit/40bbc25fc287badc317a53f2d3f21b1c9f2b211b), [`68076b7`](https://github.com/rrweb-io/rrweb/commit/68076b724ff19d198d4f351a05063b85e1705a8c), [`8059d96`](https://github.com/rrweb-io/rrweb/commit/8059d9695146626b102b2059a3a9b932d5f598f6), [`335639a`](https://github.com/rrweb-io/rrweb/commit/335639af9b0ce7f70eb0f38ce113d877c7325158), [`be6bf52`](https://github.com/rrweb-io/rrweb/commit/be6bf52c248c35de1b3491e3a3440ff61f876414)]:
-  - rrweb@2.0.0-alpha.17
-
 ## 2.0.0
 
 ### Major Changes

packages/plugins/rrweb-plugin-canvas-webrtc-record/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saola.ai/rrweb-plugin-canvas-webrtc-record",
-  "version": "2.0.13",
+  "version": "2.0.0",
   "description": "",
   "type": "module",
   "main": "./dist/rrweb-plugin-canvas-webrtc-record.umd.cjs",
@@ -25,9 +25,9 @@
   ],
   "scripts": {
     "dev": "vite build --watch",
-    "build": "yarn turbo run prepublish",
+    "build": "tsc -noEmit && vite build",
     "check-types": "tsc -noEmit",
-    "prepublish": "tsc -noEmit && vite build"
+    "prepublish": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -43,12 +43,12 @@
   },
   "homepage": "https://github.com/rrweb-io/rrweb#readme",
   "devDependencies": {
-    "@saola.ai/rrweb": "^2.0.13",
-    "typescript": "^5.4.5",
-    "vite": "^5.3.1",
-    "vite-plugin-dts": "^3.9.1"
+    "@saola.ai/rrweb": "^2.0.0",
+    "typescript": "^4.7.3",
+    "vite": "^5.2.8",
+    "vite-plugin-dts": "^3.8.1"
   },
   "peerDependencies": {
-    "@saola.ai/rrweb": "^2.0.13"
+    "@saola.ai/rrweb": "^2.0.0"
   }
 }

packages/plugins/rrweb-plugin-canvas-webrtc-replay/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @rrweb/rrweb-plugin-canvas-webrtc-replay
 
-## 2.0.13
-
-### Patch Changes
-
-- Merge from rrweb remote upstream
-
-- Updated dependencies []:
-  - @saola.ai/rrweb@2.0.13
-
-## 2.0.0-alpha.17
-
-### Patch Changes
-
-- [`db20184`](https://github.com/rrweb-io/rrweb/commit/db201841accd2b5df3cd7c88779aa62ab158501c) Thanks [@Juice10](https://github.com/Juice10)! - Keep package version in sync with other packages
-
-- Updated dependencies [[`40bbc25`](https://github.com/rrweb-io/rrweb/commit/40bbc25fc287badc317a53f2d3f21b1c9f2b211b), [`68076b7`](https://github.com/rrweb-io/rrweb/commit/68076b724ff19d198d4f351a05063b85e1705a8c), [`8059d96`](https://github.com/rrweb-io/rrweb/commit/8059d9695146626b102b2059a3a9b932d5f598f6), [`335639a`](https://github.com/rrweb-io/rrweb/commit/335639af9b0ce7f70eb0f38ce113d877c7325158), [`be6bf52`](https://github.com/rrweb-io/rrweb/commit/be6bf52c248c35de1b3491e3a3440ff61f876414)]:
-  - rrweb@2.0.0-alpha.17
-
 ## 2.0.0
 
 ### Major Changes