@jbrowse/core 2.6.1 → 2.6.3

package/PluginLoader.d.ts

@@ -48,7 +48,6 @@ export default class PluginLoader {
         fetchESM?: (url: string) => Promise<LoadedPlugin>;
         fetchCJS?: (url: string) => Promise<LoadedPlugin>;
     });
-    loadScript(scriptUrl: string): Promise<any>;
     loadCJSPlugin(def: CJSPluginDefinition, baseUri?: string): Promise<LoadedPlugin>;
     loadESMPlugin(def: ESMPluginDefinition, baseUri?: string): Promise<LoadedPlugin>;
     loadUMDPlugin(def: UMDPluginDefinition | LegacyUMDPluginDefinition, baseUri?: string): Promise<{

package/PluginLoader.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCJSPluginDefinition = exports.isESMPluginDefinition = exports.isUMDPluginDefinition = void 0;
-const load_script2_1 = __importDefault(require("load-script2"));
+const load_script_1 = __importDefault(require("load-script"));
 // locals
 const Plugin_1 = __importDefault(require("./Plugin"));
 const ReExports_1 = __importDefault(require("./ReExports"));
@@ -21,6 +21,30 @@ function isESMPluginDefinition(def) {
         def.esmLoc !== undefined);
 }
 exports.isESMPluginDefinition = isESMPluginDefinition;
+function promisifiedLoadScript(src) {
+    return new Promise((resolve, reject) => {
+        (0, load_script_1.default)(src, (err, script) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve(script.src);
+            }
+        });
+    });
+}
+async function loadScript(scriptUrl) {
+    if (!isInWebWorker()) {
+        return promisifiedLoadScript(scriptUrl);
+    }
+    // @ts-expect-error
+    if (globalThis === null || globalThis === void 0 ? void 0 : globalThis.importScripts) {
+        // @ts-expect-error
+        await globalThis.importScripts(scriptUrl);
+        return;
+    }
+    throw new Error('cannot figure out how to load external JS scripts in this environment');
+}
 function isCJSPluginDefinition(def) {
     return def.cjsUrl !== undefined;
 }
@@ -49,18 +73,6 @@ class PluginLoader {
         this.fetchCJS = args === null || args === void 0 ? void 0 : args.fetchCJS;
         this.definitions = JSON.parse(JSON.stringify(defs));
     }
-    async loadScript(scriptUrl) {
-        if (!isInWebWorker()) {
-            return (0, load_script2_1.default)(scriptUrl);
-        }
-        // @ts-expect-error
-        if (globalThis === null || globalThis === void 0 ? void 0 : globalThis.importScripts) {
-            // @ts-expect-error
-            await globalThis.importScripts(scriptUrl);
-            return;
-        }
-        throw new Error('cannot figure out how to load external JS scripts in this environment');
-    }
     async loadCJSPlugin(def, baseUri) {
         const parsedUrl = new URL(def.cjsUrl, baseUri);
         if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
@@ -99,7 +111,7 @@ class PluginLoader {
         const moduleName = def.name;
         const umdName = `JBrowsePlugin${moduleName}`;
         if (typeof jest === 'undefined') {
-            await this.loadScript(parsedUrl.href);
+            await loadScript(parsedUrl.href);
         }
         else {
             // @ts-expect-error

package/PluginManager.d.ts

@@ -31,7 +31,7 @@ type PluggableElementTypeGroup = 'renderer' | 'adapter' | 'display' | 'track' |
 declare class TypeRecord<ElementClass extends PluggableElementBase> {
     typeName: string;
     baseClass: {
-        new (...args: any[]): ElementClass;
+        new (...args: unknown[]): ElementClass;
     } | (Function & {
         prototype: ElementClass;
     });
@@ -39,7 +39,7 @@ declare class TypeRecord<ElementClass extends PluggableElementBase> {
         [name: string]: ElementClass;
     };
     constructor(typeName: string, baseClass: {
-        new (...args: any[]): ElementClass;
+        new (...args: unknown[]): ElementClass;
     } | (Function & {
         prototype: ElementClass;
     }));

package/TextSearch/TextSearchManager.js

@@ -29,9 +29,10 @@ class TextSearchManager {
         });
     }
     relevantAdapters(searchScope) {
-        var _a;
+        var _a, _b;
         const pm = this.pluginManager;
-        const { aggregateTextSearchAdapters, tracks } = (_a = pm.rootModel) === null || _a === void 0 ? void 0 : _a.jbrowse;
+        const { aggregateTextSearchAdapters } = (_a = pm.rootModel) === null || _a === void 0 ? void 0 : _a.jbrowse;
+        const { tracks } = (_b = pm.rootModel) === null || _b === void 0 ? void 0 : _b.session;
         const { assemblyName } = searchScope;
         return [
             ...this.getAdaptersWithAssembly(assemblyName, aggregateTextSearchAdapters),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -45,12 +45,12 @@
     "escape-html": "^1.0.3",
     "fast-deep-equal": "^3.1.3",
     "generic-filehandle": "^3.0.0",
-    "http-range-fetcher": "^1.4.0",
+    "http-range-fetcher": "^2.0.0",
     "is-object": "^1.0.1",
     "jexl": "^2.3.0",
     "json-stable-stringify": "^1.0.1",
     "librpc-web-mod": "^1.1.5",
-    "load-script2": "^2.0.5",
+    "load-script": "^2.0.0",
     "material-ui-popup-state": "^5.0.0",
     "rbush": "^3.0.1",
     "react-error-boundary": "^4.0.3",
@@ -74,5 +74,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "1cbe7ba097fb2d2763c776e5e429e4670cdd583c"
+  "gitHead": "ed402c87efb0904858d602c363bd1757d5742129"
 }

package/pluggableElementTypes/RpcMethodType.js

@@ -56,9 +56,8 @@ class RpcMethodType extends PluggableElementBase_1.default {
         }
         catch (error) {
             if ((0, types_1.isAuthNeededException)(error)) {
-                const retryAccount = 
-                // @ts-expect-error
-                (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.createEphemeralInternetAccount(`HTTPBasicInternetAccount-${new URL(error.url).origin}`, {}, error.url);
+                const retryAccount = // @ts-expect-error
+                 (_a = this.pluginManager.rootModel) === null || _a === void 0 ? void 0 : _a.createEphemeralInternetAccount(`HTTPBasicInternetAccount-${new URL(error.url).origin}`, {}, error.url);
                 throw new types_1.RetryError('Retrying with created internet account', retryAccount.internetAccountId);
             }
             throw error;

package/rpc/WebWorkerRpcDriver.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const librpc_web_mod_1 = __importDefault(require("librpc-web-mod"));
 const shortid_1 = __importDefault(require("shortid"));
-const serialize_error_1 = require("serialize-error");
 // locals
 const BaseRpcDriver_1 = __importDefault(require("./BaseRpcDriver"));
+const serialize_error_1 = require("serialize-error");
 class WebWorkerHandle extends librpc_web_mod_1.default.Client {
     destroy() {
         this.workers[0].terminate();
@@ -36,6 +36,9 @@ class WebWorkerRpcDriver extends BaseRpcDriver_1.default {
         // one for each worker, because we want to do our own state-group-aware
         // load balancing rather than using librpc's builtin round-robin
         const instance = this.makeWorkerInstance();
+        // @ts-ignore this is used to avoid warning in jbrowse-web startup
+        // (because this file is referred to via src, declare.d.ts file is in
+        // e.g. products/jbrowse-web)
         const worker = new WebWorkerHandle({ workers: [instance] });
         const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
         if (isSafari) {