diff --git a/.vscode/rrweb-monorepo.code-workspace b/.vscode/rrweb-monorepo.code-workspace index 896a62e5d9..6a1be41ead 100644 --- a/.vscode/rrweb-monorepo.code-workspace +++ b/.vscode/rrweb-monorepo.code-workspace @@ -23,12 +23,17 @@ { "name": "rrweb-snapshot (package)", "path": "../packages/rrweb-snapshot" + }, + { + "name": "@rrweb/types", + "path": "../packages/types" } ], "settings": { "jest.disabledWorkspaceFolders": [ " rrweb monorepo", - "rrweb-player (package)" + "rrweb-player (package)", + "@rrweb/types" ] } } diff --git a/packages/rrdom/package.json b/packages/rrdom/package.json index 74ef10f11b..27c1ed1f15 100644 --- a/packages/rrdom/package.json +++ b/packages/rrdom/package.json @@ -43,6 +43,7 @@ "rollup-plugin-typescript2": "^0.31.2", "rollup-plugin-web-worker-loader": "^1.6.1", "ts-jest": "^27.1.3", + "@rrweb/types": "^2.0.0-alpha.3", "typescript": "^4.7.3" }, "dependencies": { diff --git a/packages/rrdom/src/diff.ts b/packages/rrdom/src/diff.ts index 1cb4dd8020..f03557e7f5 100644 --- a/packages/rrdom/src/diff.ts +++ b/packages/rrdom/src/diff.ts @@ -6,7 +6,7 @@ import type { scrollData, styleDeclarationData, styleSheetRuleData, -} from 'rrweb/src/types'; +} from '@rrweb/types'; import type { IRRCDATASection, IRRComment, diff --git a/packages/rrdom/src/index.ts b/packages/rrdom/src/index.ts index da96b12db2..2b90840db2 100644 --- a/packages/rrdom/src/index.ts +++ b/packages/rrdom/src/index.ts @@ -14,7 +14,7 @@ import type { scrollData, styleSheetRuleData, styleDeclarationData, -} from 'rrweb/src/types'; +} from '@rrweb/types'; import { BaseRRNode as RRNode, BaseRRCDATASectionImpl, diff --git a/packages/rrdom/test/diff.test.ts b/packages/rrdom/test/diff.test.ts index 723b2a3e6e..6e02577f3a 100644 --- a/packages/rrdom/test/diff.test.ts +++ b/packages/rrdom/test/diff.test.ts @@ -12,12 +12,12 @@ import { import type { IRRNode } from '../src/document'; import { Replayer } from 'rrweb'; import type { + eventWithTime, canvasMutationData, styleDeclarationData, styleSheetRuleData, -} from 'rrweb/src/types'; -import { EventType, IncrementalSource } from 'rrweb/src/types'; -import type { eventWithTime } from 'rrweb/typings/types'; +} from '@rrweb/types'; +import { EventType, IncrementalSource } from '@rrweb/types'; const elementSn = { type: RRNodeType.Element, diff --git a/packages/rrdom/tsconfig.json b/packages/rrdom/tsconfig.json index 4cf4a46fa7..450e56e151 100644 --- a/packages/rrdom/tsconfig.json +++ b/packages/rrdom/tsconfig.json @@ -18,6 +18,9 @@ "references": [ { "path": "../rrweb-snapshot" + }, + { + "path": "../types" } ], "compileOnSave": true, diff --git a/packages/rrweb-player/package.json b/packages/rrweb-player/package.json index 9489effec1..6c6a21bd72 100644 --- a/packages/rrweb-player/package.json +++ b/packages/rrweb-player/package.json @@ -4,6 +4,7 @@ "devDependencies": { "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-node-resolve": "^13.2.1", + "@rrweb/types": "^2.0.0-alpha.3", "@types/offscreencanvas": "^2019.6.4", "eslint-config-google": "^0.14.0", "eslint-plugin-svelte3": "^4.0.0", diff --git a/packages/rrweb-player/src/Controller.svelte b/packages/rrweb-player/src/Controller.svelte index 61c3d56ac1..acbe32ecbd 100644 --- a/packages/rrweb-player/src/Controller.svelte +++ b/packages/rrweb-player/src/Controller.svelte @@ -1,7 +1,7 @@