@theia/core 1.22.0-next.13 → 1.22.0-next.17

package/README.md

@@ -78,9 +78,9 @@ export class SomeClass {
  - [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling)
  - [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom)
  - [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets)
- - [`@theia/application-package@1.22.0-next.13+52a652922c4`](https://www.npmjs.com/package/@theia/application-package)
- - [`@theia/application-package/lib/api@1.22.0-next.13+52a652922c4`](https://www.npmjs.com/package/@theia/application-package)
- - [`@theia/application-package/lib/environment@1.22.0-next.13+52a652922c4`](https://www.npmjs.com/package/@theia/application-package)
+ - [`@theia/application-package@1.22.0-next.17+fb74ef0ed87`](https://www.npmjs.com/package/@theia/application-package)
+ - [`@theia/application-package/lib/api@1.22.0-next.17+fb74ef0ed87`](https://www.npmjs.com/package/@theia/application-package)
+ - [`@theia/application-package/lib/environment@1.22.0-next.17+fb74ef0ed87`](https://www.npmjs.com/package/@theia/application-package)
  - [`dompurify@^2.2.9`](https://www.npmjs.com/package/dompurify)
  - [`electron@^9.0.2`](https://www.npmjs.com/package/electron)
  - [`express@^4.16.3`](https://www.npmjs.com/package/express)

package/lib/browser/external-uri-service.d.ts

@@ -13,8 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import URI from '../common/uri';
 import { MaybePromise } from '../common/types';
+import URI from '../common/uri';
+export interface AddressPort {
+    address: string;
+    port: number;
+}
 export declare class ExternalUriService {
     /**
      * Maps local to remote URLs.
@@ -25,17 +29,12 @@ export declare class ExternalUriService {
      * Use `parseLocalhost` to retrieve localhost address and port information.
      */
     resolve(uri: URI): MaybePromise<URI>;
-    protected toRemoteUrl(uri: URI, localhost: {
-        address: string;
-        port: number;
-    }): URI;
-    protected toRemoteHost(localhost: {
-        address: string;
-        port: number;
-    }): string;
-    parseLocalhost(uri: URI): {
-        address: string;
-        port: number;
-    } | undefined;
+    parseLocalhost(uri: URI): AddressPort | undefined;
+    protected toRemoteUrl(uri: URI, address: AddressPort): URI;
+    protected toRemoteHost(address: AddressPort): string;
+    /**
+     * @returns The remote host (where the backend is running).
+     */
+    protected getRemoteHost(): string;
 }
 //# sourceMappingURL=external-uri-service.d.ts.map

package/lib/browser/external-uri-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-uri-service.d.ts","sourceRoot":"","sources":["../../src/browser/external-uri-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,GAAG,MAAM,eAAe,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,qBACa,kBAAkB;IAE3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAQpC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,GAAG;IAKlF,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAI5E,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;CAc1E"}
+{"version":3,"file":"external-uri-service.d.ts","sourceRoot":"","sources":["../../src/browser/external-uri-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,GAAG,MAAM,eAAe,CAAC;AAGhC,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACf;AAED,qBACa,kBAAkB;IAE3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAQpC,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,GAAG,SAAS;IAcjD,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,GAAG,GAAG;IAQ1D,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;IAIpD;;OAEG;IACH,SAAS,CAAC,aAAa,IAAI,MAAM;CAGpC"}

package/lib/browser/external-uri-service.js

@@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalUriService = void 0;
+const environment_1 = require("@theia/application-package/lib/environment");
 const inversify_1 = require("inversify");
 const endpoint_1 = require("./endpoint");
 let ExternalUriService = class ExternalUriService {
@@ -34,32 +35,41 @@ let ExternalUriService = class ExternalUriService {
      * Use `parseLocalhost` to retrieve localhost address and port information.
      */
     resolve(uri) {
-        const localhost = this.parseLocalhost(uri);
-        if (localhost) {
-            return this.toRemoteUrl(uri, localhost);
+        const address = this.parseLocalhost(uri);
+        if (address) {
+            return this.toRemoteUrl(uri, address);
         }
         return uri;
     }
-    toRemoteUrl(uri, localhost) {
-        const host = this.toRemoteHost(localhost);
-        return new endpoint_1.Endpoint({ host }).getRestUrl().withPath(uri.path).withFragment(uri.fragment).withQuery(uri.query);
-    }
-    toRemoteHost(localhost) {
-        return `${window.location.hostname}:${localhost.port}`;
-    }
     parseLocalhost(uri) {
         if (uri.scheme !== 'http' && uri.scheme !== 'https') {
-            return undefined;
+            return;
         }
         const localhostMatch = /^(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)$/.exec(uri.authority);
         if (!localhostMatch) {
-            return undefined;
+            return;
         }
         return {
             address: localhostMatch[1],
             port: +localhostMatch[2],
         };
     }
+    toRemoteUrl(uri, address) {
+        return new endpoint_1.Endpoint({ host: this.toRemoteHost(address) })
+            .getRestUrl()
+            .withPath(uri.path)
+            .withFragment(uri.fragment)
+            .withQuery(uri.query);
+    }
+    toRemoteHost(address) {
+        return `${this.getRemoteHost()}:${address.port}`;
+    }
+    /**
+     * @returns The remote host (where the backend is running).
+     */
+    getRemoteHost() {
+        return environment_1.environment.electron.is() ? 'localhost' : window.location.hostname;
+    }
 };
 ExternalUriService = __decorate([
     inversify_1.injectable()

package/lib/browser/external-uri-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-uri-service.js","sourceRoot":"","sources":["../../src/browser/external-uri-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AAGvC,yCAAsC;AAGtC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAE3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAQ;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAC3C;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAES,WAAW,CAAC,GAAQ,EAAE,SAA4C;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1C,OAAO,IAAI,mBAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClH,CAAC;IAES,YAAY,CAAC,SAA4C;QAC/D,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;IAC3D,CAAC;IAED,cAAc,CAAC,GAAQ;QACnB,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE;YACjD,OAAO,SAAS,CAAC;SACpB;QACD,MAAM,cAAc,GAAG,6CAA6C,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzF,IAAI,CAAC,cAAc,EAAE;YACjB,OAAO,SAAS,CAAC;SACpB;QACD,OAAO;YACH,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YAC1B,IAAI,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;SAC3B,CAAC;IACN,CAAC;CAEJ,CAAA;AAzCY,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAyC9B;AAzCY,gDAAkB"}
+{"version":3,"file":"external-uri-service.js","sourceRoot":"","sources":["../../src/browser/external-uri-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,4EAAyE;AACzE,yCAAuC;AAGvC,yCAAsC;AAQtC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAE3B;;;;;;;OAOG;IACH,OAAO,CAAC,GAAQ;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE;YACT,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SACzC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,cAAc,CAAC,GAAQ;QACnB,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE;YACjD,OAAO;SACV;QACD,MAAM,cAAc,GAAG,6CAA6C,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzF,IAAI,CAAC,cAAc,EAAE;YACjB,OAAO;SACV;QACD,OAAO;YACH,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YAC1B,IAAI,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;SAC3B,CAAC;IACN,CAAC;IAES,WAAW,CAAC,GAAQ,EAAE,OAAoB;QAChD,OAAO,IAAI,mBAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;aACpD,UAAU,EAAE;aACZ,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;aAClB,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC;aAC1B,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAES,YAAY,CAAC,OAAoB;QACvC,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IACrD,CAAC;IAED;;OAEG;IACO,aAAa;QACnB,OAAO,yBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC9E,CAAC;CACJ,CAAA;AAlDY,kBAAkB;IAD9B,sBAAU,EAAE;GACA,kBAAkB,CAkD9B;AAlDY,gDAAkB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.22.0-next.13+52a652922c4",
+  "version": "1.22.0-next.17+fb74ef0ed87",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,7 +17,7 @@
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
     "@primer/octicons-react": "^9.0.0",
-    "@theia/application-package": "1.22.0-next.13+52a652922c4",
+    "@theia/application-package": "1.22.0-next.17+fb74ef0ed87",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -178,5 +178,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "52a652922c431bb26b171636004536921e46e908"
+  "gitHead": "fb74ef0ed87ecfc36a415a2d272fdcbae4ee4bf7"
 }

package/src/browser/external-uri-service.ts

@@ -14,11 +14,17 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { environment } from '@theia/application-package/lib/environment';
 import { injectable } from 'inversify';
-import URI from '../common/uri';
 import { MaybePromise } from '../common/types';
+import URI from '../common/uri';
 import { Endpoint } from './endpoint';
 
+export interface AddressPort {
+    address: string
+    port: number
+}
+
 @injectable()
 export class ExternalUriService {
 
@@ -31,29 +37,20 @@ export class ExternalUriService {
      * Use `parseLocalhost` to retrieve localhost address and port information.
      */
     resolve(uri: URI): MaybePromise<URI> {
-        const localhost = this.parseLocalhost(uri);
-        if (localhost) {
-            return this.toRemoteUrl(uri, localhost);
+        const address = this.parseLocalhost(uri);
+        if (address) {
+            return this.toRemoteUrl(uri, address);
         }
         return uri;
     }
 
-    protected toRemoteUrl(uri: URI, localhost: { address: string, port: number }): URI {
-        const host = this.toRemoteHost(localhost);
-        return new Endpoint({ host }).getRestUrl().withPath(uri.path).withFragment(uri.fragment).withQuery(uri.query);
-    }
-
-    protected toRemoteHost(localhost: { address: string, port: number }): string {
-        return `${window.location.hostname}:${localhost.port}`;
-    }
-
-    parseLocalhost(uri: URI): { address: string, port: number } | undefined {
+    parseLocalhost(uri: URI): AddressPort | undefined {
         if (uri.scheme !== 'http' && uri.scheme !== 'https') {
-            return undefined;
+            return;
         }
         const localhostMatch = /^(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)$/.exec(uri.authority);
         if (!localhostMatch) {
-            return undefined;
+            return;
         }
         return {
             address: localhostMatch[1],
@@ -61,4 +58,22 @@ export class ExternalUriService {
         };
     }
 
+    protected toRemoteUrl(uri: URI, address: AddressPort): URI {
+        return new Endpoint({ host: this.toRemoteHost(address) })
+            .getRestUrl()
+            .withPath(uri.path)
+            .withFragment(uri.fragment)
+            .withQuery(uri.query);
+    }
+
+    protected toRemoteHost(address: AddressPort): string {
+        return `${this.getRemoteHost()}:${address.port}`;
+    }
+
+    /**
+     * @returns The remote host (where the backend is running).
+     */
+    protected getRemoteHost(): string {
+        return environment.electron.is() ? 'localhost' : window.location.hostname;
+    }
 }