diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 3f551514c4..e1ca1d740a 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -71,7 +71,7 @@ jobs: - name: Build Tarballs env: - NODE_OPTIONS: "--max_old_space_size=4096" + NODE_OPTIONS: '--max_old_space_size=4096' run: yarn build:tarball - name: Upload Artifacts diff --git a/.github/workflows/size-check.yml b/.github/workflows/size-check.yml deleted file mode 100644 index 98fbf5c147..0000000000 --- a/.github/workflows/size-check.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Size Check - -on: - push: - branches: - - master - - sentry-v2 - pull_request: - -concurrency: ${{ github.workflow }}-${{ github.ref }} - -jobs: - job_size_check: - name: Size Check - timeout-minutes: 15 - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Setup Node.js lts/* - uses: actions/setup-node@v3 - with: - node-version: lts/* - cache: 'yarn' - - - name: Install Dependencies - run: yarn install --frozen-lockfile - - - name: Build Project - run: NODE_OPTIONS='--max-old-space-size=4096' yarn build:all - - - name: Check bundle sizes - uses: getsentry/size-limit-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - skip_step: build - main_branch: sentry-v2 - run_for_branch: true diff --git a/README.md b/README.md index b43df9ff72..e0289196d3 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ From this monorepo, Sentry maintains and publishes the following NPM packages: - `@sentry-internal/rrdom` (corresponds to the [original `rrdom` package](https://www.npmjs.com/package/rrdom)) - `@sentry-internal/rrweb-player` (corresponds to the [original `rrweb-player` package](https://www.npmjs.com/package/rrweb-player)) - `@sentry-internal/rrweb-snapshot` (corresponds to the [original `rrweb-snapshot` package](https://www.npmjs.com/package/rrweb-snapshot)) +- `@sentry-internal/rrweb-types` (corresponds to the [original `@rrweb/types` package](https://www.npmjs.com/package/@rrweb/types)) +- `@sentry-internal/rrweb-worker` (new package) ## Major changes from upstream branch diff --git a/package.json b/package.json index 89137c1c38..19620b3e96 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "typescript": "^4.9.5" }, "scripts": { - "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 prepare'", + "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 prepack'", "build:tarball": "yarn lerna run build:tarball", "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", @@ -54,7 +54,6 @@ "format:head": "git diff --name-only HEAD^ |grep '\\.ts$\\|\\.md$' |xargs yarn prettier --write", "dev": "CLEAR_DIST_DIR=false yarn turbo run dev --concurrency=17", "repl": "cd packages/rrweb && npm run repl", - "typings": "yarn turbo run typings", "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'", "lint:report": "yarn eslint --output-file eslint_report.json --format json packages/*/src --ext .ts,.tsx,.js,.jsx", diff --git a/packages/all/package.json b/packages/all/package.json index 4dff234b20..4e1b649fbf 100644 --- a/packages/all/package.json +++ b/packages/all/package.json @@ -14,7 +14,7 @@ "test": "vitest run", "test:watch": "vitest watch", "check-types": "tsc -noEmit", - "prepublish": "npm run build", + "prepack": "npm run build", "lint": "yarn eslint src/**/*.ts" }, "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/@rrweb/all#readme", @@ -56,9 +56,9 @@ "typescript": "^4.7.3" }, "dependencies": { - "@rrweb/types": "^2.0.0-alpha.14", - "@rrweb/packer": "^2.0.0-alpha.14", - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb-packer": "^2.0.0-alpha.14", + "@sentry-internal/rrweb-types": "^2.0.0-alpha.14" }, "browserslist": [ "supports es6-class" diff --git a/packages/all/src/index.ts b/packages/all/src/index.ts index aa01eeaba9..83ee7776e0 100644 --- a/packages/all/src/index.ts +++ b/packages/all/src/index.ts @@ -1,4 +1,4 @@ -export * from 'rrweb'; -export * from '@rrweb/packer'; +export * from '@sentry-internal/rrweb'; +export * from '@sentry-internal/rrweb-packer'; // export * from '@rrweb/rrweb-plugin-console-record'; // export * from '@rrweb/rrweb-plugin-console-replay'; diff --git a/packages/all/test/cross-origin-iframe-packer.test.ts b/packages/all/test/cross-origin-iframe-packer.test.ts index 9ae56b31bb..c3b8e009db 100644 --- a/packages/all/test/cross-origin-iframe-packer.test.ts +++ b/packages/all/test/cross-origin-iframe-packer.test.ts @@ -11,14 +11,14 @@ import type { eventWithTime, listenerHandler, mutationData, -} from '@rrweb/types'; -import { unpack } from '@rrweb/packer'; +} from '@sentry-internal/rrweb-types'; +import { unpack } from '@sentry-internal/rrweb-packer'; import * as fs from 'fs'; import * as path from 'path'; import type * as puppeteer from 'puppeteer'; -import type { recordOptions } from 'rrweb'; -import type {} from '@rrweb/types'; -import { EventType } from '@rrweb/types'; +import type { recordOptions } from '@sentry-internal/rrweb'; +import type {} from '@sentry-internal/rrweb-types'; +import { EventType } from '@sentry-internal/rrweb-types'; import { assertSnapshot, getServerURL, diff --git a/packages/all/test/utils.ts b/packages/all/test/utils.ts index 5f8aaab932..7afa33c310 100644 --- a/packages/all/test/utils.ts +++ b/packages/all/test/utils.ts @@ -1,4 +1,4 @@ -import { NodeType } from 'rrweb-snapshot'; +import { NodeType } from '@sentry-internal/rrweb-snapshot'; import { expect } from 'vitest'; import { EventType, @@ -8,7 +8,7 @@ import { mouseInteractionData, event, pluginEvent, -} from '@rrweb/types'; +} from '@sentry-internal/rrweb-types'; import * as puppeteer from 'puppeteer'; import * as path from 'path'; import * as http from 'http'; diff --git a/packages/all/tsconfig.json b/packages/all/tsconfig.json index 5de77cef36..04b4a64fca 100644 --- a/packages/all/tsconfig.json +++ b/packages/all/tsconfig.json @@ -1,19 +1,21 @@ { "extends": "../../tsconfig.base.json", - "include": ["src"], + "include": [ + "src" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "references": [ { - "path": "../types" + "path": "../rrweb" }, { "path": "../packer" }, { - "path": "../rrweb" + "path": "../types" } ] } diff --git a/packages/packer/package.json b/packages/packer/package.json index 25e7919129..eb3eff3763 100644 --- a/packages/packer/package.json +++ b/packages/packer/package.json @@ -1,6 +1,6 @@ { - "name": "@rrweb/packer", - "version": "2.0.0-alpha.14", + "name": "@sentry-internal/rrweb-packer", + "version": "2.31.0", "publishConfig": { "access": "public" }, @@ -11,10 +11,11 @@ "scripts": { "dev": "vite build --watch", "build": "tsc -noEmit && vite build", + "build:tarball": "npm pack", "test": "vitest run", "test:watch": "vitest watch", "check-types": "tsc -noEmit", - "prepublish": "npm run build", + "prepack": "npm run build", "lint": "yarn eslint src/**/*.ts" }, "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/@rrweb/packer#readme", @@ -78,7 +79,7 @@ }, "dependencies": { "fflate": "^0.4.4", - "@rrweb/types": "^2.0.0-alpha.14" + "@sentry-internal/rrweb-types": "^2.31.0" }, "browserslist": [ "supports es6-class" diff --git a/packages/packer/src/pack.ts b/packages/packer/src/pack.ts index dfe5bc2590..6cd46e63d7 100644 --- a/packages/packer/src/pack.ts +++ b/packages/packer/src/pack.ts @@ -1,8 +1,8 @@ import { strFromU8, strToU8, zlibSync } from 'fflate'; -import type { PackFn } from '@rrweb/types'; +import type { PackFn, eventWithTime } from '@sentry-internal/rrweb-types'; import { eventWithTimeAndPacker, MARK } from './base'; -export const pack: PackFn = (event) => { +export const pack: PackFn = (event: eventWithTime) => { const _e: eventWithTimeAndPacker = { ...event, v: MARK, diff --git a/packages/plugins/rrweb-plugin-canvas-webrtc-record/package.json b/packages/plugins/rrweb-plugin-canvas-webrtc-record/package.json index de391f878d..c50a6e4d53 100644 --- a/packages/plugins/rrweb-plugin-canvas-webrtc-record/package.json +++ b/packages/plugins/rrweb-plugin-canvas-webrtc-record/package.json @@ -27,7 +27,7 @@ "dev": "vite build --watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -43,12 +43,12 @@ }, "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-canvas-webrtc-record/tsconfig.json b/packages/plugins/rrweb-plugin-canvas-webrtc-record/tsconfig.json index 8ffb27ccca..35189e4952 100644 --- a/packages/plugins/rrweb-plugin-canvas-webrtc-record/tsconfig.json +++ b/packages/plugins/rrweb-plugin-canvas-webrtc-record/tsconfig.json @@ -1,7 +1,11 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" diff --git a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/package.json b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/package.json index 61d7cb6e6d..157c584c1d 100644 --- a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/package.json +++ b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/package.json @@ -27,7 +27,7 @@ "dev": "vite build --watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -43,12 +43,12 @@ }, "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/src/index.ts b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/src/index.ts index 94f828b60f..23a6005fca 100644 --- a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/src/index.ts +++ b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/src/index.ts @@ -1,7 +1,7 @@ import type { RRNode } from '@sentry-internal/rrdom'; import type { Mirror } from '@sentry-internal/rrweb-snapshot'; import SimplePeer from 'simple-peer-light'; -import type { ReplayPlugin, Replayer } from 'rrweb'; +import type { ReplayPlugin, Replayer } from '@sentry-internal/rrweb'; import type { WebRTCDataChannel } from './types'; // TODO: restrict callback to real nodes only, or make sure callback gets called when real node gets added to dom as well diff --git a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/tsconfig.json b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/tsconfig.json index 8ffb27ccca..35189e4952 100644 --- a/packages/plugins/rrweb-plugin-canvas-webrtc-replay/tsconfig.json +++ b/packages/plugins/rrweb-plugin-canvas-webrtc-replay/tsconfig.json @@ -1,7 +1,11 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" diff --git a/packages/plugins/rrweb-plugin-console-record/package.json b/packages/plugins/rrweb-plugin-console-record/package.json index 4e5bc78bd3..5f863fa631 100644 --- a/packages/plugins/rrweb-plugin-console-record/package.json +++ b/packages/plugins/rrweb-plugin-console-record/package.json @@ -29,7 +29,7 @@ "test:watch": "vitest watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -45,7 +45,7 @@ }, "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1", @@ -53,6 +53,6 @@ "puppeteer": "^20.9.0" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-console-record/test/html/index.ts b/packages/plugins/rrweb-plugin-console-record/test/html/index.ts index d701b7991e..719662e1cf 100644 --- a/packages/plugins/rrweb-plugin-console-record/test/html/index.ts +++ b/packages/plugins/rrweb-plugin-console-record/test/html/index.ts @@ -1,5 +1,5 @@ -import type { eventWithTime } from '@rrweb/types'; -import { record } from 'rrweb'; +import type { eventWithTime } from '@sentry-internal/rrweb-types'; +import { record } from '@sentry-internal/rrweb'; import { getRecordConsolePlugin } from '../../src/index'; window.Date.now = () => new Date(Date.UTC(2018, 10, 15, 8)).valueOf(); diff --git a/packages/plugins/rrweb-plugin-console-record/test/index.test.ts b/packages/plugins/rrweb-plugin-console-record/test/index.test.ts index 0938a119ff..4ececb9f8b 100644 --- a/packages/plugins/rrweb-plugin-console-record/test/index.test.ts +++ b/packages/plugins/rrweb-plugin-console-record/test/index.test.ts @@ -3,7 +3,7 @@ import { stringifySnapshots } from '../../../rrweb/test/utils'; import { createServer, ViteDevServer } from 'vite'; import * as puppeteer from 'puppeteer'; import type { Browser, Page } from 'puppeteer'; -import type { eventWithTime } from '@rrweb/types'; +import type { eventWithTime } from '@sentry-internal/rrweb-types'; export async function launchPuppeteer( options?: Parameters<(typeof puppeteer)['launch']>[0], diff --git a/packages/plugins/rrweb-plugin-console-record/tsconfig.json b/packages/plugins/rrweb-plugin-console-record/tsconfig.json index 4de4923989..dbd2e96026 100644 --- a/packages/plugins/rrweb-plugin-console-record/tsconfig.json +++ b/packages/plugins/rrweb-plugin-console-record/tsconfig.json @@ -1,11 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts", "vitest.config.ts", "test"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts", + "vitest.config.ts", + "test" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo", - // TODO: enable me in the future // at time of writing (April 2024) there are 6 errors in this package "strict": false diff --git a/packages/plugins/rrweb-plugin-console-replay/package.json b/packages/plugins/rrweb-plugin-console-replay/package.json index 8bf05cbf88..87c73ab5a1 100644 --- a/packages/plugins/rrweb-plugin-console-replay/package.json +++ b/packages/plugins/rrweb-plugin-console-replay/package.json @@ -27,7 +27,7 @@ "dev": "vite build --watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -44,12 +44,12 @@ "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { "@rrweb/rrweb-plugin-console-record": "^2.0.0-alpha.14", - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-console-replay/tsconfig.json b/packages/plugins/rrweb-plugin-console-replay/tsconfig.json index 195393c9ec..34d5fd76db 100644 --- a/packages/plugins/rrweb-plugin-console-replay/tsconfig.json +++ b/packages/plugins/rrweb-plugin-console-replay/tsconfig.json @@ -1,7 +1,13 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts", "dist", "tsconfig.json"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts", + "dist", + "tsconfig.json" + ], "compilerOptions": { "rootDir": ".", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" diff --git a/packages/plugins/rrweb-plugin-sequential-id-record/package.json b/packages/plugins/rrweb-plugin-sequential-id-record/package.json index 797b7fe96a..9f3c545fc9 100644 --- a/packages/plugins/rrweb-plugin-sequential-id-record/package.json +++ b/packages/plugins/rrweb-plugin-sequential-id-record/package.json @@ -27,7 +27,7 @@ "dev": "vite build --watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -43,12 +43,12 @@ }, "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-sequential-id-record/tsconfig.json b/packages/plugins/rrweb-plugin-sequential-id-record/tsconfig.json index 8ffb27ccca..35189e4952 100644 --- a/packages/plugins/rrweb-plugin-sequential-id-record/tsconfig.json +++ b/packages/plugins/rrweb-plugin-sequential-id-record/tsconfig.json @@ -1,7 +1,11 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" diff --git a/packages/plugins/rrweb-plugin-sequential-id-replay/package.json b/packages/plugins/rrweb-plugin-sequential-id-replay/package.json index ca57b5c87c..c1fb501219 100644 --- a/packages/plugins/rrweb-plugin-sequential-id-replay/package.json +++ b/packages/plugins/rrweb-plugin-sequential-id-replay/package.json @@ -27,7 +27,7 @@ "dev": "vite build --watch", "build": "tsc -noEmit && vite build", "check-types": "tsc -noEmit", - "prepublish": "npm run build" + "prepack": "npm run build" }, "repository": { "type": "git", @@ -44,12 +44,12 @@ "homepage": "https://github.com/rrweb-io/rrweb#readme", "devDependencies": { "@rrweb/rrweb-plugin-sequential-id-record": "^2.0.0-alpha.14", - "rrweb": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14", "typescript": "^4.7.3", "vite": "^5.2.8", "vite-plugin-dts": "^3.8.1" }, "peerDependencies": { - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb": "^2.0.0-alpha.14" } } diff --git a/packages/plugins/rrweb-plugin-sequential-id-replay/tsconfig.json b/packages/plugins/rrweb-plugin-sequential-id-replay/tsconfig.json index 5781b845a0..ec3304d260 100644 --- a/packages/plugins/rrweb-plugin-sequential-id-replay/tsconfig.json +++ b/packages/plugins/rrweb-plugin-sequential-id-replay/tsconfig.json @@ -1,7 +1,13 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src"], - "exclude": ["vite.config.ts", "dist", "tsconfig.json"], + "include": [ + "src" + ], + "exclude": [ + "vite.config.ts", + "dist", + "tsconfig.json" + ], "compilerOptions": { "rootDir": ".", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" diff --git a/packages/record/package.json b/packages/record/package.json index bd81b9cb0a..86a79f6a52 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -14,7 +14,7 @@ "test": "vitest run", "test:watch": "vitest watch", "check-types": "tsc -noEmit", - "prepublish": "npm run build", + "prepack": "npm run build", "lint": "yarn eslint src/**/*.ts" }, "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/@rrweb/record#readme", @@ -55,8 +55,8 @@ "typescript": "^4.7.3" }, "dependencies": { - "@rrweb/types": "^2.0.0-alpha.14", - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb-types": "^2.0.0-alpha.14", + "@sentry-internal/rrweb": "^2.0.0-alpha.14" }, "browserslist": [ "supports es6-class" diff --git a/packages/record/src/index.ts b/packages/record/src/index.ts index c2820aa1d2..d4fd6d3f6b 100644 --- a/packages/record/src/index.ts +++ b/packages/record/src/index.ts @@ -1,3 +1,3 @@ -import { record } from 'rrweb'; +import { record } from '@sentry-internal/rrweb'; export { record }; diff --git a/packages/record/tsconfig.json b/packages/record/tsconfig.json index eb18687a7c..a00695bf23 100644 --- a/packages/record/tsconfig.json +++ b/packages/record/tsconfig.json @@ -1,16 +1,18 @@ { "extends": "../../tsconfig.base.json", - "include": ["src"], + "include": [ + "src" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "references": [ { - "path": "../types" + "path": "../rrweb" }, { - "path": "../rrweb" + "path": "../types" } ] } diff --git a/packages/replay/package.json b/packages/replay/package.json index 205896b757..18e56f0bd8 100644 --- a/packages/replay/package.json +++ b/packages/replay/package.json @@ -1,6 +1,6 @@ { "name": "@rrweb/replay", - "version": "2.0.0-alpha.14", + "version": "2.31.0", "publishConfig": { "access": "public" }, @@ -14,7 +14,7 @@ "test": "vitest run", "test:watch": "vitest watch", "check-types": "tsc -noEmit", - "prepublish": "npm run build", + "prepack": "npm run build", "lint": "yarn eslint src/**/*.ts" }, "homepage": "https://github.com/rrweb-io/rrweb/tree/main/packages/@rrweb/replay#readme", @@ -27,19 +27,19 @@ }, "license": "MIT", "type": "module", - "main": "./dist/replay.cjs", - "module": "./dist/replay.js", - "unpkg": "./dist/replay.umd.cjs", + "main": "./dist/rrweb-replay.cjs", + "module": "./dist/rrweb-replay.js", + "unpkg": "./dist/rrweb-replay.umd.cjs", "typings": "dist/index.d.ts", "exports": { ".": { "import": { "types": "./dist/index.d.ts", - "default": "./dist/replay.js" + "default": "./dist/rrweb-replay.js" }, "require": { "types": "./dist/index.d.cts", - "default": "./dist/replay.cjs" + "default": "./dist/rrweb-replay.cjs" } }, "./dist/style.css": "./dist/style.css" @@ -56,8 +56,8 @@ "typescript": "^4.7.3" }, "dependencies": { - "@rrweb/types": "^2.0.0-alpha.14", - "rrweb": "^2.0.0-alpha.14" + "@sentry-internal/rrweb-types": "^2.31.0", + "@sentry-internal/rrweb": "^2.31.0" }, "browserslist": [ "supports es6-class" diff --git a/packages/replay/src/index.ts b/packages/replay/src/index.ts index 1df4de17e1..bb14fd8892 100644 --- a/packages/replay/src/index.ts +++ b/packages/replay/src/index.ts @@ -3,7 +3,7 @@ import { type playerConfig, type PlayerMachineState, type SpeedMachineState, -} from 'rrweb'; -import 'rrweb/dist/style.css'; +} from '@sentry-internal/rrweb'; +import '@sentry-internal/rrweb/dist/style.css'; export { Replayer, playerConfig, PlayerMachineState, SpeedMachineState }; diff --git a/packages/replay/tsconfig.json b/packages/replay/tsconfig.json index eb18687a7c..a00695bf23 100644 --- a/packages/replay/tsconfig.json +++ b/packages/replay/tsconfig.json @@ -1,16 +1,18 @@ { "extends": "../../tsconfig.base.json", - "include": ["src"], + "include": [ + "src" + ], "compilerOptions": { "rootDir": "src", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "references": [ { - "path": "../types" + "path": "../rrweb" }, { - "path": "../rrweb" + "path": "../types" } ] } diff --git a/packages/rrdom-nodejs/package.json b/packages/rrdom-nodejs/package.json index 89fbb98af1..d1cf20c340 100644 --- a/packages/rrdom-nodejs/package.json +++ b/packages/rrdom-nodejs/package.json @@ -1,5 +1,5 @@ { - "name": "@sentry-internal/rrdom-nodejs", + "name": "rrdom-nodejs", "version": "2.31.0", "scripts": { "dev": "vite build --watch", @@ -7,7 +7,7 @@ "check-types": "tsc -noEmit", "test": "vitest run", "test:watch": "vitest watch", - "prepublish": "npm run build", + "prepack": "yarn run build", "lint": "yarn eslint src/**/*.ts" }, "keywords": [ @@ -56,7 +56,7 @@ "@sentry-internal/rrweb-snapshot": "2.31.0", "cssom": "^0.5.0", "cssstyle": "^2.3.0", - "nwsapi": "^2.2.0" + "nwsapi": "2.2.0" }, "browserslist": [ "supports es6-class" diff --git a/packages/rrdom-nodejs/src/polyfill.ts b/packages/rrdom-nodejs/src/polyfill.ts index 19674611c6..b2b4f26f3f 100644 --- a/packages/rrdom-nodejs/src/polyfill.ts +++ b/packages/rrdom-nodejs/src/polyfill.ts @@ -1,4 +1,4 @@ -import { BaseRRNode } from 'rrdom'; +import { BaseRRNode } from '@sentry-internal/rrdom'; import { RRDocument } from './document-nodejs'; /** diff --git a/packages/rrdom-nodejs/test/polyfill.test.ts b/packages/rrdom-nodejs/test/polyfill.test.ts index 0e7f8cbcda..838479547f 100644 --- a/packages/rrdom-nodejs/test/polyfill.test.ts +++ b/packages/rrdom-nodejs/test/polyfill.test.ts @@ -9,7 +9,7 @@ import { polyfillDocument, } from '../src/polyfill'; import { performance as nativePerformance } from 'perf_hooks'; -import { BaseRRNode } from 'rrdom'; +import { BaseRRNode } from '@sentry-internal/rrdom'; describe('polyfill for nodejs', () => { it('should polyfill performance api', () => { diff --git a/packages/rrdom/package.json b/packages/rrdom/package.json index 33ab7b58a2..8e5528cd60 100644 --- a/packages/rrdom/package.json +++ b/packages/rrdom/package.json @@ -30,13 +30,12 @@ }, "scripts": { "dev": "vite build --watch", - "build": "tsc -noEmit && vite build", + "build": "yarn run check-types && vite build", "build:tarball": "npm pack", - "check-types": "tsc -noEmit", + "check-types": "tsc --noEmit", "test": "vitest run", "test:watch": "vitest", - "typings": "tsc -d --declarationDir typings", - "prepublish": "npm run build", + "prepack": "yarn run build", "lint": "yarn eslint src/**/*.ts" }, "bugs": { diff --git a/packages/rrdom/test/virtual-dom.test.ts b/packages/rrdom/test/virtual-dom.test.ts index be71f9e481..7b9d346c19 100644 --- a/packages/rrdom/test/virtual-dom.test.ts +++ b/packages/rrdom/test/virtual-dom.test.ts @@ -243,7 +243,9 @@ describe('RRDocument for browser environment', () => { let page: puppeteer.Page; beforeAll(async () => { - browser = await puppeteer.launch(); + browser = await puppeteer.launch({ + args: ['--no-sandbox'], + }); code = fs.readFileSync( path.resolve(__dirname, '../dist/rrdom.umd.cjs'), 'utf8', diff --git a/packages/rrvideo/package.json b/packages/rrvideo/package.json index 02f2395d76..558474b99c 100644 --- a/packages/rrvideo/package.json +++ b/packages/rrvideo/package.json @@ -1,5 +1,5 @@ { - "name": "@sentry-internal/rrvideo", + "name": "rrvideo", "version": "2.31.0", "description": "transform rrweb session into video", "main": "build/index.js", @@ -14,10 +14,9 @@ "scripts": { "install": "playwright install", "build": "tsc", - "build:tarball": "npm pack", "test": "jest", "check-types": "tsc -noEmit", - "prepare": "yarn build" + "prepack": "yarn build" }, "author": "yanzhen@smartx.com", "license": "MIT", diff --git a/packages/rrweb-player/.svelte-kit/generated/client/app.js b/packages/rrweb-player/.svelte-kit/generated/client/app.js index 3ef9588de4..14fec13d09 100644 --- a/packages/rrweb-player/.svelte-kit/generated/client/app.js +++ b/packages/rrweb-player/.svelte-kit/generated/client/app.js @@ -13,8 +13,13 @@ export const dictionary = { export const hooks = { handleError: (({ error }) => { console.error(error) }), - - reroute: (() => {}) + + reroute: (() => {}), + transport: {} }; +export const decoders = Object.fromEntries(Object.entries(hooks.transport).map(([k, v]) => [k, v.decode])); + +export const decode = (type, value) => decoders[type](value); + export { default as root } from '../root.svelte'; \ No newline at end of file diff --git a/packages/rrweb-player/.svelte-kit/generated/client/nodes/0.js b/packages/rrweb-player/.svelte-kit/generated/client/nodes/0.js index be42925a92..dd6c86a8ab 100644 --- a/packages/rrweb-player/.svelte-kit/generated/client/nodes/0.js +++ b/packages/rrweb-player/.svelte-kit/generated/client/nodes/0.js @@ -1 +1 @@ -export { default as component } from "../../../../../../node_modules/@sveltejs/kit/src/runtime/components/layout.svelte"; \ No newline at end of file +export { default as component } from "../../../../../../node_modules/@sveltejs/kit/src/runtime/components/svelte-4/layout.svelte"; \ No newline at end of file diff --git a/packages/rrweb-player/.svelte-kit/generated/client/nodes/1.js b/packages/rrweb-player/.svelte-kit/generated/client/nodes/1.js index d5b3e24a1e..d6171d8e6d 100644 --- a/packages/rrweb-player/.svelte-kit/generated/client/nodes/1.js +++ b/packages/rrweb-player/.svelte-kit/generated/client/nodes/1.js @@ -1 +1 @@ -export { default as component } from "../../../../../../node_modules/@sveltejs/kit/src/runtime/components/error.svelte"; \ No newline at end of file +export { default as component } from "../../../../../../node_modules/@sveltejs/kit/src/runtime/components/svelte-4/error.svelte"; \ No newline at end of file diff --git a/packages/rrweb-player/.svelte-kit/tsconfig.json b/packages/rrweb-player/.svelte-kit/tsconfig.json index 548368769b..5580f6b98f 100644 --- a/packages/rrweb-player/.svelte-kit/tsconfig.json +++ b/packages/rrweb-player/.svelte-kit/tsconfig.json @@ -33,7 +33,10 @@ "exclude": [ "../node_modules/**", "../src/service-worker.js", + "../src/service-worker/**/*.js", "../src/service-worker.ts", - "../src/service-worker.d.ts" + "../src/service-worker/**/*.ts", + "../src/service-worker.d.ts", + "../src/service-worker/**/*.d.ts" ] } \ No newline at end of file diff --git a/packages/rrweb-player/package.json b/packages/rrweb-player/package.json index 42588161fe..cba1a99adf 100644 --- a/packages/rrweb-player/package.json +++ b/packages/rrweb-player/package.json @@ -19,17 +19,17 @@ "vite": "^5.2.8" }, "dependencies": { - "@tsconfig/svelte": "^1.0.0", "@sentry-internal/rrweb": "2.31.0", - "@sentry-internal/rrweb-packer": "^2.31.0" + "@sentry-internal/rrweb-packer": "^2.31.0", + "@tsconfig/svelte": "^1.0.0" }, "scripts": { "dev": "vite build --watch", "build": "vite build", - "prepublishOnly": "yarn build", + "build:tarball": "npm pack", "start": "vite", "check-types": "svelte-check --tsconfig ./tsconfig.json", - "prepublish": "yarn build", + "prepack": "yarn run build", "lint": "yarn eslint src/**/*.ts" }, "description": "rrweb's replayer UI", diff --git a/packages/rrweb-player/src/Controller.svelte b/packages/rrweb-player/src/Controller.svelte index bbacb1f31f..4c4b3680c9 100644 --- a/packages/rrweb-player/src/Controller.svelte +++ b/packages/rrweb-player/src/Controller.svelte @@ -5,7 +5,7 @@ Replayer, PlayerMachineState, SpeedMachineState, - } from '@sentry-internal/rrweb-replay'; + } from '@sentry-internal/rrweb'; import { onMount, onDestroy, @@ -336,125 +336,6 @@ }); -{#if showController} -