Update to Theia 1.42.1

* update webpack configs, because manual changes have been integrated
upstream by now
* disable showWindowEarly for now until ui-tests can handle this
* increase waiting time for key handlers setup (failures on mac
workflow)

Contributed on behalf of STMicroelectronics

Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>

Jenkinsfile

@@ -261,7 +261,7 @@ spec:
                         container('jnlp') {
                             script {
                                 uploadInstaller('windows')
-                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.38.0,1.39.0,1.40.0')
+                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.39.0,1.40.0,1.41.0')
                             }
                         }
                     }

applications/browser/package.json

@@ -3,7 +3,7 @@
   "name": "blueprint-browser-app",
   "description": "Eclipse Theia blueprint browser product",
   "productName": "Theia Blueprint",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Eclipse Theia <theia-dev@eclipse.org>",
   "homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
@@ -44,50 +44,50 @@
     }
   },
   "dependencies": {
-    "@theia/bulk-edit": "1.41.0",
-    "@theia/callhierarchy": "1.41.0",
-    "@theia/console": "1.41.0",
-    "@theia/core": "1.41.0",
-    "@theia/debug": "1.41.0",
-    "@theia/editor": "1.41.0",
-    "@theia/editor-preview": "1.41.0",
-    "@theia/external-terminal": "1.41.0",
-    "@theia/file-search": "1.41.0",
-    "@theia/filesystem": "1.41.0",
-    "@theia/getting-started": "1.41.0",
-    "@theia/keymaps": "1.41.0",
-    "@theia/markers": "1.41.0",
-    "@theia/memory-inspector": "1.41.0",
-    "@theia/messages": "1.41.0",
-    "@theia/metrics": "1.41.0",
-    "@theia/mini-browser": "1.41.0",
-    "@theia/monaco": "1.41.0",
-    "@theia/navigator": "1.41.0",
-    "@theia/outline-view": "1.41.0",
-    "@theia/output": "1.41.0",
-    "@theia/plugin-dev": "1.41.0",
-    "@theia/plugin-ext": "1.41.0",
-    "@theia/plugin-ext-vscode": "1.41.0",
-    "@theia/preferences": "1.41.0",
-    "@theia/process": "1.41.0",
-    "@theia/property-view": "1.41.0",
-    "@theia/scm": "1.41.0",
-    "@theia/search-in-workspace": "1.41.0",
-    "@theia/secondary-window": "1.41.0",
-    "@theia/task": "1.41.0",
-    "@theia/terminal": "1.41.0",
-    "@theia/timeline": "1.41.0",
-    "@theia/toolbar": "1.41.0",
-    "@theia/typehierarchy": "1.41.0",
-    "@theia/userstorage": "1.41.0",
-    "@theia/variable-resolver": "1.41.0",
-    "@theia/vsx-registry": "1.41.0",
-    "@theia/workspace": "1.41.0",
+    "@theia/bulk-edit": "1.42.1",
+    "@theia/callhierarchy": "1.42.1",
+    "@theia/console": "1.42.1",
+    "@theia/core": "1.42.1",
+    "@theia/debug": "1.42.1",
+    "@theia/editor": "1.42.1",
+    "@theia/editor-preview": "1.42.1",
+    "@theia/external-terminal": "1.42.1",
+    "@theia/file-search": "1.42.1",
+    "@theia/filesystem": "1.42.1",
+    "@theia/getting-started": "1.42.1",
+    "@theia/keymaps": "1.42.1",
+    "@theia/markers": "1.42.1",
+    "@theia/memory-inspector": "1.42.1",
+    "@theia/messages": "1.42.1",
+    "@theia/metrics": "1.42.1",
+    "@theia/mini-browser": "1.42.1",
+    "@theia/monaco": "1.42.1",
+    "@theia/navigator": "1.42.1",
+    "@theia/outline-view": "1.42.1",
+    "@theia/output": "1.42.1",
+    "@theia/plugin-dev": "1.42.1",
+    "@theia/plugin-ext": "1.42.1",
+    "@theia/plugin-ext-vscode": "1.42.1",
+    "@theia/preferences": "1.42.1",
+    "@theia/process": "1.42.1",
+    "@theia/property-view": "1.42.1",
+    "@theia/scm": "1.42.1",
+    "@theia/search-in-workspace": "1.42.1",
+    "@theia/secondary-window": "1.42.1",
+    "@theia/task": "1.42.1",
+    "@theia/terminal": "1.42.1",
+    "@theia/timeline": "1.42.1",
+    "@theia/toolbar": "1.42.1",
+    "@theia/typehierarchy": "1.42.1",
+    "@theia/userstorage": "1.42.1",
+    "@theia/variable-resolver": "1.42.1",
+    "@theia/vsx-registry": "1.42.1",
+    "@theia/workspace": "1.42.1",
     "fs-extra": "^9.0.1",
-    "blueprint-product-ext": "1.41.0"
+    "blueprint-product-ext": "1.42.1"
   },
   "devDependencies": {
-    "@theia/cli": "1.41.0"
+    "@theia/cli": "1.42.1"
   },
   "scripts": {
     "clean": "theia clean && rimraf node_modules",

applications/browser/webpack.config.js

@@ -3,24 +3,19 @@
  * To reset delete this file and rerun theia build again.
  */
 // @ts-check
-const config = require('./gen-webpack.config.js');
-const backend = require('./gen-webpack.node.config.js');
+const configs = require('./gen-webpack.config.js');
+const nodeConfig = require('./gen-webpack.node.config.js');
 
 /**
  * Expose bundled modules on window.theia.moduleName namespace, e.g.
  * window['theia']['@theia/core/lib/common/uri'].
  * Such syntax can be used by external code, for instance, for testing.
-config.module.rules.push({
+configs[0].module.rules.push({
     test: /\.js$/,
     loader: require.resolve('@theia/application-manager/lib/expose-loader')
 }); */
 
-if (process.platform !== 'win32') {
-    // For some reason, blueprint wants to bundle the `.node` files directly without going through `@vscode/windows-ca-certs`
-    backend.ignoredResources.add('@vscode/windows-ca-certs/build/Release/crypt32.node');
-}
-
 module.exports = [
-    ...config,
-    backend.config
-];
+    ...configs,
+    nodeConfig.config
+];

applications/electron/package.json

@@ -3,7 +3,7 @@
   "name": "blueprint-electron-app",
   "description": "Eclipse Theia blueprint product",
   "productName": "Theia Blueprint",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "main": "scripts/theia-electron-main.js",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Eclipse Theia <theia-dev@eclipse.org>",
@@ -27,6 +27,9 @@
         "preferences": {
           "toolbar.showToolbar": true,
           "security.workspace.trust.enabled": false
+        },
+        "electron": {
+          "showWindowEarly": false
         }
       }
     },
@@ -43,53 +46,53 @@
     }
   },
   "dependencies": {
-    "@theia/bulk-edit": "1.41.0",
-    "@theia/callhierarchy": "1.41.0",
-    "@theia/console": "1.41.0",
-    "@theia/core": "1.41.0",
-    "@theia/debug": "1.41.0",
-    "@theia/editor": "1.41.0",
-    "@theia/editor-preview": "1.41.0",
-    "@theia/electron": "1.41.0",
-    "@theia/external-terminal": "1.41.0",
-    "@theia/file-search": "1.41.0",
-    "@theia/filesystem": "1.41.0",
-    "@theia/getting-started": "1.41.0",
-    "@theia/keymaps": "1.41.0",
-    "@theia/markers": "1.41.0",
-    "@theia/memory-inspector": "1.41.0",
-    "@theia/messages": "1.41.0",
-    "@theia/metrics": "1.41.0",
-    "@theia/mini-browser": "1.41.0",
-    "@theia/monaco": "1.41.0",
-    "@theia/navigator": "1.41.0",
-    "@theia/outline-view": "1.41.0",
-    "@theia/output": "1.41.0",
-    "@theia/plugin-dev": "1.41.0",
-    "@theia/plugin-ext": "1.41.0",
-    "@theia/plugin-ext-vscode": "1.41.0",
-    "@theia/preferences": "1.41.0",
-    "@theia/process": "1.41.0",
-    "@theia/property-view": "1.41.0",
-    "@theia/secondary-window": "1.41.0",
-    "@theia/scm": "1.41.0",
-    "@theia/search-in-workspace": "1.41.0",
-    "@theia/task": "1.41.0",
-    "@theia/terminal": "1.41.0",
-    "@theia/timeline": "1.41.0",
-    "@theia/toolbar": "1.41.0",
-    "@theia/typehierarchy": "1.41.0",
-    "@theia/userstorage": "1.41.0",
-    "@theia/variable-resolver": "1.41.0",
-    "@theia/vsx-registry": "1.41.0",
-    "@theia/workspace": "1.41.0",
+    "@theia/bulk-edit": "1.42.1",
+    "@theia/callhierarchy": "1.42.1",
+    "@theia/console": "1.42.1",
+    "@theia/core": "1.42.1",
+    "@theia/debug": "1.42.1",
+    "@theia/editor": "1.42.1",
+    "@theia/editor-preview": "1.42.1",
+    "@theia/electron": "1.42.1",
+    "@theia/external-terminal": "1.42.1",
+    "@theia/file-search": "1.42.1",
+    "@theia/filesystem": "1.42.1",
+    "@theia/getting-started": "1.42.1",
+    "@theia/keymaps": "1.42.1",
+    "@theia/markers": "1.42.1",
+    "@theia/memory-inspector": "1.42.1",
+    "@theia/messages": "1.42.1",
+    "@theia/metrics": "1.42.1",
+    "@theia/mini-browser": "1.42.1",
+    "@theia/monaco": "1.42.1",
+    "@theia/navigator": "1.42.1",
+    "@theia/outline-view": "1.42.1",
+    "@theia/output": "1.42.1",
+    "@theia/plugin-dev": "1.42.1",
+    "@theia/plugin-ext": "1.42.1",
+    "@theia/plugin-ext-vscode": "1.42.1",
+    "@theia/preferences": "1.42.1",
+    "@theia/process": "1.42.1",
+    "@theia/property-view": "1.42.1",
+    "@theia/secondary-window": "1.42.1",
+    "@theia/scm": "1.42.1",
+    "@theia/search-in-workspace": "1.42.1",
+    "@theia/task": "1.42.1",
+    "@theia/terminal": "1.42.1",
+    "@theia/timeline": "1.42.1",
+    "@theia/toolbar": "1.42.1",
+    "@theia/typehierarchy": "1.42.1",
+    "@theia/userstorage": "1.42.1",
+    "@theia/variable-resolver": "1.42.1",
+    "@theia/vsx-registry": "1.42.1",
+    "@theia/workspace": "1.42.1",
     "fs-extra": "^9.0.1",
-    "blueprint-updater-ext": "1.41.0",
-    "blueprint-product-ext": "1.41.0",
-    "blueprint-launcher-ext": "1.41.0"
+    "blueprint-updater-ext": "1.42.1",
+    "blueprint-product-ext": "1.42.1",
+    "blueprint-launcher-ext": "1.42.1"
   },
   "devDependencies": {
-    "@theia/cli": "1.41.0",
+    "@theia/cli": "1.42.1",
     "@types/js-yaml": "^3.12.0",
     "@types/yargs": "17.0.7",
     "@wdio/cli": "^6.10.2",

applications/electron/test/app.spec.js

@@ -95,13 +95,15 @@ describe('Theia App', function () {
   });
 
   it('Correct window title', async function () {
+    // Wait a bit to make sure workspace is set and title got updated
+    await new Promise(r => setTimeout(r, 2000));
     const windowTitle = await this.browser.getTitle();
     expect(windowTitle).to.include('workspace');
   });
 
   it('Builtin extensions', async function () {
     // Wait a bit to make sure key handlers are registered.
-    await new Promise(r => setTimeout(r, 2000));
+    await new Promise(r => setTimeout(r, 5000));
 
     // Open extensions view
     await this.browser.keys(macSafeKeyCombo(['Control', 'Shift', 'x']));

applications/electron/webpack.config.js

@@ -3,25 +3,19 @@
  * To reset delete this file and rerun theia build again.
  */
 // @ts-check
-const config = require('./gen-webpack.config.js');
-const backend = require('./gen-webpack.node.config.js');
+const configs = require('./gen-webpack.config.js');
+const nodeConfig = require('./gen-webpack.node.config.js');
 
 /**
  * Expose bundled modules on window.theia.moduleName namespace, e.g.
  * window['theia']['@theia/core/lib/common/uri'].
  * Such syntax can be used by external code, for instance, for testing.
-config.module.rules.push({
+configs[0].module.rules.push({
     test: /\.js$/,
     loader: require.resolve('@theia/application-manager/lib/expose-loader')
 }); */
 
-if (process.platform !== 'win32') {
-    // For some reason, blueprint wants to bundle the `.node` files directly without going through `@vscode/windows-ca-certs`
-    backend.ignoredResources.add('@vscode/windows-ca-certs/build/Release/crypt32.node');
-}
-
-
 module.exports = [
-    ...config,
-    backend.config
-];
+    ...configs,
+    nodeConfig.config
+];

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.41.0",
+  "version": "1.42.1",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Rob Moran <github@thegecko.org>",
   "homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
@@ -16,7 +16,7 @@
     "node": ">=12.14.1"
   },
   "devDependencies": {
-    "@theia/cli": "1.41.0",
+    "@theia/cli": "1.42.1",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/eslint-plugin-tslint": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",

theia-extensions/launcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blueprint-launcher-ext",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "keywords": [
     "theia-extension"
   ],
@@ -18,7 +18,7 @@
     "src"
   ],
   "dependencies": {
-    "@theia/core": "1.41.0",
+    "@theia/core": "1.42.1",
     "body-parser": "^1.17.2",
     "fs-extra": "^4.0.2",
     "@vscode/sudo-prompt": "9.3.1"

theia-extensions/product/package.json

@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "blueprint-product-ext",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "description": "Eclipse Theia Blueprint Product Branding",
   "dependencies": {
-    "@theia/core": "1.41.0",
-    "@theia/getting-started": "1.41.0",
-    "@theia/vsx-registry": "1.41.0",
-    "@theia/workspace": "1.41.0",
+    "@theia/core": "1.42.1",
+    "@theia/getting-started": "1.42.1",
+    "@theia/vsx-registry": "1.42.1",
+    "@theia/workspace": "1.42.1",
     "inversify": "^6.0.1"
   },
   "devDependencies": {

theia-extensions/updater/package.json

@@ -1,12 +1,12 @@
 {
   "private": true,
   "name": "blueprint-updater-ext",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "description": "Eclipse Theia Blueprint Updater",
   "dependencies": {
-    "@theia/core": "1.41.0",
-    "@theia/output": "1.41.0",
-    "@theia/preferences": "1.41.0",
+    "@theia/core": "1.42.1",
+    "@theia/output": "1.42.1",
+    "@theia/preferences": "1.42.1",
     "electron-log": "^4.3.0",
     "electron-updater": "5.3.0",
     "fs-extra": "^10.0.0",