diff --git a/dev-packages/application-manager/src/generator/webpack-generator.ts b/dev-packages/application-manager/src/generator/webpack-generator.ts
index 0eeb0b38dc269..2db2258a524c6 100644
--- a/dev-packages/application-manager/src/generator/webpack-generator.ts
+++ b/dev-packages/application-manager/src/generator/webpack-generator.ts
@@ -437,6 +437,8 @@ const config = {
${this.ifPackage('@theia/git', () => `// Ensure the git locator process can the started
'git-locator-host': require.resolve('@theia/git/lib/node/git-locator/git-locator-host'),`)}
${this.ifElectron("'electron-main': require.resolve('./src-gen/backend/electron-main'),")}
+ ${this.ifPackage('@theia/dev-container', () => `// VS Code Dev-Container communication:
+ 'dev-container-server': require.resolve('@theia/dev-container/lib/dev-container-server/dev-container-server'),`)}
...commonJsLibraries
},
module: {
diff --git a/examples/browser/package.json b/examples/browser/package.json
index 9da407c65339e..daa632e7b1e47 100644
--- a/examples/browser/package.json
+++ b/examples/browser/package.json
@@ -27,6 +27,7 @@
"@theia/console": "1.47.0",
"@theia/core": "1.47.0",
"@theia/debug": "1.47.0",
+ "@theia/dev-container": "1.47.0",
"@theia/editor": "1.47.0",
"@theia/editor-preview": "1.47.0",
"@theia/file-search": "1.47.0",
diff --git a/examples/browser/tsconfig.json b/examples/browser/tsconfig.json
index 0debed71dc386..8318b446c62cb 100644
--- a/examples/browser/tsconfig.json
+++ b/examples/browser/tsconfig.json
@@ -23,6 +23,9 @@
{
"path": "../../packages/debug"
},
+ {
+ "path": "../../packages/dev-container"
+ },
{
"path": "../../packages/editor"
},
diff --git a/examples/electron/package.json b/examples/electron/package.json
index 19c9ba0c978b3..2e04a9ffcf28b 100644
--- a/examples/electron/package.json
+++ b/examples/electron/package.json
@@ -27,6 +27,7 @@
"@theia/console": "1.47.0",
"@theia/core": "1.47.0",
"@theia/debug": "1.47.0",
+ "@theia/dev-container": "1.47.0",
"@theia/editor": "1.47.0",
"@theia/editor-preview": "1.47.0",
"@theia/electron": "1.47.0",
diff --git a/examples/electron/tsconfig.json b/examples/electron/tsconfig.json
index c1c637281a2a3..a5073361ded87 100644
--- a/examples/electron/tsconfig.json
+++ b/examples/electron/tsconfig.json
@@ -26,6 +26,9 @@
{
"path": "../../packages/debug"
},
+ {
+ "path": "../../packages/dev-container"
+ },
{
"path": "../../packages/editor"
},
diff --git a/packages/core/src/browser/window/window-service.ts b/packages/core/src/browser/window/window-service.ts
index 34adb43737c22..694046fe910a2 100644
--- a/packages/core/src/browser/window/window-service.ts
+++ b/packages/core/src/browser/window/window-service.ts
@@ -18,6 +18,11 @@ import { StopReason } from '../../common/frontend-application-state';
import { Event } from '../../common/event';
import { NewWindowOptions, WindowSearchParams } from '../../common/window';
+export interface WindowReloadOptions {
+ search?: WindowSearchParams,
+ hash?: string
+}
+
/**
* Service for opening new browser windows.
*/
@@ -35,7 +40,7 @@ export interface WindowService {
* Opens a new default window.
* - In electron and in the browser it will open the default window without a pre-defined content.
*/
- openNewDefaultWindow(params?: WindowSearchParams): void;
+ openNewDefaultWindow(params?: WindowReloadOptions): void;
/**
* Fires when the `window` unloads. The unload event is inevitable. On this event, the frontend application can save its state and release resource.
@@ -64,5 +69,5 @@ export interface WindowService {
/**
* Reloads the window according to platform.
*/
- reload(params?: WindowSearchParams): void;
+ reload(params?: WindowReloadOptions): void;
}
diff --git a/packages/core/src/electron-browser/window/electron-window-service.ts b/packages/core/src/electron-browser/window/electron-window-service.ts
index 7777063b67e0c..f2ec5d6ae2edc 100644
--- a/packages/core/src/electron-browser/window/electron-window-service.ts
+++ b/packages/core/src/electron-browser/window/electron-window-service.ts
@@ -21,6 +21,7 @@ import { ElectronMainWindowService } from '../../electron-common/electron-main-w
import { ElectronWindowPreferences } from './electron-window-preferences';
import { ConnectionCloseService } from '../../common/messaging/connection-management';
import { FrontendIdProvider } from '../../browser/messaging/frontend-id-provider';
+import { WindowReloadOptions } from '../../browser/window/window-service';
@injectable()
export class ElectronWindowService extends DefaultWindowService {
@@ -86,12 +87,20 @@ export class ElectronWindowService extends DefaultWindowService {
}
}
- override reload(params?: WindowSearchParams): void {
+ override reload(params?: WindowReloadOptions): void {
if (params) {
- const query = Object.entries(params).map(([name, value]) => `${name}=${value}`).join('&');
- location.search = query;
+ const newLocation = new URL(location.href);
+ if (params.search) {
+ const query = Object.entries(params.search).map(([name, value]) => `${name}=${value}`).join('&');
+ newLocation.search = query;
+ }
+ if (params.hash) {
+ newLocation.hash = '#' + params.hash;
+ }
+ location.assign(newLocation);
} else {
window.electronTheiaCore.requestReload();
}
}
}
+
diff --git a/packages/dev-container/.eslintrc.js b/packages/dev-container/.eslintrc.js
new file mode 100644
index 0000000000000..13089943582b6
--- /dev/null
+++ b/packages/dev-container/.eslintrc.js
@@ -0,0 +1,10 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+ extends: [
+ '../../configs/build.eslintrc.json'
+ ],
+ parserOptions: {
+ tsconfigRootDir: __dirname,
+ project: 'tsconfig.json'
+ }
+};
diff --git a/packages/dev-container/README.md b/packages/dev-container/README.md
new file mode 100644
index 0000000000000..b9ce2d06af2e5
--- /dev/null
+++ b/packages/dev-container/README.md
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
ECLIPSE THEIA - DEV-CONTAINER EXTENSION
+
+
+
+