Skip to content

Commit b88a0d6

Browse files
authored
Worldmap panel fails to render on load in V6 (#229)
* update modules and fix for worldmap * update to 1.2.6 * update dist and readme
1 parent 6a54e8f commit b88a0d6

File tree

87 files changed

+10347
-9590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+10347
-9590
lines changed

Gruntfile.js

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const sass = require('node-sass');
2+
13
module.exports = function(grunt) {
24

35
require('load-grunt-tasks')(grunt);
@@ -43,8 +45,15 @@ module.exports = function(grunt) {
4345
babel: {
4446
options: {
4547
sourceMap: true,
46-
presets: ["es2015"],
47-
plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
48+
"presets": [
49+
[
50+
"@babel/preset-env",
51+
{
52+
"useBuiltIns": "entry",
53+
"corejs": "3",
54+
}
55+
]
56+
],
4857
},
4958
dist: {
5059
files: [{
@@ -59,7 +68,7 @@ module.exports = function(grunt) {
5968

6069
curl: {
6170
worldmap: {
62-
src: 'https://grafana.com/api/plugins/grafana-worldmap-panel/versions/0.0.16/download',
71+
src: 'https://grafana.com/api/plugins/grafana-worldmap-panel/versions/latest/download',
6372
dest: 'tmp/worldmap.zip',
6473
},
6574
},
@@ -81,12 +90,12 @@ module.exports = function(grunt) {
8190

8291
"regex-replace": {
8392
worldmap: {
84-
src: 'dist/grafana-worldmap-panel/worldmap_ctrl.js',
93+
src: 'dist/grafana-worldmap-panel/module.js',
8594
actions: [
8695
{
8796
name: 'module.html',
88-
search: "'module.html';",
89-
replace: "'../../plugins/grafana-worldmap-panel/module.html';",
97+
search: "\"partials\/module.html\"",
98+
replace: "\"grafana-worldmap-panel/partials/module.html\"",
9099
},
91100
],
92101
},
@@ -117,6 +126,7 @@ module.exports = function(grunt) {
117126

118127
sass: {
119128
options: {
129+
implementation: sass,
120130
sourceMap: true
121131
},
122132
dist: {

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ WorldPing requires only a [Grafana.com](https://grafana.com) account and [Grafan
5858

5959
#### Changelog
6060

61+
##### v1.2.6
62+
63+
- Updated WorldMap panel to fix v6 rendering issue
64+
- Updated all packages to current
65+
6166
##### v1.2.4
6267
- Support contentMatch on DNS checks
6368
- Support alerting if contentMatch matches

dist/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ WorldPing requires only a [Grafana.com](https://grafana.com) account and [Grafan
5858

5959
#### Changelog
6060

61+
##### v1.2.6
62+
63+
- Updated WorldMap panel to fix v6 rendering issue
64+
- Updated all packages to current
65+
6166
##### v1.2.4
6267
- Support contentMatch on DNS checks
6368
- Support alerting if contentMatch matches

dist/components/config/config.js

+142-159
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)