From 1ea6bb6205681737520a3d28822eba1bf9be1f32 Mon Sep 17 00:00:00 2001 From: Quinn Slack Date: Sun, 28 Oct 2018 19:42:40 -0700 Subject: [PATCH] feat: pass sourcegraphURL and clientApplication to extensions See https://github.com/sourcegraph/sourcegraph-extension-api/pull/111. --- package.json | 2 +- src/extension/scripts/background.tsx | 8 ++++++-- yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 3de0a404..0e758762 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "reactstrap": "^5.0.0-beta.2", "rxjs": "^6.3.2", "socket.io-client": "^2.1.1", - "sourcegraph": "^18.3.0", + "sourcegraph": "^18.4.0", "string-score": "^1.0.1", "textarea-caret": "^3.1.0", "ts-key-enum": "^2.0.0", diff --git a/src/extension/scripts/background.tsx b/src/extension/scripts/background.tsx index dcf09391..c8eb2c8c 100644 --- a/src/extension/scripts/background.tsx +++ b/src/extension/scripts/background.tsx @@ -16,7 +16,7 @@ import * as tabs from '../../browser/tabs' import initializeCli from '../../libs/cli' import { resolveClientConfiguration } from '../../shared/backend/server' import { ExtensionConnectionInfo, onFirstMessage } from '../../shared/messaging' -import { DEFAULT_SOURCEGRAPH_URL, setSourcegraphUrl } from '../../shared/util/context' +import { DEFAULT_SOURCEGRAPH_URL, setSourcegraphUrl, sourcegraphUrl } from '../../shared/util/context' import { assertEnv } from '../envAssertion' assertEnv('BACKGROUND') @@ -391,7 +391,11 @@ function spawnWebWorkerFromURL(url: string): Promise { const blobURL = window.URL.createObjectURL(response.response) try { const worker = new ExtensionHostWorker() - const initData: InitData = { bundleURL: blobURL } + const initData: InitData = { + bundleURL: blobURL, + sourcegraphURL: sourcegraphUrl, + clientApplication: 'other', + } worker.postMessage(initData) return worker } catch (err) { diff --git a/yarn.lock b/yarn.lock index 144a7e77..90c334f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14149,10 +14149,10 @@ sourcegraph@^18.0.0: minimatch "^3.0.4" rxjs "^6.3.2" -sourcegraph@^18.3.0: - version "18.3.0" - resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-18.3.0.tgz#d624b042aabf5aa5c90cefad59cc05f697ae448c" - integrity sha512-jTbfpcNwfSU63rU6RcpEg8NYGdqR3UyF8SlEnxe6Wg79lUa3Mocq3djTYgnf8SGVovdcHXGZQYWaLGeALgvsxw== +sourcegraph@^18.4.0: + version "18.4.0" + resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-18.4.0.tgz#53b8d181c9a45075c5f6e870a3d29d7a239ca39d" + integrity sha512-l7sAmHE2I4UaMqZ2SC+YjJ2kqGT4ZdCr29lBbH3KaNANGl+hvI3qpe4UAhBGkjUUANWcBeeL9cDHRvAuf4Ovmg== dependencies: minimatch "^3.0.4" rxjs "^6.3.2"