From 579d7614338664f26a64d731e117021c927b41ae Mon Sep 17 00:00:00 2001 From: dali <dali@takima.fr> Date: Fri, 8 Jul 2022 17:10:31 +0200 Subject: [PATCH] fix: install gitlens only if reviewing --- deadlock-plugins/deadlock-extension/package.json | 3 +-- .../src/core/mission/missionDevContainer.ts | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json index 2d85cc66..acb46029 100644 --- a/deadlock-plugins/deadlock-extension/package.json +++ b/deadlock-plugins/deadlock-extension/package.json @@ -133,7 +133,6 @@ "webpack-dev-server": "^4.9.3" }, "extensionPack": [ - "ms-vscode-remote.remote-containers", - "eamodio.gitlens" + "ms-vscode-remote.remote-containers" ] } diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts index edfbe815..921fd10d 100644 --- a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts +++ b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts @@ -127,6 +127,11 @@ export class MissionDevContainer { ) { await this.setupMounts(); + const extensions = [this.extentionPath]; + if (this.revieweeId) { + extensions.push('eamodio.gitlens'); + } + return writeFile( `${this.dirs.devcontainer}/devcontainer.json`, (() => { @@ -136,7 +141,7 @@ export class MissionDevContainer { containerEnv: { WORKDIR: `${remoteMissionDir}`, }, - extensions: [this.extentionPath], + extensions, remoteUser: 'deadlock', mounts: this.mounts, userEnvProbe: 'interactiveShell', -- GitLab