grafana-image-renderer: regenerate yarn deps, remove obsolete sharp hack
This commit is contained in:
parent
cdcefcacd3
commit
50e9c77b20
|
@ -1,12 +1,7 @@
|
|||
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell
|
||||
, nodePackages, python3, vips, glib, pkg-config
|
||||
}:
|
||||
{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }:
|
||||
|
||||
# Notes for the upgrade:
|
||||
# * 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 --no-patch`.
|
||||
# * Replace new `package.json`, `yarn.nix`, `yarn.lock` here.
|
||||
# * Update `version`+`hash` and rebuild.
|
||||
|
||||
|
@ -37,14 +32,6 @@ mkYarnPackage rec {
|
|||
yarnNix = ./yarn.nix;
|
||||
yarnLock = ./yarn.lock;
|
||||
|
||||
pkgConfig.sharp = {
|
||||
nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ];
|
||||
buildInputs = [ glib vips ];
|
||||
postInstall = ''
|
||||
node-gyp rebuild
|
||||
'';
|
||||
};
|
||||
|
||||
distPhase = ''
|
||||
runHook preDist
|
||||
|
||||
|
|
|
@ -20,52 +20,55 @@
|
|||
"create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp"
|
||||
},
|
||||
"dependencies": {
|
||||
"@grpc/grpc-js": "^1.0",
|
||||
"@grpc/proto-loader": "^0.5.4",
|
||||
"@hapi/boom": "^9.1.0",
|
||||
"@grpc/grpc-js": "^1.7.0",
|
||||
"@grpc/proto-loader": "^0.7.2",
|
||||
"@hapi/boom": "^10.0.0",
|
||||
"chokidar": "^3.5.2",
|
||||
"dompurify": "^2.4.0",
|
||||
"express": "^4.16.3",
|
||||
"express-prom-bundle": "^5.1.5",
|
||||
"google-protobuf": "3.5.0",
|
||||
"jimp": "0.16.1",
|
||||
"express-prom-bundle": "^6.5.0",
|
||||
"google-protobuf": "3.21.0",
|
||||
"jimp": "^0.16.13",
|
||||
"jsdom": "20.0.0",
|
||||
"lodash": "^4.17.21",
|
||||
"minimist": "^1.2.6",
|
||||
"morgan": "^1.9.0",
|
||||
"multer": "^1.4.5-lts.1",
|
||||
"on-finished": "^2.3.0",
|
||||
"poolpeteer": "^0.23.0",
|
||||
"prom-client": "^11.5.3",
|
||||
"puppeteer": "^13.1.3",
|
||||
"prom-client": "^14.1.0",
|
||||
"puppeteer": "^17.1.3",
|
||||
"puppeteer-cluster": "^0.23.0",
|
||||
"unique-filename": "^1.1.0",
|
||||
"winston": "^3.2.1",
|
||||
"jsdom": "19.0.0",
|
||||
"dompurify": "^2.3.8",
|
||||
"multer": "^1.4.5-lts.1"
|
||||
"unique-filename": "^2.0.1",
|
||||
"winston": "^3.8.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/eslint-config": "5.0.0",
|
||||
"@types/multer": "1.4.7",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/node": "^14.14.41",
|
||||
"@types/dompurify": "2.3.4",
|
||||
"@types/express": "^4.17.14",
|
||||
"@types/jsdom": "20.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.16.0",
|
||||
"@typescript-eslint/parser": "5.31.0",
|
||||
"axios": "0.26.0",
|
||||
"@types/multer": "1.4.7",
|
||||
"@types/node": "^18.7.18",
|
||||
"@typescript-eslint/eslint-plugin": "5.37.0",
|
||||
"@typescript-eslint/parser": "5.37.0",
|
||||
"axios": "0.27.2",
|
||||
"cross-env": "7.0.3",
|
||||
"eslint": "8.22.0",
|
||||
"eslint": "8.23.1",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"eslint-plugin-jsdoc": "39.3.3",
|
||||
"eslint-plugin-jsdoc": "39.3.6",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-react": "7.31.0",
|
||||
"eslint-plugin-react": "7.31.8",
|
||||
"eslint-plugin-react-hooks": "4.6.0",
|
||||
"husky": "4.3.8",
|
||||
"husky": "8.0.1",
|
||||
"lint-staged": "13.0.3",
|
||||
"pkg": "5.8.0",
|
||||
"prettier": "2.2.1",
|
||||
"ts-node": "10.5.0",
|
||||
"pkg": "5.8.1",
|
||||
"prettier": "2.7.1",
|
||||
"ts-node": "10.9.1",
|
||||
"tsc-watch": "5.0.3",
|
||||
"typescript": "4.7.4"
|
||||
"typescript": "4.8.3"
|
||||
},
|
||||
"resolutions": {
|
||||
"jpeg-js": "^0.4.4"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.ts": [
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue