fix: tweaks to get to work on windows

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-16 08:17:05 -04:00
parent d33584d599
commit 7094fc019d
3 changed files with 7 additions and 7 deletions

10
package-lock.json generated
View file

@ -33,7 +33,7 @@
"proj4": "2.9.1", "proj4": "2.9.1",
"request": "2.88.2", "request": "2.88.2",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sharp": "0.32.6", "sharp": "0.32.3",
"tileserver-gl-styles": "2.0.0" "tileserver-gl-styles": "2.0.0"
}, },
"bin": { "bin": {
@ -7472,13 +7472,13 @@
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
}, },
"node_modules/sharp": { "node_modules/sharp": {
"version": "0.32.6", "version": "0.32.3",
"resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz", "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.3.tgz",
"integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==", "integrity": "sha512-i1gFPiNqyqxC4ouVvCKj5G8WfPIMeeSxpKcMrjic6NY4e8zktW7bIdqHPc3FCG+pNKU/XCEabKA57hhvZi8UmQ==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"color": "^4.2.3", "color": "^4.2.3",
"detect-libc": "^2.0.2", "detect-libc": "^2.0.1",
"node-addon-api": "^6.1.0", "node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1", "prebuild-install": "^7.1.1",
"semver": "^7.5.4", "semver": "^7.5.4",

View file

@ -42,7 +42,7 @@
"proj4": "2.9.1", "proj4": "2.9.1",
"request": "2.88.2", "request": "2.88.2",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sharp": "0.32.6", "sharp": "0.32.3",
"tileserver-gl-styles": "2.0.0" "tileserver-gl-styles": "2.0.0"
}, },
"devDependencies": { "devDependencies": {

View file

@ -6,8 +6,8 @@ import path from 'path';
import url from 'url'; import url from 'url';
import util from 'util'; import util from 'util';
import zlib from 'zlib'; import zlib from 'zlib';
import sharp from 'sharp'; // sharp has to be required before node-canvas on linux but after it on windows. see https://github.com/lovell/sharp/issues/371
import { createCanvas, Image } from 'canvas'; import { createCanvas, Image } from 'canvas';
import sharp from 'sharp'; // sharp has to be required before node-canvas on linux but after it on windows. see https://github.com/lovell/sharp/issues/371
import clone from 'clone'; import clone from 'clone';
import Color from 'color'; import Color from 'color';
import express from 'express'; import express from 'express';