Merge pull request #141132 from Ma27/bump-grafana-image-renderer

grafana-image-renderer: 3.2.0 -> 3.2.1

pkgs/servers/monitoring/grafana-image-renderer/default.nix

@@ -4,19 +4,19 @@
 # * Download the tarball of the new version to use.
 # * Remove the `resolutions`-section from upstream `package.json`
 #   as this breaks with `yarn2nix`.
-# * Regenerate `yarn.lock` and `yarn2nix`.
+# * Regenerate `yarn.lock` and `yarn2nix --no-patch`.
 # * Replace new `package.json`, `yarn.nix`, `yarn.lock` here.
 # * Update `version`+`hash` and rebuild.
 
 mkYarnPackage rec {
   pname = "grafana-image-renderer";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     rev = "v${version}";
-    sha256 = "sha256-PEi8jreYCafKBa8M5Mo6/g03pS1PHvmhgMpuwIlUePY=";
+    sha256 = "sha256-1xHRfEjtxiXXRt6Rpl4j8xxTQ6qXG4/ps885CLc35OQ=";
   };
 
   buildPhase = ''

pkgs/servers/monitoring/grafana-image-renderer/package.json

@@ -8,7 +8,7 @@
     "url": "http://github.com/grafana/grafana-image-renderer.git"
   },
   "scripts": {
-    "eslint": "eslint -c eslint.json",
+    "eslint": "eslint . --ext .ts",
     "typecheck": "tsc --noEmit",
     "prettier:check": "prettier --list-different \"**/*.ts\"",
     "prettier:write": "prettier --list-different \"**/*.ts\" --write",
@@ -22,7 +22,6 @@
     "@grpc/proto-loader": "^0.5.4",
     "@hapi/boom": "^9.1.0",
     "chokidar": "^3.5.2",
-    "eslint": "^7.13.0",
     "express": "^4.16.3",
     "express-prom-bundle": "^5.1.5",
     "google-protobuf": "3.5.0",
@@ -37,11 +36,20 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
+    "@grafana/eslint-config": "^2.5.0",
     "@types/express": "^4.11.1",
     "@types/node": "^14.14.41",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-jsdoc": "^36.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.26.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "^4.3.8",
-    "lint-staged": "^9.5.0",
+    "lint-staged": "^11.2.0",
-    "pkg": "^5.1.0",
+    "pkg": "^5.3.3",
     "prettier": "2.2.1",
     "tsc-watch": "^4.2.3",
     "typescript": "^4.3.2"
@@ -53,8 +61,7 @@
   },
   "lint-staged": {
     "*.ts": [
-      "prettier --write",
+      "prettier --write"
-      "git add"
     ]
   },
   "pkg": {