Skip to content

Commit 7e3e79e

Browse files
committed
revert electron to version 19
1 parent 0b3498b commit 7e3e79e

File tree

8 files changed

+213
-65
lines changed

8 files changed

+213
-65
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
# Test jobs
150150
unit-tests-ui:
151151
docker:
152-
- image: cimg/node:16.19.1
152+
- image: cimg/node:16.15.1
153153
steps:
154154
- checkout
155155
- restore_cache:
@@ -193,7 +193,7 @@ jobs:
193193
- ./node_modules
194194
unit-tests-api:
195195
docker:
196-
- image: cimg/node:16.19.1
196+
- image: cimg/node:16.15.1
197197
steps:
198198
- checkout
199199
- restore_cache:
@@ -351,7 +351,7 @@ jobs:
351351
- checkout
352352
- attach_workspace:
353353
at: .
354-
- run: choco install nodejs --version=16.19.1
354+
- run: choco install nodejs --version=16.15.1
355355
- run:
356356
command: |
357357
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
@@ -500,7 +500,7 @@ jobs:
500500
steps:
501501
- checkout
502502
- node/install:
503-
node-version: '16.19.1'
503+
node-version: '16.15.1'
504504
- attach_workspace:
505505
at: .
506506
- run:
@@ -575,7 +575,7 @@ jobs:
575575
steps:
576576
- checkout
577577
- node/install:
578-
node-version: '16.19.1'
578+
node-version: '16.15.1'
579579
- attach_workspace:
580580
at: .
581581
- run:
@@ -645,7 +645,7 @@ jobs:
645645
- run:
646646
name: Build windows exe
647647
command: |
648-
choco install nodejs --version=16.19.1
648+
choco install nodejs --version=16.15.1
649649
# set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
650650
yarn install
651651
yarn --cwd redisinsight/api/ install

electron-builder.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"type": "distribution",
3838
"hardenedRuntime": true,
3939
"darkModeSupport": true,
40-
"bundleVersion": "0.0.55",
40+
"bundleVersion": "0.0.56",
4141
"icon": "resources/icon.icns",
4242
"artifactName": "${productName}-${os}-${arch}.${ext}",
4343
"entitlements": "resources/entitlements.mac.plist",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"cross-env": "^7.0.2",
153153
"css-loader": "^5.0.1",
154154
"css-minimizer-webpack-plugin": "^1.2.0",
155-
"electron": "^23.1.4",
155+
"electron": "^19.0.7",
156156
"electron-builder": "^23.6.0",
157157
"electron-builder-notarize": "^1.5.1",
158158
"electron-debug": "^3.2.0",

redisinsight/about-panel.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const ICON_PATH = app.isPackaged
77

88
export default {
99
applicationName: 'RedisInsight-v2',
10-
applicationVersion: app.getVersion() || '2.20.0',
10+
applicationVersion:
11+
`${app.getVersion() || '2.20.0'}${process.env.NODE_ENV !== 'production' && `-dev-${process.getCreationTime()}`}`,
1112
copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
1213
iconPath: ICON_PATH,
1314
};

redisinsight/api/config/production.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { join } from 'path';
22
import * as os from 'os';
3-
import { getUsername } from '../src/utils/get-username';
43

54
const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
6-
|| (join(
7-
process['mas'] ? `/Users/${getUsername()}` : os.homedir(),
8-
process.env.APP_FOLDER_NAME || '.redisinsight-v2'));
5+
|| (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2'));
96

107
const prevHomedir = join(os.homedir(), '.redisinsight-preview');
118

redisinsight/api/src/utils/get-username.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

redisinsight/main.dev.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const bootstrap = async () => {
141141

142142
const upgradeUrl = process.env.MANUAL_UPGRADES_LINK || process.env.UPGRADES_LINK;
143143

144-
if (upgradeUrl && !process['mas']) {
144+
if (upgradeUrl && !process.mas) {
145145
new AppUpdater(upgradeUrl);
146146
}
147147

0 commit comments

Comments
 (0)