Skip to content

Commit 0f47d16

Browse files
committed
Add support of theia electron and browser app with SSL
** Not working ** The theia and electron apps do not compile correctly. You can add them to the main package.json file to try them out. SSL certificates are hard-coded paths in the app/browser directory. They can be modified by editing the package.json file, or proper keys can be symlinked to those paths: theiaCert.pem for the certificate and theiPrivKey.pem for the private key. Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
1 parent 854c1a6 commit 0f47d16

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

app/browser/package.json

+12-13
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,28 @@
1515
},
1616
"dependencies": {
1717
"@theia/core": "latest",
18+
"@theia/cpp-debug": "latest",
19+
"@theia/editor": "latest",
1820
"@theia/filesystem": "latest",
19-
"@theia/workspace": "latest",
20-
"@theia/preferences": "latest",
21+
"@theia/getting-started": "latest",
22+
"@theia/keymaps": "latest",
23+
"@theia/markers": "latest",
24+
"@theia/messages": "latest",
25+
"@theia/monaco": "latest",
2126
"@theia/navigator": "latest",
27+
"@theia/preferences": "latest",
2228
"@theia/process": "latest",
2329
"@theia/terminal": "latest",
24-
"@theia/editor": "latest",
25-
"@theia/languages": "latest",
26-
"@theia/markers": "latest",
27-
"@theia/monaco": "latest",
28-
"@theia/messages": "latest",
29-
"@theia/cpp-debug": "latest",
3030
"@theia/vsx-registry": "latest",
31-
"@theia/keymaps": "latest",
32-
"@theia/getting-started": "latest",
33-
"@trace-viewer/theia-extension": "0.0.0"
31+
"@theia/workspace": "latest"
3432
},
3533
"devDependencies": {
3634
"@theia/cli": "latest"
3735
},
3836
"scripts": {
3937
"prepare": "theia build --mode development && yarn download:plugins",
40-
"start": "theia start --plugins=local-dir:./plugins",
38+
"symlink:extension": "mkdir -p plugins && rm -f ./plugins/vscode-extension && ln -s ../../../packages/vscode-extension ./plugins/",
39+
"start": "yarn run symlink:extension && theia start --ssl --cert ./theiaCert.pem --certkey ./theiaPrivKey.pem --plugins=local-dir:./plugins",
4140
"watch": "theia build --watch --mode development",
4241
"download:plugins": "theia download:plugins -p=true"
4342
},
@@ -113,4 +112,4 @@
113112
"vscode-editorconfig": "https://open-vsx.org/api/EditorConfig/EditorConfig/0.14.4/file/EditorConfig.EditorConfig-0.14.4.vsix",
114113
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.0.21/file/llvm-vs-code-extensions.vscode-clangd-0.0.21.vsix"
115114
}
116-
}
115+
}

app/electron/package.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,33 @@
2323
}
2424
},
2525
"dependencies": {
26+
"@theia/compression-webpack-plugin": "latest",
2627
"@theia/core": "latest",
27-
"@theia/filesystem": "latest",
28-
"@theia/workspace": "latest",
29-
"@theia/preferences": "latest",
30-
"@theia/navigator": "latest",
31-
"@theia/process": "latest",
32-
"@theia/terminal": "latest",
3328
"@theia/editor": "latest",
29+
"@theia/electron": "latest",
30+
"@theia/filesystem": "latest",
31+
"@theia/getting-started": "latest",
32+
"@theia/keymaps": "latest",
3433
"@theia/languages": "latest",
3534
"@theia/markers": "latest",
36-
"@theia/monaco": "latest",
3735
"@theia/messages": "latest",
36+
"@theia/monaco": "latest",
37+
"@theia/navigator": "latest",
38+
"@theia/preferences": "latest",
39+
"@theia/process": "latest",
40+
"@theia/terminal": "latest",
3841
"@theia/vsx-registry": "latest",
39-
"@theia/keymaps": "latest",
40-
"@theia/getting-started": "latest",
41-
"@theia/electron": "latest",
42-
"@trace-viewer/theia-extension": "0.0.0"
42+
"@theia/workspace": "latest",
43+
"circular-dependency-plugin": "^5.2.0"
4344
},
4445
"devDependencies": {
4546
"@theia/cli": "latest",
4647
"electron-builder": "^22.3.2"
4748
},
4849
"scripts": {
4950
"prepare": "theia build --mode development && yarn download:plugins",
50-
"start": "theia start --plugins=local-dir:./plugins",
51+
"symlink:extension": "mkdir -p plugins && rm -f ./plugins/vscode-extension && ln -s ../../../packages/vscode-extension ./plugins/",
52+
"start": "yarn run symlink:extension && theia start --plugins=local-dir:./plugins",
5153
"watch": "theia build --watch --mode development",
5254
"package": "electron-builder",
5355
"package:preview": "electron-builder --dir",
@@ -130,4 +132,4 @@
130132
"vscode-clangd": "https://open-vsx.org/api/llvm-vs-code-extensions/vscode-clangd/0.0.21/file/llvm-vs-code-extensions.vscode-clangd-0.0.21.vsix",
131133
"cdt-gdb-vscode": "https://open-vsx.org/api/eclipse-cdt/cdt-gdb-vscode/0.0.91/file/eclipse-cdt.cdt-gdb-vscode-0.0.91.vsix"
132134
}
133-
}
135+
}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"build:browser": "theia rebuild:browser",
88
"build:electron": "theia rebuild:electron",
99
"build:vscode-extension": "yarn workspace @trace-viewer/vscode-extension build",
10-
"start:browser": "yarn rebuild:browser ; yarn --cwd browser-app start",
11-
"start:electron": "yarn rebuild:electron ; yarn --cwd electron-app start",
10+
"start:browser": "yarn rebuild:browser ; yarn --cwd app/browser start",
11+
"start:electron": "yarn rebuild:electron ; yarn --cwd app/electron start",
1212
"download:sample-traces": "curl -o TraceCompassTutorialTraces.tgz https://raw.githubusercontent.com/tuxology/tracevizlab/master/labs/TraceCompassTutorialTraces.tgz; tar -xf TraceCompassTutorialTraces.tgz",
1313
"download:server": "curl -o trace-compass-server.tar.gz https://download.eclipse.org/tracecompass.incubator/trace-server/rcp/trace-compass-server-latest-linux.gtk.x86_64.tar.gz; tar -xf trace-compass-server.tar.gz",
1414
"start:server": "./trace-compass-server/tracecompass-server",

0 commit comments

Comments
 (0)