Merge branch 'blueprint'

# Conflicts: # applications/browser/package.json # applications/electron/package.json # eos-thesis-extensions/eos-thesis-launcher/package.json # eos-thesis-extensions/eos-thesis-product/package.json # eos-thesis-extensions/eos-thesis-updater/package.json # yarn.lock
giflw · Aug 11, 2023 · c7ebb17 · c7ebb17
2 parents ba34228 + bf31e6c
commit c7ebb17
Show file tree

Hide file tree

Showing 12 changed files with 578 additions and 767 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -236,7 +236,7 @@ spec:
                         container('jnlp') {
                             script {
                                 uploadInstaller('windows')
-                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.36.0,1.37.0,1.38.0')
+                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.37.0,1.38.0,1.39.0')
                             }
                         }
                     }
@@ -328,6 +328,7 @@ def updateMetadata(String executable, String yaml, String platform, int sleepBet
     int MAX_RETRY = 4
     try {
         sh "export NODE_OPTIONS=--max_old_space_size=4096"
+        sh "rm -rf node_modules"
         sh "yarn install --force"
         sh "yarn electron update:blockmap -e ${executable}"
         sh "yarn electron update:checksum -e ${executable} -y ${yaml} -p ${platform}"

diff --git a/applications/browser/package.json b/applications/browser/package.json
@@ -3,8 +3,8 @@
   "name": "eos-thesis-browser",
   "description": "Eos Thesis IDE browser product",
   "productName": "Eos Thesis IDE",
-  "version": "1.39.0",
-  "license": "EPL-2.0 NO IA",
+  "version": "1.40.0",
+  "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Eclipse Theia <[email protected]>",
   "homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
   "bugs": {
@@ -44,51 +44,51 @@
     }
   },
   "dependencies": {
-    "@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",
+    "@theia/bulk-edit": "1.40.0",
+    "@theia/callhierarchy": "1.40.0",
+    "@theia/console": "1.40.0",
+    "@theia/core": "1.40.0",
+    "@theia/debug": "1.40.0",
+    "@theia/editor": "1.40.0",
+    "@theia/editor-preview": "1.40.0",
+    "@theia/external-terminal": "1.40.0",
+    "@theia/file-search": "1.40.0",
+    "@theia/filesystem": "1.40.0",
+    "@theia/getting-started": "1.40.0",
+    "@theia/keymaps": "1.40.0",
+    "@theia/markers": "1.40.0",
+    "@theia/memory-inspector": "1.40.0",
+    "@theia/messages": "1.40.0",
+    "@theia/metrics": "1.40.0",
+    "@theia/mini-browser": "1.40.0",
+    "@theia/monaco": "1.40.0",
+    "@theia/navigator": "1.40.0",
+    "@theia/outline-view": "1.40.0",
+    "@theia/output": "1.40.0",
+    "@theia/plugin-dev": "1.40.0",
+    "@theia/plugin-ext": "1.40.0",
+    "@theia/plugin-ext-vscode": "1.40.0",
+    "@theia/preferences": "1.40.0",
+    "@theia/process": "1.40.0",
+    "@theia/property-view": "1.40.0",
+    "@theia/scm": "1.40.0",
+    "@theia/scm-extra": "1.40.0",
+    "@theia/search-in-workspace": "1.40.0",
+    "@theia/secondary-window": "1.40.0",
+    "@theia/task": "1.40.0",
+    "@theia/terminal": "1.40.0",
+    "@theia/timeline": "1.40.0",
+    "@theia/toolbar": "1.40.0",
+    "@theia/typehierarchy": "1.40.0",
+    "@theia/userstorage": "1.40.0",
+    "@theia/variable-resolver": "1.40.0",
+    "@theia/vsx-registry": "1.40.0",
+    "@theia/workspace": "1.40.0",
     "fs-extra": "^9.0.1",
-    "eos-thesis-product": "1.39.0"
+    "eos-thesis-product": "1.40.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.39.0"
+    "@theia/cli": "1.40.0"
   },
   "scripts": {
     "prepare": "yarn build",

diff --git a/applications/electron/electron-builder.yml b/applications/electron/electron-builder.yml
@@ -2,7 +2,7 @@ appId: giflw.eos-thesis-ide
 productName: EosThesisIDE
 copyright: Copyright © 2020-2023 Guilherme Weizenmann
 electronDist: ../../node_modules/electron/dist
-electronVersion: 23.3.9
+electronVersion: 23.3.11
 # 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.

diff --git a/applications/electron/package.json b/applications/electron/package.json
@@ -3,9 +3,9 @@
   "name": "eos-thesis-ide",
   "description": "Eos Thesis IDE by giflw",
   "productName": "Eos Thesis IDE",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "main": "scripts/eos-thesis-electron-main.js",
-  "license": "EPL-2.0 NO IA",
+  "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Guilherme Weizenmann <[email protected]>",
   "homepage": "https://github.com/giflw/eos-thesis-ide#readme",
   "bugs": {
@@ -43,54 +43,53 @@
     }
   },
   "dependencies": {
-    "@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",
-    "eos-thesis-product": "1.39.0",
-    "eos-thesis-updater": "1.39.0",
-    "eos-thesis-launcher": "1.39.0"
+    "@theia/bulk-edit": "1.40.0",
+    "@theia/callhierarchy": "1.40.0",
+    "@theia/console": "1.40.0",
+    "@theia/core": "1.40.0",
+    "@theia/debug": "1.40.0",
+    "@theia/editor": "1.40.0",
+    "@theia/editor-preview": "1.40.0",
+    "@theia/electron": "1.40.0",
+    "@theia/external-terminal": "1.40.0",
+    "@theia/file-search": "1.40.0",
+    "@theia/filesystem": "1.40.0",
+    "@theia/getting-started": "1.40.0",
+    "@theia/keymaps": "1.40.0",
+    "@theia/markers": "1.40.0",
+    "@theia/memory-inspector": "1.40.0",
+    "@theia/messages": "1.40.0",
+    "@theia/metrics": "1.40.0",
+    "@theia/mini-browser": "1.40.0",
+    "@theia/monaco": "1.40.0",
+    "@theia/navigator": "1.40.0",
+    "@theia/outline-view": "1.40.0",
+    "@theia/output": "1.40.0",
+    "@theia/plugin-dev": "1.40.0",
+    "@theia/plugin-ext": "1.40.0",
+    "@theia/plugin-ext-vscode": "1.40.0",
+    "@theia/preferences": "1.40.0",
+    "@theia/process": "1.40.0",
+    "@theia/property-view": "1.40.0",
+    "@theia/secondary-window": "1.40.0",
+    "@theia/scm": "1.40.0",
+    "@theia/scm-extra": "1.40.0",
+    "@theia/search-in-workspace": "1.40.0",
+    "@theia/task": "1.40.0",
+    "@theia/terminal": "1.40.0",
+    "@theia/timeline": "1.40.0",
+    "@theia/toolbar": "1.40.0",
+    "@theia/typehierarchy": "1.40.0",
+    "@theia/userstorage": "1.40.0",
+    "@theia/variable-resolver": "1.40.0",
+    "@theia/vsx-registry": "1.40.0",
+    "@theia/workspace": "1.40.0",
+    "eos-thesis-product": "1.40.0",
+    "eos-thesis-updater": "1.40.0",
+    "eos-thesis-launcher": "1.40.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.39.0",
+    "@theia/cli": "1.40.0",
     "@types/js-yaml": "^3.12.0",
     "@types/yargs": "17.0.7",
     "@wdio/cli": "^6.10.2",

diff --git a/applications/electron/test/app.spec.js b/applications/electron/test/app.spec.js
@@ -111,6 +111,9 @@ describe("Theia App", function() {
 
     // Expand builtin extensions
     const builtinHeader = await builtinContainer.$(".theia-header.header");
+    await builtinHeader.moveTo({ xOffset: 1, yOffset: 1 })
+    await builtinHeader.waitForDisplayed();
+    await builtinHeader.waitForClickable();
     await builtinHeader.click();
 
     // Wait for expansion to finish

diff --git a/eos-thesis-extensions/eos-thesis-launcher/package.json b/eos-thesis-extensions/eos-thesis-launcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eos-thesis-launcher",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "keywords": [
     "theia-extension"
   ],
@@ -18,7 +18,7 @@
     "src"
   ],
   "dependencies": {
-    "@theia/core": "1.39.0",
+    "@theia/core": "1.40.0",
     "@vscode/sudo-prompt": "9.3.1"
   },
   "devDependencies": {

diff --git a/eos-thesis-extensions/eos-thesis-product/package.json b/eos-thesis-extensions/eos-thesis-product/package.json
@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "eos-thesis-product",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "description": "Eos Thesis IDE Product Branding",
   "dependencies": {
-    "@theia/core": "1.39.0",
-    "@theia/getting-started": "1.39.0",
-    "@theia/vsx-registry": "1.39.0",
-    "@theia/workspace": "1.39.0",
+    "@theia/core": "1.40.0",
+    "@theia/getting-started": "1.40.0",
+    "@theia/vsx-registry": "1.40.0",
+    "@theia/workspace": "1.40.0",
     "inversify": "^6.0.1"
   },
   "devDependencies": {

diff --git a/eos-thesis-extensions/eos-thesis-updater/package.json b/eos-thesis-extensions/eos-thesis-updater/package.json
@@ -1,12 +1,12 @@
 {
   "private": true,
   "name": "eos-thesis-updater",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "description": "Eos Thesis IDE Updater",
   "dependencies": {
-    "@theia/core": "1.39.0",
-    "@theia/output": "1.39.0",
-    "@theia/preferences": "1.39.0",
+    "@theia/core": "1.40.0",
+    "@theia/output": "1.40.0",
+    "@theia/preferences": "1.40.0",
     "electron-log": "^4.3.0",
     "electron-updater": "5.3.0",
     "fs-extra": "^10.0.0",

diff --git a/...ns/eos-thesis-updater/src/electron-browser/updater/theia-updater-frontend-contribution.ts b/...ns/eos-thesis-updater/src/electron-browser/updater/theia-updater-frontend-contribution.ts
@@ -30,7 +30,6 @@ import { TheiaUpdater, TheiaUpdaterClient, UpdaterError } from '../../common/upd
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { CommonMenus, OpenerService } from '@theia/core/lib/browser';
 import { ElectronMainMenuFactory } from '@theia/core/lib/electron-browser/menu/electron-main-menu-factory';
-import { setInterval, clearInterval } from 'timers';
 import URI from '@theia/core/lib/common/uri';
 import { URI as VSCodeURI } from 'vscode-uri';
 

diff --git a/next/Jenkinsfile b/next/Jenkinsfile
@@ -167,6 +167,7 @@ def buildNext(boolean runTests, int sleepBetweenRetries) {
 
     echo "Upgrading versions"
     sh "yarn upgrade"
+    sh "git clean -xfd"
     try {
         sh(script: 'yarn --force')
     } catch(error) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.39.0",
+  "version": "1.40.0",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "author": "Rob Moran <[email protected]>",
   "homepage": "https://github.com/giflw/eos-thesis-ide#readme",
@@ -16,7 +16,7 @@
     "node": ">=12.14.1"
   },
   "devDependencies": {
-    "@theia/cli": "1.39.0",
+    "@theia/cli": "1.40.0",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/eslint-plugin-tslint": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",