Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 62a83dd

Browse files
author
Scott Lepper
committed
lint and upgrade deps
1 parent adfc4e9 commit 62a83dd

File tree

4 files changed

+70
-69
lines changed

4 files changed

+70
-69
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"private": true,
1212
"license": "SEE LICENSE IN LICENSE",
1313
"devDependencies": {
14-
"@grafana/data": "7.0.6",
15-
"@grafana/runtime": "7.0.6",
16-
"@grafana/toolkit": "7.0.6",
17-
"@grafana/ui": "7.0.6",
14+
"@grafana/data": "7.1.3",
15+
"@grafana/runtime": "7.1.3",
16+
"@grafana/toolkit": "7.1.3",
17+
"@grafana/ui": "7.1.3",
1818
"@types/lodash": "4.14.123",
1919
"@types/react": "16.8.16 ",
2020
"@types/request-promise-native": "^1.0.17"

‎src/components/ConfigEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
4343
const jsonData = { ...state.jsonData, ...option };
4444

4545
const { onOptionsChange, options } = this.props;
46-
const opt = {...options, url: option.url || options.url};
46+
const opt = { ...options, url: option.url || options.url };
4747
onOptionsChange({
4848
...opt,
4949
jsonData,

‎src/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"updated": "%TODAY%"
2828
},
2929
"dependencies": {
30-
"grafanaVersion": "6.5.x",
30+
"grafanaVersion": "7.1.x",
3131
"plugins": []
3232
}
3333
}

‎yarn.lock

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -948,40 +948,40 @@
948948
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
949949
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
950950

951-
"@grafana/data@7.0.6":
952-
version "7.0.6"
953-
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-7.0.6.tgz#a971030c2447c3e7daf6874b7e0cb1ccc411ad0f"
954-
integrity sha512-NEcuFmy42Kh9ly7pdXxNqmfwL0LVBNlRDWo7N3JYDxCj/zPzgSOIrgVYFmvwhpnm0oAaWdP2Q0e0Jw9PwZItOA==
951+
"@grafana/data@7.1.3", "@grafana/data@next":
952+
version "7.1.3"
953+
resolved "https://registry.yarnpkg.com/@grafana/data/-/data-7.1.3.tgz#25cfb93077598ac5fe3b18c1f31bf1313884d387"
954+
integrity sha512-kIvm/hGwO93h/viZBRUGOPT5aXb1kTMJCWVVtVuHkrciPogbrUxjDARGNB6BJ+H1Uoc4byUdlY0gOFvU6WBWTA==
955955
dependencies:
956956
"@braintree/sanitize-url" "4.0.0"
957957
apache-arrow "0.16.0"
958958
lodash "4.17.15"
959-
rxjs "6.5.5"
959+
rxjs "6.6.0"
960960
xss "1.0.6"
961961

962-
"@grafana/e2e-selectors@7.0.6":
963-
version "7.0.6"
964-
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-7.0.6.tgz#df5e17d16ce20b57c7afc2146cce1203cb8be89e"
965-
integrity sha512-5/p65RSAVeQgxbP++geep7CEoCSPlTAXmCN7WdMrM3UIQ+eujPBUb8NYzype8s3wat2b2wjyiHuVSx5ZPh0Zew==
962+
"@grafana/e2e-selectors@7.1.3":
963+
version "7.1.3"
964+
resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-7.1.3.tgz#5e93ace48bdc1702d5c76edbc4133ceaf0dba1a8"
965+
integrity sha512-26ND2O1PTQEuOsuTCbcA6m4bi86K2XUZ6/voQjmonBa09kWTuLVXRwPRfGvP+I1rz3+ZfIwXzAoxr1mvCsxUnQ==
966966
dependencies:
967967
"@grafana/tsconfig" "^1.0.0-rc1"
968968
commander "5.0.0"
969969
execa "4.0.0"
970-
typescript "3.7.5"
970+
typescript "3.9.3"
971971
yaml "^1.8.3"
972972

973973
"@grafana/eslint-config@^1.0.0-rc1":
974974
version "1.0.0-rc1"
975975
resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-1.0.0-rc1.tgz#3b0a1abddfea900a57abc9526ad31abb1da2d42c"
976976
integrity sha512-xmcJR6mUYw1llq3m8gT2kE7xoq6yLMUgNf2Mf1yZvDCx2cXFSyaLlGs1dqjFWjJDbV46GdhYRAyRbyGR+J9QKg==
977977

978-
"@grafana/runtime@7.0.6":
979-
version "7.0.6"
980-
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-7.0.6.tgz#c8853118a71a72d3febb9f62f750da8c87d4ece4"
981-
integrity sha512-QD519/NpPUeixLbSrfxhon03sTHWOtTbHBko6q7RdLvPm0vSnZyWOhwTRLvAFp3+mtXQFiFLhB0MaKN/j01ezg==
978+
"@grafana/runtime@7.1.3":
979+
version "7.1.3"
980+
resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-7.1.3.tgz#ae31537c6eb02cd3e2c741e2e3fafc7c715fd838"
981+
integrity sha512-+RBagBC/0RDMktdRs/+F9gPVHldwxTIw0/k9IbOK7yUOL5vWOWHEh2oisAktVF3e5Ps0cE4fEYjGgsVPePBAew==
982982
dependencies:
983-
"@grafana/data" "7.0.6"
984-
"@grafana/ui" "7.0.6"
983+
"@grafana/data" "7.1.3"
984+
"@grafana/ui" "7.1.3"
985985
systemjs "0.20.19"
986986
systemjs-plugin-css "0.1.37"
987987

@@ -1007,17 +1007,17 @@
10071007
tiny-invariant "^1.0.1"
10081008
tiny-warning "^0.0.3"
10091009

1010-
"@grafana/toolkit@7.0.6":
1011-
version "7.0.6"
1012-
resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-7.0.6.tgz#fd0c4e56dc2024bee03f46ad00e18a2282749408"
1013-
integrity sha512-gTb2QtTp3JBgoIJ305/0QygoXZdpnYqvrJwVez+pUF15J2s3FnR4MQARKgcO0YNe5xipJ6k/ixQm7uygaHZGUA==
1010+
"@grafana/toolkit@7.1.3":
1011+
version "7.1.3"
1012+
resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-7.1.3.tgz#8c5710230a32530eed83fdac17f4d67d4c683760"
1013+
integrity sha512-xw0d7isD+h1zDGV87r/cgfzIvtHWiYxXHWHbLQgz75K3hR4nrSvjNjhm86ioOcTNhUI6/h2wnozw/C6BiQLXpQ==
10141014
dependencies:
10151015
"@babel/core" "7.9.0"
10161016
"@babel/preset-env" "7.9.0"
1017-
"@grafana/data" "7.0.6"
1017+
"@grafana/data" next
10181018
"@grafana/eslint-config" "^1.0.0-rc1"
10191019
"@grafana/tsconfig" "^1.0.0-rc1"
1020-
"@grafana/ui" "7.0.6"
1020+
"@grafana/ui" next
10211021
"@types/command-exists" "^1.2.0"
10221022
"@types/execa" "^0.9.0"
10231023
"@types/expect-puppeteer" "3.3.1"
@@ -1091,7 +1091,7 @@
10911091
ts-loader "6.2.1"
10921092
ts-node "8.8.1"
10931093
tslib "1.10.0"
1094-
typescript "3.7.5"
1094+
typescript "3.9.3"
10951095
url-loader "^2.0.1"
10961096
webpack "4.41.5"
10971097

@@ -1100,14 +1100,14 @@
11001100
resolved "https://registry.yarnpkg.com/@grafana/tsconfig/-/tsconfig-1.0.0-rc1.tgz#d07ea16755a50cae21000113f30546b61647a200"
11011101
integrity sha512-nucKPGyzlSKYSiJk5RA8GzMdVWhdYNdF+Hh65AXxjD9PlY69JKr5wANj8bVdQboag6dgg0BFKqgKPyY+YtV4Iw==
11021102

1103-
"@grafana/ui@7.0.6":
1104-
version "7.0.6"
1105-
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-7.0.6.tgz#652f8f3abe7d6c2dd7625136bfc5fd3c259c8ca1"
1106-
integrity sha512-0HCglJykO33gHGcD22uL6Kp2nBQwykajZif/KQXhtmzcBIZKflOnfKmnqsGje7nshbrZLkExrKUJoLGTziZpZw==
1103+
"@grafana/ui@7.1.3", "@grafana/ui@next":
1104+
version "7.1.3"
1105+
resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-7.1.3.tgz#842c2ca554b84546b2c6a357a1598f4a47988005"
1106+
integrity sha512-XN3szzxdQ+WtvJ5vkKfgYLLfXnSVXz2MKuqTxRe2m8mwcrbkl9QYQVijeZszJIVohnddhB3K0kTC8Y750itQoA==
11071107
dependencies:
11081108
"@emotion/core" "^10.0.27"
1109-
"@grafana/data" "7.0.6"
1110-
"@grafana/e2e-selectors" "7.0.6"
1109+
"@grafana/data" "7.1.3"
1110+
"@grafana/e2e-selectors" "7.1.3"
11111111
"@grafana/slate-react" "0.22.9-grafana"
11121112
"@grafana/tsconfig" "^1.0.0-rc1"
11131113
"@iconscout/react-unicons" "^1.0.0"
@@ -1126,6 +1126,7 @@
11261126
jquery "3.5.1"
11271127
lodash "4.17.15"
11281128
moment "2.24.0"
1129+
monaco-editor "0.20.0"
11291130
papaparse "4.6.3"
11301131
rc-cascader "1.0.1"
11311132
rc-drawer "3.1.3"
@@ -1139,12 +1140,12 @@
11391140
react-dom "16.12.0"
11401141
react-highlight-words "0.16.0"
11411142
react-hook-form "5.1.3"
1143+
react-monaco-editor "0.36.0"
11421144
react-popper "1.3.3"
11431145
react-storybook-addon-props-combinations "1.1.0"
11441146
react-table "7.0.0"
11451147
react-transition-group "4.3.0"
11461148
slate "0.47.8"
1147-
storybook-dark-mode "0.4.0"
11481149
tinycolor2 "1.4.1"
11491150

11501151
"@icons/material@^0.2.4":
@@ -1764,6 +1765,14 @@
17641765
"@types/prop-types" "*"
17651766
csstype "^2.2.0"
17661767

1768+
"@types/react@^16.x":
1769+
version "16.9.46"
1770+
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.46.tgz#f0326cd7adceda74148baa9bff6e918632f5069e"
1771+
integrity sha512-dbHzO3aAq1lB3jRQuNpuZ/mnu+CdD3H0WVaaBQA8LTT3S33xhVBUj232T8M3tAhSWJs/D/UqORYUlJNl/8VQZg==
1772+
dependencies:
1773+
"@types/prop-types" "*"
1774+
csstype "^3.0.2"
1775+
17671776
"@types/relateurl@*":
17681777
version "0.2.28"
17691778
resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
@@ -3951,6 +3960,11 @@ csstype@^2.2.0, csstype@^2.5.7, csstype@^2.6.7:
39513960
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5"
39523961
integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==
39533962

3963+
csstype@^3.0.2:
3964+
version "3.0.2"
3965+
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.2.tgz#ee5ff8f208c8cd613b389f7b222c9801ca62b3f7"
3966+
integrity sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==
3967+
39543968
currently-unhandled@^0.4.1:
39553969
version "0.4.1"
39563970
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -5014,7 +5028,7 @@ extsprintf@^1.2.0:
50145028
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
50155029
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
50165030

5017-
fast-deep-equal@^3.0.0, fast-deep-equal@^3.1.1:
5031+
fast-deep-equal@^3.1.1:
50185032
version "3.1.3"
50195033
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
50205034
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -7408,11 +7422,6 @@ map-obj@^1.0.0, map-obj@^1.0.1:
74087422
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
74097423
integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
74107424

7411-
map-or-similar@^1.5.0:
7412-
version "1.5.0"
7413-
resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
7414-
integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
7415-
74167425
map-visit@^1.0.0:
74177426
version "1.0.0"
74187427
resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -7468,13 +7477,6 @@ memoize-one@^5.0.0, memoize-one@^5.1.1:
74687477
resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
74697478
integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
74707479

7471-
memoizerific@^1.11.3:
7472-
version "1.11.3"
7473-
resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
7474-
integrity sha1-fIekZGREwy11Q4VwkF8tvRsagFo=
7475-
dependencies:
7476-
map-or-similar "^1.5.0"
7477-
74787480
memory-fs@^0.4.1:
74797481
version "0.4.1"
74807482
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -7715,6 +7717,11 @@ [email protected]:
77157717
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
77167718
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
77177719

7720+
monaco-editor@*, [email protected]:
7721+
version "0.20.0"
7722+
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz#5d5009343a550124426cb4d965a4d27a348b4dea"
7723+
integrity sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ==
7724+
77187725
move-concurrently@^1.0.1:
77197726
version "1.0.1"
77207727
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -9673,6 +9680,15 @@ react-lifecycles-compat@^3.0.4:
96739680
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
96749681
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
96759682

9683+
[email protected]:
9684+
version "0.36.0"
9685+
resolved "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.36.0.tgz#ac085c14f25fb072514c925596f6a06a711ee078"
9686+
integrity sha512-JVA5SZhOoYZ0DCdTwYgagtRb3jHo4KN7TVFiJauG+ZBAJWfDSTzavPIrwzWbgu8ahhDqDk4jUcYlOJL2BC/0UA==
9687+
dependencies:
9688+
"@types/react" "^16.x"
9689+
monaco-editor "*"
9690+
prop-types "^15.7.2"
9691+
96769692
[email protected]:
96779693
version "1.3.3"
96789694
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
@@ -10227,14 +10243,7 @@ rw@1, rw@^1.3.2:
1022710243
resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
1022810244
integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
1022910245

10230-
[email protected]:
10231-
version "6.5.5"
10232-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
10233-
integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
10234-
dependencies:
10235-
tslib "^1.9.0"
10236-
10237-
rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0:
10246+
[email protected], rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.6.0:
1023810247
version "6.6.0"
1023910248
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
1024010249
integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
@@ -10766,14 +10775,6 @@ stealthy-require@^1.1.1:
1076610775
resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
1076710776
integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
1076810777

10769-
[email protected]:
10770-
version "0.4.0"
10771-
resolved "https://registry.yarnpkg.com/storybook-dark-mode/-/storybook-dark-mode-0.4.0.tgz#d58f6d6591150138d666876d342d724d841af843"
10772-
integrity sha512-z6srmjsQxMVaaiyeeYav4wywloUzQQg64vX2ajdGViRsbfy9z3TbBcOBdnDzLLLCAx9S8ATly8njoy3S6KsEpg==
10773-
dependencies:
10774-
fast-deep-equal "^3.0.0"
10775-
memoizerific "^1.11.3"
10776-
1077710778
stream-browserify@^2.0.1:
1077810779
version "2.0.2"
1077910780
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -11426,10 +11427,10 @@ typedarray@^0.0.6:
1142611427
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1142711428
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1142811429

11429-
typescript@3.7.5:
11430-
version "3.7.5"
11431-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
11432-
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
11430+
typescript@3.9.3:
11431+
version "3.9.3"
11432+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
11433+
integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
1143311434

1143411435
typical@^2.6.1:
1143511436
version "2.6.1"

0 commit comments

Comments
 (0)