Skip to content

Commit 50f7a28

Browse files
committed
Merge branch 'main' into e2e/bugfix/3532-fix-unstable-e2e
2 parents 9302354 + dadab33 commit 50f7a28

File tree

100 files changed

+3381
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3381
-134
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,6 @@ vendor
5858

5959
# Parcel
6060
.parcel-cache
61+
62+
# caches
63+
.temp_cache

configs/webpack.config.web.dev.babel.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* https://webpack.js.org/concepts/hot-module-replacement/
66
*/
77

8+
import path from 'path';
89
import webpack from 'webpack';
910
import { merge } from 'webpack-merge';
1011
import ip from 'ip';
@@ -21,6 +22,18 @@ export default merge(commonConfig, {
2122

2223
mode: 'development',
2324

25+
cache: {
26+
type: 'filesystem',
27+
allowCollectingMemory: true,
28+
cacheDirectory: path.resolve(__dirname, '../.temp_cache'),
29+
name: 'webpack',
30+
maxAge: 86_400_000, // 1 day
31+
buildDependencies: {
32+
// This makes all dependencies of this file - build dependencies
33+
config: [__filename],
34+
}
35+
},
36+
2437
devtool: 'source-map',
2538

2639
entry: [

jest.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = {
1616
'rehype-stringify': '<rootDir>/redisinsight/__mocks__/rehypeStringify.js',
1717
'unist-util-visit': '<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js',
1818
'react-children-utilities': '<rootDir>/redisinsight/__mocks__/react-children-utilities.js',
19+
d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
1920
},
2021
setupFiles: [
2122
'<rootDir>/redisinsight/ui/src/setup-env.ts',
@@ -38,6 +39,11 @@ module.exports = {
3839
transformIgnorePatterns: [
3940
'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
4041
],
42+
// TODO: add tests for plugins
43+
modulePathIgnorePatterns: [
44+
'<rootDir>/redisinsight/ui/src/packages',
45+
'<rootDir>/redisinsight/ui/src/mocks',
46+
],
4147
coverageThreshold: {
4248
global: {
4349
statements: 70,

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"@testing-library/user-event": "^14.4.3",
111111
"@types/axios": "^0.14.0",
112112
"@types/classnames": "^2.2.11",
113+
"@types/d3": "^7.4.0",
113114
"@types/date-fns": "^2.6.0",
114115
"@types/detect-port": "^1.3.0",
115116
"@types/electron-store": "^3.2.0",
@@ -216,6 +217,7 @@
216217
"buffer": "^6.0.3",
217218
"classnames": "^2.3.1",
218219
"connection-string": "^4.3.2",
220+
"d3": "^7.6.1",
219221
"date-fns": "^2.16.1",
220222
"detect-port": "^1.3.0",
221223
"electron-context-menu": "^3.1.0",
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 20 additions & 0 deletions
Loading
Lines changed: 25 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)