Convert electron-builder config file to TS #1591
Conversation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
…into t3chguy/config-file-ts Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # yarn.lock
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
t3chguy
requested review from
dbkr,
MidhunSureshR and
richvdh
and removed request for
dbkr
| @@ -17,17 +17,17 @@ limitations under the License. | |||
| import path from "path"; | |||
| import os from "os"; | |||
| import nodePreGypVersioning from "node-pre-gyp/lib/util/versioning"; | |||
| import { getElectronVersion } from "app-builder-lib/out/electron/electronVersion"; | |||
| import { getElectronVersionFromInstalled } from "app-builder-lib/out/electron/electronVersion"; | |||
There was a problem hiding this comment.
Can you explain how getElectronVersionFromInstalled differs from getElectronVersion, and why we need to change it as part of the TS translation? I couldn't find any documentation for them,
There was a problem hiding this comment.
getElectronVersion evaluates the config and sees whether the electron version is overridden there, which requires evaluating electron-builder.ts which errors in the hak scripts like in https://github.com/element-hq/element-desktop/actions/runs/8480242660/job/23235652340?pr=1591
There was a problem hiding this comment.
... whereas getElectronVersionFromInstalled inspects what was actually used in the build, or something?
There was a problem hiding this comment.
It looks at the version we dictate via package.json/yarn.lock, which is what getElectronVersion fell back to if it did not find an electron version specified in the builder config file (so no change for us)
| @@ -123,6 +124,7 @@ | |||
| "keytar": "^7.9.0" | |||
| }, | |||
| "resolutions": { | |||
| "@types/node": "18.19.28" | |||
| "@types/node": "18.19.28", | |||
| "config-file-ts": "0.2.8-rc1" | |||
There was a problem hiding this comment.
aaaaaaaaargh my kingdom for a config file format that lets you write COMMENTS
There was a problem hiding this comment.
For the benefit of anyone who gets here via PR spelunking: this is a workaround for electron-userland/electron-builder#7775.
Fixes #1462