Always send SDK param for style requests

GitOrigin-RevId: 5b1fe3cad1164e743514f9b557221996a2573e46

Author: underoot

build/rollup_plugins.js

@@ -15,23 +15,22 @@ import minifyStyleSpec from './rollup_plugin_minify_style_spec.js';
  * builds (umd and esm mapboxgl bundles, style-spec package bundle)
  *
  * @param {Object} options
- * @param {string | 'dev' | 'production'} [options.mode] - build mode
  * @param {'umd' | 'csp' | 'esm'} [options.format] - bundle format, reported as `bundleFormat` in telemetry
  * @param {boolean} [options.minified] - whether to minify the output
  * @param {boolean} [options.production] - whether this is a production build
  * @param {boolean} [options.test] - whether this is a test build
  * @param {boolean} [options.keepClassNames] - whether to keep class names during minification
  * @returns {import('rollup').InputPluginOption[]}
  */
-export const plugins = ({mode, format, minified, production, test, keepClassNames}) => [
+export const plugins = ({format, minified, production, test, keepClassNames}) => [
     minifyStyleSpec(),
     esbuild({
         target: browserslistToEsbuild(),
         minify: false,
         sourceMap: true,
         tsconfig: './tsconfig.browser.json',
         define: {
-            'import.meta.env': JSON.stringify({mode, format}),
+            'import.meta.env': JSON.stringify({format}),
         }
     }),
     json({

rollup.config.csp.ts

@@ -17,7 +17,7 @@ const config = (input: InputOption, file: string, format: ModuleFormat): RollupO
         banner
     },
     treeshake: {preset: 'recommended', moduleSideEffects: (id) => !id.endsWith('devtools.ts')},
-    plugins: plugins({minified: true, production: true, keepClassNames: true, test: false, mode: 'production', format: 'csp'})
+    plugins: plugins({minified: true, production: true, keepClassNames: true, test: false, format: 'csp'})
 });
 
 export default [

rollup.config.esm.ts

@@ -59,7 +59,7 @@ function esmConfig(dir: string, workerSuffix: string, emitVisualizer = false): R
         preserveEntrySignatures: 'strict',
         plugins: [
             esmSubstitutions(workerSuffix),
-            ...plugins({production, minified, test: false, keepClassNames: false, mode: BUILD, format: 'esm'}),
+            ...plugins({production, minified, test: false, keepClassNames: false, format: 'esm'}),
             emitVisualizer && visualizer({
                 filename: `${dir}treemap.html`,
                 template: 'treemap',

rollup.config.ts

@@ -64,7 +64,7 @@ export default ({watch}: {watch: boolean}): RollupOptions[] => {
         },
         onwarn: production ? onwarn : undefined,
         treeshake: production ? {preset: 'recommended', moduleSideEffects: (id) => !id.endsWith('devtools.ts')} : false,
-        plugins: [preserveDynamicImport(), ...plugins({minified, production, test: false, keepClassNames: false, mode: BUILD, format: 'umd'})]
+        plugins: [preserveDynamicImport(), ...plugins({minified, production, test: false, keepClassNames: false, format: 'umd'})]
     }, {
         // Next, bundle together the three "chunks" produced in the previous pass
         // into a single, final bundle. See rollup/bundle_prelude.js and

src/types/import-meta.d.ts

@@ -1,6 +1,5 @@
 interface ImportMeta {
     env: {
-        mode?: 'dev' | 'production';
         format?: 'umd' | 'csp' | 'esm';
         [key: string]: unknown;
     };

src/util/mapbox.ts

@@ -80,9 +80,7 @@ export class RequestManager {
     normalizeStyleURL(url: string, accessToken?: string): string {
         if (!isMapboxURL(url)) return url;
         const urlObject = parseUrl(url);
-        if (import.meta.env.mode !== 'dev') {
-            urlObject.params.push(`sdk=js-${sdkVersion}`);
-        }
+        urlObject.params.push(`sdk=js-${sdkVersion}`);
         urlObject.path = `/styles/v1${urlObject.path}`;
         return this._makeAPIURL(urlObject, this._customAccessToken || accessToken);
     }