Skip to content

Commit 35f3922

Browse files
authored
Merge pull request #388 from entrylabs/issue/5209
[#5209] [WS] 데이터 분석에 새로운 기능(산점도 행렬, 차트 크게 보기 등)을 추가
2 parents bd1331c + d547fec commit 35f3922

File tree

166 files changed

+16053
-5513
lines changed

Some content is hidden

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

166 files changed

+16053
-5513
lines changed

.eslintrc

+21-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
{
2-
"plugins": ["prettier"],
3-
"extends": ["plugin:prettier/recommended"],
2+
"plugins": ["react", "prettier", "react-hooks"],
3+
"extends": [
4+
"plugin:prettier/recommended",
5+
"eslint:recommended",
6+
"plugin:react/recommended",
7+
"plugin:react/jsx-runtime"
8+
],
49
"env": {
510
"es6": true,
611
"browser": true,
712
"jquery": true
813
},
9-
"parser": "babel-eslint",
14+
"settings": {
15+
"react": {
16+
"version": "detect"
17+
}
18+
},
19+
"parser": "@babel/eslint-parser",
1020
"parserOptions": {
11-
"ecmaVersion": 2017,
21+
"ecmaVersion": 11,
1222
"sourceType": "module",
1323
"ecmaFeatures": {
1424
"jsx": true
15-
}
25+
},
26+
"requireConfigFile": false
1627
},
1728
"rules": {
29+
"no-unused-vars": "warn",
1830
"prefer-const": "warn",
1931
"no-var": "warn",
2032
"eqeqeq": 0,
@@ -72,7 +84,10 @@
7284
"camelcase": ["warn", { "properties": "never" }],
7385
"new-cap": ["warn", { "capIsNewExceptionPattern": "^Entry." }],
7486
"curly": "warn",
75-
"keyword-spacing": "warn"
87+
"keyword-spacing": "warn",
88+
"react-hooks/rules-of-hooks": "error",
89+
"react-hooks/exhaustive-deps": "warn",
90+
"react/prop-types": "off"
7691
},
7792
"globals": {
7893
"$": true,

.storybook/.babelrc

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
{
22
"plugins": [
3-
"@babel/plugin-transform-runtime",
3+
[
4+
"@babel/plugin-transform-runtime",
5+
{
6+
"useESModules": true
7+
}
8+
],
9+
// "@babel/plugin-transform-runtime",,
410
"@babel/plugin-transform-regenerator",
511
"@babel/plugin-syntax-dynamic-import",
612
"@babel/plugin-transform-object-assign",
713
"@babel/plugin-proposal-class-properties",
14+
"@babel/plugin-transform-modules-commonjs",
15+
"@babel/plugin-proposal-object-rest-spread",
16+
"@babel/plugin-proposal-private-methods",
817
[
918
"module-resolver",
1019
{
@@ -32,6 +41,6 @@
3241
}
3342
}
3443
],
35-
"@babel/react"
44+
["@babel/react", { "runtime": "automatic" }]
3645
]
3746
}

jsconfig.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"target": "ES6",
3+
"target": "ES2022",
44
"baseUrl": "./",
55
"paths": {
66
"@hoc/*": ["src/hoc/*"],
@@ -10,7 +10,9 @@
1010
"@components/*": ["src/components/*"],
1111
"@utils/*": ["src/utils/*"],
1212
"@reducers/*": ["src/reducers/*"],
13-
"@contexts/*": ["src/contexts/*"]
13+
"@contexts/*": ["src/contexts/*"],
14+
"@selectors/*": ["src/selectors/*"],
15+
"@constants/*": ["src/constants/*"]
1416
}
1517
},
1618
"exclude": ["node_modules", "**/node_modules/*", "dist", "component"]

package.json

+30-23
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,31 @@
3232
"prepublish": "npm run build"
3333
},
3434
"devDependencies": {
35-
"@babel/cli": "^7.8.3",
36-
"@babel/core": "^7.12.3",
37-
"@babel/plugin-proposal-class-properties": "^7.3.0",
38-
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
39-
"@babel/plugin-proposal-private-methods": "^7.12.1",
40-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
41-
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
42-
"@babel/plugin-transform-object-assign": "^7.2.0",
43-
"@babel/plugin-transform-regenerator": "^7.0.0",
44-
"@babel/plugin-transform-runtime": "^7.2.0",
45-
"@babel/preset-env": "^7.3.1",
46-
"@babel/preset-react": "^7.0.0",
47-
"@babel/register": "^7.9.0",
35+
"@babel/cli": "^7.19.3",
36+
"@babel/core": "^7.20.5",
37+
"@babel/eslint-parser": "^7.19.1",
38+
"@babel/eslint-plugin": "^7.19.1",
39+
"@babel/parser": "^7.20.5",
40+
"@babel/plugin-proposal-class-properties": "^7.18.6",
41+
"@babel/plugin-proposal-object-rest-spread": "^7.20.2",
42+
"@babel/plugin-proposal-private-methods": "^7.18.6",
43+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
44+
"@babel/plugin-transform-modules-commonjs": "^7.19.6",
45+
"@babel/plugin-transform-object-assign": "^7.18.6",
46+
"@babel/plugin-transform-regenerator": "^7.20.5",
47+
"@babel/plugin-transform-runtime": "^7.19.6",
48+
"@babel/preset-env": "^7.20.2",
49+
"@babel/preset-react": "^7.18.6",
50+
"@babel/register": "^7.18.9",
4851
"@storybook/addon-actions": "^3.4.10",
4952
"@storybook/addon-knobs": "^3.4.10",
5053
"@storybook/addon-links": "^3.4.10",
5154
"@storybook/react": "^3.4.10",
5255
"autoprefixer": "7.1.6",
5356
"babel-core": "^7.0.0-bridge.0",
54-
"babel-eslint": "^10.1.0",
55-
"babel-jest": "^26.0.1",
57+
"babel-jest": "^29.3.1",
5658
"babel-loader": "^8.1.0",
57-
"babel-plugin-module-resolver": "^4.0.0",
59+
"babel-plugin-module-resolver": "^4.1.0",
5860
"case-sensitive-paths-webpack-plugin": "2.1.1",
5961
"chalk": "1.1.3",
6062
"cross-env": "^6.0.3",
@@ -63,11 +65,15 @@
6365
"dotenv-expand": "4.2.0",
6466
"enzyme": "^3.4.2",
6567
"enzyme-adapter-react-16": "^1.2.0",
66-
"eslint": "^7.14.0",
67-
"eslint-config-prettier": "^6.15.0",
68-
"eslint-config-react-app": "^6.0.0",
68+
"eslint": "^8.30.0",
69+
"eslint-config-next": "^13.0.6",
70+
"eslint-config-prettier": "^8.5.0",
71+
"eslint-config-react-app": "^7.0.1",
6972
"eslint-loader": "^4.0.2",
70-
"eslint-plugin-prettier": "^3.1.4",
73+
"eslint-plugin-jsx-a11y": "^6.6.1",
74+
"eslint-plugin-prettier": "^4.2.1",
75+
"eslint-plugin-react": "^7.31.11",
76+
"eslint-plugin-react-hooks": "^5.0.0-next-4dda96a40-20221213",
7177
"events": "^3.0.0",
7278
"extract-text-webpack-plugin": "3.0.2",
7379
"file-loader": "1.1.5",
@@ -82,8 +88,8 @@
8288
"postcss-flexbugs-fixes": "3.2.0",
8389
"postcss-loader": "^3.0.0",
8490
"postcss-prefixer": "^2.1.2",
85-
"prettier": "^1.19.1",
86-
"prettier-eslint": "^12.0.0",
91+
"prettier": "^2.8.1",
92+
"prettier-eslint": "^15.0.1",
8793
"promise": "8.0.1",
8894
"raf": "3.4.0",
8995
"react": "^17.0.1",
@@ -97,6 +103,7 @@
97103
"recompose": "^0.30.0",
98104
"redux": "^4.0.0",
99105
"redux-thunk": "^2.3.0",
106+
"regenerator-runtime": "^0.13.11",
100107
"resolve": "1.6.0",
101108
"rimraf": "^2.6.2",
102109
"safe-umd-webpack-plugin": "^4.0.0",
@@ -120,7 +127,7 @@
120127
"@entrylabs/postcss-url": "^8.0.1",
121128
"@toast-ui/react-grid": "^4.10.1",
122129
"axios": "^0.18.0",
123-
"billboard.js": "^1.11.1",
130+
"billboard.js": "^3.6.3",
124131
"chroma-js": "^1.4.0",
125132
"classnames": "^2.2.6",
126133
"clipboard": "^2.0.11",

src/App.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Component } from 'react';
1+
import { Component } from 'react';
22
import { connect } from 'react-redux';
33

44
class App extends Component {
Loading
Loading
Loading

0 commit comments

Comments
 (0)