From fadf01a51d92948fb53b1eb824a15ea86d2a5904 Mon Sep 17 00:00:00 2001 From: Harel M Date: Tue, 7 Jul 2026 23:27:43 +0300 Subject: [PATCH] Remove jsonlint build hack (#1987) ## Launch Checklist This removes the jsonlint build hack that was used for a long time due to json lint part of the style spec package that was missing a fix. This is now no longer needed with the latest style spec package. - [x] Briefly describe the changes in this PR. --- package-lock.json | 63 ++++------------------------------------------- package.json | 3 +-- vite.config.ts | 9 ------- 3 files changed, 6 insertions(+), 69 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7fd96cb2..50f1d9c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@mapbox/mapbox-gl-rtl-text": "^0.4.0", "@maplibre/maplibre-gl-geocoder": "^1.9.4", "@maplibre/maplibre-gl-inspect": "^1.8.2", - "@maplibre/maplibre-gl-style-spec": "^25.0.1", + "@maplibre/maplibre-gl-style-spec": "^25.0.2", "array-move": "^4.0.0", "buffer": "^6.0.3", "classnames": "^2.5.1", @@ -67,7 +67,6 @@ "@cypress/code-coverage": "^4.0.3", "@eslint/js": "^10.0.1", "@istanbuljs/nyc-config-typescript": "^1.0.2", - "@rollup/plugin-replace": "^6.0.3", "@shellygo/cypress-test-utils": "^6.0.6", "@stylistic/eslint-plugin": "^5.10.0", "@types/codemirror": "^5.60.17", @@ -2023,12 +2022,12 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "25.0.1", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-25.0.1.tgz", - "integrity": "sha512-cppei6MsmpZnBgtZoHwQu8Ioie6LcHC+ME8/wcLDwzdLi6eWnMgoryiWnd00qQ5ZNTmFcAnw5EMZIqZxMamEBQ==", + "version": "25.0.2", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-25.0.2.tgz", + "integrity": "sha512-hTNlIVG1gaLKz6UvOV23PYcT8wVS69LLMK9jbGT2hDWzs6hlTbMejeMyQsAF0rebj9czVp77Vhp4KRaUHHUp9g==", "license": "ISC", "dependencies": { - "@mapbox/jsonlint-lines-primitives": "~2.0.3", + "@mapbox/jsonlint-lines-primitives": "^2.0.3", "@mapbox/unitbezier": "^1.0.0", "json-stringify-pretty-compact": "^4.0.0", "minimist": "^1.2.8", @@ -2458,51 +2457,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@rollup/plugin-replace": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.3.tgz", - "integrity": "sha512-J4RZarRvQAm5IF0/LwUUg+obsm+xZhYnbMXmXROyoSE1ATJe3oXSb9L5MMppdxP2ylNSjv6zFBwKYjcKMucVfA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@rollup/pluginutils": "^5.0.1", - "magic-string": "^0.30.3" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, - "node_modules/@rollup/pluginutils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", - "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0", - "estree-walker": "^2.0.2", - "picomatch": "^4.0.2" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.59.0", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz", @@ -6740,13 +6694,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "license": "MIT" - }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", diff --git a/package.json b/package.json index e0eefd47..5f02c3ea 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@mapbox/mapbox-gl-rtl-text": "^0.4.0", "@maplibre/maplibre-gl-geocoder": "^1.9.4", "@maplibre/maplibre-gl-inspect": "^1.8.2", - "@maplibre/maplibre-gl-style-spec": "^25.0.1", + "@maplibre/maplibre-gl-style-spec": "^25.0.2", "array-move": "^4.0.0", "buffer": "^6.0.3", "classnames": "^2.5.1", @@ -101,7 +101,6 @@ "@cypress/code-coverage": "^4.0.3", "@eslint/js": "^10.0.1", "@istanbuljs/nyc-config-typescript": "^1.0.2", - "@rollup/plugin-replace": "^6.0.3", "@shellygo/cypress-test-utils": "^6.0.6", "@stylistic/eslint-plugin": "^5.10.0", "@types/codemirror": "^5.60.17", diff --git a/vite.config.ts b/vite.config.ts index 19b9b7c1..f5f41973 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,4 +1,3 @@ -import replace from "@rollup/plugin-replace"; import react from "@vitejs/plugin-react"; import { defineConfig } from "vite"; import istanbul from "vite-plugin-istanbul"; @@ -11,14 +10,6 @@ export default defineConfig(({ mode }) => ({ sourcemap: true }, plugins: [ - replace({ - preventAssignment: true, - include: /\/jsonlint-lines-primitives\/lib\/jsonlint.js/, - delimiters: ["", ""], - values: { - "_token_stack:": "", - }, - }), react(), istanbul({ cypress: true,