@jbrowse/core 4.1.0 → 4.1.2

package/esm/PluginLoader.js

@@ -71,6 +71,14 @@ export function pluginUrl(d) {
 function isInWebWorker() {
     return 'WorkerGlobalScope' in globalThis;
 }
+function addCacheBuster(url) {
+    if (!globalThis.__jbrowseCacheBuster) {
+        return url;
+    }
+    const u = new URL(url);
+    u.searchParams.set('_cb', Date.now().toString());
+    return u.href;
+}
 export default class PluginLoader {
     definitions = [];
     fetchESM;
@@ -100,7 +108,7 @@ export default class PluginLoader {
         if (!this.fetchESM) {
             throw new Error('No ESM fetcher installed');
         }
-        const plugin = await this.fetchESM(parsedUrl.href);
+        const plugin = await this.fetchESM(addCacheBuster(parsedUrl.href));
         if (!plugin) {
             throw new Error(`Could not load ESM plugin: ${parsedUrl}`);
         }
@@ -118,7 +126,7 @@ export default class PluginLoader {
         const moduleName = def.name;
         const umdName = `JBrowsePlugin${moduleName}`;
         if (typeof jest === 'undefined') {
-            await loadScript(parsedUrl.href);
+            await loadScript(addCacheBuster(parsedUrl.href));
         }
         else {
             globalThis[umdName] = { default: Plugin };

package/esm/data_adapters/util.js

@@ -1,4 +1,6 @@
 import idMaker from "../util/idMaker.js";
 export function adapterConfigCacheKey(conf = {}) {
-    return `${idMaker(conf)}`;
+    return conf.type && conf.adapterId
+        ? `${conf.type}-${conf.adapterId}`
+        : `${idMaker(conf)}`;
 }

package/esm/pluggableElementTypes/renderers/ServerSideRendererType.d.ts

@@ -4,6 +4,7 @@ import type { RenderProps, RenderResults } from './RendererType.tsx';
 import type { SerializedFilterChain } from './util/serializableFilterChain.ts';
 import type { AnyConfigurationModel } from '../../configuration/index.ts';
 import type RpcManager from '../../rpc/RpcManager.ts';
+import type { LastStopTokenCheck } from '../../util/stopToken.ts';
 import type { SnapshotIn, SnapshotOrInstance } from '@jbrowse/mobx-state-tree';
 import type { ThemeOptions } from '@mui/material';
 interface BaseRenderArgs extends RenderProps {
@@ -28,6 +29,7 @@ export interface RenderArgsSerialized extends BaseRenderArgs {
 export interface RenderArgsDeserialized extends BaseRenderArgs {
     config: AnyConfigurationModel;
     filters?: SerializableFilterChain;
+    stopTokenCheck?: LastStopTokenCheck;
 }
 export type ResultsSerialized = Omit<RenderResults, 'reactElement'> & {
     imageData?: ImageBitmap;

package/esm/pluggableElementTypes/renderers/ServerSideRendererType.js

@@ -4,7 +4,7 @@ import RendererType from "./RendererType.js";
 import SerializableFilterChain from "./util/serializableFilterChain.js";
 import { getSerializedSvg, updateStatus } from "../../util/index.js";
 import { isRpcResult } from "../../util/rpc.js";
-import { checkStopToken } from "../../util/stopToken.js";
+import { checkStopToken2, createStopTokenChecker, } from "../../util/stopToken.js";
 function isCanvasRecordedSvgExport(e) {
     return 'canvasRecordedData' in e;
 }
@@ -99,13 +99,14 @@ export default class ServerSideRenderer extends RendererType {
     }
     async renderInWorker(args) {
         const { stopToken, statusCallback = () => { } } = args;
+        const stopTokenCheck = createStopTokenChecker(stopToken);
         const args2 = this.deserializeArgsInWorker(args);
-        const results = await updateStatus('Rendering plot', statusCallback, () => this.render(args2));
-        checkStopToken(stopToken);
+        const results = await updateStatus('Rendering plot', statusCallback, () => this.render({ ...args2, stopTokenCheck }));
+        checkStopToken2(stopTokenCheck);
         if (isRpcResult(results)) {
             return results;
         }
-        return updateStatus('Serializing results', statusCallback, () => this.serializeResultsInWorker(results, args2));
+        return updateStatus('Serializing results', statusCallback, () => this.serializeResultsInWorker(results, { ...args2, stopTokenCheck }));
     }
     async freeResourcesInClient(rpcManager, args) {
         const serializedArgs = this.serializeArgsInClient(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "type": "module",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [