From 3b5b93ec65a2d60a4d61f0e983d4a03e22c2b099 Mon Sep 17 00:00:00 2001 From: "egg-sourcegraph-testing[bot]" <278724144+egg-sourcegraph-testing[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 12:43:07 +0000 Subject: [PATCH] =?UTF-8?q?security:=20upgrade=20rxjs=20v6.x=20=E2=86=92?= =?UTF-8?q?=207.8.2=20and=20migrate=20breaking=20API=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sourcegraph Egg --- package.json | 2 +- src/lsp.ts | 4 +++- src/sourcegraph-python.ts | 12 ++++++++++-- yarn.lock | 12 ++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 67e11fe..5dd385a 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "@types/ws": "^6.0.1", "concurrently": "^4.1.0", "path-browserify": "^1.0.0", - "rxjs": "^6.3.3", + "rxjs": "7.8.2", "tagged-template-noop": "^2.1.0", "vscode-jsonrpc": "^4.0.0", "vscode-languageserver-protocol": "^3.13.0", diff --git a/src/lsp.ts b/src/lsp.ts index 651c0da..16520e5 100644 --- a/src/lsp.ts +++ b/src/lsp.ts @@ -1,12 +1,14 @@ // tslint:disable:rxjs-no-wholesale import { BehaviorSubject, + bufferCount, from, + map, Observable, + startWith, Subscribable, Subscription, } from 'rxjs' -import { bufferCount, map, startWith } from 'rxjs/operators' import * as sourcegraph from 'sourcegraph' import { Unsubscribable } from 'sourcegraph' import * as rpc from 'vscode-jsonrpc' diff --git a/src/sourcegraph-python.ts b/src/sourcegraph-python.ts index 1948a09..6eb5ea4 100644 --- a/src/sourcegraph-python.ts +++ b/src/sourcegraph-python.ts @@ -1,7 +1,15 @@ import { activateBasicCodeIntel } from '@sourcegraph/basic-code-intel' // tslint:disable-next-line:rxjs-no-wholesale -import { combineLatest, concat, from, Observable, of } from 'rxjs' -import { map, startWith, tap } from 'rxjs/operators' +import { + combineLatest, + concat, + from, + map, + Observable, + of, + startWith, + tap, +} from 'rxjs' import * as sourcegraph from 'sourcegraph' import { Position, ReferenceContext, TextDocument } from 'sourcegraph' import * as rpc from 'vscode-jsonrpc' diff --git a/yarn.lock b/yarn.lock index dd2b7b7..2944ec0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4955,6 +4955,13 @@ rxjs-tslint-rules@^4.2.0: tslib "^1.8.0" tsutils "^3.0.0" +rxjs@7.8.2: + version "7.8.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b" + integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA== + dependencies: + tslib "^2.1.0" + rxjs@^6.3.3: version "6.3.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" @@ -5570,6 +5577,11 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== +tslib@^2.1.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== + tslint-config-prettier@^1.6.0: version "1.15.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.15.0.tgz#76b9714399004ab6831fdcf76d89b73691c812cf"