From 2133e3cd0f792ea7e0524315b022f60d227ac5b1 Mon Sep 17 00:00:00 2001 From: Mark-Fenng Date: Mon, 7 Nov 2022 12:13:51 +1100 Subject: [PATCH 1/2] fix CI error --- packages/rrweb-player/src/utils.ts | 2 +- packages/rrweb-player/typings/index.d.ts | 3 ++- packages/rrweb/tsconfig.json | 16 +++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) mode change 100644 => 100755 packages/rrweb-player/typings/index.d.ts diff --git a/packages/rrweb-player/src/utils.ts b/packages/rrweb-player/src/utils.ts index 796d18106c..2a3f29219c 100644 --- a/packages/rrweb-player/src/utils.ts +++ b/packages/rrweb-player/src/utils.ts @@ -16,7 +16,7 @@ declare global { } import { EventType, IncrementalSource } from 'rrweb'; -import type { eventWithTime } from 'rrweb/typings/types'; +import type { eventWithTime } from '@rrweb/types'; export function inlineCss(cssObj: Record): string { let style = ''; diff --git a/packages/rrweb-player/typings/index.d.ts b/packages/rrweb-player/typings/index.d.ts old mode 100644 new mode 100755 index b6d980b08d..c3c3b80277 --- a/packages/rrweb-player/typings/index.d.ts +++ b/packages/rrweb-player/typings/index.d.ts @@ -1,4 +1,5 @@ -import { eventWithTime, playerConfig } from 'rrweb/typings/types'; +import { playerConfig } from 'rrweb/typings/types'; +import type { eventWithTime } from '@rrweb/types'; import { Replayer, mirror } from 'rrweb'; import { SvelteComponent } from 'svelte'; diff --git a/packages/rrweb/tsconfig.json b/packages/rrweb/tsconfig.json index 268d008f66..fb1b407ad6 100644 --- a/packages/rrweb/tsconfig.json +++ b/packages/rrweb/tsconfig.json @@ -9,7 +9,10 @@ "preserveConstEnums": true, "rootDir": "src", "outDir": "build", - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "downlevelIteration": true, "importsNotUsedAsValues": "error", "strictBindCallApply": true, @@ -17,16 +20,19 @@ }, "references": [ { - "path": "../rrdom" + "path": "../types" }, { - "path": "../rrweb-snapshot" + "path": "../rrdom" }, { - "path": "../types" + "path": "../rrweb-snapshot" } ], - "exclude": ["test", "scripts"], + "exclude": [ + "test", + "scripts" + ], "include": [ "src", "node_modules/@types/css-font-loading-module/index.d.ts", From e9e740eb0de733747fed6813453e3bb5e99a8325 Mon Sep 17 00:00:00 2001 From: Mark-Fenng Date: Mon, 7 Nov 2022 12:28:04 +1100 Subject: [PATCH 2/2] change the CI triggering event to pull_request --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 6f98b26d8a..4a0355b07a 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -1,6 +1,6 @@ name: Tests -on: [push, pull_request_target] +on: [push, pull_request] concurrency: ${{ github.workflow }}-${{ github.ref }}