Skip to content

Commit 5090e07

Browse files
authored
Merge pull request #70 from borgvin/v4.1
v4.1 (slippage support)
2 parents d604239 + 2e5f632 commit 5090e07

33 files changed

+17751
-59639
lines changed

.github/workflows/desktop.build.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
system:
2222
- os: "windows-latest"
2323
path: "squirrel.windows/x64/"
24-
- os: "macos-13"
24+
- os: "macos-latest"
2525
path: ""
2626
- os: ubuntu-latest
2727
path: "deb/x64/"
@@ -38,12 +38,12 @@ jobs:
3838
with:
3939
python-version: '3.10'
4040

41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242

4343
- name: Use Node.js
44-
uses: actions/setup-node@v3
44+
uses: actions/setup-node@v4
4545
with:
46-
node-version: '14'
46+
node-version: '18'
4747

4848
- name: Install client dependencies
4949
working-directory: client
@@ -54,7 +54,7 @@ jobs:
5454
- name: Audit client dependencies
5555
working-directory: client
5656
run: |
57-
npm audit fix --production
57+
npm audit fix --audit-level moderate
5858
5959
- name: Client Build for Desktop
6060
working-directory: client
@@ -81,7 +81,7 @@ jobs:
8181
- name: Audit backend dependencies
8282
working-directory: haven-desktop-app
8383
run: |
84-
npm audit fix --production
84+
npm audit fix --audit-level moderate
8585
8686
- if: matrix.system.os == 'ubuntu-latest'
8787
run: |

.github/workflows/docker.build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
]
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: Set up QEMU
2727
uses: docker/setup-qemu-action@v2
2828
- name: Set up Docker Buildx

.github/workflows/web.build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
url: "https://nodes-stagenet.havenprotocol.org:443"
3535
name: "stagenet"
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- name: Use Node.js
39-
uses: actions/setup-node@v3
39+
uses: actions/setup-node@v4
4040
with:
41-
node-version: '14'
41+
node-version: '18'
4242

4343
- name: Install client dependencies
4444
working-directory: client
@@ -59,7 +59,7 @@ jobs:
5959
- name: Audit client dependencies
6060
working-directory: client
6161
run: |
62-
npm audit fix --production
62+
npm audit fix --audit-level moderate
6363
6464
- name: Client Build for Web
6565
working-directory: client

client/.docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:14-buster as builder
1+
FROM node:18-bookworm as builder
22

33
ARG REACT_APP_NET_TYPE_ID
44
ARG REACT_APP_HAVEN_DIRECT_HOST
@@ -12,7 +12,7 @@ RUN git config --global url."https://".insteadOf git://
1212
RUN npm install
1313
RUN npm install haven-wallet-core@latest --save
1414
RUN npm run copy-haven-core
15-
RUN npm audit fix --production
15+
RUN npm audit fix --audit-level moderate
1616
RUN npm run build:web:ci
1717

1818
FROM nginx:stable-alpine

client/config-overrides.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const webpack = require('webpack');
2+
module.exports = function override(config, env) {
3+
config.resolve.fallback = {
4+
crypto: require.resolve('crypto-browserify'),
5+
http: require.resolve('stream-http'),
6+
https: require.resolve('https-browserify'),
7+
path: require.resolve('path-browserify'),
8+
fs: false,
9+
child_process: false,
10+
vm: false
11+
};
12+
13+
return config;
14+
}

0 commit comments

Comments
 (0)