Support Node 18

grafana · Sep 14, 2023 · f2e2fac · f2e2fac
1 parent a56fdf2
commit f2e2fac
Show file tree

Hide file tree

Showing 4 changed files with 308 additions and 188 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+18
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "@grafana/data": "9.2.5",
     "@grafana/e2e": "9.2.5",
     "@grafana/e2e-selectors": "9.2.5",
-    "@grafana/eslint-config": "^5.1.0",
+    "@grafana/eslint-config": "^6.0.1",
     "@grafana/runtime": "9.2.5",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@grafana/ui": "9.2.5",
@@ -50,7 +50,7 @@
     "css-loader": "^6.7.1",
     "eslint": "8.26.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-jsdoc": "^39.6.2",
+    "eslint-plugin-jsdoc": "^46.7.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",

diff --git a/src/DataSource.test.ts b/src/DataSource.test.ts
@@ -2,7 +2,6 @@ import { DataSource } from './DataSource';
 import { DataSourceInstanceSettings, PluginMeta, ScopedVar, ScopedVars } from '@grafana/data';
 import { QueryType, SitewiseOptions, SitewiseQuery } from './types';
 
-
 const testInstanceSettings = (
   overrides?: Partial<DataSourceInstanceSettings<SitewiseOptions>>
 ): DataSourceInstanceSettings<SitewiseOptions> => ({
@@ -21,26 +20,26 @@ jest.mock('@grafana/runtime', () => ({
   ...jest.requireActual('@grafana/runtime'),
   getTemplateSrv: () => {
     // ref: https://github.com/grafana/grafana/blob/main/public/app/features/variables/utils.ts#L17
-    const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g; 
+    const variableRegex = /\$(\w+)|\[\[(\w+?)(?::(\w+))?\]\]|\${(\w+)(?:\.([^:^\}]+))?(?::([^\}]+))?}/g;
     const globalVars: ScopedVars = {
-      assetIdConstant: {text: 'valueConstant', value: 'valueConstant'},
-      assetIdArray: {text: ['array1', 'array2', 'array3'], value: ['array1', 'array2', 'array3']}
+      assetIdConstant: { text: 'valueConstant', value: 'valueConstant' },
+      assetIdArray: { text: ['array1', 'array2', 'array3'], value: ['array1', 'array2', 'array3'] },
     };
     return {
       // Approximate mock of replace function, with 'csv' format
-      // ref: https://github.com/grafana/grafana/blob/main/public/app/features/templating/template_srv.mock.ts#L30 
+      // ref: https://github.com/grafana/grafana/blob/main/public/app/features/templating/template_srv.mock.ts#L30
       replace(str: string, scopedVars?: ScopedVars, format?: string | Function) {
         return str.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
-            const variableName = var1 || var2 || var3;
-            let varMatch: ScopedVar | undefined;
-            if (!!scopedVars) {
-                varMatch = scopedVars[variableName];
-            }
-            varMatch = varMatch ?? globalVars[variableName];
-            if (Array.isArray(varMatch.value)) {
-                return varMatch.value.join(',');
-            }
-            return varMatch.value;
+          const variableName = var1 || var2 || var3;
+          let varMatch: ScopedVar | undefined;
+          if (!!scopedVars) {
+            varMatch = scopedVars[variableName];
+          }
+          varMatch = varMatch ?? globalVars[variableName];
+          if (Array.isArray(varMatch.value)) {
+            return varMatch.value.join(',');
+          }
+          return varMatch.value;
         });
       },
     };
@@ -104,7 +103,11 @@ describe('Sitewise Datasource', () => {
         region: 'default',
         propertyId: '',
       };
-      expect(datasource.applyTemplateVariables(query, { assetIdConstant: { text: 'scopedValueConstant', value: 'scopedValueConstant' } })).toEqual({
+      expect(
+        datasource.applyTemplateVariables(query, {
+          assetIdConstant: { text: 'scopedValueConstant', value: 'scopedValueConstant' },
+        })
+      ).toEqual({
         ...query,
         assetIds: ['scopedValueConstant'],
       });
@@ -119,10 +122,14 @@ describe('Sitewise Datasource', () => {
         region: 'default',
         propertyId: '',
       };
-      expect(datasource.applyTemplateVariables(query, { assetIdConstant: { text: 'scopedValueConstant', value: 'scopedValueConstant' } })).toEqual({
+      expect(
+        datasource.applyTemplateVariables(query, {
+          assetIdConstant: { text: 'scopedValueConstant', value: 'scopedValueConstant' },
+        })
+      ).toEqual({
         ...query,
         assetIds: ['scopedValueConstant', 'noVar', 'array1', 'array2', 'array3'],
       });
     });
   });
-});
+});