Update to 1.39.0 [ Jenkins ]

.gitignore

@@ -5,6 +5,7 @@
 **/lib
 **/src-gen
 **/gen-webpack.config.js
+**/gen-webpack.node.config.js
 **/plugins
 **/tsconfig.tsbuildinfo
 *.log

Jenkinsfile

@@ -226,15 +226,17 @@ spec:
                     steps {
                         unstash 'win'
                         container('theia-dev') {
-                            script {
-                                signInstaller('exe', 'windows')
-                                updateMetadata('TheiaBlueprint.exe', 'latest.yml', 'windows', 1200)
+                            withCredentials([string(credentialsId: "github-bot-token", variable: 'GITHUB_TOKEN')]) {
+                                script {
+                                    signInstaller('exe', 'windows')
+                                    updateMetadata('TheiaBlueprint.exe', 'latest.yml', 'windows', 1200)
+                                }
                             }
                         }
                         container('jnlp') {
                             script {
                                 uploadInstaller('windows')
-                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.36.0,1.37.0')
+                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.36.0,1.37.0,1.38.0')
                             }
                         }
                     }

applications/browser/package.json

@@ -3,7 +3,7 @@
   "name": "theia-blueprint-browser",
   "description": "Eclipse Theia blueprint browser product",
   "productName": "Theia Blueprint",
-  "version": "1.38.0",
+  "version": "1.39.0",
   "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,60 +44,60 @@
     }
   },
   "dependencies": {
-    "@theia/bulk-edit": "1.38.0",
-    "@theia/callhierarchy": "1.38.0",
-    "@theia/console": "1.38.0",
-    "@theia/core": "1.38.0",
-    "@theia/debug": "1.38.0",
-    "@theia/editor": "1.38.0",
-    "@theia/editor-preview": "1.38.0",
-    "@theia/external-terminal": "1.38.0",
-    "@theia/file-search": "1.38.0",
-    "@theia/filesystem": "1.38.0",
-    "@theia/getting-started": "1.38.0",
-    "@theia/keymaps": "1.38.0",
-    "@theia/markers": "1.38.0",
-    "@theia/memory-inspector": "1.38.0",
-    "@theia/messages": "1.38.0",
-    "@theia/metrics": "1.38.0",
-    "@theia/mini-browser": "1.38.0",
-    "@theia/monaco": "1.38.0",
-    "@theia/navigator": "1.38.0",
-    "@theia/outline-view": "1.38.0",
-    "@theia/output": "1.38.0",
-    "@theia/plugin-dev": "1.38.0",
-    "@theia/plugin-ext": "1.38.0",
-    "@theia/plugin-ext-vscode": "1.38.0",
-    "@theia/preferences": "1.38.0",
-    "@theia/process": "1.38.0",
-    "@theia/property-view": "1.38.0",
-    "@theia/scm": "1.38.0",
-    "@theia/scm-extra": "1.38.0",
-    "@theia/search-in-workspace": "1.38.0",
-    "@theia/secondary-window": "1.38.0",
-    "@theia/task": "1.38.0",
-    "@theia/terminal": "1.38.0",
-    "@theia/timeline": "1.38.0",
-    "@theia/toolbar": "1.38.0",
-    "@theia/typehierarchy": "1.38.0",
-    "@theia/userstorage": "1.38.0",
-    "@theia/variable-resolver": "1.38.0",
-    "@theia/vsx-registry": "1.38.0",
-    "@theia/workspace": "1.38.0",
+    "@theia/bulk-edit": "1.39.0",
+    "@theia/callhierarchy": "1.39.0",
+    "@theia/console": "1.39.0",
+    "@theia/core": "1.39.0",
+    "@theia/debug": "1.39.0",
+    "@theia/editor": "1.39.0",
+    "@theia/editor-preview": "1.39.0",
+    "@theia/external-terminal": "1.39.0",
+    "@theia/file-search": "1.39.0",
+    "@theia/filesystem": "1.39.0",
+    "@theia/getting-started": "1.39.0",
+    "@theia/keymaps": "1.39.0",
+    "@theia/markers": "1.39.0",
+    "@theia/memory-inspector": "1.39.0",
+    "@theia/messages": "1.39.0",
+    "@theia/metrics": "1.39.0",
+    "@theia/mini-browser": "1.39.0",
+    "@theia/monaco": "1.39.0",
+    "@theia/navigator": "1.39.0",
+    "@theia/outline-view": "1.39.0",
+    "@theia/output": "1.39.0",
+    "@theia/plugin-dev": "1.39.0",
+    "@theia/plugin-ext": "1.39.0",
+    "@theia/plugin-ext-vscode": "1.39.0",
+    "@theia/preferences": "1.39.0",
+    "@theia/process": "1.39.0",
+    "@theia/property-view": "1.39.0",
+    "@theia/scm": "1.39.0",
+    "@theia/scm-extra": "1.39.0",
+    "@theia/search-in-workspace": "1.39.0",
+    "@theia/secondary-window": "1.39.0",
+    "@theia/task": "1.39.0",
+    "@theia/terminal": "1.39.0",
+    "@theia/timeline": "1.39.0",
+    "@theia/toolbar": "1.39.0",
+    "@theia/typehierarchy": "1.39.0",
+    "@theia/userstorage": "1.39.0",
+    "@theia/variable-resolver": "1.39.0",
+    "@theia/vsx-registry": "1.39.0",
+    "@theia/workspace": "1.39.0",
     "fs-extra": "^9.0.1",
-    "theia-blueprint-product": "1.38.0"
+    "theia-blueprint-product": "1.39.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.38.0"
+    "@theia/cli": "1.39.0"
   },
   "scripts": {
     "prepare": "yarn build",
     "clean": "theia clean && rimraf node_modules",
     "build": "yarn -s compile && yarn -s bundle",
-    "bundle": "theia build",
+    "bundle": "yarn -s rebuild && theia build",
     "compile": "tsc -b",
     "rebuild": "theia rebuild:browser --cacheRoot ../..",
-    "start": "yarn -s rebuild && theia start --plugins=local-dir:./plugins",
+    "start": "theia start --plugins=local-dir:./plugins",
     "watch": "concurrently --kill-others -n tsc,bundle -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s watch:bundle\"",
     "download:plugins": "theia download:plugins --rate-limit=15",
     "update:next": "ts-node ../../scripts/update-theia-to-next.ts"

applications/browser/webpack.config.js

@@ -4,6 +4,7 @@
  */
 // @ts-check
 const config = require('./gen-webpack.config.js');
+const backend = require('./gen-webpack.node.config.js');
 
 /**
  * Expose bundled modules on window.theia.moduleName namespace, e.g.
@@ -14,4 +15,12 @@ config.module.rules.push({
     loader: require.resolve('@theia/application-manager/lib/expose-loader')
 }); */
 
-module.exports = config;
+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
+];

applications/electron/electron-builder.yml

@@ -1,8 +1,8 @@
 appId: eclipse.theia
 productName: TheiaBlueprint
-copyright: Copyright © 2020-2022 Eclipse Foundation, Inc
+copyright: Copyright © 2020-2023 Eclipse Foundation, Inc
 electronDist: ../../node_modules/electron/dist
-electronVersion: 23.3.5
+electronVersion: 23.3.9
 # Although it is generally not recommended to disable asar, it is required for Theia.
 # Enabling this leads to: process ERROR Error: spawn ENOTDIR
 # because binaries can not be executed from the asar archive.
@@ -15,13 +15,12 @@ directories:
   buildResources: resources
 
 # node_modules and package.json are copied automatically
-# Copying node_modules must be automatic for correct resolvement of binaries.
-# Furthermore, This reduces bundle sizes significantly because it avoids duplicates of the electron runtime.
+# Exclude node_modules manually because electron is copied by electron-builder and we are using a bundled backend
 files:
   - src-gen
   - lib
   - scripts
-  - "!**node_modules/electron/**"
+  - "!**node_modules/**"
 extraResources:
   - from: plugins
     to: app/plugins

applications/electron/package.json

@@ -3,7 +3,7 @@
   "name": "theia-blueprint",
   "description": "Eclipse Theia blueprint product",
   "productName": "Theia Blueprint",
-  "version": "1.38.0",
+  "version": "1.39.0",
   "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>",
@@ -43,53 +43,54 @@
     }
   },
   "dependencies": {
-    "@theia/bulk-edit": "1.38.0",
-    "@theia/callhierarchy": "1.38.0",
-    "@theia/console": "1.38.0",
-    "@theia/core": "1.38.0",
-    "@theia/debug": "1.38.0",
-    "@theia/editor": "1.38.0",
-    "@theia/editor-preview": "1.38.0",
-    "@theia/electron": "1.38.0",
-    "@theia/external-terminal": "1.38.0",
-    "@theia/file-search": "1.38.0",
-    "@theia/filesystem": "1.38.0",
-    "@theia/getting-started": "1.38.0",
-    "@theia/keymaps": "1.38.0",
-    "@theia/markers": "1.38.0",
-    "@theia/memory-inspector": "1.38.0",
-    "@theia/messages": "1.38.0",
-    "@theia/metrics": "1.38.0",
-    "@theia/mini-browser": "1.38.0",
-    "@theia/monaco": "1.38.0",
-    "@theia/navigator": "1.38.0",
-    "@theia/outline-view": "1.38.0",
-    "@theia/output": "1.38.0",
-    "@theia/plugin-dev": "1.38.0",
-    "@theia/plugin-ext": "1.38.0",
-    "@theia/plugin-ext-vscode": "1.38.0",
-    "@theia/preferences": "1.38.0",
-    "@theia/process": "1.38.0",
-    "@theia/property-view": "1.38.0",
-    "@theia/scm": "1.38.0",
-    "@theia/scm-extra": "1.38.0",
-    "@theia/search-in-workspace": "1.38.0",
-    "@theia/task": "1.38.0",
-    "@theia/terminal": "1.38.0",
-    "@theia/timeline": "1.38.0",
-    "@theia/toolbar": "1.38.0",
-    "@theia/typehierarchy": "1.38.0",
-    "@theia/userstorage": "1.38.0",
-    "@theia/variable-resolver": "1.38.0",
-    "@theia/vsx-registry": "1.38.0",
-    "@theia/workspace": "1.38.0",
+    "@theia/bulk-edit": "1.39.0",
+    "@theia/callhierarchy": "1.39.0",
+    "@theia/console": "1.39.0",
+    "@theia/core": "1.39.0",
+    "@theia/debug": "1.39.0",
+    "@theia/editor": "1.39.0",
+    "@theia/editor-preview": "1.39.0",
+    "@theia/electron": "1.39.0",
+    "@theia/external-terminal": "1.39.0",
+    "@theia/file-search": "1.39.0",
+    "@theia/filesystem": "1.39.0",
+    "@theia/getting-started": "1.39.0",
+    "@theia/keymaps": "1.39.0",
+    "@theia/markers": "1.39.0",
+    "@theia/memory-inspector": "1.39.0",
+    "@theia/messages": "1.39.0",
+    "@theia/metrics": "1.39.0",
+    "@theia/mini-browser": "1.39.0",
+    "@theia/monaco": "1.39.0",
+    "@theia/navigator": "1.39.0",
+    "@theia/outline-view": "1.39.0",
+    "@theia/output": "1.39.0",
+    "@theia/plugin-dev": "1.39.0",
+    "@theia/plugin-ext": "1.39.0",
+    "@theia/plugin-ext-vscode": "1.39.0",
+    "@theia/preferences": "1.39.0",
+    "@theia/process": "1.39.0",
+    "@theia/property-view": "1.39.0",    
+    "@theia/secondary-window": "1.39.0",
+    "@theia/scm": "1.39.0",
+    "@theia/scm-extra": "1.39.0",
+    "@theia/search-in-workspace": "1.39.0",
+    "@theia/task": "1.39.0",
+    "@theia/terminal": "1.39.0",
+    "@theia/timeline": "1.39.0",
+    "@theia/toolbar": "1.39.0",
+    "@theia/typehierarchy": "1.39.0",
+    "@theia/userstorage": "1.39.0",
+    "@theia/variable-resolver": "1.39.0",
+    "@theia/vsx-registry": "1.39.0",
+    "@theia/workspace": "1.39.0",
     "fs-extra": "^9.0.1",
-    "theia-blueprint-updater": "1.38.0",
-    "theia-blueprint-product": "1.38.0",
-    "theia-blueprint-launcher": "1.38.0"
+    "theia-blueprint-updater": "1.39.0",
+    "theia-blueprint-product": "1.39.0",
+    "theia-blueprint-launcher": "1.39.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.38.0",
+    "@theia/cli": "1.39.0",
     "@types/js-yaml": "^3.12.0",
     "@types/yargs": "17.0.7",
     "@wdio/cli": "^6.10.2",
@@ -116,14 +117,14 @@
     "clean": "theia clean && rimraf node_modules",
     "clean:dist": "rimraf dist",
     "build": "yarn -s bundle",
-    "bundle": "theia build",
+    "bundle": "yarn -s rebuild && theia build",
     "rebuild": "theia rebuild:electron",
     "watch": "concurrently -n compile,bundle \"theiaext watch --preserveWatchOutput\" \"theia build --watch --mode development\"",
-    "start": "yarn -s rebuild && electron scripts/theia-electron-main.js",
+    "start": "electron scripts/theia-electron-main.js",
     "start:debug": "yarn start --log-level=debug",
-    "package": "yarn clean:dist && yarn -s rebuild && electron-builder -c.mac.identity=null --publish never",
-    "deploy": "yarn clean:dist && yarn -s rebuild && electron-builder -c.mac.identity=null --publish always",
-    "package:preview": "yarn clean:dist && yarn -s rebuild && electron-builder -c.mac.identity=null --dir",
+    "package": "yarn clean:dist && electron-builder -c.mac.identity=null --publish never",
+    "deploy": "yarn clean:dist && electron-builder -c.mac.identity=null --publish always",
+    "package:preview": "yarn clean:dist && electron-builder -c.mac.identity=null --dir",
     "update:checksum": "ts-node scripts/update-checksum.ts",
     "update:blockmap": "ts-node scripts/update-blockmap.ts",
     "update:next": "ts-node ../../scripts/update-theia-to-next.ts",

applications/electron/scripts/theia-electron-main.js

@@ -13,4 +13,4 @@ process.env.THEIA_PLUGINS = [
 ].filter(Boolean).join(',')
 
 // Handover to the auto-generated electron application handler.
-require('../src-gen/frontend/electron-main.js')
+require('../lib/backend/electron-main.js')

applications/electron/webpack.config.js

@@ -4,6 +4,7 @@
  */
 // @ts-check
 const config = require('./gen-webpack.config.js');
+const backend = require('./gen-webpack.node.config.js');
 
 /**
  * Expose bundled modules on window.theia.moduleName namespace, e.g.
@@ -14,4 +15,13 @@ config.module.rules.push({
     loader: require.resolve('@theia/application-manager/lib/expose-loader')
 }); */
 
-module.exports = config;
+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
+];

browser.Dockerfile

@@ -21,7 +21,7 @@ RUN yarn --pure-lockfile && \
     echo *.spec.* >> .yarnclean && \
     yarn autoclean --force && \
     yarn cache clean && \
-    rm -rf .git applications/electron theia-extensions/theia-blueprint-launcher theia-extensions/theia-blueprint-updater
+    rm -rf .git applications/electron theia-extensions/theia-blueprint-launcher theia-extensions/theia-blueprint-updater node_modules
 
 # Production stage uses a small base image
 FROM node:16-bullseye-slim as production-stage
@@ -64,7 +64,7 @@ USER theia
 WORKDIR /home/theia/applications/browser
 
 # Launch the backend application via node
-ENTRYPOINT [ "node", "/home/theia/applications/browser/src-gen/backend/main.js" ]
+ENTRYPOINT [ "node", "/home/theia/applications/browser/lib/backend/main.js" ]
 
 # Arguments passed to the application
 CMD [ "/home/project", "--hostname=0.0.0.0" ]

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.38.0",
+  "version": "1.39.0",
   "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.38.0",
+    "@theia/cli": "1.39.0",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/eslint-plugin-tslint": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",
@@ -51,6 +51,7 @@
   ],
   "resolutions": {
     "@types/puppeteer": "^5.4.0",
+    "@yarnpkg/parsers": "3.0.0-rc.44",
     "**/msgpackr": "1.8.3",
     "**/multer": "1.4.4-lts.1"
   }