Skip to content

Commit

Permalink
Merge 1.52.0 changes to fork
Browse files Browse the repository at this point in the history
  • Loading branch information
iyannsch committed Aug 6, 2024
2 parents f237360 + eee0a28 commit b44e447
Show file tree
Hide file tree
Showing 11 changed files with 580 additions and 587 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ spec:
container('jnlp') {
script {
uploadInstaller('windows')
copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', '1.46.0,1.46.100,1.47.0,1.47.100,1.48.0,1.48.300,1.49.100,1.49.101,1.50.0')
copyInstallerAndUpdateLatestYml('windows', 'TheiaIDESetup', 'exe', 'latest.yml', '1.46.0,1.46.100,1.47.0,1.47.100,1.48.0,1.48.300,1.49.100,1.49.101,1.50.0,1.50.100,1.51.0')
}
}
}
Expand Down
90 changes: 45 additions & 45 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.50.100",
"version": "1.52.0",
"license": "MIT",
"author": "Eclipse Theia <[email protected]>",
"homepage": "https://github.com/eclipse-theia/theia-blueprint#readme",
Expand Down Expand Up @@ -44,52 +44,52 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.50.1",
"@theia/callhierarchy": "1.50.1",
"@theia/console": "1.50.1",
"@theia/core": "1.50.1",
"@theia/debug": "1.50.1",
"@theia/dev-container": "1.50.1",
"@theia/editor": "1.50.1",
"@theia/editor-preview": "1.50.1",
"@theia/external-terminal": "1.50.1",
"@theia/file-search": "1.50.1",
"@theia/filesystem": "1.50.1",
"@theia/getting-started": "1.50.1",
"@theia/keymaps": "1.50.1",
"@theia/markers": "1.50.1",
"@theia/memory-inspector": "1.50.1",
"@theia/messages": "1.50.1",
"@theia/metrics": "1.50.1",
"@theia/mini-browser": "1.50.1",
"@theia/monaco": "1.50.1",
"@theia/navigator": "1.50.1",
"@theia/outline-view": "1.50.1",
"@theia/output": "1.50.1",
"@theia/plugin-dev": "1.50.1",
"@theia/plugin-ext": "1.50.1",
"@theia/plugin-ext-vscode": "1.50.1",
"@theia/preferences": "1.50.1",
"@theia/process": "1.50.1",
"@theia/property-view": "1.50.1",
"@theia/remote": "1.50.1",
"@theia/scm": "1.50.1",
"@theia/search-in-workspace": "1.50.1",
"@theia/secondary-window": "1.50.1",
"@theia/task": "1.50.1",
"@theia/terminal": "1.50.1",
"@theia/timeline": "1.50.1",
"@theia/toolbar": "1.50.1",
"@theia/typehierarchy": "1.50.1",
"@theia/userstorage": "1.50.1",
"@theia/variable-resolver": "1.50.1",
"@theia/vsx-registry": "1.50.1",
"@theia/workspace": "1.50.1",
"@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",
"fs-extra": "^9.0.1",
"theia-ide-product-ext": "1.50.100"
"theia-ide-product-ext": "1.52.0"
},
"devDependencies": {
"@theia/cli": "1.50.1"
"@theia/cli": "1.52.0"
},
"scripts": {
"clean": "theia clean && rimraf node_modules",
Expand All @@ -101,4 +101,4 @@
"update:theia": "ts-node ../../scripts/update-theia-version.ts",
"update:next": "ts-node ../../scripts/update-theia-version.ts next"
}
}
}
96 changes: 48 additions & 48 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.50.100",
"version": "1.52.0",
"main": "scripts/theia-electron-main.js",
"license": "MIT",
"author": "Eclipse Theia <[email protected]>",
Expand Down Expand Up @@ -53,55 +53,55 @@
}
},
"dependencies": {
"@theia/bulk-edit": "1.50.1",
"@theia/callhierarchy": "1.50.1",
"@theia/console": "1.50.1",
"@theia/core": "1.50.1",
"@theia/debug": "1.50.1",
"@theia/dev-container": "1.50.1",
"@theia/editor": "1.50.1",
"@theia/editor-preview": "1.50.1",
"@theia/electron": "1.50.1",
"@theia/external-terminal": "1.50.1",
"@theia/file-search": "1.50.1",
"@theia/filesystem": "1.50.1",
"@theia/getting-started": "1.50.1",
"@theia/keymaps": "1.50.1",
"@theia/markers": "1.50.1",
"@theia/memory-inspector": "1.50.1",
"@theia/messages": "1.50.1",
"@theia/metrics": "1.50.1",
"@theia/mini-browser": "1.50.1",
"@theia/monaco": "1.50.1",
"@theia/navigator": "1.50.1",
"@theia/outline-view": "1.50.1",
"@theia/output": "1.50.1",
"@theia/plugin-dev": "1.50.1",
"@theia/plugin-ext": "1.50.1",
"@theia/plugin-ext-vscode": "1.50.1",
"@theia/preferences": "1.50.1",
"@theia/process": "1.50.1",
"@theia/property-view": "1.50.1",
"@theia/remote": "1.50.1",
"@theia/scm": "1.50.1",
"@theia/search-in-workspace": "1.50.1",
"@theia/secondary-window": "1.50.1",
"@theia/task": "1.50.1",
"@theia/terminal": "1.50.1",
"@theia/timeline": "1.50.1",
"@theia/toolbar": "1.50.1",
"@theia/typehierarchy": "1.50.1",
"@theia/userstorage": "1.50.1",
"@theia/variable-resolver": "1.50.1",
"@theia/vsx-registry": "1.50.1",
"@theia/workspace": "1.50.1",
"@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",
"fs-extra": "^9.0.1",
"theia-ide-launcher-ext": "1.50.100",
"theia-ide-product-ext": "1.50.100",
"theia-ide-updater-ext": "1.50.100"
"theia-ide-launcher-ext": "1.52.0",
"theia-ide-product-ext": "1.52.0",
"theia-ide-updater-ext": "1.52.0"
},
"devDependencies": {
"@theia/cli": "1.50.1",
"@theia/cli": "1.52.0",
"@types/js-yaml": "^3.12.0",
"@types/yargs": "17.0.7",
"@wdio/cli": "^6.10.2",
Expand Down Expand Up @@ -145,4 +145,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 browser.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN yarn --pure-lockfile && \
echo *.spec.* >> .yarnclean && \
yarn autoclean --force && \
yarn cache clean && \
rm -r .git applications/electron theia-extensions/launcher theia-extensions/updater node_modules
rm -rf .git applications/electron theia-extensions/launcher theia-extensions/updater node_modules

# Production stage uses a small base image
FROM node:18-bullseye-slim as production-stage
Expand Down
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.50.100",
"version": "1.52.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "1.50.100",
"version": "1.52.0",
"license": "MIT",
"author": "Rob Moran <[email protected]>",
"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.50.1",
"@theia/cli": "1.52.0",
"@typescript-eslint/eslint-plugin": "^4.25.0",
"@typescript-eslint/eslint-plugin-tslint": "^4.25.0",
"@typescript-eslint/parser": "^4.25.0",
Expand Down
6 changes: 3 additions & 3 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.50.100",
"version": "1.52.0",
"keywords": [
"theia-extension"
],
Expand All @@ -18,7 +18,7 @@
"src"
],
"dependencies": {
"@theia/core": "1.50.1",
"@theia/core": "1.52.0",
"@vscode/sudo-prompt": "9.3.1",
"body-parser": "^1.17.2",
"fs-extra": "^4.0.2"
Expand All @@ -42,4 +42,4 @@
"backend": "lib/node/launcher-backend-module"
}
]
}
}
12 changes: 6 additions & 6 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.50.100",
"version": "1.52.0",
"description": "Eclipse Theia IDE Product Branding",
"dependencies": {
"@theia/core": "1.50.1",
"@theia/getting-started": "1.50.1",
"@theia/vsx-registry": "1.50.1",
"@theia/workspace": "1.50.1",
"@theia/core": "1.52.0",
"@theia/getting-started": "1.52.0",
"@theia/vsx-registry": "1.52.0",
"@theia/workspace": "1.52.0",
"inversify": "^6.0.1"
},
"devDependencies": {
Expand Down Expand Up @@ -49,4 +49,4 @@
"peerDependencies": {
"react": "^16.8.0"
}
}
}
Loading

0 comments on commit b44e447

Please sign in to comment.