Expose setWorkerUrl for ESM entry point

GitOrigin-RevId: 894f6dc62c1ac1cefef6002305f95b908884fd5c

Author: mourner

src/index.esm.ts

@@ -166,6 +166,7 @@ export {FreeCameraOptions} from './ui/free_camera';
 export {setRTLTextPlugin, getRTLTextPluginStatus} from './source/rtl_text_plugin';
 export {addTileProvider} from './source/tile_provider';
 export {prewarm, clearPrewarmedResources} from './util/worker_pool_factory';
+export {setWorkerUrl} from './util/worker_class';
 export {getWorkerCount, setWorkerCount} from './util/worker_pool';
 export {setAccessToken, setBaseApiUrl, setMaxParallelImageRequests, getDracoUrl, setDracoUrl, getMeshoptUrl, setMeshoptUrl, getBuildingGenUrl, setBuildingGenUrl} from './util/config';
 

src/index.ts

@@ -274,14 +274,6 @@ const exported = {
         WorkerClass.workerClass = klass;
     },
 
-    get workerParams(): WorkerOptions {
-        return WorkerClass.workerParams;
-    },
-
-    set workerParams(params: WorkerOptions) {
-        WorkerClass.workerParams = params;
-    },
-
     /**
      * Provides an interface for loading Draco decoding library (draco_decoder_gltf.wasm v1.5.6) from a self-hosted URL.
      * This needs to be set only once, and before any call to `new mapboxgl.Map(..)` takes place.

src/util/worker_class.ts

@@ -1,15 +1,27 @@
 import type {Class} from '../types/class';
 
-type WorkerClass = {
+type WorkerState = {
     workerUrl: string;
     workerClass: Class<Worker> | null;
-    workerParams?: WorkerOptions;
+    workerParams?: WorkerOptions; // Internal, test-only: extra options passed to `new Worker()`
 };
 
-const WorkerClass: WorkerClass = {
+const WorkerClass: WorkerState = {
     workerUrl: '',
     workerClass: null,
     workerParams: undefined,
 };
 
+/**
+ * Sets the URL from which the WebWorker bundle is loaded. Must be set once,
+ * before the first `new Map(...)`. Used by both the UMD and ESM bundles to
+ * override the default worker location — for example to load the worker from a
+ * same-origin trampoline when GL JS is served cross-origin.
+ *
+ * @param {string} url A URL hosting the GL JS WebWorker bundle.
+ */
+export function setWorkerUrl(url: string) {
+    WorkerClass.workerUrl = url;
+}
+
 export default WorkerClass;

test/unit/setup.ts

@@ -5,14 +5,10 @@ import WorkerClass from '../../src/util/worker_class';
 import {prewarm} from '../../src/util/worker_pool_factory';
 import {markTestBaseline, cleanupTestMaps} from '../util/vitest';
 
-if (!globalThis.defined) {
-    WorkerClass.workerParams = {
-        type: 'module'
-    };
-
+if (!WorkerClass.workerUrl) {
+    // Internal, test-only: load the untranspiled worker source as an ES module.
+    WorkerClass.workerParams = {type: 'module'};
     WorkerClass.workerUrl = '/src/source/worker.ts';
-
-    globalThis.defined = true;
 }
 
 // Keep the shared WorkerPool alive across all tests in this iframe. Without

test/usvg/setup.ts

@@ -1,13 +1,7 @@
-/* global globalThis */
+import WorkerClass from '../../src/util/worker_class';
 
-import mapboxgl from '../../src/index';
-
-if (!globalThis.defined) {
-    mapboxgl.workerParams = {
-        type: 'module'
-    };
-
-    mapboxgl.workerUrl = '/src/source/worker.ts';
-
-    globalThis.defined = true;
+if (!WorkerClass.workerUrl) {
+    // Internal, test-only: load the untranspiled worker source as an ES module.
+    WorkerClass.workerParams = {type: 'module'};
+    WorkerClass.workerUrl = '/src/source/worker.ts';
 }