Fix launch configs for 1.39.0 and earlier versions

eclipse-theia · Jul 24, 2023 · 53d5d83 · 53d5d83
1 parent 20a970e
commit 53d5d83
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/app/index.ts b/src/app/index.ts
@@ -21,6 +21,8 @@ const tar = require('tar');
 const fs = require('fs-extra');
 
 const glspExamplesRepositoryTag = "generator-latest";
+const backend = "backend";
+const frontend = "frontend";
 
 enum ExtensionType {
     HelloWorld = 'hello-world',
@@ -63,6 +65,7 @@ module.exports = class TheiaExtension extends Base {
         scripts: string
         rootscripts: string
         containsTests: boolean
+        electronMainLocation: string
     };
 
     constructor(args: string | string[], options: any) {
@@ -238,7 +241,8 @@ module.exports = class TheiaExtension extends Base {
             githubURL,
             theiaVersion: options["theia-version"],
             lernaVersion: options["lerna-version"],
-            backend: options["extensionType"] === ExtensionType.Backend
+            backend: options["extensionType"] === ExtensionType.Backend,
+            electronMainLocation: this.getElectronMainLocation(options["theia-version"])
         }
         this.params.dependencies = '';
         this.params.browserDevDependencies = '';
@@ -529,6 +533,24 @@ module.exports = class TheiaExtension extends Base {
     private _capitalize(name: string): string {
         return name.substring(0, 1).toUpperCase() + name.substring(1)
     }
+
+    private getElectronMainLocation(theiaVersion: string): string {
+        try {
+            const semVer = theiaVersion.split('.');
+            if (semVer.length < 3) {
+                return backend;
+            }
+            const major = Number(semVer[0]);
+            const minor = Number(semVer[1]);
+            if ((major === 0) || (major === 1 && minor < 39)) {
+                return frontend;
+            }
+            return backend;
+        } catch (e) {
+            return backend;
+        }
+    }
 }
 
-module.exports.ExtensionType = ExtensionType;
+module.exports.ExtensionType = ExtensionType;
+
diff --git a/templates/launch.json b/templates/launch.json
@@ -35,7 +35,7 @@
             "windows": {
                 "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
             },
-            "program": "${workspaceRoot}/electron-app/src-gen/frontend/electron-main.js",
+            "program": "${workspaceRoot}/electron-app/src-gen/<%= params.electronMainLocation %>/electron-main.js",
             "protocol": "inspector",
             "args": [
                 "--loglevel=debug",
@@ -47,7 +47,7 @@
             },
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/electron-app/src-gen/frontend/electron-main.js",
+                "${workspaceRoot}/electron-app/src-gen/<%= params.electronMainLocation %>/electron-main.js",
                 "${workspaceRoot}/electron-app/src-gen/backend/main.js",
                 "${workspaceRoot}/*/lib/**/*.js",
                 "${workspaceRoot}/node_modules/@theia/*/lib/**/*.js"