Skip to content

Commit 0ae8c92

Browse files
committed
Merge branch 'develop' into main
2 parents b2a94a6 + c023cfc commit 0ae8c92

17 files changed

+4726
-50680
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = {
2222
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
2323
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
2424
'react/prop-types': 'off',
25+
'react-hooks/exhaustive-deps': 'off',
2526
'@typescript-eslint/explicit-function-return-type': 'off',
2627
'@typescript-eslint/explicit-module-boundary-types': 'off',
2728
'@typescript-eslint/no-non-null-assertion': 'off', // linter sucks sometimes

.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ module.exports = {
55
arrowParens: 'avoid',
66
jsxSingleQuote: true,
77
trailingComma: 'all',
8-
};
8+
}

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# Changelog
22

3+
## 1.0.2
4+
5+
- update plugin's description and bump toolkit version
6+
37
## 1.0.1
48

5-
- add links at the plugin.jon pointing to the license and to the repo.
9+
- add links at the plugin.jon pointing to the license and to the repo.
610

711
## 1.0.0
812

913
Golioth's WebSocket Data Source Plugin Launch
1014

11-
The main focus on this release is to launch the new websocket data source plugin for the Grafana Community.
15+
The main focus on this release is to launch the new websocket data source plugin for the Grafana Community.

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ go 1.16
44

55
require (
66
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c
7-
github.com/grafana/grafana-plugin-sdk-go v0.120.0
7+
github.com/grafana/grafana-plugin-sdk-go v0.142.0
8+
github.com/magefile/mage v1.14.0 // indirect
89
)

go.sum

Lines changed: 127 additions & 25 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)