Merge branch 'blueprint'

# Conflicts: # applications/browser/package.json # applications/electron/electron-builder.yml # 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 · Jul 26, 2023 · ba34228 · ba34228
2 parents 6288ad0 + 022878d
commit ba34228
Show file tree

Hide file tree

Showing 22 changed files with 2,245 additions and 2,320 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 **/lib
 **/src-gen
 **/gen-webpack.config.js
+**/gen-webpack.node.config.js
 **/plugins
 **/tsconfig.tsbuildinfo
 *.log

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -31,7 +31,7 @@
         "--log-level=debug",
         "--hostname=localhost",
         "--no-cluster",
-        "--app-project-path=${workspaceFolder}/examples/electron",
+        "--app-project-path=${workspaceFolder}/applications/electron",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
         "--plugins=local-dir:../../plugins"
@@ -55,12 +55,12 @@
       "type": "node",
       "request": "launch",
       "name": "Launch Browser Backend",
-      "program": "${workspaceFolder}/examples/browser/src-gen/backend/main.js",
+      "program": "${workspaceFolder}/applications/browser/src-gen/backend/main.js",
       "args": [
         "--hostname=0.0.0.0",
         "--port=3000",
         "--no-cluster",
-        "--app-project-path=${workspaceFolder}/examples/browser",
+        "--app-project-path=${workspaceFolder}/applications/browser",
         "--plugins=local-dir:plugins",
         "--hosted-plugin-inspect=9339"
       ],
@@ -69,8 +69,8 @@
       },
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceFolder}/examples/browser/src-gen/backend/*.js",
-        "${workspaceFolder}/examples/browser/lib/**/*.js",
+        "${workspaceFolder}/applications/browser/src-gen/backend/*.js",
+        "${workspaceFolder}/applications/browser/lib/**/*.js",
         "${workspaceFolder}/packages/*/lib/**/*.js",
         "${workspaceFolder}/dev-packages/*/lib/**/*.js"
       ],
@@ -94,7 +94,7 @@
       "type": "node",
       "request": "launch",
       "name": "Launch Browser Backend (eclipse.jdt.ls)",
-      "program": "${workspaceFolder}/examples/browser/src-gen/backend/main.js",
+      "program": "${workspaceFolder}/applications/browser/src-gen/backend/main.js",
       "args": [
         "--log-level=debug",
         "--root-dir=${workspaceFolder}/../eclipse.jdt.ls/org.eclipse.jdt.ls.core",
@@ -107,8 +107,8 @@
       },
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceFolder}/examples/browser/src-gen/backend/*.js",
-        "${workspaceFolder}/examples/browser/lib/**/*.js",
+        "${workspaceFolder}/applications/browser/src-gen/backend/*.js",
+        "${workspaceFolder}/applications/browser/lib/**/*.js",
         "${workspaceFolder}/packages/*/lib/**/*.js",
         "${workspaceFolder}/dev-packages/*/lib/**/*.js"
       ],
@@ -136,21 +136,21 @@
       "type": "chrome",
       "request": "launch",
       "url": "http://localhost:3000/",
-      "webRoot": "${workspaceFolder}/examples/browser"
+      "webRoot": "${workspaceFolder}/applications/browser"
     },
     {
       "type": "chrome",
       "request": "attach",
       "name": "Attach to Electron Frontend",
       "port": 9222,
-      "webRoot": "${workspaceFolder}/examples/electron"
+      "webRoot": "${workspaceFolder}/applications/electron"
     },
     {
       "name": "Launch VS Code Tests",
       "type": "node",
       "request": "launch",
       "args": [
-        "${workspaceFolder}/examples/browser/src-gen/backend/main.js",
+        "${workspaceFolder}/applications/browser/src-gen/backend/main.js",
         "${workspaceFolder}/plugins/vscode-api-tests/testWorkspace",
         "--port",
         "3030",
@@ -165,16 +165,6 @@
       "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": ["${workspaceFolder}/../.js"]
-    },
-    {
-      "name": "Run Playwright Test",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/examples/playwright/node_modules/.bin/playwright",
-      "args": ["test", "--debug", "--config=./configs/playwright.debug.config.ts", "${fileBasenameNoExtension}"],
-      "cwd": "${workspaceFolder}/examples/playwright",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen"
     }
   ],
   "compounds": [

diff --git a/Dockerfile b/Dockerfile
@@ -3,15 +3,7 @@
 # .github/workflows/publish-builder-img.yml
 # It can be triggered manually from the GitHub project page. 
 
-# We still want Ubuntu 18.04 LTS compatibility, which is based on stretch
-# -> install newer python version manually
-FROM node:14.19.3-stretch 
-RUN apt-get update && apt-get install -y libxkbfile-dev libsecret-1-dev && \
-    cd /tmp && \
-    wget https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tar.xz && \
-    tar xvf Python-3.6.15.tar.xz && \
-    cd Python-3.6.15 && \
-    ./configure --enable-optimizations --enable-loadable-sqlite-extensions && \
-    make -j 8 && \
-    make altinstall && \
-    update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.6 1
+# We still want Ubuntu 20.04 LTS compatibility, which is based on bullseye
+# -> buster is old enough
+FROM node:16.14.2-buster
+RUN apt-get update && apt-get install -y libxkbfile-dev libsecret-1-dev python3
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -47,6 +47,7 @@ spec:
   containers:
   - name: theia-dev
     image: eclipsetheia/theia-blueprint:builder
+    imagePullPolicy: Always
     command:
     - cat
     tty: true
@@ -82,7 +83,7 @@ spec:
                         container('theia-dev') {
                             withCredentials([string(credentialsId: "github-bot-token", variable: 'GITHUB_TOKEN')]) {
                                 script {
-                                    buildInstaller(1200)
+                                    buildInstaller(1200, false)
                                 }
                             }
                         }
@@ -100,7 +101,7 @@ spec:
                     }
                     steps {
                         script {
-                            buildInstaller(60)
+                            buildInstaller(60, false)
                         }
                         stash includes: "${distFolder}/*", name: 'mac'
                     }
@@ -118,7 +119,13 @@ spec:
                         script {
                             sh "npm config set msvs_version 2017"
                             sh "npx node-gyp install 14.20.0"
-                            buildInstaller(60)
+
+                            // analyze memory usage
+                            bat "wmic ComputerSystem get TotalPhysicalMemory"
+                            bat "wmic OS get FreePhysicalMemory"
+                            bat "tasklist"
+
+                            buildInstaller(60, true)
                         }
                         stash name: 'win'
                     }
@@ -177,6 +184,7 @@ spec:
   containers:
   - name: theia-dev
     image: eclipsetheia/theia-blueprint:builder
+    imagePullPolicy: Always
     command:
     - cat
     tty: true
@@ -218,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', '')
+                                copyInstallerAndUpdateLatestYml('windows', 'TheiaBlueprint', 'exe', 'latest.yml', '1.36.0,1.37.0,1.38.0')
                             }
                         }
                     }
@@ -236,10 +246,15 @@ spec:
     }
 }
 
-def buildInstaller(int sleepBetweenRetries) {
+def buildInstaller(int sleepBetweenRetries, boolean excludeBrowser) {
     int MAX_RETRY = 3
 
     checkout scm
+    if (excludeBrowser) {
+        sh "npm install -g ts-node typescript '@types/node'"
+        sh "ts-node scripts/patch-workspaces.ts"
+    }
+    sh "node --version"
     sh "export NODE_OPTIONS=--max_old_space_size=4096"
     sh "printenv && yarn cache dir"
     sh "yarn cache clean"

diff --git a/applications/browser/package.json b/applications/browser/package.json
@@ -1,10 +1,10 @@
 {
   "private": true,
   "name": "eos-thesis-browser",
-  "description": "Eclipse Theia blueprint browser product",
-  "productName": "Theia Blueprint",
-  "version": "1.36.0",
-  "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
+  "description": "Eos Thesis IDE browser product",
+  "productName": "Eos Thesis IDE",
+  "version": "1.39.0",
+  "license": "EPL-2.0 NO IA",
   "author": "Eclipse Theia <[email protected]>",
   "homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
   "bugs": {
@@ -25,7 +25,8 @@
         "warnOnPotentiallyInsecureHostPattern": false,
         "preferences": {
           "toolbar.showToolbar": true,
-          "files.enableTrash": false
+          "files.enableTrash": false,
+          "security.workspace.trust.enabled": false
         }
       }
     },
@@ -43,80 +44,78 @@
     }
   },
   "dependencies": {
-    "@theia/bulk-edit": "1.36.0",
-    "@theia/callhierarchy": "1.36.0",
-    "@theia/console": "1.36.0",
-    "@theia/core": "1.36.0",
-    "@theia/debug": "1.36.0",
-    "@theia/editor": "1.36.0",
-    "@theia/editor-preview": "1.36.0",
-    "@theia/external-terminal": "1.36.0",
-    "@theia/file-search": "1.36.0",
-    "@theia/filesystem": "1.36.0",
-    "@theia/getting-started": "1.36.0",
-    "@theia/keymaps": "1.36.0",
-    "@theia/markers": "1.36.0",
-    "@theia/messages": "1.36.0",
-    "@theia/memory-inspector": "1.36.0",
-    "@theia/metrics": "1.36.0",
-    "@theia/mini-browser": "1.36.0",
-    "@theia/monaco": "1.36.0",
-    "@theia/navigator": "1.36.0",
-    "@theia/outline-view": "1.36.0",
-    "@theia/output": "1.36.0",
-    "@theia/plugin-dev": "1.36.0",
-    "@theia/plugin-ext": "1.36.0",
-    "@theia/plugin-ext-vscode": "1.36.0",
-    "@theia/preferences": "1.36.0",
-    "@theia/process": "1.36.0",
-    "@theia/property-view": "1.36.0",
-    "@theia/scm": "1.36.0",
-    "@theia/scm-extra": "1.36.0",
-    "@theia/search-in-workspace": "1.36.0",
-    "@theia/task": "1.36.0",
-    "@theia/terminal": "1.36.0",
-    "@theia/timeline": "1.36.0",
-    "@theia/toolbar": "1.36.0",
-    "@theia/typehierarchy": "1.36.0",
-    "@theia/userstorage": "1.36.0",
-    "@theia/variable-resolver": "1.36.0",
-    "@theia/vsx-registry": "1.36.0",
-    "@theia/workspace": "1.36.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",
-    "eos-thesis-product": "1.36.0"
+    "eos-thesis-product": "1.39.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.36.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"
   },
   "theiaPluginsDir": "plugins",
   "theiaPlugins": {
-    "vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix",
-    "vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.50.1/file/eclipse-theia.builtin-extension-pack-1.50.1.vsix",
-    "vscode.typescript": "https://open-vsx.org/api/vscode/typescript/1.62.3/file/vscode.typescript-1.62.3.vsix",
-    "vscode.typescript-language-features": "https://open-vsx.org/api/vscode/typescript-language-features/1.62.3/file/vscode.typescript-language-features-1.62.3.vsix",
-    "redhat.java": "https://open-vsx.org/api/redhat/java/0.73.0/file/redhat.java-0.73.0.vsix",
-    "vscjava.vscode-java-debug": "https://open-vsx.org/api/vscjava/vscode-java-debug/0.30.0/file/vscjava.vscode-java-debug-0.30.0.vsix",
-    "vscjava.vscode-java-test": "https://open-vsx.org/api/vscjava/vscode-java-test/0.26.1/file/vscjava.vscode-java-test-0.26.1.vsix",
-    "vscjava.vscode-maven": "https://open-vsx.org/api/vscjava/vscode-maven/0.21.2/file/vscjava.vscode-maven-0.21.2.vsix",
-    "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.16.0/file/vscjava.vscode-java-dependency-0.16.0.vsix"
+    "vscode-builtin-extensions-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.77.0/file/eclipse-theia.builtin-extension-pack-1.77.0.vsix",
+    "vscjava.vscode-java-pack": "https://open-vsx.org/api/vscjava/vscode-java-pack/0.25.11/file/vscjava.vscode-java-pack-0.25.11.vsix",
+    "vscjava.vscode-java-dependency": "https://open-vsx.org/api/vscjava/vscode-java-dependency/0.21.2/file/vscjava.vscode-java-dependency-0.21.2.vsix"
   },
   "theiaPluginsExcludeIds": [
     "ms-vscode.js-debug-companion",
+    "VisualStudioExptTeam.vscodeintellicode",
+    "vscode.builtin-notebook-renderers",
     "vscode.extension-editing",
     "vscode.github",
     "vscode.github-authentication",
+    "vscode.ipynb",
     "vscode.microsoft-authentication"
   ]
 }
diff --git a/applications/browser/webpack.config.js b/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
+];