Skip to content

Commit db05227

Browse files
egor-zalenskiegor-zalenski
committed
#RI-4265 - Enchance opening window Electron
1 parent db8ec2f commit db05227

27 files changed

+114
-123
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import path from 'path';
22
import webpack from 'webpack';
33
import { merge } from 'webpack-merge';
4-
import { toString } from 'lodash'
54
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
65
import baseConfig from './webpack.config.base';
76
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -74,15 +73,6 @@ export default merge(baseConfig, {
7473
APP_VERSION: version,
7574
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
7675
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
77-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
78-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
79-
: toString(30 * 1000), // 30 sec
80-
API_PREFIX: 'api',
81-
BASE_API_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
82-
RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
83-
SCAN_COUNT_DEFAULT: '500',
84-
SCAN_TREE_COUNT_DEFAULT: '10000',
85-
PIPELINE_COUNT_DEFAULT: '5',
8676
}),
8777

8878
new webpack.DefinePlugin({

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
33
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
4-
import { toString } from 'lodash'
54
import mainProdConfig from './webpack.config.main.prod';
65
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
76
import { version } from '../redisinsight/package.json';
@@ -31,15 +30,6 @@ export default merge(mainProdConfig, {
3130
APP_VERSION: version,
3231
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
3332
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
34-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
35-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
36-
: toString(30 * 1000), // 30 sec
37-
API_PREFIX: 'api',
38-
BASE_API_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
39-
RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
40-
SCAN_COUNT_DEFAULT: '500',
41-
SCAN_TREE_COUNT_DEFAULT: '10000',
42-
PIPELINE_COUNT_DEFAULT: '5',
4333
}),
4434
],
4535
});

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import webpack from 'webpack';
77
import { merge } from 'webpack-merge';
88
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
99
import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
10+
import HtmlWebpackPlugin from 'html-webpack-plugin';
1011
import baseConfig from './webpack.config.base';
1112
import webpackPaths from './webpack.paths';
12-
import HtmlWebpackPlugin from 'html-webpack-plugin';
13+
import { version } from '../redisinsight/package.json';
1314

1415
const port = process.env.PORT || 1212;
1516
const manifest = path.resolve(webpackPaths.dllPath, 'renderer.json');
@@ -46,7 +47,7 @@ const configuration: webpack.Configuration = {
4647
entry: [
4748
`webpack-dev-server/client?http://localhost:${port}/dist`,
4849
'webpack/hot/only-dev-server',
49-
path.join(webpackPaths.uiPath, 'index.tsx'),
50+
path.join(webpackPaths.uiPath, 'indexElectron.tsx'),
5051
],
5152

5253
output: {
@@ -60,7 +61,9 @@ const configuration: webpack.Configuration = {
6061

6162
resolve: {
6263
alias: {
64+
src: webpackPaths.apiSrcPath,
6365
apiSrc: webpackPaths.apiSrcPath,
66+
uiSrc: webpackPaths.uiSrcPath,
6467
},
6568
},
6669

@@ -251,6 +254,25 @@ const configuration: webpack.Configuration = {
251254
isDevelopment: process.env.NODE_ENV !== 'production',
252255
nodeModules: webpackPaths.appNodeModulesPath,
253256
}),
257+
258+
new webpack.DefinePlugin({
259+
'process.env.NODE_ENV': JSON.stringify('development'),
260+
'process.env.APP_ENV': JSON.stringify('web'),
261+
'process.env.API_PREFIX': JSON.stringify('api'),
262+
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
263+
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
264+
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
265+
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
266+
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
267+
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
268+
'process.env.APP_VERSION': JSON.stringify(version),
269+
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
270+
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
271+
: JSON.stringify(30 * 1000),
272+
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
273+
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
274+
: JSON.stringify('SOURCE_WRITE_KEY'),
275+
}),
254276
],
255277

256278
node: {
@@ -268,6 +290,7 @@ const configuration: webpack.Configuration = {
268290
},
269291
historyApiFallback: {
270292
verbose: true,
293+
disableDotRule: true,
271294
},
272295
setupMiddlewares(middlewares) {
273296
console.log('Starting preload.js builder...');

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import webpack from 'webpack';
33
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
44
import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
55
import { merge } from 'webpack-merge';
6+
import HtmlWebpackPlugin from 'html-webpack-plugin';
67
import baseConfig from './webpack.config.base';
78
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
8-
import HtmlWebpackPlugin from 'html-webpack-plugin';
99
import webpackPaths from './webpack.paths';
10+
import { version } from '../redisinsight/package.json';
1011

1112
DeleteSourceMaps();
1213

@@ -195,6 +196,22 @@ const configuration: webpack.Configuration = {
195196

196197
new webpack.DefinePlugin({
197198
'process.type': '"renderer"',
199+
'process.env.NODE_ENV': JSON.stringify('development'),
200+
'process.env.APP_ENV': JSON.stringify('electron'),
201+
'process.env.API_PREFIX': JSON.stringify('api'),
202+
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
203+
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
204+
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
205+
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
206+
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
207+
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
208+
'process.env.APP_VERSION': JSON.stringify(version),
209+
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
210+
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
211+
: JSON.stringify(30 * 1000),
212+
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
213+
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
214+
: JSON.stringify('SOURCE_WRITE_KEY'),
198215
}),
199216
],
200217
};

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
3-
import { toString } from 'lodash'
43
import baseConfig from './webpack.config.base';
54
import rendererProdConfig from './webpack.config.renderer.prod';
65
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
6+
import { version } from '../redisinsight/package.json';
77

88
DeleteSourceMaps();
99

@@ -13,20 +13,24 @@ export default merge(baseConfig, {
1313
plugins: [
1414
...rendererProdConfig.plugins,
1515

16-
new webpack.EnvironmentPlugin({
17-
NODE_ENV: 'staging',
18-
DEBUG_PROD: false,
19-
API_PREFIX: 'api',
20-
BASE_API_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
21-
RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
22-
APP_ENV: 'electron',
23-
SCAN_COUNT_DEFAULT: '500',
24-
SCAN_COUNT_MEMORY_ANALYSES: '10000',
25-
SEGMENT_WRITE_KEY:
26-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
27-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
28-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
29-
: toString(30 * 1000), // 30 sec
16+
new webpack.DefinePlugin({
17+
'process.type': '"renderer"',
18+
'process.env.NODE_ENV': JSON.stringify('staging'),
19+
'process.env.APP_ENV': JSON.stringify('electron'),
20+
'process.env.API_PREFIX': JSON.stringify('api'),
21+
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
22+
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
23+
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
24+
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
25+
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
26+
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
27+
'process.env.APP_VERSION': JSON.stringify(version),
28+
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
29+
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
30+
: JSON.stringify(30 * 1000),
31+
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
32+
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
33+
: JSON.stringify('SOURCE_WRITE_KEY'),
3034
}),
3135
],
3236
});

‎configs/webpack.config.web.common.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ export default {
6565
},
6666

6767
plugins: [
68+
new webpack.DefinePlugin({
69+
'window.ENV_VARS.API_PORT': JSON.stringify('5000'),
70+
}),
71+
6872
new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
6973

7074
new MonacoWebpackPlugin({ languages: ['json'], features: ['!rename'] }),

‎configs/webpack.config.web.dev.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function employCache(loaders) {
1818

1919
const HOST = process.env.PUBLIC_DEV ? ip.address(): 'localhost'
2020

21-
export default merge(commonConfig, {
21+
const configuration: webpack.Configuration = {
2222
target: 'web',
2323

2424
mode: 'development',
@@ -39,7 +39,7 @@ export default merge(commonConfig, {
3939

4040
entry: [
4141
'regenerator-runtime/runtime',
42-
`webpack-dev-server/client?http://${HOST}:8081`,
42+
`webpack-dev-server/client?http://${HOST}:8080`,
4343
'webpack/hot/only-dev-server',
4444
require.resolve('../redisinsight/ui/index.tsx'),
4545
],
@@ -179,6 +179,7 @@ export default merge(commonConfig, {
179179
hot: true, // enable HMR on the server
180180
historyApiFallback: true,
181181
},
182+
182183
plugins: [
183184
new webpack.HotModuleReplacementPlugin({
184185
multiStep: true,
@@ -202,13 +203,13 @@ export default merge(commonConfig, {
202203
NODE_ENV: 'development',
203204
APP_ENV: 'web',
204205
API_PREFIX: 'api',
205-
API_PORT: '5001',
206206
BASE_API_URL: `http://${HOST}`,
207207
RESOURCES_BASE_URL: `http://${HOST}`,
208208
PIPELINE_COUNT_DEFAULT: '5',
209209
SCAN_COUNT_DEFAULT: '500',
210210
SCAN_TREE_COUNT_DEFAULT: '10000',
211-
SEGMENT_WRITE_KEY: 'MWGOG146oPdLSWO5mZy3eM1NzcC3alRF',
211+
SEGMENT_WRITE_KEY:
212+
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
212213
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
213214
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
214215
: toString(30 * 1000),
@@ -224,4 +225,6 @@ export default merge(commonConfig, {
224225
externals: {
225226
// react: 'React',
226227
},
227-
});
228+
};
229+
230+
export default merge(commonConfig, configuration);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const devtoolsConfig =
1818
}
1919
: {};
2020

21-
export default merge(commonConfig, {
21+
const configuration: webpack.Configuration = {
2222
...devtoolsConfig,
2323

2424
mode: 'production',
@@ -208,4 +208,6 @@ export default merge(commonConfig, {
208208
],
209209
},
210210
externals: {},
211-
});
211+
};
212+
213+
export default merge(commonConfig, configuration);

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.renderer.dev.ts",
3939
"start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.preload.dev.ts",
4040
"start:main": "cross-env NODE_ENV=development electron -r ./scripts/BabelRegister redisinsight/electron/main.dev.ts",
41-
"start:web": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
42-
"start:web:public": "cross-env PUBLIC_DEV=true NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
41+
"start:web": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
42+
"start:web:public": "cross-env PUBLIC_DEV=true NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
4343
"test": "jest ./redisinsight/ui -w 1",
4444
"test:watch": "jest ./redisinsight/ui --watch -w 1",
4545
"test:cov": "jest ./redisinsight/ui --coverage -w 1",

‎redisinsight/api/config/logger.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const logger: WinstonModuleOptions = {
5959
format: format.errors({ stack: true }),
6060
transports: transportsConfig,
6161
level: LOGGER_CONFIG.logLevel,
62+
silent: true,
6263
};
6364

6465
export default logger;

0 commit comments

Comments
 (0)