Skip to content

Commit

Permalink
feat: electron upgrade - 18.0.3 => 20.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
aadiene authored and DIENE committed Sep 24, 2022
1 parent fa6222a commit f1fce63
Show file tree
Hide file tree
Showing 8 changed files with 4,275 additions and 10,335 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
node-version: [12.x, 14.x, 16.x]
node-version: [14.x, 16.x, 18.x]

steps:
- uses: actions/checkout@v2
Expand Down
11 changes: 8 additions & 3 deletions .husky/_/husky.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/sh
#!/usr/bin/env sh
if [ -z "$husky_skip_init" ]; then
debug () {
if [ "$HUSKY_DEBUG" = "1" ]; then
echo "husky (debug) - $1"
fi
}

readonly hook_name="$(basename "$0")"
readonly hook_name="$(basename -- "$0")"
debug "starting $hook_name..."

if [ "$HUSKY" = "0" ]; then
Expand All @@ -19,13 +19,18 @@ if [ -z "$husky_skip_init" ]; then
. ~/.huskyrc
fi

export readonly husky_skip_init=1
readonly husky_skip_init=1
export husky_skip_init
sh -e "$0" "$@"
exitCode="$?"

if [ $exitCode != 0 ]; then
echo "husky - $hook_name hook exited with code $exitCode (error)"
fi

if [ $exitCode = 127 ]; then
echo "husky - command not found in PATH=$PATH"
fi

exit $exitCode
fi
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ Depending on your need, putting up [Electron](https://www.electronjs.org/) and [
To clone and run this repository, you'll need installed on your computer at least :

- [Git](https://git-scm.com)
- [Node 12.20, 14.15 or 16.10](https://nodejs.org/en/download/)
- [Npm 7+](https://docs.npmjs.com/about-npm)
- [Angular-CLI 13](https://angular.io/cli)
- [Node 14.15.0 or later](https://nodejs.org/en/download/)
- [Npm 7 or later](https://docs.npmjs.com/about-npm)
- [Angular-CLI 14 or later](https://angular.io/cli)

Then from your command line:

Expand Down Expand Up @@ -89,6 +89,15 @@ npm start
| `npm run make` | Generate platform distributables (./out) |
| `npm run clean` | Delete generated outputs |

## Behind a proxy

After settings **HTTP_PROXY** and **HTTPS_PROXY** environment variables :

```bash
# Install dependencies
npx cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=%HTTPS_PROXY% npm install
```

### Adding dependencies

This project architecture is based on [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces). This allows having different version of the same dependency depending on your workspace :
Expand Down
Loading

0 comments on commit f1fce63

Please sign in to comment.