Skip to content

Commit

Permalink
Theia 1.53.0
Browse files Browse the repository at this point in the history
* update to latest Theia #378
* update electron
* add @theia/collaboration #383
* update Jenkinsfile global environment

Contributed on behalf of STMicroelectronics
  • Loading branch information
jfaltermeier committed Sep 2, 2024
1 parent eee0a28 commit 79aa091
Show file tree
Hide file tree
Showing 12 changed files with 660 additions and 563 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, ubuntu-latest, macos-14]
os: [windows-2019, ubuntu-latest, macos-12]
node: ['20.x']

runs-on: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ pipeline {
// THEIA_IDE_JENKINS_RELEASE_DRYRUN = 'true'
msvs_version = '2019'
GYP_MSVS_VERSION = '2019'

NODE_OPTIONS = '--max_old_space_size=4096'
}
stages {
stage('Build') {
Expand Down Expand Up @@ -289,7 +291,6 @@ def buildInstaller(int sleepBetweenRetries) {
}

sh 'node --version'
sh 'export NODE_OPTIONS=--max_old_space_size=4096'
sh 'printenv && yarn cache dir'
try {
sh(script: buildPackageCmd)
Expand Down Expand Up @@ -380,7 +381,6 @@ def updateMetadata(String executable, String yaml, String platform, int sleepBet

int maxRetry = 4
try {
sh "export NODE_OPTIONS=--max_old_space_size=4096"
// make sure the npm dependencies are available to the update scripts
sh "yarn install --force"
sh "yarn electron update:blockmap -e ${executable}"
Expand Down
89 changes: 45 additions & 44 deletions applications/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "theia-ide-browser-app",
"description": "Eclipse Theia IDE browser product",
"productName": "Theia IDE",
"version": "1.52.0",
"version": "1.53.0",
"license": "MIT",
"author": "Eclipse Theia <theia-dev@eclipse.org>",
"homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
Expand Down Expand Up @@ -44,52 +44,53 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.52.0",
"@theia/callhierarchy": "1.52.0",
"@theia/console": "1.52.0",
"@theia/core": "1.52.0",
"@theia/debug": "1.52.0",
"@theia/dev-container": "1.52.0",
"@theia/editor": "1.52.0",
"@theia/editor-preview": "1.52.0",
"@theia/external-terminal": "1.52.0",
"@theia/file-search": "1.52.0",
"@theia/filesystem": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/keymaps": "1.52.0",
"@theia/markers": "1.52.0",
"@theia/memory-inspector": "1.52.0",
"@theia/messages": "1.52.0",
"@theia/metrics": "1.52.0",
"@theia/mini-browser": "1.52.0",
"@theia/monaco": "1.52.0",
"@theia/navigator": "1.52.0",
"@theia/outline-view": "1.52.0",
"@theia/output": "1.52.0",
"@theia/plugin-dev": "1.52.0",
"@theia/plugin-ext": "1.52.0",
"@theia/plugin-ext-vscode": "1.52.0",
"@theia/preferences": "1.52.0",
"@theia/process": "1.52.0",
"@theia/property-view": "1.52.0",
"@theia/remote": "1.52.0",
"@theia/scm": "1.52.0",
"@theia/search-in-workspace": "1.52.0",
"@theia/secondary-window": "1.52.0",
"@theia/task": "1.52.0",
"@theia/terminal": "1.52.0",
"@theia/timeline": "1.52.0",
"@theia/toolbar": "1.52.0",
"@theia/typehierarchy": "1.52.0",
"@theia/userstorage": "1.52.0",
"@theia/variable-resolver": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"@theia/bulk-edit": "1.53.0",
"@theia/callhierarchy": "1.53.0",
"@theia/collaboration": "1.53.0",
"@theia/console": "1.53.0",
"@theia/core": "1.53.0",
"@theia/debug": "1.53.0",
"@theia/dev-container": "1.53.0",
"@theia/editor": "1.53.0",
"@theia/editor-preview": "1.53.0",
"@theia/external-terminal": "1.53.0",
"@theia/file-search": "1.53.0",
"@theia/filesystem": "1.53.0",
"@theia/getting-started": "1.53.0",
"@theia/keymaps": "1.53.0",
"@theia/markers": "1.53.0",
"@theia/memory-inspector": "1.53.0",
"@theia/messages": "1.53.0",
"@theia/metrics": "1.53.0",
"@theia/mini-browser": "1.53.0",
"@theia/monaco": "1.53.0",
"@theia/navigator": "1.53.0",
"@theia/outline-view": "1.53.0",
"@theia/output": "1.53.0",
"@theia/plugin-dev": "1.53.0",
"@theia/plugin-ext": "1.53.0",
"@theia/plugin-ext-vscode": "1.53.0",
"@theia/preferences": "1.53.0",
"@theia/process": "1.53.0",
"@theia/property-view": "1.53.0",
"@theia/remote": "1.53.0",
"@theia/scm": "1.53.0",
"@theia/search-in-workspace": "1.53.0",
"@theia/secondary-window": "1.53.0",
"@theia/task": "1.53.0",
"@theia/terminal": "1.53.0",
"@theia/timeline": "1.53.0",
"@theia/toolbar": "1.53.0",
"@theia/typehierarchy": "1.53.0",
"@theia/userstorage": "1.53.0",
"@theia/variable-resolver": "1.53.0",
"@theia/vsx-registry": "1.53.0",
"@theia/workspace": "1.53.0",
"fs-extra": "^9.0.1",
"theia-ide-product-ext": "1.52.0"
"theia-ide-product-ext": "1.53.0"
},
"devDependencies": {
"@theia/cli": "1.52.0"
"@theia/cli": "1.53.0"
},
"scripts": {
"clean": "theia clean && rimraf node_modules",
Expand Down
2 changes: 1 addition & 1 deletion applications/electron/electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ appId: eclipse.theia
productName: TheiaIDE
copyright: Copyright © 2020-2023 Eclipse Foundation, Inc
electronDist: ../../node_modules/electron/dist
electronVersion: 28.3.3
electronVersion: 30.4.0
# 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.
Expand Down
99 changes: 50 additions & 49 deletions applications/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "theia-ide-electron-app",
"description": "Eclipse Theia IDE product",
"productName": "Theia IDE",
"version": "1.52.0",
"version": "1.53.0",
"main": "scripts/theia-electron-main.js",
"license": "MIT",
"author": "Eclipse Theia <theia-dev@eclipse.org>",
Expand Down Expand Up @@ -53,55 +53,56 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.52.0",
"@theia/callhierarchy": "1.52.0",
"@theia/console": "1.52.0",
"@theia/core": "1.52.0",
"@theia/debug": "1.52.0",
"@theia/dev-container": "1.52.0",
"@theia/editor": "1.52.0",
"@theia/editor-preview": "1.52.0",
"@theia/electron": "1.52.0",
"@theia/external-terminal": "1.52.0",
"@theia/file-search": "1.52.0",
"@theia/filesystem": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/keymaps": "1.52.0",
"@theia/markers": "1.52.0",
"@theia/memory-inspector": "1.52.0",
"@theia/messages": "1.52.0",
"@theia/metrics": "1.52.0",
"@theia/mini-browser": "1.52.0",
"@theia/monaco": "1.52.0",
"@theia/navigator": "1.52.0",
"@theia/outline-view": "1.52.0",
"@theia/output": "1.52.0",
"@theia/plugin-dev": "1.52.0",
"@theia/plugin-ext": "1.52.0",
"@theia/plugin-ext-vscode": "1.52.0",
"@theia/preferences": "1.52.0",
"@theia/process": "1.52.0",
"@theia/property-view": "1.52.0",
"@theia/remote": "1.52.0",
"@theia/scm": "1.52.0",
"@theia/search-in-workspace": "1.52.0",
"@theia/secondary-window": "1.52.0",
"@theia/task": "1.52.0",
"@theia/terminal": "1.52.0",
"@theia/timeline": "1.52.0",
"@theia/toolbar": "1.52.0",
"@theia/typehierarchy": "1.52.0",
"@theia/userstorage": "1.52.0",
"@theia/variable-resolver": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"@theia/bulk-edit": "1.53.0",
"@theia/callhierarchy": "1.53.0",
"@theia/collaboration": "1.53.0",
"@theia/console": "1.53.0",
"@theia/core": "1.53.0",
"@theia/debug": "1.53.0",
"@theia/dev-container": "1.53.0",
"@theia/editor": "1.53.0",
"@theia/editor-preview": "1.53.0",
"@theia/electron": "1.53.0",
"@theia/external-terminal": "1.53.0",
"@theia/file-search": "1.53.0",
"@theia/filesystem": "1.53.0",
"@theia/getting-started": "1.53.0",
"@theia/keymaps": "1.53.0",
"@theia/markers": "1.53.0",
"@theia/memory-inspector": "1.53.0",
"@theia/messages": "1.53.0",
"@theia/metrics": "1.53.0",
"@theia/mini-browser": "1.53.0",
"@theia/monaco": "1.53.0",
"@theia/navigator": "1.53.0",
"@theia/outline-view": "1.53.0",
"@theia/output": "1.53.0",
"@theia/plugin-dev": "1.53.0",
"@theia/plugin-ext": "1.53.0",
"@theia/plugin-ext-vscode": "1.53.0",
"@theia/preferences": "1.53.0",
"@theia/process": "1.53.0",
"@theia/property-view": "1.53.0",
"@theia/remote": "1.53.0",
"@theia/scm": "1.53.0",
"@theia/search-in-workspace": "1.53.0",
"@theia/secondary-window": "1.53.0",
"@theia/task": "1.53.0",
"@theia/terminal": "1.53.0",
"@theia/timeline": "1.53.0",
"@theia/toolbar": "1.53.0",
"@theia/typehierarchy": "1.53.0",
"@theia/userstorage": "1.53.0",
"@theia/variable-resolver": "1.53.0",
"@theia/vsx-registry": "1.53.0",
"@theia/workspace": "1.53.0",
"fs-extra": "^9.0.1",
"theia-ide-launcher-ext": "1.52.0",
"theia-ide-product-ext": "1.52.0",
"theia-ide-updater-ext": "1.52.0"
"theia-ide-launcher-ext": "1.53.0",
"theia-ide-product-ext": "1.53.0",
"theia-ide-updater-ext": "1.53.0"
},
"devDependencies": {
"@theia/cli": "1.52.0",
"@theia/cli": "1.53.0",
"@types/js-yaml": "^3.12.0",
"@types/yargs": "17.0.7",
"@wdio/cli": "^6.10.2",
Expand All @@ -111,7 +112,7 @@
"app-builder-lib": "24.13.2",
"chai": "^4.3.10",
"concurrently": "^3.5.0",
"electron": "^28.2.8",
"electron": "^30.1.2",
"electron-builder": "24.13.2",
"electron-chromedriver": "^28.2.8",
"electron-mocha": "^12.3.0",
Expand Down Expand Up @@ -145,4 +146,4 @@
"lint": "eslint --ext js,jsx,ts,tsx scripts && eslint --ext js,jsx,ts,tsx test",
"lint:fix": "eslint --ext js,jsx,ts,tsx scripts --fix && eslint --ext js,jsx,ts,tsx test -fix"
}
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "4.0.0",
"version": "1.52.0",
"version": "1.53.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
Expand Down
5 changes: 3 additions & 2 deletions next/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ pipeline {
timeout(time: 5, unit: 'HOURS')
disableConcurrentBuilds()
}
environment {
NODE_OPTIONS = '--max_old_space_size=4096'
}
stages {
stage('Build') {
parallel {
Expand Down Expand Up @@ -137,8 +140,6 @@ def buildNext(boolean runTests, int sleepBetweenRetries) {
sh "git merge FETCH_HEAD"
sh "node --version"

sh "export NODE_OPTIONS=--max_old_space_size=4096"

// regular build
sh "printenv && yarn cache dir"

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "1.52.0",
"version": "1.53.0",
"license": "MIT",
"author": "Rob Moran <github@thegecko.org>",
"homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
Expand All @@ -17,7 +17,7 @@
},
"devDependencies": {
"@eclipse-dash/nodejs-wrapper": "^0.0.1",
"@theia/cli": "1.52.0",
"@theia/cli": "1.53.0",
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/eslint-plugin-tslint": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
Expand Down Expand Up @@ -81,7 +81,7 @@
"@types/puppeteer": "^5.4.0",
"@yarnpkg/parsers": "3.0.0-rc.44",
"**/multer": "1.4.4-lts.1",
"**/nan": "2.18.0",
"**/nan": "2.20.0",
"**/cpu-features": "0.0.9"
}
}
4 changes: 2 additions & 2 deletions theia-extensions/launcher/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theia-ide-launcher-ext",
"version": "1.52.0",
"version": "1.53.0",
"keywords": [
"theia-extension"
],
Expand All @@ -18,7 +18,7 @@
"src"
],
"dependencies": {
"@theia/core": "1.52.0",
"@theia/core": "1.53.0",
"@vscode/sudo-prompt": "9.3.1",
"body-parser": "^1.17.2",
"fs-extra": "^4.0.2"
Expand Down
10 changes: 5 additions & 5 deletions theia-extensions/product/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"private": true,
"name": "theia-ide-product-ext",
"version": "1.52.0",
"version": "1.53.0",
"description": "Eclipse Theia IDE Product Branding",
"dependencies": {
"@theia/core": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"@theia/core": "1.53.0",
"@theia/getting-started": "1.53.0",
"@theia/vsx-registry": "1.53.0",
"@theia/workspace": "1.53.0",
"inversify": "^6.0.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions theia-extensions/updater/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"private": true,
"name": "theia-ide-updater-ext",
"version": "1.52.0",
"version": "1.53.0",
"description": "Eclipse Theia IDE Updater",
"dependencies": {
"@theia/core": "1.52.0",
"@theia/output": "1.52.0",
"@theia/preferences": "1.52.0",
"@theia/core": "1.53.0",
"@theia/output": "1.53.0",
"@theia/preferences": "1.53.0",
"electron-log": "^4.3.0",
"electron-updater": "5.3.0",
"fs-extra": "^10.0.0",
Expand Down
Loading

0 comments on commit 79aa091

Please sign in to comment.