송용우 / oss-Jaksimsamil

Go to a project
Toggle navigation Toggle navigation pinning
송용우
112fc5b5 2 parents b7662131 0a64d87a

Merge commit '0a64d87a' into develop

Inline Side-by-side
Showing 5 changed files with 217 additions and 97 deletions
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 "moment": "^2.27.0", 13 "moment": "^2.27.0",
14 "open-color": "^1.7.0", 14 "open-color": "^1.7.0",
15 "react": "^16.13.1", 15 "react": "^16.13.1",
16 + "react-calendar-heatmap": "^1.8.1",
16 "react-dom": "^16.13.1", 17 "react-dom": "^16.13.1",
17 "react-redux": "^7.2.0", 18 "react-redux": "^7.2.0",
18 "react-router-dom": "^5.2.0", 19 "react-router-dom": "^5.2.0",
......
1 +import React, { use } from 'react';
2 +import CalendarHeatmap from 'react-calendar-heatmap';
3 +import 'react-calendar-heatmap/dist/styles.css';
4 +/*
5 +TODO: 날짜 범위 지정, 날짜별 검색 추가
6 +*/
7 +/*
8 +solvedBJbyDATE:
9 +solvedBJbyDATE:{
10 + 20190304 : [Object]
11 + ...
12 +}
13 +*/
14 +const HeatMap = (HMArr) => {
15 + return (
16 + <div>
17 + <CalendarHeatmap
18 + onClick={() => {
19 + console.log(HMArr);
20 + }}
21 + startDate={new Date('2020-01-01')}
22 + endDate={new Date('2020-12-01')}
23 + values={HMArr.HMArr}
24 + classForValue={(value) => {
25 + if (!value) {
26 + return 'color-empty';
27 + }
28 + return `color-github-${value.count}`;
29 + }}
30 + tooltipDataAttrs={(value) => {
31 + return {
32 + 'data-tooltip': `${value.date} has count: ${value.count}`,
33 + };
34 + }}
35 + showWeekdayLabels={true}
36 + />
37 + </div>
38 + );
39 +};
40 +
41 +export default HeatMap;
...@@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core/styles'; ...@@ -3,7 +3,7 @@ import { makeStyles } from '@material-ui/core/styles';
3 import Paper from '@material-ui/core/Paper'; 3 import Paper from '@material-ui/core/Paper';
4 import Grid from '@material-ui/core/Grid'; 4 import Grid from '@material-ui/core/Grid';
5 import palette from '../../lib/styles/palette'; 5 import palette from '../../lib/styles/palette';
6 -import AuthForm from '../auth/AuthForm'; 6 +import HeatMap from './HeatMap';
7 const useStyles = makeStyles((theme) => ({ 7 const useStyles = makeStyles((theme) => ({
8 root: { 8 root: {
9 flexGrow: 1, 9 flexGrow: 1,
...@@ -17,7 +17,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -17,7 +17,7 @@ const useStyles = makeStyles((theme) => ({
17 color: theme.palette.text.secondary, 17 color: theme.palette.text.secondary,
18 }, 18 },
19 })); 19 }));
20 -const HomeForm = ({ PSdata, goalNum }) => { 20 +const HomeForm = ({ PSdata, HMArr, goalNum }) => {
21 const classes = useStyles(); 21 const classes = useStyles();
22 return PSdata ? ( 22 return PSdata ? (
23 <div className={classes.root}> 23 <div className={classes.root}>
...@@ -48,7 +48,11 @@ const HomeForm = ({ PSdata, goalNum }) => { ...@@ -48,7 +48,11 @@ const HomeForm = ({ PSdata, goalNum }) => {
48 <h3>마지막으로 푼 문제</h3> 48 <h3>마지막으로 푼 문제</h3>
49 </Paper> 49 </Paper>
50 </Grid> 50 </Grid>
51 - 51 + <Grid item xs={12}>
52 + <Paper className={classes.paper}>
53 + <HeatMap HMArr={HMArr} />
54 + </Paper>
55 + </Grid>
52 <Grid item xs={4}> 56 <Grid item xs={4}>
53 <Paper className={classes.paper}> 57 <Paper className={classes.paper}>
54 <h1>{PSdata.weekNum}</h1> 58 <h1>{PSdata.weekNum}</h1>
......
1 -import React, { useEffect } from 'react'; 1 +import React, { useEffect, useState } from 'react';
2 import { useDispatch, useSelector } from 'react-redux'; 2 import { useDispatch, useSelector } from 'react-redux';
3 import { withRouter } from 'react-router-dom'; 3 import { withRouter } from 'react-router-dom';
4 import HomeForm from '../../components/home/HomeForm'; 4 import HomeForm from '../../components/home/HomeForm';
5 import { getPROFILE, initializeProfile } from '../../modules/profile'; 5 import { getPROFILE, initializeProfile } from '../../modules/profile';
6 const HomeContainer = ({ history }) => { 6 const HomeContainer = ({ history }) => {
7 const dispatch = useDispatch(); 7 const dispatch = useDispatch();
8 + const [HMArr, setHMArr] = useState([]);
8 const { user, profile } = useSelector(({ user, profile }) => ({ 9 const { user, profile } = useSelector(({ user, profile }) => ({
9 user: user.user, 10 user: user.user,
10 profile: profile, 11 profile: profile,
11 })); 12 }));
12 13
14 + const makeHeatmapValues = (PSdata) => {
15 + let obj_keys = Object.keys(PSdata);
16 + let result = [];
17 + for (let i = 0; i < obj_keys.length; i++) {
18 + result.push({
19 + date:
20 + //2019-10-15
21 + obj_keys[i].slice(0, 4) +
22 + '-' +
23 + obj_keys[i].slice(4, 6) +
24 + '-' +
25 + obj_keys[i].slice(6, 8),
26 + count: PSdata[obj_keys[i]].length,
27 + });
28 + }
29 + return result;
30 + };
31 +
13 useEffect(() => { 32 useEffect(() => {
14 if (!user) { 33 if (!user) {
15 alert('로그인이 필요합니다 '); 34 alert('로그인이 필요합니다 ');
...@@ -23,7 +42,9 @@ const HomeContainer = ({ history }) => { ...@@ -23,7 +42,9 @@ const HomeContainer = ({ history }) => {
23 } 42 }
24 }, [dispatch, user, history]); 43 }, [dispatch, user, history]);
25 useEffect(() => { 44 useEffect(() => {
26 - console.log(profile); 45 + if (profile.solvedBJ_date) {
46 + setHMArr(makeHeatmapValues(profile.solvedBJ_date.solvedBJbyDATE));
47 + }
27 }, [profile]); 48 }, [profile]);
28 useEffect(() => { 49 useEffect(() => {
29 if (user) { 50 if (user) {
...@@ -31,6 +52,12 @@ const HomeContainer = ({ history }) => { ...@@ -31,6 +52,12 @@ const HomeContainer = ({ history }) => {
31 dispatch(getPROFILE({ username })); 52 dispatch(getPROFILE({ username }));
32 } 53 }
33 }, [dispatch, user]); 54 }, [dispatch, user]);
34 - return <HomeForm PSdata={profile.solvedBJ_date} goalNum={profile.goalNum} />; 55 + return (
56 + <HomeForm
57 + PSdata={profile.solvedBJ_date}
58 + HMArr={HMArr}
59 + goalNum={profile.goalNum}
60 + />
61 + );
35 }; 62 };
36 export default withRouter(HomeContainer); 63 export default withRouter(HomeContainer);
......
...@@ -1703,6 +1703,11 @@ ...@@ -1703,6 +1703,11 @@
1703 resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" 1703 resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
1704 integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== 1704 integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
1705 1705
1706 +"@types/json-schema@^7.0.4":
1707 + version "7.0.5"
1708 + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
1709 + integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
1710 +
1706 "@types/minimatch@*": 1711 "@types/minimatch@*":
1707 version "3.0.3" 1712 version "3.0.3"
1708 resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" 1713 resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
...@@ -2120,6 +2125,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: ...@@ -2120,6 +2125,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
2120 json-schema-traverse "^0.4.1" 2125 json-schema-traverse "^0.4.1"
2121 uri-js "^4.2.2" 2126 uri-js "^4.2.2"
2122 2127
2128 +ajv@^6.12.2:
2129 + version "6.12.4"
2130 + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
2131 + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
2132 + dependencies:
2133 + fast-deep-equal "^3.1.1"
2134 + fast-json-stable-stringify "^2.0.0"
2135 + json-schema-traverse "^0.4.1"
2136 + uri-js "^4.2.2"
2137 +
2123 alphanum-sort@^1.0.0: 2138 alphanum-sort@^1.0.0:
2124 version "1.0.2" 2139 version "1.0.2"
2125 resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" 2140 resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
...@@ -5114,7 +5129,7 @@ find-cache-dir@^2.1.0: ...@@ -5114,7 +5129,7 @@ find-cache-dir@^2.1.0:
5114 make-dir "^2.0.0" 5129 make-dir "^2.0.0"
5115 pkg-dir "^3.0.0" 5130 pkg-dir "^3.0.0"
5116 5131
5117 -find-cache-dir@^3.2.0: 5132 +find-cache-dir@^3.3.1:
5118 version "3.3.1" 5133 version "3.3.1"
5119 resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" 5134 resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
5120 integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== 5135 integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
...@@ -5755,10 +5770,10 @@ html-encoding-sniffer@^1.0.2: ...@@ -5755,10 +5770,10 @@ html-encoding-sniffer@^1.0.2:
5755 dependencies: 5770 dependencies:
5756 whatwg-encoding "^1.0.1" 5771 whatwg-encoding "^1.0.1"
5757 5772
5758 -html-entities@^1.2.1: 5773 +html-entities@^1.3.1:
5759 - version "1.2.1" 5774 + version "1.3.1"
5760 - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" 5775 + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
5761 - integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= 5776 + integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
5762 5777
5763 html-escaper@^2.0.0: 5778 html-escaper@^2.0.0:
5764 version "2.0.0" 5779 version "2.0.0"
...@@ -5968,10 +5983,10 @@ immer@1.10.0: ...@@ -5968,10 +5983,10 @@ immer@1.10.0:
5968 resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" 5983 resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
5969 integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg== 5984 integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
5970 5985
5971 -immer@^7.0.1: 5986 +immer@^7.0.5:
5972 - version "7.0.1" 5987 + version "7.0.7"
5973 - resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.1.tgz#830f44a36c4181c0eca4385e7782e164e5eb9249" 5988 + resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.7.tgz#9dfe713d49bf871cc59aedfce59b1992fa37a977"
5974 - integrity sha512-DpWL/ES2Ba8KwW+A5AgNRoJPZP8LxdHejKXar1VfbF5a7ATvvekzmmNSQxje+WG0DIhuanvFEumFffVqyCLmBQ== 5989 + integrity sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw==
5975 5990
5976 import-cwd@^2.0.0: 5991 import-cwd@^2.0.0:
5977 version "2.1.0" 5992 version "2.1.0"
...@@ -6973,10 +6988,10 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: ...@@ -6973,10 +6988,10 @@ jest-worker@^24.6.0, jest-worker@^24.9.0:
6973 merge-stream "^2.0.0" 6988 merge-stream "^2.0.0"
6974 supports-color "^6.1.0" 6989 supports-color "^6.1.0"
6975 6990
6976 -jest-worker@^25.1.0: 6991 +jest-worker@^25.4.0:
6977 - version "25.1.0" 6992 + version "25.5.0"
6978 - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" 6993 + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
6979 - integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== 6994 + integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
6980 dependencies: 6995 dependencies:
6981 merge-stream "^2.0.0" 6996 merge-stream "^2.0.0"
6982 supports-color "^7.0.0" 6997 supports-color "^7.0.0"
...@@ -7659,10 +7674,10 @@ lodash.without@~4.4.0: ...@@ -7659,10 +7674,10 @@ lodash.without@~4.4.0:
7659 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" 7674 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
7660 integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== 7675 integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
7661 7676
7662 -loglevel@^1.6.6: 7677 +loglevel@^1.6.8:
7663 - version "1.6.7" 7678 + version "1.6.8"
7664 - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56" 7679 + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
7665 - integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A== 7680 + integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
7666 7681
7667 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: 7682 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
7668 version "1.4.0" 7683 version "1.4.0"
...@@ -7808,6 +7823,11 @@ mem@^4.0.0: ...@@ -7808,6 +7823,11 @@ mem@^4.0.0:
7808 mimic-fn "^2.0.0" 7823 mimic-fn "^2.0.0"
7809 p-is-promise "^2.0.0" 7824 p-is-promise "^2.0.0"
7810 7825
7826 +memoize-one@^5.0.0:
7827 + version "5.1.1"
7828 + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
7829 + integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
7830 +
7811 memory-fs@^0.4.1: 7831 memory-fs@^0.4.1:
7812 version "0.4.1" 7832 version "0.4.1"
7813 resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" 7833 resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
...@@ -8063,6 +8083,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: ...@@ -8063,6 +8083,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
8063 dependencies: 8083 dependencies:
8064 minimist "^1.2.5" 8084 minimist "^1.2.5"
8065 8085
8086 +moment@^2.27.0:
8087 + version "2.27.0"
8088 + resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
8089 + integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
8090 +
8066 move-concurrently@^1.0.1: 8091 move-concurrently@^1.0.1:
8067 version "1.0.1" 8092 version "1.0.1"
8068 resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" 8093 resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
...@@ -8778,7 +8803,7 @@ os-locale@^2.0.0: ...@@ -8778,7 +8803,7 @@ os-locale@^2.0.0:
8778 lcid "^1.0.0" 8803 lcid "^1.0.0"
8779 mem "^1.1.0" 8804 mem "^1.1.0"
8780 8805
8781 -os-locale@^3.0.0, os-locale@^3.1.0: 8806 +os-locale@^3.1.0:
8782 version "3.1.0" 8807 version "3.1.0"
8783 resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" 8808 resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
8784 integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== 8809 integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
...@@ -8829,13 +8854,20 @@ p-limit@^1.1.0: ...@@ -8829,13 +8854,20 @@ p-limit@^1.1.0:
8829 dependencies: 8854 dependencies:
8830 p-try "^1.0.0" 8855 p-try "^1.0.0"
8831 8856
8832 -p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2: 8857 +p-limit@^2.0.0, p-limit@^2.2.0:
8833 version "2.2.2" 8858 version "2.2.2"
8834 resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" 8859 resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
8835 integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== 8860 integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
8836 dependencies: 8861 dependencies:
8837 p-try "^2.0.0" 8862 p-try "^2.0.0"
8838 8863
8864 +p-limit@^2.3.0:
8865 + version "2.3.0"
8866 + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
8867 + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
8868 + dependencies:
8869 + p-try "^2.0.0"
8870 +
8839 p-locate@^2.0.0: 8871 p-locate@^2.0.0:
8840 version "2.0.0" 8872 version "2.0.0"
8841 resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" 8873 resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
...@@ -9221,14 +9253,14 @@ popper.js@1.16.1-lts: ...@@ -9221,14 +9253,14 @@ popper.js@1.16.1-lts:
9221 resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" 9253 resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
9222 integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== 9254 integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
9223 9255
9224 -portfinder@^1.0.25: 9256 +portfinder@^1.0.26:
9225 - version "1.0.25" 9257 + version "1.0.28"
9226 - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca" 9258 + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
9227 - integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg== 9259 + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
9228 dependencies: 9260 dependencies:
9229 async "^2.6.2" 9261 async "^2.6.2"
9230 debug "^3.1.1" 9262 debug "^3.1.1"
9231 - mkdirp "^0.5.1" 9263 + mkdirp "^0.5.5"
9232 9264
9233 posix-character-classes@^0.1.0: 9265 posix-character-classes@^0.1.0:
9234 version "0.1.1" 9266 version "0.1.1"
...@@ -10154,7 +10186,7 @@ raf@^3.4.1: ...@@ -10154,7 +10186,7 @@ raf@^3.4.1:
10154 dependencies: 10186 dependencies:
10155 performance-now "^2.1.0" 10187 performance-now "^2.1.0"
10156 10188
10157 -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: 10189 +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
10158 version "2.1.0" 10190 version "2.1.0"
10159 resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" 10191 resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
10160 integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== 10192 integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
...@@ -10206,6 +10238,14 @@ react-app-polyfill@^1.0.6: ...@@ -10206,6 +10238,14 @@ react-app-polyfill@^1.0.6:
10206 regenerator-runtime "^0.13.3" 10238 regenerator-runtime "^0.13.3"
10207 whatwg-fetch "^3.0.0" 10239 whatwg-fetch "^3.0.0"
10208 10240
10241 +react-calendar-heatmap@^1.8.1:
10242 + version "1.8.1"
10243 + resolved "https://registry.yarnpkg.com/react-calendar-heatmap/-/react-calendar-heatmap-1.8.1.tgz#8370151f6cf7477d49cb3459596d6d046bdfc704"
10244 + integrity sha512-4Hbq/pDMJoCPzZnyIWFfHgokLlLXzKyGsDcMgNhYpi7zcKHcvsK9soLEPvhW2dBBqgDrQOSp/uG4wtifaDg4eQ==
10245 + dependencies:
10246 + memoize-one "^5.0.0"
10247 + prop-types "^15.6.2"
10248 +
10209 react-dev-utils@^10.2.1: 10249 react-dev-utils@^10.2.1:
10210 version "10.2.1" 10250 version "10.2.1"
10211 resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19" 10251 resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
...@@ -10296,10 +10336,10 @@ react-router@5.2.0: ...@@ -10296,10 +10336,10 @@ react-router@5.2.0:
10296 tiny-invariant "^1.0.2" 10336 tiny-invariant "^1.0.2"
10297 tiny-warning "^1.0.0" 10337 tiny-warning "^1.0.0"
10298 10338
10299 -react-scripts@3.4.1: 10339 +react-scripts@^3.4.3:
10300 - version "3.4.1" 10340 + version "3.4.3"
10301 - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz#f551298b5c71985cc491b9acf3c8e8c0ae3ada0a" 10341 + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz#21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"
10302 - integrity sha512-JpTdi/0Sfd31mZA6Ukx+lq5j1JoKItX7qqEK4OiACjVQletM1P38g49d9/D0yTxp9FrSF+xpJFStkGgKEIRjlQ== 10342 + integrity sha512-oSnoWmii/iKdeQiwaO6map1lUaZLmG0xIUyb/HwCVFLT7gNbj8JZ9RmpvMCZ4fB98ZUMRfNmp/ft8uy/xD1RLA==
10303 dependencies: 10343 dependencies:
10304 "@babel/core" "7.9.0" 10344 "@babel/core" "7.9.0"
10305 "@svgr/webpack" "4.3.3" 10345 "@svgr/webpack" "4.3.3"
...@@ -10346,11 +10386,11 @@ react-scripts@3.4.1: ...@@ -10346,11 +10386,11 @@ react-scripts@3.4.1:
10346 sass-loader "8.0.2" 10386 sass-loader "8.0.2"
10347 semver "6.3.0" 10387 semver "6.3.0"
10348 style-loader "0.23.1" 10388 style-loader "0.23.1"
10349 - terser-webpack-plugin "2.3.5" 10389 + terser-webpack-plugin "2.3.8"
10350 ts-pnp "1.1.6" 10390 ts-pnp "1.1.6"
10351 url-loader "2.3.0" 10391 url-loader "2.3.0"
10352 webpack "4.42.0" 10392 webpack "4.42.0"
10353 - webpack-dev-server "3.10.3" 10393 + webpack-dev-server "3.11.0"
10354 webpack-manifest-plugin "2.2.0" 10394 webpack-manifest-plugin "2.2.0"
10355 workbox-webpack-plugin "4.3.1" 10395 workbox-webpack-plugin "4.3.1"
10356 optionalDependencies: 10396 optionalDependencies:
...@@ -11010,7 +11050,7 @@ schema-utils@^1.0.0: ...@@ -11010,7 +11050,7 @@ schema-utils@^1.0.0:
11010 ajv-errors "^1.0.0" 11050 ajv-errors "^1.0.0"
11011 ajv-keywords "^3.1.0" 11051 ajv-keywords "^3.1.0"
11012 11052
11013 -schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.4, schema-utils@^2.6.5: 11053 +schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6.5:
11014 version "2.6.5" 11054 version "2.6.5"
11015 resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a" 11055 resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
11016 integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ== 11056 integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
...@@ -11018,6 +11058,15 @@ schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6 ...@@ -11018,6 +11058,15 @@ schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1, schema-utils@^2.6
11018 ajv "^6.12.0" 11058 ajv "^6.12.0"
11019 ajv-keywords "^3.4.1" 11059 ajv-keywords "^3.4.1"
11020 11060
11061 +schema-utils@^2.6.6:
11062 + version "2.7.0"
11063 + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
11064 + integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
11065 + dependencies:
11066 + "@types/json-schema" "^7.0.4"
11067 + ajv "^6.12.2"
11068 + ajv-keywords "^3.4.1"
11069 +
11021 select-hose@^2.0.0: 11070 select-hose@^2.0.0:
11022 version "2.0.0" 11071 version "2.0.0"
11023 resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" 11072 resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
...@@ -11076,6 +11125,13 @@ serialize-javascript@^2.1.2: ...@@ -11076,6 +11125,13 @@ serialize-javascript@^2.1.2:
11076 resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" 11125 resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
11077 integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== 11126 integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
11078 11127
11128 +serialize-javascript@^4.0.0:
11129 + version "4.0.0"
11130 + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
11131 + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
11132 + dependencies:
11133 + randombytes "^2.1.0"
11134 +
11079 serve-index@^1.9.1: 11135 serve-index@^1.9.1:
11080 version "1.9.1" 11136 version "1.9.1"
11081 resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" 11137 resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
...@@ -11301,13 +11357,14 @@ sockjs-client@1.4.0: ...@@ -11301,13 +11357,14 @@ sockjs-client@1.4.0:
11301 json3 "^3.3.2" 11357 json3 "^3.3.2"
11302 url-parse "^1.4.3" 11358 url-parse "^1.4.3"
11303 11359
11304 -sockjs@0.3.19: 11360 +sockjs@0.3.20:
11305 - version "0.3.19" 11361 + version "0.3.20"
11306 - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d" 11362 + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
11307 - integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw== 11363 + integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
11308 dependencies: 11364 dependencies:
11309 faye-websocket "^0.10.0" 11365 faye-websocket "^0.10.0"
11310 - uuid "^3.0.1" 11366 + uuid "^3.4.0"
11367 + websocket-driver "0.6.5"
11311 11368
11312 socks-proxy-agent@^4.0.0: 11369 socks-proxy-agent@^4.0.0:
11313 version "4.0.2" 11370 version "4.0.2"
...@@ -11422,10 +11479,10 @@ spdy-transport@^3.0.0: ...@@ -11422,10 +11479,10 @@ spdy-transport@^3.0.0:
11422 readable-stream "^3.0.6" 11479 readable-stream "^3.0.6"
11423 wbuf "^1.7.3" 11480 wbuf "^1.7.3"
11424 11481
11425 -spdy@^4.0.1: 11482 +spdy@^4.0.2:
11426 - version "4.0.1" 11483 + version "4.0.2"
11427 - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz#6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2" 11484 + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
11428 - integrity sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA== 11485 + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
11429 dependencies: 11486 dependencies:
11430 debug "^4.1.0" 11487 debug "^4.1.0"
11431 handle-thing "^2.0.0" 11488 handle-thing "^2.0.0"
...@@ -11861,19 +11918,19 @@ term-size@^1.2.0: ...@@ -11861,19 +11918,19 @@ term-size@^1.2.0:
11861 dependencies: 11918 dependencies:
11862 execa "^0.7.0" 11919 execa "^0.7.0"
11863 11920
11864 -terser-webpack-plugin@2.3.5: 11921 +terser-webpack-plugin@2.3.8:
11865 - version "2.3.5" 11922 + version "2.3.8"
11866 - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81" 11923 + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724"
11867 - integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w== 11924 + integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==
11868 dependencies: 11925 dependencies:
11869 cacache "^13.0.1" 11926 cacache "^13.0.1"
11870 - find-cache-dir "^3.2.0" 11927 + find-cache-dir "^3.3.1"
11871 - jest-worker "^25.1.0" 11928 + jest-worker "^25.4.0"
11872 - p-limit "^2.2.2" 11929 + p-limit "^2.3.0"
11873 - schema-utils "^2.6.4" 11930 + schema-utils "^2.6.6"
11874 - serialize-javascript "^2.1.2" 11931 + serialize-javascript "^4.0.0"
11875 source-map "^0.6.1" 11932 source-map "^0.6.1"
11876 - terser "^4.4.3" 11933 + terser "^4.6.12"
11877 webpack-sources "^1.4.3" 11934 webpack-sources "^1.4.3"
11878 11935
11879 terser-webpack-plugin@^1.4.3: 11936 terser-webpack-plugin@^1.4.3:
...@@ -11891,7 +11948,7 @@ terser-webpack-plugin@^1.4.3: ...@@ -11891,7 +11948,7 @@ terser-webpack-plugin@^1.4.3:
11891 webpack-sources "^1.4.0" 11948 webpack-sources "^1.4.0"
11892 worker-farm "^1.7.0" 11949 worker-farm "^1.7.0"
11893 11950
11894 -terser@^4.1.2, terser@^4.4.3, terser@^4.6.3: 11951 +terser@^4.1.2, terser@^4.6.3:
11895 version "4.6.7" 11952 version "4.6.7"
11896 resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" 11953 resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"
11897 integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== 11954 integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==
...@@ -11900,6 +11957,15 @@ terser@^4.1.2, terser@^4.4.3, terser@^4.6.3: ...@@ -11900,6 +11957,15 @@ terser@^4.1.2, terser@^4.4.3, terser@^4.6.3:
11900 source-map "~0.6.1" 11957 source-map "~0.6.1"
11901 source-map-support "~0.5.12" 11958 source-map-support "~0.5.12"
11902 11959
11960 +terser@^4.6.12:
11961 + version "4.8.0"
11962 + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
11963 + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
11964 + dependencies:
11965 + commander "^2.20.0"
11966 + source-map "~0.6.1"
11967 + source-map-support "~0.5.12"
11968 +
11903 test-exclude@^5.2.3: 11969 test-exclude@^5.2.3:
11904 version "5.2.3" 11970 version "5.2.3"
11905 resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" 11971 resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
...@@ -12387,7 +12453,7 @@ utils-merge@1.0.1: ...@@ -12387,7 +12453,7 @@ utils-merge@1.0.1:
12387 resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" 12453 resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
12388 integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= 12454 integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
12389 12455
12390 -uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3: 12456 +uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
12391 version "3.4.0" 12457 version "3.4.0"
12392 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" 12458 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
12393 integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== 12459 integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
...@@ -12508,10 +12574,10 @@ webpack-dev-middleware@^3.7.2: ...@@ -12508,10 +12574,10 @@ webpack-dev-middleware@^3.7.2:
12508 range-parser "^1.2.1" 12574 range-parser "^1.2.1"
12509 webpack-log "^2.0.0" 12575 webpack-log "^2.0.0"
12510 12576
12511 -webpack-dev-server@3.10.3: 12577 +webpack-dev-server@3.11.0:
12512 - version "3.10.3" 12578 + version "3.11.0"
12513 - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" 12579 + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
12514 - integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== 12580 + integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
12515 dependencies: 12581 dependencies:
12516 ansi-html "0.0.7" 12582 ansi-html "0.0.7"
12517 bonjour "^3.5.0" 12583 bonjour "^3.5.0"
...@@ -12521,31 +12587,31 @@ webpack-dev-server@3.10.3: ...@@ -12521,31 +12587,31 @@ webpack-dev-server@3.10.3:
12521 debug "^4.1.1" 12587 debug "^4.1.1"
12522 del "^4.1.1" 12588 del "^4.1.1"
12523 express "^4.17.1" 12589 express "^4.17.1"
12524 - html-entities "^1.2.1" 12590 + html-entities "^1.3.1"
12525 http-proxy-middleware "0.19.1" 12591 http-proxy-middleware "0.19.1"
12526 import-local "^2.0.0" 12592 import-local "^2.0.0"
12527 internal-ip "^4.3.0" 12593 internal-ip "^4.3.0"
12528 ip "^1.1.5" 12594 ip "^1.1.5"
12529 is-absolute-url "^3.0.3" 12595 is-absolute-url "^3.0.3"
12530 killable "^1.0.1" 12596 killable "^1.0.1"
12531 - loglevel "^1.6.6" 12597 + loglevel "^1.6.8"
12532 opn "^5.5.0" 12598 opn "^5.5.0"
12533 p-retry "^3.0.1" 12599 p-retry "^3.0.1"
12534 - portfinder "^1.0.25" 12600 + portfinder "^1.0.26"
12535 schema-utils "^1.0.0" 12601 schema-utils "^1.0.0"
12536 selfsigned "^1.10.7" 12602 selfsigned "^1.10.7"
12537 semver "^6.3.0" 12603 semver "^6.3.0"
12538 serve-index "^1.9.1" 12604 serve-index "^1.9.1"
12539 - sockjs "0.3.19" 12605 + sockjs "0.3.20"
12540 sockjs-client "1.4.0" 12606 sockjs-client "1.4.0"
12541 - spdy "^4.0.1" 12607 + spdy "^4.0.2"
12542 strip-ansi "^3.0.1" 12608 strip-ansi "^3.0.1"
12543 supports-color "^6.1.0" 12609 supports-color "^6.1.0"
12544 url "^0.11.0" 12610 url "^0.11.0"
12545 webpack-dev-middleware "^3.7.2" 12611 webpack-dev-middleware "^3.7.2"
12546 webpack-log "^2.0.0" 12612 webpack-log "^2.0.0"
12547 ws "^6.2.1" 12613 ws "^6.2.1"
12548 - yargs "12.0.5" 12614 + yargs "^13.3.2"
12549 12615
12550 webpack-log@^2.0.0: 12616 webpack-log@^2.0.0:
12551 version "2.0.0" 12617 version "2.0.0"
...@@ -12602,6 +12668,13 @@ webpack@4.42.0: ...@@ -12602,6 +12668,13 @@ webpack@4.42.0:
12602 watchpack "^1.6.0" 12668 watchpack "^1.6.0"
12603 webpack-sources "^1.4.1" 12669 webpack-sources "^1.4.1"
12604 12670
12671 +websocket-driver@0.6.5:
12672 + version "0.6.5"
12673 + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
12674 + integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
12675 + dependencies:
12676 + websocket-extensions ">=0.1.1"
12677 +
12605 websocket-driver@>=0.5.1: 12678 websocket-driver@>=0.5.1:
12606 version "0.7.3" 12679 version "0.7.3"
12607 resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9" 12680 resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
...@@ -12931,7 +13004,7 @@ y18n@^3.2.1: ...@@ -12931,7 +13004,7 @@ y18n@^3.2.1:
12931 resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" 13004 resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
12932 integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= 13005 integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
12933 13006
12934 -"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: 13007 +y18n@^4.0.0:
12935 version "4.0.0" 13008 version "4.0.0"
12936 resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" 13009 resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
12937 integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== 13010 integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
...@@ -12958,14 +13031,6 @@ yaml@^1.7.2: ...@@ -12958,14 +13031,6 @@ yaml@^1.7.2:
12958 dependencies: 13031 dependencies:
12959 "@babel/runtime" "^7.8.7" 13032 "@babel/runtime" "^7.8.7"
12960 13033
12961 -yargs-parser@^11.1.1:
12962 - version "11.1.1"
12963 - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
12964 - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
12965 - dependencies:
12966 - camelcase "^5.0.0"
12967 - decamelize "^1.2.0"
12968 -
12969 yargs-parser@^13.1.2: 13034 yargs-parser@^13.1.2:
12970 version "13.1.2" 13035 version "13.1.2"
12971 resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" 13036 resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
...@@ -12988,24 +13053,6 @@ yargs-parser@^9.0.2: ...@@ -12988,24 +13053,6 @@ yargs-parser@^9.0.2:
12988 dependencies: 13053 dependencies:
12989 camelcase "^4.1.0" 13054 camelcase "^4.1.0"
12990 13055
12991 -yargs@12.0.5:
12992 - version "12.0.5"
12993 - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
12994 - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
12995 - dependencies:
12996 - cliui "^4.0.0"
12997 - decamelize "^1.2.0"
12998 - find-up "^3.0.0"
12999 - get-caller-file "^1.0.1"
13000 - os-locale "^3.0.0"
13001 - require-directory "^2.1.1"
13002 - require-main-filename "^1.0.1"
13003 - set-blocking "^2.0.0"
13004 - string-width "^2.0.0"
13005 - which-module "^2.0.0"
13006 - y18n "^3.2.1 || ^4.0.0"
13007 - yargs-parser "^11.1.1"
13008 -
13009 yargs@^11.0.0: 13056 yargs@^11.0.0:
13010 version "11.1.1" 13057 version "11.1.1"
13011 resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766" 13058 resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
...@@ -13024,7 +13071,7 @@ yargs@^11.0.0: ...@@ -13024,7 +13071,7 @@ yargs@^11.0.0:
13024 y18n "^3.2.1" 13071 y18n "^3.2.1"
13025 yargs-parser "^9.0.2" 13072 yargs-parser "^9.0.2"
13026 13073
13027 -yargs@^13.3.0: 13074 +yargs@^13.3.0, yargs@^13.3.2:
13028 version "13.3.2" 13075 version "13.3.2"
13029 resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" 13076 resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
13030 integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== 13077 integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
......