ci: version bump must bump electron version as well

Author: abose

.github/workflows/update-phcode-build.yml

@@ -45,6 +45,7 @@ jobs:
             package.json
             src-tauri/Cargo.toml
             src-tauri/tauri.conf.json
+            src-electron/package.json
           body: |
             A new version of phcode has been pushed to `${{github.event.client_payload.source}}` repo's `tauri` branch.
             This pull request updates the dependency to bring in the latest changes to phcode.

src-build/ci-setupDistFolders.js

@@ -173,8 +173,14 @@ function createElectronReleaseAssets() {
     const envConfig = JSON.parse(fs.readFileSync(envConfigPath));
     const effectiveConfig = { ...baseConfig, ...envConfig };
 
+    // Inject version from src-electron/package.json
+    const electronPackagePath = join(electronDir, 'package.json');
+    const electronPackage = JSON.parse(fs.readFileSync(electronPackagePath));
+    effectiveConfig.version = electronPackage.version;
+
     console.log('phoenixLoadURL:', effectiveConfig.phoenixLoadURL);
     console.log('gaMetricsURL:', effectiveConfig.gaMetricsURL);
+    console.log('version:', effectiveConfig.version);
     fs.writeFileSync(configEffectivePath, JSON.stringify(effectiveConfig, null, 2));
 }
 

src-build/createDistRelease.js

@@ -155,8 +155,14 @@ function createElectronConfig() {
     const envConfig = JSON.parse(fs.readFileSync(envConfigPath));
     const effectiveConfig = { ...baseConfig, ...envConfig };
 
+    // Inject version from src-electron/package.json
+    const electronPackagePath = join(electronDir, 'package.json');
+    const electronPackage = JSON.parse(fs.readFileSync(electronPackagePath));
+    effectiveConfig.version = electronPackage.version;
+
     console.log('phoenixLoadURL:', effectiveConfig.phoenixLoadURL);
     console.log('gaMetricsURL:', effectiveConfig.gaMetricsURL);
+    console.log('version:', effectiveConfig.version);
     fs.writeFileSync(configEffectivePath, JSON.stringify(effectiveConfig, null, 2));
 }
 

src-build/createDistTestRelease.js

@@ -151,8 +151,14 @@ function createElectronConfig() {
     const envConfig = JSON.parse(fs.readFileSync(envConfigPath));
     const effectiveConfig = { ...baseConfig, ...envConfig };
 
+    // Inject version from src-electron/package.json
+    const electronPackagePath = join(electronDir, 'package.json');
+    const electronPackage = JSON.parse(fs.readFileSync(electronPackagePath));
+    effectiveConfig.version = electronPackage.version;
+
     console.log('phoenixLoadURL:', effectiveConfig.phoenixLoadURL);
     console.log('gaMetricsURL:', effectiveConfig.gaMetricsURL);
+    console.log('version:', effectiveConfig.version);
     fs.writeFileSync(configEffectivePath, JSON.stringify(effectiveConfig, null, 2));
 }
 

src-build/createSrcRelease.js

@@ -127,8 +127,14 @@ function createElectronConfig() {
     // Merge: config-dev.json overrides config.json
     const effectiveConfig = { ...baseConfig, ...devConfig };
 
+    // Inject version from src-electron/package.json
+    const electronPackagePath = join(electronDir, 'package.json');
+    const electronPackage = JSON.parse(fs.readFileSync(electronPackagePath));
+    effectiveConfig.version = electronPackage.version;
+
     console.log('phoenixLoadURL:', effectiveConfig.phoenixLoadURL);
     console.log('gaMetricsURL:', effectiveConfig.gaMetricsURL);
+    console.log('version:', effectiveConfig.version);
     fs.writeFileSync(configEffectivePath, JSON.stringify(effectiveConfig, null, 2));
 }
 

src-build/serveForPlatform.js

@@ -2,7 +2,7 @@ import {getPlatformDetails} from "./utils.js";
 import {execa} from "execa";
 import chalk from "chalk";
 import {resolve} from "path";
-import {copyFileSync} from "fs";
+import {copyFileSync, readFileSync, writeFileSync} from "fs";
 
 const {platform} = getPlatformDetails();
 
@@ -63,6 +63,13 @@ if (target === "tauri") {
     console.log('Copying config.json to config-effective.json...');
     copyFileSync(configSrc, configDest);
 
+    // Inject version from package.json
+    const packageJsonPath = resolve(electronDir, "package.json");
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+    const effectiveConfig = JSON.parse(readFileSync(configDest, 'utf8'));
+    effectiveConfig.version = packageJson.version;
+    writeFileSync(configDest, JSON.stringify(effectiveConfig, null, 2));
+
     console.log('Starting Electron...');
     await execa("./src-electron/node_modules/.bin/electron", ["src-electron/main.js"], {stdio: "inherit"});
 }

src-build/setupElectron.js

@@ -1,7 +1,7 @@
 import { execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
-import { copyFileSync } from 'fs';
+import { copyFileSync, readFileSync, writeFileSync } from 'fs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -19,4 +19,11 @@ const configSrc = join(electronDir, 'config.json');
 const configDest = join(electronDir, 'config-effective.json');
 console.log('Copying config.json to config-effective.json...');
 copyFileSync(configSrc, configDest);
-console.log('Config file copied successfully!');
+
+// Inject version from package.json
+const packageJsonPath = join(electronDir, 'package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+const effectiveConfig = JSON.parse(readFileSync(configDest, 'utf8'));
+effectiveConfig.version = packageJson.version;
+writeFileSync(configDest, JSON.stringify(effectiveConfig, null, 2));
+console.log('Config file copied and version injected successfully!');

src-build/update-phcode-build.js

@@ -71,4 +71,12 @@ for(let i=0;i<lines.length;i++){
     }
 }
 const patchedTOML = lines.join(EOL);
-fs.writeFileSync(tauriTOMLPath, patchedTOML);
+fs.writeFileSync(tauriTOMLPath, patchedTOML);
+
+
+// update file src-electron/package.json
+const electronPackagePath = join(__dirname, '..', 'src-electron', 'package.json');
+console.log("write version in src-electron/package.json", electronPackagePath);
+let electronPackageJson = JSON.parse(fs.readFileSync(electronPackagePath));
+electronPackageJson.version = phoenixVersion;
+fs.writeFileSync(electronPackagePath, JSON.stringify(electronPackageJson, null, 2));

src-electron/config.json

@@ -1,7 +1,6 @@
 {
   "identifier": "io.phcode.dev",
   "stage": "dev",
-  "version": "5.0.5",
   "productName": "Phoenix Code Experimental Build",
   "phoenixLoadURL": "phtauri://localhost/src/",
   "trustedElectronDomains": ["phtauri://localhost/", "https://phcode.dev/"],