From 471dd15e770d2a01aeedf0230373895682d97770 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 22:33:31 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump lint-staged from 15.0.1 to 15.0.2 (#1024) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.0.1 to 15.0.2. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/okonet/lint-staged/compare/v15.0.1...v15.0.2) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0fea18..5c86771 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-security": "^1.7.1", "husky": "^8.0.3", - "lint-staged": "^15.0.1", + "lint-staged": "^15.0.2", "mocha": "^10.2.0", "prettier": "^2.8.8", "should": "^13.2.3", @@ -4810,9 +4810,9 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "node_modules/lint-staged": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.0.1.tgz", - "integrity": "sha512-2IU5OWmCaxch0X0+IBF4/v7sutpB+F3qoXbro43pYjQTOo5wumckjxoxn47pQBqqBsCWrD5HnI2uG/zJA7isew==", + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.0.2.tgz", + "integrity": "sha512-vnEy7pFTHyVuDmCAIFKR5QDO8XLVlPFQQyujQ/STOxe40ICWqJ6knS2wSJ/ffX/Lw0rz83luRDh+ET7toN+rOw==", "dev": true, "dependencies": { "chalk": "5.3.0", @@ -4820,11 +4820,11 @@ "debug": "4.3.4", "execa": "8.0.1", "lilconfig": "2.1.0", - "listr2": "7.0.1", + "listr2": "7.0.2", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.2" + "yaml": "2.3.3" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -4983,9 +4983,9 @@ } }, "node_modules/listr2": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-7.0.1.tgz", - "integrity": "sha512-nz+7hwgbDp8eWNoDgzdl4hA/xDSLrNRzPu1TLgOYs6l5Y+Ma6zVWWy9Oyt9TQFONwKoSPoka3H50D3vD5EuNwg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-7.0.2.tgz", + "integrity": "sha512-rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==", "dev": true, "dependencies": { "cli-truncate": "^3.1.0", @@ -8816,9 +8816,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", - "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz", + "integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==", "dev": true, "engines": { "node": ">= 14" diff --git a/package.json b/package.json index c314328..7e20041 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-security": "^1.7.1", "husky": "^8.0.3", - "lint-staged": "^15.0.1", + "lint-staged": "^15.0.2", "mocha": "^10.2.0", "prettier": "^2.8.8", "should": "^13.2.3", From 4568027046bfc4ca3ab67f3e61e176e260b30306 Mon Sep 17 00:00:00 2001 From: Alek Kowalczyk Date: Fri, 20 Oct 2023 20:02:45 +0200 Subject: [PATCH 2/3] Fixed Issue #1025 - URL-based glyphs and fonts break displaying of vector tiles (#1026) Root cause: modified regex in #1002 caused URLs to be broken. Fixed by reverting previous regexes. Tests: * Confirmed by building and running locally with formerly breaking config.json and style json. * Run tests via Dockerfile_test --- src/serve_rendered.js | 2 +- src/serve_style.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/serve_rendered.js b/src/serve_rendered.js index 6968b43..da92fd6 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -33,7 +33,7 @@ import { const FLOAT_PATTERN = '[+-]?(?:\\d+|\\d+.?\\d+)'; const PATH_PATTERN = /^((fill|stroke|width)\:[^\|]+\|)*(enc:.+|-?\d+(\.\d*)?,-?\d+(\.\d*)?(\|-?\d+(\.\d*)?,-?\d+(\.\d*)?)+)/; -const httpTester = /^\/\//; +const httpTester = /^(http(s)?:)?\/\//; const mercator = new SphericalMercator(); const getScale = (scale) => (scale || '@1x').slice(1, 2) | 0; diff --git a/src/serve_style.js b/src/serve_style.js index 5f4e5ee..de981c7 100644 --- a/src/serve_style.js +++ b/src/serve_style.js @@ -9,7 +9,7 @@ import { validate } from '@maplibre/maplibre-gl-style-spec'; import { getPublicUrl } from './utils.js'; -const httpTester = /^\/\//; +const httpTester = /^(http(s)?:)?\/\//; const fixUrl = (req, url, publicUrl, opt_nokey) => { if (!url || typeof url !== 'string' || url.indexOf('local://') !== 0) { From 5092298d673e0d40a70ee66ff97aac03a9e41466 Mon Sep 17 00:00:00 2001 From: Andrew Calcutt Date: Fri, 20 Oct 2023 14:12:30 -0400 Subject: [PATCH 3/3] v4.6.2 Signed-off-by: Andrew Calcutt --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c86771..41ff8df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tileserver-gl", - "version": "4.6.1", + "version": "4.6.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tileserver-gl", - "version": "4.6.1", + "version": "4.6.2", "license": "BSD-2-Clause", "dependencies": { "@mapbox/glyph-pbf-composite": "0.0.3", diff --git a/package.json b/package.json index 7e20041..4193a28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tileserver-gl", - "version": "4.6.1", + "version": "4.6.2", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "main": "src/main.js", "bin": "src/main.js",