diff --git a/.babelrc b/.babelrc index 123a6433d..8646b20fb 100644 --- a/.babelrc +++ b/.babelrc @@ -1,10 +1,10 @@ { - "presets": ["es2015"], + "presets": ["@babel/preset-env"], "env": { "test": { "sourceMaps": "inline", "plugins": [ - "__coverage__" + "istanbul" ] } } diff --git a/.gitignore b/.gitignore index 2cdf79c74..fe22bb721 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ npm-debug.log dist/mapbox-gl-draw.js coverage/ .nyc_output/ +debug/access_token_generated.js diff --git a/build/generate-access-token-script.js b/build/generate-access-token-script.js new file mode 100644 index 000000000..0eb7d3d60 --- /dev/null +++ b/build/generate-access-token-script.js @@ -0,0 +1,11 @@ +/* eslint-disable */ +'use strict'; +const fs = require('fs'); +const path = require('path'); +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 new file mode 100644 index 000000000..e7ca3cb68 --- /dev/null +++ b/debug/access_token.js @@ -0,0 +1,20 @@ +'use strict'; + +mapboxgl.accessToken = getAccessToken(); + +function getAccessToken() { + var accessToken = ( + process.env.MapboxAccessToken || + process.env.MAPBOX_ACCESS_TOKEN || + getURLParameter('access_token') || + localStorage.getItem('accessToken') + ); + localStorage.setItem('accessToken', accessToken); + return accessToken; +} + +function getURLParameter(name) { + var regexp = new RegExp('[?&]' + name + '=([^&#]*)', 'i'); + var output = regexp.exec(window.location.href); + return output && output[1]; +} diff --git a/debug/index.html b/debug/index.html index b038a4fc9..b586c0241 100644 --- a/debug/index.html +++ b/debug/index.html @@ -51,6 +51,7 @@ +