enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 12:21:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixing yargs and electron-builder regressions (#3725)

Browse Source 
This PR reverts two version bumps from #3712:
* `yargs` needs to be downgraded, because a never version can trigger https://github.com/evanw/esbuild/issues/2441
* `electron-builder` needs to be downgraded, because our workaround for https://github.com/electron-userland/electron-builder/issues/6865 proved insufficient.

As the upstream issues are resolved, we should bump these dependencies again.
This commit is contained in:
Michał Wawrzyniec Urbańczyk 2022-09-21 11:32:20 +02:00 committed by GitHub
parent 9134f9b2d7
commit d6bd80011f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/ide-desktop/lib/client/package.json
View File

@ -22,11 +22,12 @@
"mime-types": "^2.1.35",
"@electron/remote": "^2.0.8",
"electron-is-dev": "^1.2.0",
"yargs": "^16.2.0"
"yargs": "=15.4.1"
},
"//": "`yargs` dependency is pinned to version 15.4.1 because newer version triggers https://github.com/evanw/esbuild/issues/2441",
"devDependencies": {
"electron": "17.1.0",
"electron-builder": "^23.3.3",
"electron-builder": "^22.14.13",
"esbuild": "^0.14.43",
"crypto-js": "4.1.1",
"electron-notarize": "1.2.1",

5
app/ide-desktop/patches/README.md
View File

@ -1,5 +0,0 @@
Patches to be applied on NPM dependencies of the IDE.
- [app-builder-lib](./app-builder-lib%2B23.3.3.patch) — workaround for
https://github.com/electron-userland/electron-builder/issues/6865, as
discovered by James.

12
app/ide-desktop/patches/app-builder-lib+23.3.3.patch
View File

@ -1,12 +0,0 @@
diff --git a/node_modules/app-builder-lib/out/targets/nsis/NsisTarget.js b/node_modules/app-builder-lib/out/targets/nsis/NsisTarget.js
index e487f90..a09e531 100644
--- a/node_modules/app-builder-lib/out/targets/nsis/NsisTarget.js
+++ b/node_modules/app-builder-lib/out/targets/nsis/NsisTarget.js
@@ -473,7 +473,6 @@ class NsisTarget extends core_1.Target {
}
async executeMakensis(defines, commands, script) {
const args = this.options.warningsAsErrors === false ? [] : ["-WX"];
- args.push("-INPUTCHARSET", "UTF8");
for (const name of Object.keys(defines)) {
const value = defines[name];
if (value == null) {

11
docs/CONTRIBUTING.md
View File

@ -167,6 +167,17 @@ helper tools for that. We recommend:
**For users of M1 Mac**: installing GraalVM on M1 Mac requires manual actions,
please refer to a [dedicated documentation](./graalvm-m1-mac.md).
**For users of MacOS Monterey and later**: building desktop IDE currently
requires Python 2 installed in the system. It can be installed using the
following commands:
```sh
brew install pyenv
pyenv install 2.7.18
pyenv global 2.7.18
export PYTHON_PATH=$(pyenv root)/shims/python
```
The flatbuffers `flatc` compiler can be installed from the following locations:
- Using the `conda` package manager (`conda install flatbuffers`). This will