Skip to content

Commit

Permalink
Merge pull request #495 from mysteriumnetwork/494-node-version
Browse files Browse the repository at this point in the history
Bump Mysterium node to 1.29.2
  • Loading branch information
tadaskay authored Dec 18, 2023
2 parents 75c0021 + 0821839 commit b697d9d
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- run: yarn
- run: yarn lint
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:

strategy:
matrix:
os: [macos-11, windows-2022, ubuntu-20.04]
os: [macos-12, windows-2022, ubuntu-20.04]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- run: yarn
- uses: battila7/[email protected]
id: get_version
Expand Down
2 changes: 1 addition & 1 deletion ci/notarize.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { notarize } = require("electron-notarize")
const { notarize } = require("@electron/notarize")

// eslint-disable-next-line @typescript-eslint/no-var-requires
const packageJson = require("../package.json")
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"bundle-dev": "yarn build && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder"
},
"engines": {
"node": ">=16"
"node": ">=18"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@mysteriumnetwork/node": "1.19.8",
"@mysteriumnetwork/node": "1.29.2",
"@mysteriumnetwork/terms": "0.0.50",
"@sentry/electron": "^4.0.0",
"@use-it/interval": "^1.0.0",
Expand All @@ -41,7 +41,7 @@
"mobx": "^6.6.0",
"mobx-logger": "^0.7.1",
"mobx-react-lite": "^3.3.0",
"mysterium-vpn-js": "26.0.0",
"mysterium-vpn-js": "^28.0.0",
"node-machine-id": "^1.1.12",
"open": "^7.0.0",
"qrcode.react": "^2.0.0",
Expand All @@ -66,6 +66,7 @@
"sudo-prompt": "^9.2.1"
},
"devDependencies": {
"@electron/notarize": "^2.2.0",
"@sentry/cli": "^2.5.2",
"@types/async-retry": "^1.4.3",
"@types/electron-devtools-installer": "^2.2.2",
Expand All @@ -85,11 +86,10 @@
"@typescript-eslint/parser": "^5.23.0",
"chmodr": "^1.2.0",
"cross-env": "^7.0.3",
"electron": "^20.1.2",
"electron": "^28.0.0",
"electron-builder": "^23.3.3",
"electron-devtools-installer": "^3.2.0",
"electron-download": "^4.1.1",
"electron-notarize": "^1.2.1",
"electron-webpack": "^2.8.2",
"electron-webpack-ts": "^4.0.1",
"eslint": "^8.23.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ export const MysteriumVPN2Toast: React.FC = () => {
link = "https://www.mysteriumvpn.com/mysterium-vpn-v2?utm_source=MysteriumDark&utm_medium=Other&utm_campaign=Banner"
}

toast(dismissibleToast(
const toastID = toast(dismissibleToast(
<Container>
<a onClick={() => {
shell.openExternal(link);
config.setVpn2Offered()
toast.dismiss(toastID)
}}>
<b>MysteriumVPN 2.0 for Desktop is available</b><br />
<span>Download the new app to use Mysterium VPN on Android, iOS, Mac and Windows</span>
Expand Down
Loading

0 comments on commit b697d9d

Please sign in to comment.