From b5a276fa25ea97ef6e03cf82168790f6057e7570 Mon Sep 17 00:00:00 2001 From: Paulius Varna Date: Tue, 2 Jul 2024 12:29:47 +0300 Subject: [PATCH 1/7] chore: Update package.json to Node.js version 18.0.0 or higher --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 7ab391326..62f51c6e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,9 @@ { "name": "@mapbox/mapbox-gl-draw", "version": "1.4.3", + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, "description": "A drawing component for Mapbox GL JS", "author": "mapbox", "license": "ISC", From 3ca9f4bc6881ea8b574d864ade5a1a4f7ab4d186 Mon Sep 17 00:00:00 2001 From: Paulius Varna Date: Tue, 2 Jul 2024 13:01:08 +0300 Subject: [PATCH 2/7] Use standard script naming for dev --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62f51c6e7..236a3fa3c 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "browser": "dist/mapbox-gl-draw.js", "style": "dist/mapbox-gl-draw.css", "scripts": { + "dev": "vite -c vite.config.js", "docs": "run-s docs-modes-life-cycle docs-modes-get-and-set", "docs-modes-get-and-set": "documentation readme --readme-file ./docs/MODES.md -s \"Setters and Getters\" src/modes/mode_interface_accessors.js --shallow", "docs-modes-life-cycle": "documentation readme --readme-file ./docs/MODES.md -s \"Life Cycle Functions\" src/modes/mode_interface.js --shallow", @@ -40,7 +41,6 @@ "prepublishOnly": "run-s build build-min", "watch": "rollup -c --watch", "watch-bench": "rollup -c bench/rollup.config.js --watch", - "start-server": "vite --config vite.config.js", "start-bench": "run-p build-token watch watch-bench \"start-server --base . .\"", "start": "run-p build-token start-server" }, From 031e156ec6899594909b131fc866b523297cfe7f Mon Sep 17 00:00:00 2001 From: Paulius Varna Date: Tue, 2 Jul 2024 13:47:36 +0300 Subject: [PATCH 3/7] chore: Move access_token into proper .env variable --- .env.development.local.example | 2 + .gitignore | 4 +- build/generate-access-token-script.js | 13 -- debug/access_token.js | 3 +- debug/index.html | 243 ++++++++++++++------------ package.json | 5 +- 6 files changed, 136 insertions(+), 134 deletions(-) create mode 100644 .env.development.local.example delete mode 100644 build/generate-access-token-script.js diff --git a/.env.development.local.example b/.env.development.local.example new file mode 100644 index 000000000..54ead7ed2 --- /dev/null +++ b/.env.development.local.example @@ -0,0 +1,2 @@ +# remove the <.example> extension from the file name +VITE_MAPBOX_ACCESS_TOKEN="Replace this with your own Mapbox access token" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 95ab04dc1..17b1c26d5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ dist/bench.js dist/bench.js.map coverage/ .nyc_output/ -debug/access_token_generated.js + +# Vite +*.local \ No newline at end of file diff --git a/build/generate-access-token-script.js b/build/generate-access-token-script.js deleted file mode 100644 index 227093811..000000000 --- a/build/generate-access-token-script.js +++ /dev/null @@ -1,13 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import {fileURLToPath} from 'url'; - -const __dirname = fileURLToPath(new URL('.', import.meta.url)); - -const script = fs.readFileSync(path.join(__dirname, '../debug/access_token.js'), 'utf-8') - .replace('process.env.MapboxAccessToken', - JSON.stringify(process.env.MapboxAccessToken)) - .replace('process.env.MAPBOX_ACCESS_TOKEN', - JSON.stringify(process.env.MAPBOX_ACCESS_TOKEN)); - -fs.writeFileSync(path.join(__dirname, '../debug/access_token_generated.js'), script); diff --git a/debug/access_token.js b/debug/access_token.js index 48c3f841b..86966f182 100644 --- a/debug/access_token.js +++ b/debug/access_token.js @@ -1,7 +1,6 @@ export function getAccessToken() { const accessToken = - process.env.MapboxAccessToken || - process.env.MAPBOX_ACCESS_TOKEN || + import.meta.env.VITE_MAPBOX_ACCESS_TOKEN || (new URLSearchParams(location.search).get('access_token')) || localStorage.getItem('accessToken'); diff --git a/debug/index.html b/debug/index.html index 72f6d3dc2..59f8c6e00 100644 --- a/debug/index.html +++ b/debug/index.html @@ -1,19 +1,30 @@ + Mapbox GL Draw | Mapbox