Skip to content

Commit 52fc373

Browse files
krystophvkrystophv
authored
Merge pull request #211 from tidepool-org/release-1.12.0
Release 1.12.0 to develop
2 parents 3c2b084 + f052b02 commit 52fc373

File tree

5 files changed

+62
-20
lines changed

5 files changed

+62
-20
lines changed

‎babel.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = function babelConfig(api) {
77

88
const plugins = [
99
'react-hot-loader/babel',
10+
'@babel/plugin-proposal-class-properties',
1011
'@babel/plugin-transform-modules-commonjs',
1112
];
1213

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tidepool/viz",
3-
"version": "1.12.0-react-upgrade.1",
3+
"version": "1.12.0",
44
"description": "Tidepool data visualization for diabetes device data.",
55
"keywords": [
66
"data visualization"
@@ -66,7 +66,7 @@
6666
"react-dom": "16.12.0",
6767
"react-markdown": "4.0.3",
6868
"react-motion": "0.5.2",
69-
"react-redux": "5.1.2",
69+
"react-redux": "7.2.0",
7070
"react-select": "2.0.0",
7171
"react-sizeme": "2.6.12",
7272
"react-transition-group-plus": "0.5.3",
@@ -82,6 +82,7 @@
8282
"devDependencies": {
8383
"@babel/cli": "7.1.0",
8484
"@babel/core": "7.1.0",
85+
"@babel/plugin-proposal-class-properties": "7.1.0",
8586
"@babel/polyfill": "7.0.0",
8687
"@babel/preset-env": "7.1.0",
8788
"@babel/preset-react": "7.0.0",
@@ -130,7 +131,7 @@
130131
"postcss-calc": "6.0.1",
131132
"postcss-custom-properties": "7.0.0",
132133
"postcss-loader": "3.0.0",
133-
"react-hot-loader": "4.3.6",
134+
"react-hot-loader": "4.12.19",
134135
"react-test-renderer": "16.12.0",
135136
"rimraf": "2.6.2",
136137
"sinon": "6.3.3",

‎src/components/common/stat/Stat.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ class Stat extends PureComponent {
455455
x: i + 1,
456456
y: d.value,
457457
deviation: d.deviation,
458+
eventKey: i,
458459
})),
459460
dataComponent: (
460461
<BgBar
@@ -544,6 +545,7 @@ class Stat extends PureComponent {
544545
x: i + 1,
545546
y: total > 0 ? d.value / total : d.value,
546547
id: d.id,
548+
eventKey: i,
547549
})),
548550
dataComponent: (
549551
<HoverBar

‎test/components/common/stat/Stat.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,7 @@ describe('Stat', () => {
14341434
x: 1,
14351435
y: 100,
14361436
deviation: { value: 30 },
1437+
eventKey: 0,
14371438
},
14381439
]);
14391440
});

‎yarn.lock‎

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@
449449
version "7.0.0"
450450
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
451451

452+
"@babel/helper-plugin-utils@^7.10.4":
453+
version "7.10.4"
454+
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
455+
integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
456+
452457
"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
453458
version "7.8.3"
454459
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
@@ -683,6 +688,18 @@
683688
"@babel/helper-remap-async-to-generator" "^7.8.3"
684689
"@babel/plugin-syntax-async-generators" "^7.8.0"
685690

691+
"@babel/[email protected]":
692+
version "7.1.0"
693+
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4"
694+
integrity sha512-/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw==
695+
dependencies:
696+
"@babel/helper-function-name" "^7.1.0"
697+
"@babel/helper-member-expression-to-functions" "^7.0.0"
698+
"@babel/helper-optimise-call-expression" "^7.0.0"
699+
"@babel/helper-plugin-utils" "^7.0.0"
700+
"@babel/helper-replace-supers" "^7.1.0"
701+
"@babel/plugin-syntax-class-properties" "^7.0.0"
702+
686703
"@babel/[email protected]":
687704
version "7.3.0"
688705
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
@@ -887,6 +904,13 @@
887904
dependencies:
888905
"@babel/helper-plugin-utils" "^7.8.0"
889906

907+
"@babel/plugin-syntax-class-properties@^7.0.0":
908+
version "7.10.4"
909+
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
910+
integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
911+
dependencies:
912+
"@babel/helper-plugin-utils" "^7.10.4"
913+
890914
"@babel/plugin-syntax-decorators@^7.2.0":
891915
version "7.2.0"
892916
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
@@ -2187,6 +2211,13 @@
21872211
dependencies:
21882212
regenerator-runtime "^0.13.2"
21892213

2214+
"@babel/runtime@^7.5.5":
2215+
version "7.10.4"
2216+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz#a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"
2217+
integrity sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==
2218+
dependencies:
2219+
regenerator-runtime "^0.13.4"
2220+
21902221
"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2":
21912222
version "7.8.3"
21922223
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
@@ -7970,7 +8001,7 @@ [email protected]:
79708001
version "2.16.3"
79718002
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
79728003

7973-
hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
8004+
hoist-non-react-statics@^2.3.1:
79748005
version "2.5.5"
79758006
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
79768007

@@ -11884,16 +11915,19 @@ react-helmet-async@^0.2.0:
1188411915
react-fast-compare "^2.0.2"
1188511916
shallowequal "^1.0.2"
1188611917

11887-
[email protected]:
11888-
version "4.3.6"
11889-
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.3.6.tgz#26e1491f08daf2bad99d141b1927c9faadef2fb4"
11918+
[email protected]:
11919+
version "4.12.19"
11920+
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.19.tgz#99a1c763352828f404fa51cd887c5e16bb5b74d1"
11921+
integrity sha512-p8AnA4QE2GtrvkdmqnKrEiijtVlqdTIDCHZOwItkI9kW51bt5XnQ/4Anz8giiWf9kqBpEQwsmnChDCAFBRyR/Q==
1189011922
dependencies:
1189111923
fast-levenshtein "^2.0.6"
1189211924
global "^4.3.0"
11893-
hoist-non-react-statics "^2.5.0"
11925+
hoist-non-react-statics "^3.3.0"
11926+
loader-utils "^1.1.0"
1189411927
prop-types "^15.6.1"
1189511928
react-lifecycles-compat "^3.0.4"
11896-
shallowequal "^1.0.2"
11929+
shallowequal "^1.1.0"
11930+
source-map "^0.7.3"
1189711931

1189811932
[email protected]:
1189911933
version "2.0.0-pre4"
@@ -11924,7 +11958,7 @@ react-inspector@^2.3.1:
1192411958
is-dom "^1.0.9"
1192511959
prop-types "^15.6.1"
1192611960

11927-
react-is@^16.12.0, react-is@^16.6.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
11961+
react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
1192811962
version "16.12.0"
1192911963
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
1193011964
integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
@@ -11988,18 +12022,16 @@ react-popper@^1.3.3:
1198812022
typed-styles "^0.0.7"
1198912023
warning "^4.0.2"
1199012024

11991-
react-redux@5.1.2:
11992-
version "5.1.2"
11993-
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
11994-
integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==
12025+
react-redux@7.2.0:
12026+
version "7.2.0"
12027+
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
12028+
integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
1199512029
dependencies:
11996-
"@babel/runtime" "^7.1.2"
12030+
"@babel/runtime" "^7.5.5"
1199712031
hoist-non-react-statics "^3.3.0"
11998-
invariant "^2.2.4"
11999-
loose-envify "^1.1.0"
12000-
prop-types "^15.6.1"
12001-
react-is "^16.6.0"
12002-
react-lifecycles-compat "^3.0.0"
12032+
loose-envify "^1.4.0"
12033+
prop-types "^15.7.2"
12034+
react-is "^16.9.0"
1200312035

1200412036
react-resize-detector@^3.2.1:
1200512037
version "3.4.0"
@@ -12451,6 +12483,11 @@ regenerator-runtime@^0.13.2:
1245112483
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
1245212484
integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
1245312485

12486+
regenerator-runtime@^0.13.4:
12487+
version "0.13.5"
12488+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
12489+
integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
12490+
1245412491
regenerator-transform@^0.13.3:
1245512492
version "0.13.3"
1245612493
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"

0 commit comments

Comments
 (0)