Skip to content

Commit 281e0c2

Browse files
technote-spacetechnote-space
authored
Merge pull request #118 from technote-space/release/next-v0.14.17
Release/next v0.14.17
2 parents 45d8ff3 + 2684d42 commit 281e0c2

File tree

3 files changed

+75
-73
lines changed

3 files changed

+75
-73
lines changed

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@material-ui/core": "^4.11.4",
4444
"@material-ui/icons": "^4.11.2",
4545
"@mui-treasury/layout": "^4.5.0",
46-
"@technote-space/genetic-algorithms-js": "^0.8.18",
46+
"@technote-space/genetic-algorithms-js": "^0.8.19",
4747
"@technote-space/worker-controller": "^0.5.34",
4848
"chart.js": "^3.3.2",
4949
"clsx": "^1.1.1",
@@ -68,24 +68,23 @@
6868
"@babel/preset-typescript": "^7.14.5",
6969
"@commitlint/cli": "^12.1.4",
7070
"@commitlint/config-conventional": "^12.1.4",
71-
"@types/chart.js": "^2.9.32",
72-
"@types/node": "^15.12.2",
71+
"@types/node": "^15.12.4",
7372
"@types/react-helmet": "^6.1.1",
7473
"@types/styled-components": "^5.1.10",
7574
"@typescript-eslint/eslint-plugin": "^4.27.0",
7675
"@typescript-eslint/parser": "^4.27.0",
7776
"babel-plugin-react-html-attrs": "^3.0.5",
7877
"babel-plugin-transform-class-properties": "^6.24.1",
7978
"copy-webpack-plugin": "^9.0.0",
80-
"eslint": "^7.28.0",
79+
"eslint": "^7.29.0",
8180
"eslint-plugin-react": "^7.24.0",
8281
"eslint-plugin-react-hooks": "^4.2.0",
8382
"html-webpack-plugin": "^5.3.1",
8483
"husky": "^6.0.0",
8584
"lint-staged": "^11.0.0",
8685
"pinst": "^2.1.6",
87-
"typescript": "^4.3.2",
88-
"webpack": "^5.39.0"
86+
"typescript": "^4.3.4",
87+
"webpack": "^5.39.1"
8988
},
9089
"publishConfig": {
9190
"access": "public"

‎src/app/components/Timeline.tsx‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import type {FC} from 'react';
2+
import type {ScatterDataPoint} from 'chart.js';
23
import React, {memo, useRef, useState, useEffect} from 'react';
34
import {makeStyles, createStyles, Theme} from '@material-ui/core/styles';
4-
import Chart, {ChartPoint} from 'chart.js';
5+
import {Chart} from 'chart.js';
56
import useTheme from '@/hooks/useTheme';
67
import {useStoreContext} from '@/Store';
78

@@ -13,7 +14,7 @@ const useStyles = makeStyles((theme: Theme) => createStyles({
1314
}));
1415

1516
const Timeline: FC<{
16-
data: Array<ChartPoint>;
17+
data: Array<ScatterDataPoint>;
1718
}> = memo(({data}) => {
1819
const classes = useStyles();
1920
const [chart, setChart] = useState<Chart | null>(null);
@@ -36,7 +37,7 @@ const Timeline: FC<{
3637
data: {
3738
datasets: [
3839
{
39-
lineTension: 0.1,
40+
tension: 0.1,
4041
backgroundColor: 'rgba(75, 192, 192, 0.4)',
4142
borderColor: 'rgba(75, 192, 192, 1)',
4243
label: 'Fitness',
@@ -47,33 +48,35 @@ const Timeline: FC<{
4748
labels: [...Array(101).keys()],
4849
},
4950
options: {
50-
legend: {display: false},
51+
plugins: {
52+
legend: {display: false},
53+
},
5154
scales: {
52-
xAxes: [
53-
{
54-
type: 'linear',
55-
ticks: {
56-
min: 0, max: 100, stepSize: 10,
57-
fontColor: themeObject.palette.primary.contrastText,
58-
padding: 5,
59-
},
60-
gridLines: {
61-
color: themeObject.palette.secondary.contrastText,
62-
},
55+
x: {
56+
type: 'linear',
57+
min: 0,
58+
max: 100,
59+
ticks: {
60+
stepSize: 10,
61+
color: themeObject.palette.primary.contrastText,
62+
padding: 5,
63+
},
64+
grid: {
65+
color: themeObject.palette.secondary.contrastText,
6366
},
64-
],
65-
yAxes: [
66-
{
67-
ticks: {
68-
min: 0, max: 1.1, stepSize: 0.1,
69-
fontColor: themeObject.palette.primary.contrastText,
70-
padding: 5,
71-
},
72-
gridLines: {
73-
color: themeObject.palette.secondary.contrastText,
74-
},
67+
},
68+
y: {
69+
min: 0,
70+
max: 1.1,
71+
ticks: {
72+
stepSize: 0.1,
73+
color: themeObject.palette.primary.contrastText,
74+
padding: 5,
7575
},
76-
],
76+
grid: {
77+
color: themeObject.palette.secondary.contrastText,
78+
},
79+
},
7780
},
7881
animation: undefined,
7982
},

‎yarn.lock‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,10 +1280,10 @@
12801280
"@nodelib/fs.scandir" "2.1.5"
12811281
fastq "^1.6.0"
12821282

1283-
"@technote-space/genetic-algorithms-js@^0.8.18":
1284-
version "0.8.18"
1285-
resolved "https://registry.yarnpkg.com/@technote-space/genetic-algorithms-js/-/genetic-algorithms-js-0.8.18.tgz#12f198fb1ec4a82e4cca62880d185d5947d05431"
1286-
integrity sha512-EceufGPz1ijUJlEY+8ApyuwFqu8ArevBG7/cZSaOgTzTW+EfdUMyc/4itKjenTyjtqX5H+NL4eWuMGj1SSoVGQ==
1283+
"@technote-space/genetic-algorithms-js@^0.8.19":
1284+
version "0.8.19"
1285+
resolved "https://registry.yarnpkg.com/@technote-space/genetic-algorithms-js/-/genetic-algorithms-js-0.8.19.tgz#860723d78f8c7059c0b8cdbe67f83771840e07be"
1286+
integrity sha512-FKj6dkyy9jSVqwXdUN4zMZNzCPaaE0TxJpY9iqP2psrhDlEdRdjYviRRuWAywsKy63b7cRy0bAKk8mV8gLt1Mw==
12871287

12881288
"@technote-space/worker-controller@^0.5.34":
12891289
version "0.5.34"
@@ -1363,10 +1363,10 @@
13631363
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
13641364
integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
13651365

1366-
"@types/node@*", "@types/node@^15.12.2":
1367-
version "15.12.2"
1368-
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"
1369-
integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==
1366+
"@types/node@*", "@types/node@^15.12.4":
1367+
version "15.12.4"
1368+
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26"
1369+
integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==
13701370

13711371
"@types/normalize-package-data@^2.4.0":
13721372
version "2.4.0"
@@ -1823,12 +1823,12 @@ babel-plugin-polyfill-corejs2@^0.2.2:
18231823
semver "^6.1.1"
18241824

18251825
babel-plugin-polyfill-corejs3@^0.2.2:
1826-
version "0.2.2"
1827-
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz#7424a1682ee44baec817327710b1b094e5f8f7f5"
1828-
integrity sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==
1826+
version "0.2.3"
1827+
resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
1828+
integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
18291829
dependencies:
18301830
"@babel/helper-define-polyfill-provider" "^0.2.2"
1831-
core-js-compat "^3.9.1"
1831+
core-js-compat "^3.14.0"
18321832

18331833
babel-plugin-polyfill-regenerator@^0.2.2:
18341834
version "0.2.2"
@@ -2003,9 +2003,9 @@ camelize@^1.0.0:
20032003
integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
20042004

20052005
caniuse-lite@^1.0.30001219:
2006-
version "1.0.30001237"
2007-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5"
2008-
integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==
2006+
version "1.0.30001239"
2007+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"
2008+
integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==
20092009

20102010
chalk@^1.1.3:
20112011
version "1.1.3"
@@ -2174,9 +2174,9 @@ conventional-commits-parser@^3.0.0:
21742174
trim-off-newlines "^1.0.0"
21752175

21762176
convert-source-map@^1.7.0:
2177-
version "1.7.0"
2178-
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
2179-
integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
2177+
version "1.8.0"
2178+
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
2179+
integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
21802180
dependencies:
21812181
safe-buffer "~5.1.1"
21822182

@@ -2193,10 +2193,10 @@ copy-webpack-plugin@^9.0.0:
21932193
schema-utils "^3.0.0"
21942194
serialize-javascript "^5.0.1"
21952195

2196-
core-js-compat@^3.14.0, core-js-compat@^3.9.1:
2197-
version "3.14.0"
2198-
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.14.0.tgz#b574dabf29184681d5b16357bd33d104df3d29a5"
2199-
integrity sha512-R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A==
2196+
core-js-compat@^3.14.0:
2197+
version "3.15.0"
2198+
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.0.tgz#e14a371123db9d1c5b41206d3f420643d238b8fa"
2199+
integrity sha512-8X6lWsG+s7IfOKzV93a7fRYfWRZobOfjw5V5rrq43Vh/W+V6qYxl7Akalsvgab4PFT/4L/pjQbdBUEM36NXKrw==
22002200
dependencies:
22012201
browserslist "^4.16.6"
22022202
semver "7.0.0"
@@ -2557,10 +2557,10 @@ eslint-visitor-keys@^2.0.0:
25572557
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
25582558
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
25592559

2560-
eslint@^7.28.0:
2561-
version "7.28.0"
2562-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820"
2563-
integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==
2560+
eslint@^7.29.0:
2561+
version "7.29.0"
2562+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
2563+
integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
25642564
dependencies:
25652565
"@babel/code-frame" "7.12.11"
25662566
"@eslint/eslintrc" "^0.4.2"
@@ -2868,9 +2868,9 @@ globals@^9.18.0:
28682868
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
28692869

28702870
globby@^11.0.3:
2871-
version "11.0.3"
2872-
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
2873-
integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
2871+
version "11.0.4"
2872+
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
2873+
integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
28742874
dependencies:
28752875
array-union "^2.1.0"
28762876
dir-glob "^3.0.1"
@@ -4651,10 +4651,10 @@ type-fest@^0.8.1:
46514651
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
46524652
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
46534653

4654-
typescript@^4.3.2:
4655-
version "4.3.2"
4656-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
4657-
integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
4654+
typescript@^4.3.4:
4655+
version "4.3.4"
4656+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc"
4657+
integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==
46584658

46594659
unbox-primitive@^1.0.1:
46604660
version "1.0.1"
@@ -4755,10 +4755,10 @@ webpack-sources@^2.3.0:
47554755
source-list-map "^2.0.1"
47564756
source-map "^0.6.1"
47574757

4758-
webpack@^5.39.0:
4759-
version "5.39.0"
4760-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.39.0.tgz#37d6899f1f40c31d5901abc0f39bc8cc7224138c"
4761-
integrity sha512-25CHmuDj+oOTyteI13sUqNlCnjCnySuhiKWE/cRYPQYeoQ3ijHgyWX27CiyUKLNGq27v8S0mrksyTreT/xo7pg==
4758+
webpack@^5.39.1:
4759+
version "5.39.1"
4760+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.39.1.tgz#d1e014b6d71e1aef385316ad528f21cd5b1f9784"
4761+
integrity sha512-ulOvoNCh2PvTUa+zbpRuEb1VPeQnhxpnHleMPVVCq3QqnaFogjsLyps+o42OviQFoaGtTQYrUqDXu1QNkvUPzw==
47624762
dependencies:
47634763
"@types/eslint-scope" "^3.7.0"
47644764
"@types/estree" "^0.0.47"
@@ -4846,9 +4846,9 @@ yaml@^1.10.0:
48464846
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
48474847

48484848
yargs-parser@^20.2.2, yargs-parser@^20.2.3:
4849-
version "20.2.7"
4850-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
4851-
integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
4849+
version "20.2.9"
4850+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
4851+
integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
48524852

48534853
yargs@^16.2.0:
48544854
version "16.2.0"

0 commit comments

Comments
 (0)