@theia/dev-container 1.71.0-next.72 → 1.71.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/README.md +1 -0
  2. package/lib/electron-browser/container-connection-contribution.d.ts +8 -0
  3. package/lib/electron-browser/container-connection-contribution.d.ts.map +1 -1
  4. package/lib/electron-browser/container-connection-contribution.js +158 -6
  5. package/lib/electron-browser/container-connection-contribution.js.map +1 -1
  6. package/lib/electron-browser/dev-container-frontend-module.d.ts.map +1 -1
  7. package/lib/electron-browser/dev-container-frontend-module.js +3 -0
  8. package/lib/electron-browser/dev-container-frontend-module.js.map +1 -1
  9. package/lib/electron-browser/dev-container-suggestion-contribution.d.ts +16 -0
  10. package/lib/electron-browser/dev-container-suggestion-contribution.d.ts.map +1 -0
  11. package/lib/electron-browser/dev-container-suggestion-contribution.js +96 -0
  12. package/lib/electron-browser/dev-container-suggestion-contribution.js.map +1 -0
  13. package/lib/electron-common/remote-container-connection-provider.d.ts +9 -0
  14. package/lib/electron-common/remote-container-connection-provider.d.ts.map +1 -1
  15. package/lib/electron-node/dev-container-file-service.d.ts.map +1 -1
  16. package/lib/electron-node/dev-container-file-service.js +4 -6
  17. package/lib/electron-node/dev-container-file-service.js.map +1 -1
  18. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.d.ts.map +1 -1
  19. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.js +7 -1
  20. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.js.map +1 -1
  21. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.d.ts +2 -0
  22. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.d.ts.map +1 -0
  23. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.js +421 -0
  24. package/lib/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.js.map +1 -0
  25. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts +28 -1
  26. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map +1 -1
  27. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js +304 -4
  28. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map +1 -1
  29. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts.map +1 -1
  30. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js +0 -1
  31. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js.map +1 -1
  32. package/lib/electron-node/devcontainer-file.d.ts +8 -1
  33. package/lib/electron-node/devcontainer-file.d.ts.map +1 -1
  34. package/lib/electron-node/devcontainer-file.js +14 -0
  35. package/lib/electron-node/devcontainer-file.js.map +1 -1
  36. package/lib/electron-node/remote-container-connection-provider.d.ts +6 -1
  37. package/lib/electron-node/remote-container-connection-provider.d.ts.map +1 -1
  38. package/lib/electron-node/remote-container-connection-provider.js +112 -4
  39. package/lib/electron-node/remote-container-connection-provider.js.map +1 -1
  40. package/lib/electron-node/remote-container-connection-provider.spec.d.ts +2 -0
  41. package/lib/electron-node/remote-container-connection-provider.spec.d.ts.map +1 -0
  42. package/lib/electron-node/remote-container-connection-provider.spec.js +131 -0
  43. package/lib/electron-node/remote-container-connection-provider.spec.js.map +1 -0
  44. package/package.json +7 -7
  45. package/src/electron-browser/container-connection-contribution.ts +173 -7
  46. package/src/electron-browser/dev-container-frontend-module.ts +4 -0
  47. package/src/electron-browser/dev-container-suggestion-contribution.ts +93 -0
  48. package/src/electron-common/remote-container-connection-provider.ts +10 -0
  49. package/src/electron-node/dev-container-file-service.ts +4 -6
  50. package/src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.ts +519 -0
  51. package/src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts +7 -1
  52. package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts +323 -5
  53. package/src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts +0 -1
  54. package/src/electron-node/devcontainer-file.ts +13 -1
  55. package/src/electron-node/remote-container-connection-provider.spec.ts +152 -0
  56. package/src/electron-node/remote-container-connection-provider.ts +121 -5
package/README.md CHANGED
@@ -26,6 +26,7 @@ Currently not all of the configuration file properties are implemented. The foll
26
26
  - forwardPorts
27
27
  - mounts
28
28
  - containerEnv
29
+ - remoteEnv
29
30
  - remoteUser
30
31
  - shutdownAction
31
32
  - postCreateCommand
@@ -9,6 +9,8 @@ import { RemotePreferences } from '@theia/remote/lib/electron-common/remote-pref
9
9
  import { LocalStorageService } from '@theia/core/lib/browser';
10
10
  export declare namespace RemoteContainerCommands {
11
11
  const REOPEN_IN_CONTAINER: Command;
12
+ const ATTACH_TO_CONTAINER: Command;
13
+ const REBUILD_CONTAINER: Command;
12
14
  }
13
15
  export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution implements WorkspaceOpenHandlerContribution {
14
16
  protected readonly connectionProvider: RemoteContainerConnectionProvider;
@@ -20,11 +22,17 @@ export declare class ContainerConnectionContribution extends AbstractRemoteRegis
20
22
  protected readonly workspaceServer: WorkspaceServer;
21
23
  protected readonly quickInputService: QuickInputService;
22
24
  protected readonly containerOutputProvider: ContainerOutputProvider;
25
+ protected hasDevContainerFiles: boolean;
26
+ protected init(): void;
27
+ protected checkForDevContainerFiles(): Promise<void>;
23
28
  registerRemoteCommands(registry: RemoteRegistry): void;
29
+ protected isRemoteSession(): boolean;
24
30
  canHandle(uri: URI): MaybePromise<boolean>;
25
31
  openWorkspace(uri: URI, options?: WorkspaceInput | undefined): Promise<void>;
26
32
  getWorkspaceLabel(uri: URI): Promise<string | undefined>;
27
33
  openInContainer(): Promise<void>;
34
+ attachToContainer(): Promise<void>;
35
+ rebuildContainer(): Promise<void>;
28
36
  doOpenInContainer(devcontainerFile: DevContainerFile, workspacePath?: string): Promise<void>;
29
37
  getOrSelectDevcontainerFile(): Promise<DevContainerFile | undefined>;
30
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAO,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIQ,CAAC;CAC5C;AAGD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMtD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAIpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAyB7E"}
1
+ {"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAO,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIQ,CAAC;IAElC,MAAM,mBAAmB,SAIO,CAAC;IAEjC,MAAM,iBAAiB,SAIU,CAAC;CAC5C;AAWD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,SAAS,CAAC,oBAAoB,UAAS;IAGvC,SAAS,CAAC,IAAI,IAAI,IAAI;cAWN,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1D,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IActD,SAAS,CAAC,eAAe,IAAI,OAAO;IAIpC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAgBpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BlC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDjC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC5F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAyB7E"}
@@ -35,26 +35,93 @@ var RemoteContainerCommands;
35
35
  label: 'Reopen in Container',
36
36
  category: 'Dev Container'
37
37
  }, 'theia/remote/dev-container/connect');
38
+ RemoteContainerCommands.ATTACH_TO_CONTAINER = core_1.Command.toLocalizedCommand({
39
+ id: 'dev-container:attach-to-container',
40
+ label: 'Attach to Running Container',
41
+ category: 'Dev Container'
42
+ }, 'theia/remote/dev-container/attach');
43
+ RemoteContainerCommands.REBUILD_CONTAINER = core_1.Command.toLocalizedCommand({
44
+ id: 'dev-container:rebuild-container',
45
+ label: 'Rebuild Container',
46
+ category: 'Dev Container'
47
+ }, 'theia/remote/dev-container/rebuild');
38
48
  })(RemoteContainerCommands || (exports.RemoteContainerCommands = RemoteContainerCommands = {}));
39
49
  const LAST_USED_CONTAINER = 'lastUsedContainer';
50
+ const ACTIVE_DEV_CONTAINER_CONTEXT = 'activeDevContainerContext';
40
51
  let ContainerConnectionContribution = class ContainerConnectionContribution extends remote_registry_contribution_1.AbstractRemoteRegistryContribution {
52
+ constructor() {
53
+ super(...arguments);
54
+ this.hasDevContainerFiles = false;
55
+ }
56
+ init() {
57
+ // Mark that we're in a remote session. sessionStorage survives page
58
+ // reloads (disconnect) but is cleared on window close (restart).
59
+ // This lets canHandle() distinguish disconnect from restart.
60
+ if (this.isRemoteSession()) {
61
+ sessionStorage.setItem('devcontainer:wasRemote', 'true');
62
+ }
63
+ this.workspaceService.ready.then(() => this.checkForDevContainerFiles());
64
+ this.workspaceService.onWorkspaceChanged(() => this.checkForDevContainerFiles());
65
+ }
66
+ async checkForDevContainerFiles() {
67
+ if (this.isRemoteSession()) {
68
+ this.hasDevContainerFiles = true;
69
+ return;
70
+ }
71
+ const workspace = this.workspaceService.workspace;
72
+ if (!workspace) {
73
+ this.hasDevContainerFiles = false;
74
+ return;
75
+ }
76
+ try {
77
+ const files = await this.connectionProvider.getDevContainerFiles(workspace.resource.path.toString());
78
+ this.hasDevContainerFiles = files.length > 0;
79
+ }
80
+ catch (error) {
81
+ // Failed to check for devcontainer files, assume none exist
82
+ this.hasDevContainerFiles = false;
83
+ }
84
+ }
41
85
  registerRemoteCommands(registry) {
42
86
  registry.registerCommand(RemoteContainerCommands.REOPEN_IN_CONTAINER, {
43
- execute: () => this.openInContainer()
87
+ execute: () => this.openInContainer(),
88
+ isVisible: () => !this.isRemoteSession() && this.hasDevContainerFiles
89
+ });
90
+ registry.registerCommand(RemoteContainerCommands.ATTACH_TO_CONTAINER, {
91
+ execute: () => this.attachToContainer()
92
+ });
93
+ registry.registerCommand(RemoteContainerCommands.REBUILD_CONTAINER, {
94
+ execute: () => this.rebuildContainer(),
95
+ isVisible: () => this.isRemoteSession()
44
96
  });
45
97
  }
98
+ isRemoteSession() {
99
+ return new URLSearchParams(window.location.search).has('localPort');
100
+ }
46
101
  canHandle(uri) {
47
- return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
102
+ if (uri.scheme !== dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME) {
103
+ return false;
104
+ }
105
+ // After disconnect (reload), sessionStorage still has the flag from
106
+ // the remote session's init. Skip auto-reopen so the user gets their
107
+ // local workspace. After restart (close+open), sessionStorage is
108
+ // cleared, so auto-reopen works.
109
+ const wasRemote = sessionStorage.getItem('devcontainer:wasRemote');
110
+ if (wasRemote) {
111
+ sessionStorage.removeItem('devcontainer:wasRemote');
112
+ return false;
113
+ }
114
+ return true;
48
115
  }
49
116
  async openWorkspace(uri, options) {
50
117
  const filePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
51
118
  if (!filePath) {
52
- throw new Error('No devcontainer file specified for workspace');
119
+ throw new Error(core_1.nls.localize('theia/dev-container/noDevcontainerFileSpecified', 'No devcontainer file specified for workspace'));
53
120
  }
54
121
  const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
55
122
  const devcontainerFile = devcontainerFiles.find(file => file.path === filePath);
56
123
  if (!devcontainerFile) {
57
- throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
124
+ throw new Error(core_1.nls.localize('theia/dev-container/devcontainerFileNotFound', 'Devcontainer file at {0} not found in workspace', filePath));
58
125
  }
59
126
  return this.doOpenInContainer(devcontainerFile, uri.path.toString());
60
127
  }
@@ -75,21 +142,100 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
75
142
  }
76
143
  this.doOpenInContainer(devcontainerFile);
77
144
  }
145
+ async attachToContainer() {
146
+ const containers = await this.connectionProvider.listRunningContainers();
147
+ if (containers.length === 0) {
148
+ this.messageService.info(core_1.nls.localize('theia/remote/dev-container/noRunningContainers', 'No running containers found.'));
149
+ return;
150
+ }
151
+ const selected = await this.quickInputService.pick(containers.map(container => ({
152
+ type: 'item',
153
+ label: container.name || container.id.substring(0, 12),
154
+ description: container.image,
155
+ detail: container.status,
156
+ container
157
+ })), {
158
+ title: core_1.nls.localize('theia/remote/dev-container/selectContainer', 'Select a running container to attach to')
159
+ });
160
+ if (!selected) {
161
+ return;
162
+ }
163
+ this.containerOutputProvider.openChannel();
164
+ const connectionResult = await this.connectionProvider.attachToContainer(selected.container.id);
165
+ this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
166
+ }
167
+ async rebuildContainer() {
168
+ this.containerOutputProvider.openChannel();
169
+ const progress = await this.messageService.showProgress({
170
+ text: core_1.nls.localize('theia/remote/dev-container/rebuilding', 'Rebuilding dev container')
171
+ });
172
+ try {
173
+ // When inside a remote container, read the stored context instead of
174
+ // scanning the filesystem (the RPC goes to the local backend which
175
+ // doesn't have the container's workspace path).
176
+ const ctx = await this.storageService.getData(ACTIVE_DEV_CONTAINER_CONTEXT);
177
+ if (ctx) {
178
+ progress.report({ message: core_1.nls.localize('theia/dev-container/removingOldContainer', 'Removing old container...') });
179
+ try {
180
+ await this.connectionProvider.removeContainer(ctx.containerId);
181
+ }
182
+ catch (error) {
183
+ // Container may already be gone, ignore error
184
+ }
185
+ const lastContainerKey = `${LAST_USED_CONTAINER}:${ctx.devcontainerFilePath}`;
186
+ await this.storageService.setData(lastContainerKey, undefined);
187
+ progress.cancel();
188
+ this.doOpenInContainer({ path: ctx.devcontainerFilePath, name: ctx.devcontainerFileName }, ctx.hostWorkspacePath);
189
+ return;
190
+ }
191
+ // Fallback: local workspace — scan for devcontainer files
192
+ const devcontainerFile = await this.getOrSelectDevcontainerFile();
193
+ if (!devcontainerFile) {
194
+ return;
195
+ }
196
+ const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
197
+ const lastContainerInfo = await this.storageService.getData(lastContainerInfoKey);
198
+ if (lastContainerInfo) {
199
+ progress.report({ message: core_1.nls.localize('theia/dev-container/removingOldContainer', 'Removing old container...') });
200
+ try {
201
+ await this.connectionProvider.removeContainer(lastContainerInfo.id);
202
+ }
203
+ catch (error) {
204
+ // Container may already be gone, ignore error
205
+ }
206
+ await this.storageService.setData(lastContainerInfoKey, undefined);
207
+ }
208
+ progress.cancel();
209
+ this.doOpenInContainer(devcontainerFile);
210
+ }
211
+ catch (e) {
212
+ progress.cancel();
213
+ this.messageService.error(core_1.nls.localize('theia/dev-container/failedToRebuild', 'Failed to rebuild container: {0}', e.message));
214
+ }
215
+ }
78
216
  async doOpenInContainer(devcontainerFile, workspacePath) {
79
217
  const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
80
218
  const lastContainerInfo = await this.storageService.getData(lastContainerInfoKey);
81
219
  this.containerOutputProvider.openChannel();
220
+ const hostWorkspacePath = workspacePath ?? this.workspaceService.workspace?.resource.path.toString();
82
221
  const connectionResult = await this.connectionProvider.connectToContainer({
83
222
  nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
84
223
  lastContainerInfo,
85
224
  devcontainerFile: devcontainerFile.path,
86
- workspacePath: workspacePath
225
+ workspacePath: hostWorkspacePath
87
226
  });
88
227
  this.storageService.setData(lastContainerInfoKey, {
89
228
  id: connectionResult.containerId,
90
229
  lastUsed: Date.now()
91
230
  });
92
- this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${workspacePath ?? this.workspaceService.workspace?.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
231
+ // Store full context so rebuild works from inside the container
232
+ this.storageService.setData(ACTIVE_DEV_CONTAINER_CONTEXT, {
233
+ devcontainerFilePath: devcontainerFile.path,
234
+ devcontainerFileName: devcontainerFile.name,
235
+ hostWorkspacePath: hostWorkspacePath ?? '',
236
+ containerId: connectionResult.containerId,
237
+ });
238
+ this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${hostWorkspacePath}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
93
239
  this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
94
240
  }
95
241
  async getOrSelectDevcontainerFile() {
@@ -153,6 +299,12 @@ tslib_1.__decorate([
153
299
  (0, inversify_1.inject)(container_output_provider_1.ContainerOutputProvider),
154
300
  tslib_1.__metadata("design:type", container_output_provider_1.ContainerOutputProvider)
155
301
  ], ContainerConnectionContribution.prototype, "containerOutputProvider", void 0);
302
+ tslib_1.__decorate([
303
+ (0, inversify_1.postConstruct)(),
304
+ tslib_1.__metadata("design:type", Function),
305
+ tslib_1.__metadata("design:paramtypes", []),
306
+ tslib_1.__metadata("design:returntype", void 0)
307
+ ], ContainerConnectionContribution.prototype, "init", null);
156
308
  exports.ContainerConnectionContribution = ContainerConnectionContribution = tslib_1.__decorate([
157
309
  (0, inversify_1.injectable)()
158
310
  ], ContainerConnectionContribution);
@@ -1 +1 @@
1
- {"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAW/D,wBAgBG"}
1
+ {"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAY/D,wBAmBG"}
@@ -25,6 +25,7 @@ const container_info_contribution_1 = require("./container-info-contribution");
25
25
  const browser_1 = require("@theia/core/lib/browser");
26
26
  const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
27
27
  const window_title_service_1 = require("@theia/core/lib/browser/window/window-title-service");
28
+ const dev_container_suggestion_contribution_1 = require("./dev-container-suggestion-contribution");
28
29
  exports.default = new inversify_1.ContainerModule(bind => {
29
30
  bind(container_connection_contribution_1.ContainerConnectionContribution).toSelf().inSingletonScope();
30
31
  bind(remote_registry_contribution_1.RemoteRegistryContribution).toService(container_connection_contribution_1.ContainerConnectionContribution);
@@ -38,5 +39,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
38
39
  bind(browser_1.FrontendApplicationContribution).toService(container_info_contribution_1.ContainerInfoContribution);
39
40
  bind(window_title_service_1.WindowTitleContribution).toService(container_info_contribution_1.ContainerInfoContribution);
40
41
  bind(browser_1.LabelProviderContribution).toService(container_info_contribution_1.ContainerInfoContribution);
42
+ bind(dev_container_suggestion_contribution_1.DevContainerSuggestionContribution).toSelf().inSingletonScope();
43
+ bind(browser_1.FrontendApplicationContribution).toService(dev_container_suggestion_contribution_1.DevContainerSuggestionContribution);
41
44
  });
42
45
  //# sourceMappingURL=dev-container-frontend-module.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":";;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,qDAAqG;AACrG,sFAAkG;AAClG,8FAA8F;AAE9F,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAC5E,IAAI,CAAC,oDAAgC,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAElF,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,wEAAiC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;QAClE,OAAO,uDAAyB,CAAC,gBAAgB,CAAoC,GAAG,CAAC,SAAS,EAAE,4EAAqC,EAAE,cAAc,CAAC,CAAC;IAC/J,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAC3E,IAAI,CAAC,8CAAuB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IACnE,IAAI,CAAC,mCAAyB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":";;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,qDAAqG;AACrG,sFAAkG;AAClG,8FAA8F;AAC9F,mGAA6F;AAE7F,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAC5E,IAAI,CAAC,oDAAgC,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAElF,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,wEAAiC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;QAClE,OAAO,uDAAyB,CAAC,gBAAgB,CAAoC,GAAG,CAAC,SAAS,EAAE,4EAAqC,EAAE,cAAc,CAAC,CAAC;IAC/J,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAC3E,IAAI,CAAC,8CAAuB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IACnE,IAAI,CAAC,mCAAyB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAErE,IAAI,CAAC,0EAAkC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrE,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,0EAAkC,CAAC,CAAC;AACxF,CAAC,CAAC,CAAC"}
@@ -0,0 +1,16 @@
1
+ import { CommandService, MessageService } from '@theia/core';
2
+ import { FrontendApplicationContribution, LocalStorageService } from '@theia/core/lib/browser';
3
+ import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
4
+ import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
5
+ import { RemoteStatusService } from '@theia/remote/lib/electron-common/remote-status-service';
6
+ export declare class DevContainerSuggestionContribution implements FrontendApplicationContribution {
7
+ protected readonly workspaceService: WorkspaceService;
8
+ protected readonly connectionProvider: RemoteContainerConnectionProvider;
9
+ protected readonly messageService: MessageService;
10
+ protected readonly commandService: CommandService;
11
+ protected readonly remoteStatusService: RemoteStatusService;
12
+ protected readonly storageService: LocalStorageService;
13
+ onStart(): void;
14
+ protected checkForDevContainer(): Promise<void>;
15
+ }
16
+ //# sourceMappingURL=dev-container-suggestion-contribution.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-suggestion-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-suggestion-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAO,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAE5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAI9F,qBACa,kCAAmC,YAAW,+BAA+B;IAGtF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAEvD,OAAO,IAAI,IAAI;cAIC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyCxD"}
@@ -0,0 +1,96 @@
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2026 EclipseSource and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.DevContainerSuggestionContribution = void 0;
19
+ const tslib_1 = require("tslib");
20
+ const inversify_1 = require("@theia/core/shared/inversify");
21
+ const core_1 = require("@theia/core");
22
+ const browser_1 = require("@theia/core/lib/browser");
23
+ const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
24
+ const remote_container_connection_provider_1 = require("../electron-common/remote-container-connection-provider");
25
+ const container_connection_contribution_1 = require("./container-connection-contribution");
26
+ const remote_status_service_1 = require("@theia/remote/lib/electron-common/remote-status-service");
27
+ const DONT_SHOW_AGAIN_KEY = 'dev-container.suggestion.dontShowAgain';
28
+ let DevContainerSuggestionContribution = class DevContainerSuggestionContribution {
29
+ onStart() {
30
+ this.checkForDevContainer();
31
+ }
32
+ async checkForDevContainer() {
33
+ const containerPort = parseInt(new URLSearchParams(location.search).get('port') ?? '0');
34
+ if (containerPort > 0) {
35
+ const status = await this.remoteStatusService.getStatus(containerPort);
36
+ if (status?.alive) {
37
+ return;
38
+ }
39
+ }
40
+ const dontShowAgain = await this.storageService.getData(DONT_SHOW_AGAIN_KEY);
41
+ if (dontShowAgain) {
42
+ return;
43
+ }
44
+ await this.workspaceService.ready;
45
+ const workspace = this.workspaceService.workspace;
46
+ if (!workspace) {
47
+ return;
48
+ }
49
+ try {
50
+ const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(workspace.resource.path.toString());
51
+ if (devcontainerFiles.length > 0) {
52
+ const reopenAction = core_1.nls.localize('theia/remote/dev-container/reopenInContainer', 'Reopen in Container');
53
+ const dontShowAgainAction = core_1.nls.localizeByDefault("Don't Show Again");
54
+ const result = await this.messageService.info(core_1.nls.localize('theia/remote/dev-container/suggestion', 'This workspace has a dev container configuration. Would you like to reopen it in a container?'), reopenAction, dontShowAgainAction);
55
+ if (result === reopenAction) {
56
+ this.commandService.executeCommand(container_connection_contribution_1.RemoteContainerCommands.REOPEN_IN_CONTAINER.id);
57
+ }
58
+ else if (result === dontShowAgainAction) {
59
+ await this.storageService.setData(DONT_SHOW_AGAIN_KEY, true);
60
+ }
61
+ }
62
+ }
63
+ catch (error) {
64
+ // Silently ignore if we can't check for devcontainer files
65
+ }
66
+ }
67
+ };
68
+ exports.DevContainerSuggestionContribution = DevContainerSuggestionContribution;
69
+ tslib_1.__decorate([
70
+ (0, inversify_1.inject)(workspace_service_1.WorkspaceService),
71
+ tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
72
+ ], DevContainerSuggestionContribution.prototype, "workspaceService", void 0);
73
+ tslib_1.__decorate([
74
+ (0, inversify_1.inject)(remote_container_connection_provider_1.RemoteContainerConnectionProvider),
75
+ tslib_1.__metadata("design:type", Object)
76
+ ], DevContainerSuggestionContribution.prototype, "connectionProvider", void 0);
77
+ tslib_1.__decorate([
78
+ (0, inversify_1.inject)(core_1.MessageService),
79
+ tslib_1.__metadata("design:type", core_1.MessageService)
80
+ ], DevContainerSuggestionContribution.prototype, "messageService", void 0);
81
+ tslib_1.__decorate([
82
+ (0, inversify_1.inject)(core_1.CommandService),
83
+ tslib_1.__metadata("design:type", Object)
84
+ ], DevContainerSuggestionContribution.prototype, "commandService", void 0);
85
+ tslib_1.__decorate([
86
+ (0, inversify_1.inject)(remote_status_service_1.RemoteStatusService),
87
+ tslib_1.__metadata("design:type", Object)
88
+ ], DevContainerSuggestionContribution.prototype, "remoteStatusService", void 0);
89
+ tslib_1.__decorate([
90
+ (0, inversify_1.inject)(browser_1.LocalStorageService),
91
+ tslib_1.__metadata("design:type", browser_1.LocalStorageService)
92
+ ], DevContainerSuggestionContribution.prototype, "storageService", void 0);
93
+ exports.DevContainerSuggestionContribution = DevContainerSuggestionContribution = tslib_1.__decorate([
94
+ (0, inversify_1.injectable)()
95
+ ], DevContainerSuggestionContribution);
96
+ //# sourceMappingURL=dev-container-suggestion-contribution.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-suggestion-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-suggestion-contribution.ts"],"names":[],"mappings":"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"}
@@ -22,9 +22,18 @@ export interface DevContainerFile {
22
22
  name: string;
23
23
  path: string;
24
24
  }
25
+ export interface RunningContainerInfo {
26
+ id: string;
27
+ name: string;
28
+ image: string;
29
+ status: string;
30
+ }
25
31
  export interface RemoteContainerConnectionProvider extends RpcServer<ContainerOutputProvider> {
26
32
  connectToContainer(options: ContainerConnectionOptions): Promise<ContainerConnectionResult>;
27
33
  getDevContainerFiles(workspacePath: string): Promise<DevContainerFile[]>;
28
34
  getCurrentContainerInfo(port: number): Promise<ContainerInspectInfo | undefined>;
35
+ listRunningContainers(): Promise<RunningContainerInfo[]>;
36
+ attachToContainer(containerId: string): Promise<ContainerConnectionResult>;
37
+ removeContainer(containerId: string): Promise<void>;
29
38
  }
30
39
  //# sourceMappingURL=remote-container-connection-provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;CACpF"}
1
+ {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;IACjF,qBAAqB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACzD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC3E,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD"}
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI3G,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAahD,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAe7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAWlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
1
+ {"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI3G,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWhD,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAe7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAWlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
@@ -23,19 +23,17 @@ const jsonc_parser_1 = require("jsonc-parser");
23
23
  const fs = require("@theia/core/shared/fs-extra");
24
24
  const core_1 = require("@theia/core");
25
25
  const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
26
- const VARIABLE_REGEX = /^\$\{(.+?)(?::(.+))?\}$/;
26
+ const VARIABLE_REGEX = /\$\{(.+?)(?::(.+?))?\}/g;
27
27
  let DevContainerFileService = class DevContainerFileService {
28
28
  resolveVariable(value) {
29
- const match = value.match(VARIABLE_REGEX);
30
- if (match) {
31
- const [, type, variable] = match;
29
+ return value.replace(VARIABLE_REGEX, (match, type, variable) => {
32
30
  for (const contribution of this.variableResolverContributions.getContributions()) {
33
31
  if (contribution.canResolve(type)) {
34
32
  return contribution.resolve(variable ?? type);
35
33
  }
36
34
  }
37
- }
38
- return value;
35
+ return match;
36
+ });
39
37
  }
40
38
  resolveVariablesRecursively(obj) {
41
39
  if (typeof obj === 'string') {
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"cli-enhancing-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAG,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEtE,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAGlF;AAED,qBACa,sBAAuB,YAAW,qBAAqB,EAAE,6BAA6B;IAC/F,SAAS,CAAC,aAAa,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAE/D,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAY1C,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzI;AAED,qBACa,oBAAqB,YAAW,qBAAqB,EAAE,6BAA6B;IAC7F,SAAS,CAAC,aAAa,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAE/D,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAY1C,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzI"}
1
+ {"version":3,"file":"cli-enhancing-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAG,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEtE,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAGlF;AAED,qBACa,sBAAuB,YAAW,qBAAqB,EAAE,6BAA6B;IAC/F,SAAS,CAAC,aAAa,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAE/D,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAY1C,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzI;AAED,qBACa,oBAAqB,YAAW,qBAAqB,EAAE,6BAA6B;IAC7F,SAAS,CAAC,aAAa,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAE/D,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAkB1C,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzI"}
@@ -54,7 +54,13 @@ let SettingsContribution = class SettingsContribution {
54
54
  ...(this.currentConfig.customizations?.vscode?.settings ?? [])
55
55
  };
56
56
  this.currentConfig = undefined;
57
- return Object.entries(settings).map(([key, value]) => `--set-preference=${key}=${JSON.stringify(value)}`) ?? [];
57
+ return Object.entries(settings).map(([key, value]) => {
58
+ const jsonValue = JSON.stringify(value);
59
+ if (value && typeof value === 'object') {
60
+ return `--set-preference=${key}=base64:${Buffer.from(jsonValue).toString('base64')}`;
61
+ }
62
+ return `--set-preference=${key}=${jsonValue}`;
63
+ });
58
64
  }
59
65
  async handleContainerCreation(createOptions, containerConfig) {
60
66
  this.currentConfig = containerConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"cli-enhancing-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAQhF,wFAGC;;AARD,0EAA4E;AAG5E,4DAAsE;AAEtE,SAAgB,sCAAsC,CAAC,IAAqB;IACxE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AACxE,CAAC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAG/B,WAAW,CAAC,OAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG;YACf,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;YACxC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;SACnE,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,OAAO,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAA4C,EAAE,eAA0C;QAClH,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC;IACzC,CAAC;CACJ,CAAA;AAlBY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAkBlC;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAG7B,WAAW,CAAC,OAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG;YACb,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;SACjE,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,oBAAoB,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IACpH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAA4C,EAAE,eAA0C;QAClH,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC;IACzC,CAAC;CACJ,CAAA;AAlBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAkBhC"}
1
+ {"version":3,"file":"cli-enhancing-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAQhF,wFAGC;;AARD,0EAA4E;AAG5E,4DAAsE;AAEtE,SAAgB,sCAAsC,CAAC,IAAqB;IACxE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AACxE,CAAC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAG/B,WAAW,CAAC,OAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG;YACf,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;YACxC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;SACnE,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,OAAO,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAA4C,EAAE,eAA0C;QAClH,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC;IACzC,CAAC;CACJ,CAAA;AAlBY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAkBlC;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAG7B,WAAW,CAAC,OAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG;YACb,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;SACjE,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACjD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACrC,OAAO,oBAAoB,GAAG,WAAW,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzF,CAAC;YACD,OAAO,oBAAoB,GAAG,IAAI,SAAS,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,aAA4C,EAAE,eAA0C;QAClH,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC;IACzC,CAAC;CACJ,CAAA;AAxBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAwBhC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=cli-enhancing-creation-contributions.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-enhancing-creation-contributions.spec.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.spec.ts"],"names":[],"mappings":""}