-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Add an electron example app in addition to the browser app. This allows use to also test the electron use case and makes it easier to discover electron specific issues. - Adapt the build scripts to the same convention as used in the Theia repository. - yarn (install) only compiles the ts sources but does not build any example app - Example apps have to be built explicitly with `yarn browser build` or `yarn electron build` - Rename glsp debug arugment to avoid clashes with nodes debug argument - Update readmes and launch configs - Update Jenkins file - Update grid and tool palette styling - Update example1.wf - Allow reuse of `createDiagramWidgetFactory` for custom diagram widget - Add temporary workaround to remove @vscode/ripgrep postinstall script which often fails the build to rate limits. Can be removed once we have access to the github token in the ci. i.e. switch to GH actions
- Loading branch information
Showing
18 changed files
with
1,608 additions
and
945 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,10 +8,10 @@ spec: | |
| tty: true | ||
| resources: | ||
| limits: | ||
| memory: "2Gi" | ||
| memory: "4Gi" | ||
| cpu: "1" | ||
| requests: | ||
| memory: "2Gi" | ||
| memory: "4Gi" | ||
| cpu: "1" | ||
| command: | ||
| - cat | ||
|
|
@@ -45,6 +45,7 @@ pipeline { | |
| SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}" | ||
| EMAIL_TO= "[email protected]" | ||
| PUPPETEER_SKIP_DOWNLOAD="true" | ||
| ELECTRON_SKIP_BINARY_DOWNLOAD=1 | ||
| } | ||
|
|
||
| stages { | ||
|
|
@@ -53,6 +54,7 @@ pipeline { | |
| timeout(30) { | ||
| container('node') { | ||
| sh "yarn install --unsafe-perm" | ||
| sh "yarn browser build" | ||
| script { | ||
| // Fail the step if there are uncommited changes to the yarn.lock file | ||
| if (sh(returnStatus: true, script: 'git diff --name-only | grep -q "^yarn.lock"') == 0) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| const fs = require('fs'); | ||
| const path = require('path'); | ||
|
|
||
| // Path to the dependency's package.json | ||
| const dependencyPath = path.join(__dirname, '..', 'node_modules', '@vscode', 'ripgrep', 'package.json'); | ||
|
|
||
| // Read the dependency's package.json | ||
| const packageJson = JSON.parse(fs.readFileSync(dependencyPath, 'utf8')); | ||
|
|
||
| // Remove the postinstall script | ||
| if (packageJson.scripts && packageJson.scripts.postinstall) { | ||
| delete packageJson.scripts.postinstall; | ||
| } | ||
|
|
||
| // Write the modified package.json back to the file system | ||
| fs.writeFileSync(dependencyPath, JSON.stringify(packageJson, null, 2), 'utf8'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| { | ||
| "name": "electron-app", | ||
| "version": "2.2.0-next", | ||
| "private": true, | ||
| "main": "lib/backend/electron-main.js", | ||
| "scripts": { | ||
| "build": "yarn rebuild && theia build --mode development", | ||
| "clean": "rimraf lib", | ||
| "rebuild": "theia rebuild:electron --cacheRoot ../..", | ||
| "postinstall": "node ../../configs/disable-ripgrep-postinstall.js", | ||
| "start": "theia start --WF_GLSP=0 --root-dir=../workspace", | ||
| "start:debug": "theia start --WF_GLSP=5007 --root-dir=../workspace --loglevel=debug --glspDebug", | ||
| "start:integrated": "theia start --WF_GLSP=5007 --root-dir=../workspace --loglevel=debug --integratedNode", | ||
| "start:ws": "theia start --WF_GLSP=0 --WF_PATH=workflow --root-dir=../workspace", | ||
| "start:ws:debug": "theia start --WF_GLSP=8081 --WF_PATH=workflow --root-dir=../workspace --logLevel=debug --glspDebug", | ||
| "watch": "theia build --watch --mode development" | ||
| }, | ||
| "dependencies": { | ||
| "@eclipse-glsp-examples/workflow-theia": "2.2.0-next", | ||
| "@theia/core": "~1.49.1", | ||
| "@theia/editor": "~1.49.1", | ||
| "@theia/electron": "~1.49.1", | ||
| "@theia/filesystem": "~1.49.1", | ||
| "@theia/markers": "~1.49.1", | ||
| "@theia/messages": "~1.49.1", | ||
| "@theia/monaco": "~1.49.1", | ||
| "@theia/navigator": "~1.49.1", | ||
| "@theia/preferences": "~1.49.1", | ||
| "@theia/process": "~1.49.1", | ||
| "@theia/terminal": "~1.49.1", | ||
| "@theia/workspace": "~1.49.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@theia/cli": "~1.49.1", | ||
| "electron": "^23.2.4" | ||
| }, | ||
| "theia": { | ||
| "target": "electron", | ||
| "frontend": { | ||
| "config": { | ||
| "applicationName": "Workflow Electron Example", | ||
| "reloadOnReconnect": true | ||
| } | ||
| }, | ||
| "backend": { | ||
| "config": { | ||
| "frontendConnectionTimeout": -1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /** | ||
| * This file can be edited to customize webpack configuration. | ||
| * To reset delete this file and rerun theia build again. | ||
| */ | ||
| // @ts-check | ||
| const configs = require('./gen-webpack.config.js'); | ||
| const nodeConfig = require('./gen-webpack.node.config.js'); | ||
|
|
||
| /** | ||
| * Expose bundled modules on window.theia.moduleName namespace, e.g. | ||
| * window['theia']['@theia/core/lib/common/uri']. | ||
| * Such syntax can be used by external code, for instance, for testing. | ||
| configs[0].module.rules.push({ | ||
| test: /\.js$/, | ||
| loader: require.resolve('@theia/application-manager/lib/expose-loader') | ||
| }); */ | ||
|
|
||
| module.exports = [ | ||
| ...configs, | ||
| nodeConfig.config | ||
| ]; |
Oops, something went wrong.