Skip to content

Commit

Permalink
Fix monitor demo applications
Browse files Browse the repository at this point in the history 
Use latest community release. Update to CRs from now on.

VSCode demo:
- Fix plugins folder location

Theia extension demo:
- Make Theia dependencies of extension peerDependencies.
- Build the demo with the local extension for easier testing.
- Make sure that the test directory is not cleared
    - This crashed the plugins

Contributed on behalf of STMicroelectronics

Co-authored-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
  • Loading branch information
@sgraband @jfaltermeier
sgraband and jfaltermeier committed Jan 10, 2024
1 parent fbfc675 commit 3526eb0
Show file tree
Hide file tree
Showing 9 changed files with 2,076 additions and 1,748 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- [java/service] Update Quarkus from 2.12.0 to 3.3.1 [#266](https://github.com/eclipsesource/theia-cloud/pull/266) - contributed on behalf of STMicroelectronics
- [java] Update fabric8 Kubernetes client from 5.12.2 to 6.7.2 [#266](https://github.com/eclipsesource/theia-cloud/pull/266) - contributed on behalf of STMicroelectronics
- [java/common] Introduce hub-objects for all custom resources [#266](https://github.com/eclipsesource/theia-cloud/pull/266) - contributed on behalf of STMicroelectronics
- [demo] Fix demo applications to Theia's latest Community Release (1.43.1) [#267](https://github.com/eclipsesource/theia-cloud/pull/267) - contributed on behalf of STMicroelectronics
- [node/monitor-theia] Make `@theia` dependencies peerDependencies [#267](https://github.com/eclipsesource/theia-cloud/pull/267) - contributed on behalf of STMicroelectronics

## [0.8.1] - 2023-10-01

Expand Down
80 changes: 40 additions & 40 deletions demo/dockerfiles/demo-theia-docker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,48 @@
}
},
"dependencies": {
"@theia/bulk-edit": "latest",
"@theia/callhierarchy": "latest",
"@theia/console": "latest",
"@theia/core": "latest",
"@theia/debug": "latest",
"@theia/editor": "latest",
"@theia/editor-preview": "latest",
"@theia/electron": "latest",
"@theia/external-terminal": "latest",
"@theia/file-search": "latest",
"@theia/filesystem": "latest",
"@theia/getting-started": "latest",
"@theia/keymaps": "latest",
"@theia/markers": "latest",
"@theia/messages": "latest",
"@theia/metrics": "latest",
"@theia/mini-browser": "latest",
"@theia/monaco": "latest",
"@theia/navigator": "latest",
"@theia/outline-view": "latest",
"@theia/output": "latest",
"@theia/plugin-dev": "latest",
"@theia/plugin-ext": "latest",
"@theia/plugin-ext-vscode": "latest",
"@theia/preferences": "latest",
"@theia/process": "latest",
"@theia/property-view": "latest",
"@theia/scm": "latest",
"@theia/scm-extra": "latest",
"@theia/search-in-workspace": "latest",
"@theia/task": "latest",
"@theia/terminal": "latest",
"@theia/timeline": "latest",
"@theia/toolbar": "latest",
"@theia/typehierarchy": "latest",
"@theia/userstorage": "latest",
"@theia/variable-resolver": "latest",
"@theia/vsx-registry": "latest",
"@theia/workspace": "latest"
"@theia/bulk-edit": "1.43.1",
"@theia/callhierarchy": "1.43.1",
"@theia/console": "1.43.1",
"@theia/core": "1.43.1",
"@theia/debug": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/editor-preview": "1.43.1",
"@theia/electron": "1.43.1",
"@theia/external-terminal": "1.43.1",
"@theia/file-search": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/metrics": "1.43.1",
"@theia/mini-browser": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/outline-view": "1.43.1",
"@theia/output": "1.43.1",
"@theia/plugin-dev": "1.43.1",
"@theia/plugin-ext": "1.43.1",
"@theia/plugin-ext-vscode": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/property-view": "1.43.1",
"@theia/scm": "1.43.1",
"@theia/scm-extra": "1.43.1",
"@theia/search-in-workspace": "1.43.1",
"@theia/task": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/timeline": "1.43.1",
"@theia/toolbar": "1.43.1",
"@theia/typehierarchy": "1.43.1",
"@theia/userstorage": "1.43.1",
"@theia/variable-resolver": "1.43.1",
"@theia/vsx-registry": "1.43.1",
"@theia/workspace": "1.43.1"
},
"devDependencies": {
"@theia/cli": "latest"
"@theia/cli": "1.43.1"
},
"scripts": {
"preinstall": "node-gyp install"
Expand Down
11 changes: 10 additions & 1 deletion demo/dockerfiles/demo-theia-monitor-theia/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
FROM node:16-bookworm as build-stage
RUN apt-get update && apt-get install -y libxkbfile-dev libsecret-1-dev
WORKDIR /home/theia
ADD package.json ./package.json
ADD demo/dockerfiles/demo-theia-monitor-theia/package.json ./package.json

## Link package from local
ADD node ./node
WORKDIR /home/theia/node
RUN npm ci && npm run build -w monitor-theia
WORKDIR /home/theia
RUN sed -i 's/"@eclipse-theiacloud\/monitor-theia": "next"/"@eclipse-theiacloud\/monitor-theia": "file:node\/monitor-theia"/' package.json

RUN yarn --pure-lockfile && \
NODE_OPTIONS="--max_old_space_size=4096" yarn theia build && \
yarn theia download:plugins && \
yarn --production && \
yarn autoclean --init && \
sed -i '/__tests__\|test\|tests\|powered-test/ s/^/#/' .yarnclean && \
echo *.ts >> .yarnclean && \
echo *.ts.map >> .yarnclean && \
echo *.spec.* >> .yarnclean && \
Expand Down
81 changes: 41 additions & 40 deletions demo/dockerfiles/demo-theia-monitor-theia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,50 @@
}
},
"dependencies": {
"@theia/bulk-edit": "^1.34.0",
"@theia/callhierarchy": "^1.34.0",
"@theia/console": "^1.34.0",
"@theia/core": "^1.34.0",
"@theia/debug": "^1.34.0",
"@theia/editor": "^1.34.0",
"@theia/editor-preview": "^1.34.0",
"@theia/electron": "^1.34.0",
"@theia/external-terminal": "^1.34.0",
"@theia/file-search": "^1.34.0",
"@theia/filesystem": "^1.34.0",
"@theia/getting-started": "^1.34.0",
"@theia/keymaps": "^1.34.0",
"@theia/markers": "^1.34.0",
"@theia/messages": "^1.34.0",
"@theia/metrics": "^1.34.0",
"@theia/mini-browser": "^1.34.0",
"@theia/monaco": "^1.34.0",
"@theia/navigator": "^1.34.0",
"@theia/outline-view": "^1.34.0",
"@theia/output": "^1.34.0",
"@theia/plugin-dev": "^1.34.0",
"@theia/plugin-ext": "^1.34.0",
"@theia/plugin-ext-vscode": "^1.34.0",
"@theia/preferences": "^1.34.0",
"@theia/process": "^1.34.0",
"@theia/property-view": "^1.34.0",
"@theia/scm": "^1.34.0",
"@theia/scm-extra": "^1.34.0",
"@theia/search-in-workspace": "^1.34.0",
"@theia/task": "^1.34.0",
"@theia/terminal": "^1.34.0",
"@theia/timeline": "^1.34.0",
"@theia/toolbar": "^1.34.0",
"@theia/typehierarchy": "^1.34.0",
"@theia/userstorage": "^1.34.0",
"@theia/variable-resolver": "^1.34.0",
"@theia/vsx-registry": "^1.34.0",
"@theia/workspace": "^1.34.0",
"@theia/bulk-edit": "1.43.1",
"@theia/callhierarchy": "1.43.1",
"@theia/console": "1.43.1",
"@theia/core": "1.43.1",
"@theia/debug": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/editor-preview": "1.43.1",
"@theia/electron": "1.43.1",
"@theia/external-terminal": "1.43.1",
"@theia/file-search": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/metrics": "1.43.1",
"@theia/mini-browser": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/outline-view": "1.43.1",
"@theia/output": "1.43.1",
"@theia/plugin-dev": "1.43.1",
"@theia/plugin-ext": "1.43.1",
"@theia/plugin-ext-vscode": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/property-view": "1.43.1",
"@theia/scm": "1.43.1",
"@theia/scm-extra": "1.43.1",
"@theia/search-in-workspace": "1.43.1",
"@theia/task": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/test": "1.43.1",
"@theia/timeline": "1.43.1",
"@theia/toolbar": "1.43.1",
"@theia/typehierarchy": "1.43.1",
"@theia/userstorage": "1.43.1",
"@theia/variable-resolver": "1.43.1",
"@theia/vsx-registry": "1.43.1",
"@theia/workspace": "1.43.1",
"@eclipse-theiacloud/monitor-theia": "next"
},
"devDependencies": {
"@theia/cli": "^1.34.0"
"@theia/cli": "1.43.1"
},
"scripts": {
"preinstall": "node-gyp install"
Expand Down
2 changes: 1 addition & 1 deletion demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM theiacloud/theia-cloud-demo:0.9.0-next as production-stage

COPY --chown=theia:theia theiacloud-monitor-0.9.0-next.vsix /home/theia/applications/browser/plugins
COPY --chown=theia:theia theiacloud-monitor-0.9.0-next.vsix /home/theia/plugins
80 changes: 40 additions & 40 deletions demo/dockerfiles/demo-theia-monitor-vscode/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,48 @@
}
},
"dependencies": {
"@theia/bulk-edit": "latest",
"@theia/callhierarchy": "latest",
"@theia/console": "latest",
"@theia/core": "latest",
"@theia/debug": "latest",
"@theia/editor": "latest",
"@theia/editor-preview": "latest",
"@theia/electron": "latest",
"@theia/external-terminal": "latest",
"@theia/file-search": "latest",
"@theia/filesystem": "latest",
"@theia/getting-started": "latest",
"@theia/keymaps": "latest",
"@theia/markers": "latest",
"@theia/messages": "latest",
"@theia/metrics": "latest",
"@theia/mini-browser": "latest",
"@theia/monaco": "latest",
"@theia/navigator": "latest",
"@theia/outline-view": "latest",
"@theia/output": "latest",
"@theia/plugin-dev": "latest",
"@theia/plugin-ext": "latest",
"@theia/plugin-ext-vscode": "latest",
"@theia/preferences": "latest",
"@theia/process": "latest",
"@theia/property-view": "latest",
"@theia/scm": "latest",
"@theia/scm-extra": "latest",
"@theia/search-in-workspace": "latest",
"@theia/task": "latest",
"@theia/terminal": "latest",
"@theia/timeline": "latest",
"@theia/toolbar": "latest",
"@theia/typehierarchy": "latest",
"@theia/userstorage": "latest",
"@theia/variable-resolver": "latest",
"@theia/vsx-registry": "latest",
"@theia/workspace": "latest"
"@theia/bulk-edit": "1.43.1",
"@theia/callhierarchy": "1.43.1",
"@theia/console": "1.43.1",
"@theia/core": "1.43.1",
"@theia/debug": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/editor-preview": "1.43.1",
"@theia/electron": "1.43.1",
"@theia/external-terminal": "1.43.1",
"@theia/file-search": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/metrics": "1.43.1",
"@theia/mini-browser": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/outline-view": "1.43.1",
"@theia/output": "1.43.1",
"@theia/plugin-dev": "1.43.1",
"@theia/plugin-ext": "1.43.1",
"@theia/plugin-ext-vscode": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/property-view": "1.43.1",
"@theia/scm": "1.43.1",
"@theia/scm-extra": "1.43.1",
"@theia/search-in-workspace": "1.43.1",
"@theia/task": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/timeline": "1.43.1",
"@theia/toolbar": "1.43.1",
"@theia/typehierarchy": "1.43.1",
"@theia/userstorage": "1.43.1",
"@theia/variable-resolver": "1.43.1",
"@theia/vsx-registry": "1.43.1",
"@theia/workspace": "1.43.1"
},
"devDependencies": {
"@theia/cli": "latest"
"@theia/cli": "1.43.1"
},
"scripts": {
"preinstall": "node-gyp install"
Expand Down
2 changes: 1 addition & 1 deletion doc/docs/Building-Internal.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ docker push theiacloud/theia-cloud-activity-demo:latest
Build and push the Theia Activity Tracker Theia Extension Demo application with:

```bash
docker build -t theiacloud/theia-cloud-activity-demo-theia:latest -f demo/dockerfiles/demo-theia-monitor-theia/Dockerfile demo/dockerfiles/demo-theia-monitor-theia/.
docker build -t theiacloud/theia-cloud-activity-demo-theia:latest -f demo/dockerfiles/demo-theia-monitor-theia/Dockerfile .
docker push theiacloud/theia-cloud-activity-demo-theia:latest
```

Expand Down
2 changes: 1 addition & 1 deletion node/monitor-theia/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lib",
"src"
],
"dependencies": {
"peerDependencies": {
"@theia/core": "^1.34.0",
"@theia/plugin-ext": "^1.34.0"
},
Expand Down
Loading

0 comments on commit 3526eb0

Please sign in to comment.