Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: tweaks to get to work on windows

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package-lock.json generated
View file

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

2
package.json
View file

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

2
src/serve_rendered.js
View file

@ -6,8 +6,8 @@ import path from 'path';
import url from 'url';
import util from 'util';
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 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 Color from 'color';
import express from 'express';