Skip to content

Commit f05fa55

Browse files
authored
Merge pull request #95 from bitfinexcom/beta
Release version 3.5.0
2 parents 640ea44 + 41ab2f8 commit f05fa55

37 files changed

Lines changed: 1437 additions & 149 deletions

Dockerfile.linux-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM electronuserland/builder
22

3-
ENV NODE_VERSION 12.18.3
3+
ENV NODE_VERSION 14.16.0
44

55
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
66

Dockerfile.mac-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM electronuserland/builder
22

3-
ENV NODE_VERSION 12.18.3
3+
ENV NODE_VERSION 14.16.0
44

55
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
66

Dockerfile.ui-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM electronuserland/builder
22

3-
ENV NODE_VERSION 12.18.3
3+
ENV NODE_VERSION 14.16.0
44

55
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
66

Dockerfile.win-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM electronuserland/builder:wine
22

3-
ENV NODE_VERSION 12.18.3
3+
ENV NODE_VERSION 14.16.0
44

55
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
66

bfx-report-ui

Submodule bfx-report-ui updated 113 files
-728 KB
Binary file not shown.

docker-compose.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
dockerfile: Dockerfile.ui-builder
99
environment:
1010
BRANCH: ${BRANCH}
11+
UI_BUILD_FOLDER: /ui-build
1112
volumes:
1213
- ui-build:/ui-build
1314

@@ -20,6 +21,7 @@ services:
2021
ELECTRON_CACHE: /root/.cache/electron
2122
ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
2223
BRANCH: ${BRANCH}
24+
UI_BUILD_FOLDER: /ui-build
2325
volumes:
2426
- ui-build:/ui-build
2527
- ./dist:/dist
@@ -35,6 +37,7 @@ services:
3537
ELECTRON_CACHE: /root/.cache/electron
3638
ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
3739
BRANCH: ${BRANCH}
40+
UI_BUILD_FOLDER: /ui-build
3841
volumes:
3942
- ui-build:/ui-build
4043
- ./dist:/dist
@@ -50,6 +53,7 @@ services:
5053
ELECTRON_CACHE: /root/.cache/electron
5154
ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
5255
BRANCH: ${BRANCH}
56+
UI_BUILD_FOLDER: /ui-build
5357
volumes:
5458
- ui-build:/ui-build
5559
- ./dist:/dist

index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
const { app } = require('electron')
44

5+
process.traceProcessWarnings = true
56
app.allowRendererProcessReuse = true
67

8+
require('./src/error-manager')
9+
.initLogger()
10+
711
const initializeApp = require('./src/initialize-app')
812
const makeSingleInstance = require('./src/make-single-instance')
913

package.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bfx-report-electron",
3-
"version": "3.4.0",
3+
"version": "3.5.0",
44
"repository": "https://github.com/bitfinexcom/bfx-report-electron",
55
"description": "Reporting tool",
66
"author": "bitfinex.com",
@@ -11,27 +11,32 @@
1111
"async": "^2.6.1",
1212
"bfx-svc-test-helper": "git+https://github.com/bitfinexcom/bfx-svc-test-helper.git",
1313
"bittorrent-dht": "^8.4.0",
14+
"clean-stack": "^3.0.1",
1415
"cron-validate": "^1.4.2",
1516
"ed25519-supercop": "^2.0.1",
16-
"electron-alert": "^0.1.11",
17+
"electron-alert": "0.1.13",
1718
"electron-log": "^4.3.2",
1819
"electron-root-path": "^1.0.16",
1920
"electron-serve": "^1.0.0",
20-
"electron-updater": "^4.3.8",
21+
"electron-updater": "4.3.8",
2122
"extract-zip": "^2.0.1",
2223
"find-free-port": "^2.0.0",
23-
"grenache-grape": "^0.9.8",
24+
"github-markdown-css": "^4.0.0",
25+
"grenache-grape": "git+https://github.com/bitfinexcom/grenache-grape.git",
26+
"js-yaml": "^4.0.0",
2427
"lodash": "^4.17.15",
28+
"new-github-issue-url": "^0.2.1",
29+
"showdown": "^1.9.1",
30+
"truncate-utf8-bytes": "^1.0.2",
2531
"yauzl": "^2.10.0"
2632
},
2733
"devDependencies": {
2834
"app-builder-bin": "^3.5.13",
29-
"electron": "11.4.5",
30-
"electron-builder": "22.11.1",
31-
"js-yaml": "^4.0.0",
35+
"electron": "13.1.6",
36+
"electron-builder": "22.11.7",
3237
"node-gyp": "7.1.2",
3338
"node-pre-gyp": "^0.11.0",
34-
"standard": "^14.3.1"
39+
"standard": "^16.0.3"
3540
},
3641
"standard": {
3742
"globals": [

0 commit comments

Comments
 (0)