Skip to content

Commit 9616881

Browse files
egor-zalenskiegor-zalenski
committed
good build
1 parent 7fab9b4 commit 9616881

File tree

4 files changed

+98
-52
lines changed

4 files changed

+98
-52
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,20 +1092,19 @@ workflows:
10921092
env: dev
10931093
requires:
10941094
- Setup sign certificates (dev)
1095-
# - linux:
1096-
# name: Build app - Linux (dev)
1097-
# env: dev
1098-
# requires: &devBuildRequire
1099-
# - Setup build (dev)
1095+
- linux:
1096+
name: Build app - Linux (dev)
1097+
env: dev
1098+
requires: &devBuildRequire
1099+
- Setup build (dev)
11001100
- macosx:
11011101
name: Build app - MacOS (dev)
11021102
env: dev
1103-
requires:
1104-
- Setup build (dev)
1105-
# - windows:
1106-
# name: Build app - Windows (dev)
1107-
# env: dev
1108-
# requires: *devBuildRequire
1103+
requires: *devBuildRequire
1104+
- windows:
1105+
name: Build app - Windows (dev)
1106+
env: dev
1107+
requires: *devBuildRequire
11091108
- store-build-artifacts:
11101109
name: Store build artifacts (dev)
11111110
requires:

‎configs/webpack.config.renderer.prod.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import { version } from '../redisinsight/package.json';
1212
DeleteSourceMaps();
1313

1414
const htmlPagesNames = ['splash.ejs', 'index.ejs']
15+
const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
16+
? 'https://localhost'
17+
: 'http://localhost'
1518

1619
const devtoolsConfig =
1720
process.env.DEBUG_PROD === 'true'
@@ -201,8 +204,8 @@ const configuration: webpack.Configuration = {
201204
'process.env.NODE_ENV': JSON.stringify('development'),
202205
'process.env.APP_ENV': JSON.stringify('electron'),
203206
'process.env.API_PREFIX': JSON.stringify('api'),
204-
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
205-
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
207+
'process.env.BASE_API_URL': JSON.stringify(apiUrl),
208+
'process.env.RESOURCES_BASE_URL': JSON.stringify(apiUrl),
206209
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
207210
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
208211
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),

‎configs/webpack.config.renderer.stage.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import { version } from '../redisinsight/package.json';
77

88
DeleteSourceMaps();
99

10+
const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
11+
? 'https://localhost'
12+
: 'http://localhost'
13+
1014
export default merge(baseConfig, {
1115
...rendererProdConfig,
1216

@@ -20,8 +24,8 @@ export default merge(baseConfig, {
2024
'process.env.NODE_ENV': JSON.stringify('staging'),
2125
'process.env.APP_ENV': JSON.stringify('electron'),
2226
'process.env.API_PREFIX': JSON.stringify('api'),
23-
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
24-
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
27+
'process.env.BASE_API_URL': JSON.stringify(apiUrl),
28+
'process.env.RESOURCES_BASE_URL': JSON.stringify(apiUrl),
2529
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
2630
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
2731
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),

‎tests/e2e/yarn.lock‎

Lines changed: 77 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,21 @@ array.prototype.flat@^1.2.4:
16971697
es-abstract "^1.20.4"
16981698
es-shim-unscopables "^1.0.0"
16991699

1700+
asar@^2.0.1:
1701+
version "2.1.0"
1702+
resolved "https://registry.yarnpkg.com/asar/-/asar-2.1.0.tgz#97c6a570408c4e38a18d4a3fb748a621b5a7844e"
1703+
integrity sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==
1704+
dependencies:
1705+
chromium-pickle-js "^0.2.0"
1706+
commander "^2.20.0"
1707+
cuint "^0.2.2"
1708+
glob "^7.1.3"
1709+
minimatch "^3.0.4"
1710+
mkdirp "^0.5.1"
1711+
tmp-promise "^1.0.5"
1712+
optionalDependencies:
1713+
"@types/glob" "^7.1.1"
1714+
17001715
assertion-error@^1.1.0:
17011716
version "1.1.0"
17021717
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -1806,7 +1821,7 @@ balanced-match@^1.0.0:
18061821
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
18071822
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
18081823

1809-
base64-js@^1.3.1:
1824+
base64-js@^1.1.2, base64-js@^1.3.1:
18101825
version "1.5.1"
18111826
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
18121827
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -1820,6 +1835,11 @@ bl@^4.0.3:
18201835
inherits "^2.0.4"
18211836
readable-stream "^3.4.0"
18221837

1838+
bluebird@^3.5.0:
1839+
version "3.7.2"
1840+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
1841+
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
1842+
18231843
[email protected]:
18241844
version "1.6.0"
18251845
resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.6.0.tgz#37fc387b616cb6aef370dab4d6bd402b74c5c54d"
@@ -1852,6 +1872,13 @@ braces@^3.0.2:
18521872
dependencies:
18531873
fill-range "^7.0.1"
18541874

1875+
brotli@^1.3.1:
1876+
version "1.3.3"
1877+
resolved "https://registry.yarnpkg.com/brotli/-/brotli-1.3.3.tgz#7365d8cc00f12cf765d2b2c898716bcf4b604d48"
1878+
integrity sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==
1879+
dependencies:
1880+
base64-js "^1.1.2"
1881+
18551882
browserslist@^4.21.3, browserslist@^4.21.5:
18561883
version "4.21.7"
18571884
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.7.tgz#e2b420947e5fb0a58e8f4668ae6e23488127e551"
@@ -2068,12 +2095,17 @@ [email protected]:
20682095
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
20692096
integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
20702097

2071-
commander@^2.20.0, commander@^2.8.1:
2098+
commander@^2.20.0:
20722099
version "2.20.3"
20732100
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
20742101
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
20752102

2076-
component-emitter@^1.2.0, component-emitter@^1.2.1:
2103+
commander@^8.3.0:
2104+
version "8.3.0"
2105+
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
2106+
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
2107+
2108+
component-emitter@^1.2.0:
20772109
version "1.3.0"
20782110
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
20792111
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -2174,6 +2206,11 @@ [email protected]:
21742206
source-map-resolve "^0.5.1"
21752207
urix "^0.1.0"
21762208

2209+
cuint@^0.2.2:
2210+
version "0.2.2"
2211+
resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
2212+
integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==
2213+
21772214
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3:
21782215
version "4.3.4"
21792216
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -2295,14 +2332,6 @@ depd@^2.0.0:
22952332
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
22962333
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
22972334

2298-
des.js@^1.0.1:
2299-
version "1.1.0"
2300-
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da"
2301-
integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
2302-
dependencies:
2303-
inherits "^2.0.1"
2304-
minimalistic-assert "^1.0.0"
2305-
23062335
detect-libc@^2.0.0:
23072336
version "2.0.1"
23082337
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
@@ -2903,15 +2932,6 @@ fs-extra@^10.0.0:
29032932
jsonfile "^6.0.1"
29042933
universalify "^2.0.0"
29052934

2906-
fs-extra@^10.0.0:
2907-
version "10.1.0"
2908-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
2909-
integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
2910-
dependencies:
2911-
graceful-fs "^4.2.0"
2912-
jsonfile "^6.0.1"
2913-
universalify "^2.0.0"
2914-
29152935
fs-minipass@^2.0.0:
29162936
version "2.1.0"
29172937
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -3047,7 +3067,7 @@ glob-parent@^5.1.2:
30473067
dependencies:
30483068
is-glob "^4.0.1"
30493069

3050-
glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
3070+
glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
30513071
version "7.2.3"
30523072
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
30533073
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -3224,6 +3244,11 @@ http-proxy-agent@^4.0.1:
32243244
agent-base "6"
32253245
debug "4"
32263246

3247+
http-status-codes@^2.2.0:
3248+
version "2.2.0"
3249+
resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-2.2.0.tgz#bb2efe63d941dfc2be18e15f703da525169622be"
3250+
integrity sha512-feERVo9iWxvnejp3SEfm/+oNG517npqL2/PIA8ORjyOZjGC7TwCRQsZylciLS64i6pJ0wRYz3rkXLRwbtFa8Ng==
3251+
32273252
https-proxy-agent@^5.0.0:
32283253
version "5.0.1"
32293254
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -4502,6 +4527,11 @@ pump@^3.0.0:
45024527
end-of-stream "^1.1.0"
45034528
once "^1.3.1"
45044529

4530+
punycode@^1.4.1:
4531+
version "1.4.1"
4532+
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
4533+
integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
4534+
45054535
punycode@^2.1.0:
45064536
version "2.3.0"
45074537
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
@@ -4739,7 +4769,7 @@ reusify@^1.0.4:
47394769
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
47404770
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
47414771

4742-
rimraf@^2.2.8:
4772+
rimraf@^2.2.8, rimraf@^2.6.3:
47434773
version "2.7.1"
47444774
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
47454775
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -5191,7 +5221,7 @@ [email protected]:
51915221
read-file-relative "^1.2.0"
51925222
which-promise "^1.0.0"
51935223

5194-
[email protected]:
5224+
[email protected], [email protected], testcafe-hammerhead@>=19.4.0:
51955225
version "24.2.1"
51965226
resolved "https://registry.yarnpkg.com/testcafe-hammerhead/-/testcafe-hammerhead-24.2.1.tgz#1ff657da8170bc05f74d78edd863259d815fae95"
51975227
integrity sha512-SyZgnOnF7ya+I9+jagWd5RMcyS9K+yzZDX8i/FkuAS6QITbEMvNxyNIS20enBAGy4FE3dlrfzo4TQfgp6Au3Bg==
@@ -5222,10 +5252,10 @@ [email protected]:
52225252
tunnel-agent "0.6.0"
52235253
webauth "^1.1.0"
52245254

5225-
testcafe-legacy-api@5.0.0:
5226-
version "5.0.0"
5227-
resolved "https://registry.yarnpkg.com/testcafe-legacy-api/-/testcafe-legacy-api-5.0.0.tgz#dde9dc2ee9e9490afed58b83df23cf2e01a6c303"
5228-
integrity sha512-Peb5NJLP7g6HTihMrrGKV7YnGvD6xw4eNPA7Fx44r1GzncuVY/fV1lIL0EQyr8uz0bS5+Hgr0fHSiZ/E4hCjeQ==
5255+
testcafe-legacy-api@5.1.6:
5256+
version "5.1.6"
5257+
resolved "https://registry.yarnpkg.com/testcafe-legacy-api/-/testcafe-legacy-api-5.1.6.tgz#157b29902153cc086649f91960a4e45694481f50"
5258+
integrity sha512-Q451IdSUX1NmRfE8kzIcEeoqbUlLaMv2fwVNgQOBEFmA5E57c3jsIpLDTDqv6FPcNwdNMYIZMiB6tzlXB5wf1g==
52295259
dependencies:
52305260
async "3.2.3"
52315261
dedent "^0.6.0"
@@ -5400,13 +5430,28 @@ time-limit-promise@^1.0.2:
54005430
resolved "https://registry.yarnpkg.com/time-limit-promise/-/time-limit-promise-1.0.4.tgz#33e928212273c70d52153c28ad2a7e3319b975f9"
54015431
integrity sha512-FLHDDsIDducw7MBcRWlFtW2Tm50DoKOSFf0Nzx17qwXj8REXCte0eUkHrJl9QU3Bl9arG3XNYX0PcHpZ9xyuLw==
54025432

5433+
tmp-promise@^1.0.5:
5434+
version "1.1.0"
5435+
resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.1.0.tgz#bb924d239029157b9bc1d506a6aa341f8b13e64c"
5436+
integrity sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==
5437+
dependencies:
5438+
bluebird "^3.5.0"
5439+
tmp "0.1.0"
5440+
54035441
[email protected]:
54045442
version "0.0.28"
54055443
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
54065444
integrity sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==
54075445
dependencies:
54085446
os-tmpdir "~1.0.1"
54095447

5448+
[email protected]:
5449+
version "0.1.0"
5450+
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
5451+
integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
5452+
dependencies:
5453+
rimraf "^2.6.3"
5454+
54105455
to-fast-properties@^2.0.0:
54115456
version "2.0.0"
54125457
resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -5419,16 +5464,6 @@ to-regex-range@^5.0.1:
54195464
dependencies:
54205465
is-number "^7.0.0"
54215466

5422-
to-regex@^3.0.1, to-regex@^3.0.2:
5423-
version "3.0.2"
5424-
resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
5425-
integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
5426-
dependencies:
5427-
define-property "^2.0.2"
5428-
extend-shallow "^3.0.2"
5429-
regex-not "^1.0.2"
5430-
safe-regex "^1.1.0"
5431-
54325467
[email protected]:
54335468
version "2.3.3"
54345469
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
@@ -5657,6 +5692,11 @@ w-json@^1.3.10:
56575692
resolved "https://registry.yarnpkg.com/w-json/-/w-json-1.3.10.tgz#ac448a19ca22376e2753a684b52369c7b1e83313"
56585693
integrity sha512-XadVyw0xE+oZ5FGApXsdswv96rOhStzKqL53uSe5UaTadABGkWIg1+DTx8kiZ/VqTZTBneoL0l65RcPe4W3ecw==
56595694

5695+
webauth@^1.1.0:
5696+
version "1.1.0"
5697+
resolved "https://registry.yarnpkg.com/webauth/-/webauth-1.1.0.tgz#64704f6b8026986605bc3ca629952e6e26fdd100"
5698+
integrity sha512-BwbI3vESF7eVleIU6zYPnFuzT89IRswYoJ0C6xYLDpNSUpiw7pdX0HjebyYkFYt1IuYnQvx2Y1Lx+bGKz4Zi6w==
5699+
56605700
webidl-conversions@^3.0.0:
56615701
version "3.0.1"
56625702
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

0 commit comments

Comments
 (0)