Update electron and node packages

Signed-off-by: Rob Moran <rob.moran@arm.com> Fix node 10 AddressInfo type change Signed-off-by: Rob Moran <rob.moran@arm.com> Fix electron scroll options change Signed-off-by: Rob Moran <rob.moran@arm.com>
eclipse-theia · Jan 23, 2019 · e29673b · e29673b · paul-marechal · Feb 12, 2019
1 parent f143065
commit e29673b
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 116 deletions.
diff --git a/dev-packages/application-manager/package.json b/dev-packages/application-manager/package.json
@@ -35,7 +35,7 @@
     "circular-dependency-plugin": "^5.0.0",
     "copy-webpack-plugin": "^4.5.0",
     "css-loader": "^0.28.1",
-    "electron": "^2.0.14",
+    "electron": "^3.0.10",
     "electron-rebuild": "^1.5.11",
     "file-loader": "^1.1.11",
     "font-awesome-webpack": "0.0.5-beta.2",

diff --git a/package.json b/package.json
@@ -4,17 +4,17 @@
   "version": "0.0.0",
   "engines": {
     "yarn": "1.0.x || >=1.2.1",
-    "node": ">=8.9.3"
+    "node": ">=10.2.0"
   },
   "resolution": {
-    "**/@types/node": "8.10.20"
+    "**/@types/node": "~10.3.6"
   },
   "devDependencies": {
     "@types/chai": "^4.0.1",
     "@types/chai-string": "^1.4.0",
     "@types/jsdom": "^11.0.4",
     "@types/mocha": "^2.2.41",
-    "@types/node": "8.10.20",
+    "@types/node": "~10.3.6",
     "@types/sinon": "^2.3.5",
     "@types/temp": "^0.8.29",
     "@types/webdriverio": "^4.7.0",
@@ -39,7 +39,7 @@
     "typedoc": "^0.13.0",
     "typescript": "^3.1.3",
     "uuid": "^3.1.0",
-    "wdio-mocha-framework": "0.5.9",
+    "wdio-mocha-framework": "0.6.4",
     "wdio-selenium-standalone-service": "0.0.8",
     "wdio-spec-reporter": "0.1.0",
     "webdriverio": "4.9.2"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,7 +20,7 @@
     "@types/yargs": "^11.1.0",
     "ajv": "^6.5.3",
     "body-parser": "^1.17.2",
-    "electron": "^2.0.14",
+    "electron": "^3.0.10",
     "es6-promise": "^4.2.4",
     "express": "^4.16.3",
     "file-icons-js": "^1.0.3",
@@ -38,7 +38,7 @@
     "reflect-metadata": "^0.1.10",
     "route-parser": "^0.0.5",
     "vscode-languageserver-types": "^3.10.0",
-    "vscode-nsfw": "^1.0.17",
+    "vscode-nsfw": "^1.1.2",
     "vscode-uri": "^1.0.1",
     "vscode-ws-jsonrpc": "^0.0.2-1",
     "ws": "^5.2.2",

diff --git a/packages/core/src/node/backend-application.ts b/packages/core/src/node/backend-application.ts
@@ -24,6 +24,7 @@ import { ILogger, ContributionProvider, MaybePromise } from '../common';
 import { CliContribution } from './cli';
 import { Deferred } from '../common/promise-util';
 import { environment } from '../common/index';
+import { AddressInfo } from 'net';
 
 export const BackendApplicationContribution = Symbol('BackendApplicationContribution');
 export interface BackendApplicationContribution {
@@ -185,7 +186,7 @@ export class BackendApplication {
 
         server.listen(port, hostname, () => {
             const scheme = this.cliParams.ssl ? 'https' : 'http';
-            this.logger.info(`Theia app listening on ${scheme}://${hostname || 'localhost'}:${server.address().port}.`);
+            this.logger.info(`Theia app listening on ${scheme}://${hostname || 'localhost'}:${(server.address() as AddressInfo).port}.`);
             deferred.resolve(server);
         });
 

diff --git a/packages/core/src/node/messaging/test/test-web-socket-channel.ts b/packages/core/src/node/messaging/test/test-web-socket-channel.ts
@@ -19,6 +19,7 @@ import * as http from 'http';
 import * as https from 'https';
 import { WebSocketChannel } from '../../../common/messaging/web-socket-channel';
 import { Disposable } from '../../../common/disposable';
+import { AddressInfo } from 'net';
 
 export class TestWebSocketChannel extends WebSocketChannel {
 
@@ -27,7 +28,7 @@ export class TestWebSocketChannel extends WebSocketChannel {
         path: string
     }) {
         super(0, content => socket.send(content));
-        const socket = new ws(`ws://localhost:${server.address().port}${WebSocketChannel.wsPath}`);
+        const socket = new ws(`ws://localhost:${(server.address() as AddressInfo).port}${WebSocketChannel.wsPath}`);
         socket.on('error', error =>
             this.fireError(error)
         );

diff --git a/packages/git/src/electron-node/askpass/askpass.ts b/packages/git/src/electron-node/askpass/askpass.ts
@@ -14,6 +14,7 @@ import { MaybePromise } from '@theia/core/lib/common/types';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { GitPrompt } from '../../common/git-prompt';
 import { DugiteGitPromptServer } from '../../node/dugite-git-prompt';
+import { AddressInfo } from 'net';
 
 /**
  * Environment for the Git askpass helper.
@@ -89,7 +90,7 @@ export class Askpass implements Disposable {
             return new Promise<Address>(resolve => {
                 this.server.on('error', err => this.logger.error(err));
                 this.server.listen(0, this.hostname(), () => {
-                    resolve(this.server.address());
+                    resolve(this.server.address() as AddressInfo);
                 });
             });
         } catch (err) {

diff --git a/packages/java/src/node/java-contribution.ts b/packages/java/src/node/java-contribution.ts
@@ -28,6 +28,7 @@ import { JAVA_LANGUAGE_ID, JAVA_LANGUAGE_NAME, JavaStartParams } from '../common
 import { JavaCliContribution } from './java-cli-contribution';
 import { ContributionProvider } from '@theia/core';
 import { JavaExtensionContribution } from './java-extension-model';
+import { AddressInfo } from 'net';
 const sha1 = require('sha1');
 
 export type ConfigurationType = 'config_win' | 'config_mac' | 'config_linux';
@@ -135,7 +136,7 @@ export class JavaContribution extends BaseLanguageServerContribution {
 
             this.logInfo('logs at ' + path.resolve(workspacePath, '.metadata', '.log'));
             const env = Object.create(process.env);
-            const address = server.address();
+            const address = server.address() as AddressInfo;
             env.CLIENT_HOST = address.address;
             env.CLIENT_PORT = address.port;
             this.createProcessSocketConnection(socket, socket, command, args, { env })

diff --git a/packages/preview/src/browser/markdown/markdown-preview-handler.ts b/packages/preview/src/browser/markdown/markdown-preview-handler.ts
@@ -106,7 +106,7 @@ export class MarkdownPreviewHandler implements PreviewHandler {
         if (!elementToReveal) {
             return;
         }
-        elementToReveal.scrollIntoView({ behavior: 'instant' });
+        elementToReveal.scrollIntoView();
     }
 
     findElementForFragment(content: HTMLElement, link: string): HTMLElement | undefined {

diff --git a/packages/preview/src/browser/preview-widget.ts b/packages/preview/src/browser/preview-widget.ts
@@ -208,7 +208,7 @@ export class PreviewWidget extends BaseWidget implements Navigatable {
         const elementToReveal = this.previewHandler.findElementForFragment(this.node, uri.fragment);
         if (elementToReveal) {
             this.preventScrollNotification = true;
-            elementToReveal.scrollIntoView({ behavior: 'instant' });
+            elementToReveal.scrollIntoView();
             window.setTimeout(() => {
                 this.preventScrollNotification = false;
             }, 50);
@@ -225,7 +225,7 @@ export class PreviewWidget extends BaseWidget implements Navigatable {
         const elementToReveal = this.previewHandler.findElementForSourceLine(this.node, sourceLine);
         if (elementToReveal) {
             this.preventScrollNotification = true;
-            elementToReveal.scrollIntoView({ behavior: 'instant' });
+            elementToReveal.scrollIntoView();
             window.setTimeout(() => {
                 this.preventScrollNotification = false;
             }, 50);