Merge branch 'master' into windows

Signed-off-by: acalcutt <acalcutt@techidiots.net>
2023-11-27 11:05:56 -05:00 · 2023-11-23 11:52:31 -05:00 · 2023-11-15 21:38:59 -05:00 · 2023-11-09 20:36:32 -05:00 · 2023-10-20 14:20:00 -04:00 · 2023-10-18 12:48:43 -04:00
2 changed files with 6 additions and 6 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -33,7 +33,7 @@
        "pmtiles": "2.11.0",
        "proj4": "2.9.2",
        "sanitize-filename": "1.6.3",
-        "sharp": "0.32.6",
+        "sharp": "0.32.3",
        "tileserver-gl-styles": "2.0.0"
      },
      "bin": {
@ -7362,13 +7362,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",
--- a/package.json
+++ b/package.json
@ -42,7 +42,7 @@
    "pmtiles": "2.11.0",
    "proj4": "2.9.2",
    "sanitize-filename": "1.6.3",
-    "sharp": "0.32.6",
+    "sharp": "0.32.3",
    "tileserver-gl-styles": "2.0.0"
  },
  "devDependencies": {
Author	SHA1	Message	Date
acalcutt	c634cdf0b3	Merge branch 'master' into windows Signed-off-by: acalcutt <acalcutt@techidiots.net>	2023-11-27 11:05:56 -05:00
Andrew Calcutt	e0d1a1c708	Merge branch 'master' into windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-11-23 11:52:31 -05:00
Andrew Calcutt	49c27cf77d	Merge branch 'master' into windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-11-15 21:38:59 -05:00
Andrew Calcutt	944f87573c	Merge branch 'master' into windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-11-09 20:36:32 -05:00
Andrew Calcutt	46408d1948	Merge branch 'master' into windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-10-20 14:20:00 -04:00
Andrew Calcutt	18d3271727	Merge branch 'master' into windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-10-18 12:48:43 -04:00
Andrew Calcutt	7094fc019d	fix: tweaks to get to work on windows Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>	2023-10-16 08:17:05 -04:00