Skip to content
This repository was archived by the owner on Jan 22, 2019. It is now read-only.

Commit 7eef3c8

Browse files
committed
feat: pass sourcegraphURL and clientApplication to extensions
See sourcegraph/sourcegraph-extension-api#111.
1 parent 36da4ea commit 7eef3c8

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"reactstrap": "^5.0.0-beta.2",
139139
"rxjs": "^6.3.2",
140140
"socket.io-client": "^2.1.1",
141-
"sourcegraph": "^18.3.0",
141+
"sourcegraph": "^18.4.0",
142142
"string-score": "^1.0.1",
143143
"textarea-caret": "^3.1.0",
144144
"ts-key-enum": "^2.0.0",

src/extension/scripts/background.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as tabs from '../../browser/tabs'
1616
import initializeCli from '../../libs/cli'
1717
import { resolveClientConfiguration } from '../../shared/backend/server'
1818
import { ExtensionConnectionInfo, onFirstMessage } from '../../shared/messaging'
19-
import { DEFAULT_SOURCEGRAPH_URL, setSourcegraphUrl } from '../../shared/util/context'
19+
import { DEFAULT_SOURCEGRAPH_URL, setSourcegraphUrl, sourcegraphUrl } from '../../shared/util/context'
2020
import { assertEnv } from '../envAssertion'
2121

2222
assertEnv('BACKGROUND')
@@ -391,7 +391,11 @@ function spawnWebWorkerFromURL(url: string): Promise<Worker> {
391391
const blobURL = window.URL.createObjectURL(response.response)
392392
try {
393393
const worker = new ExtensionHostWorker()
394-
const initData: InitData = { bundleURL: blobURL }
394+
const initData: InitData = {
395+
bundleURL: blobURL,
396+
sourcegraphURL: sourcegraphUrl,
397+
clientApplication: 'other',
398+
}
395399
worker.postMessage(initData)
396400
return worker
397401
} catch (err) {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14149,10 +14149,10 @@ sourcegraph@^18.0.0:
1414914149
minimatch "^3.0.4"
1415014150
rxjs "^6.3.2"
1415114151

14152-
sourcegraph@^18.3.0:
14153-
version "18.3.0"
14154-
resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-18.3.0.tgz#d624b042aabf5aa5c90cefad59cc05f697ae448c"
14155-
integrity sha512-jTbfpcNwfSU63rU6RcpEg8NYGdqR3UyF8SlEnxe6Wg79lUa3Mocq3djTYgnf8SGVovdcHXGZQYWaLGeALgvsxw==
14152+
sourcegraph@^18.4.0:
14153+
version "18.4.0"
14154+
resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-18.4.0.tgz#53b8d181c9a45075c5f6e870a3d29d7a239ca39d"
14155+
integrity sha512-l7sAmHE2I4UaMqZ2SC+YjJ2kqGT4ZdCr29lBbH3KaNANGl+hvI3qpe4UAhBGkjUUANWcBeeL9cDHRvAuf4Ovmg==
1415614156
dependencies:
1415714157
minimatch "^3.0.4"
1415814158
rxjs "^6.3.2"

0 commit comments

Comments
 (0)