@jbrowse/core 2.3.3 → 2.3.4

package/PluginLoader.d.ts

@@ -40,24 +40,23 @@ export interface PluginRecord {
 export interface LoadedPlugin {
     default: PluginConstructor;
 }
-export declare function getWindowPath(windowHref: string): string;
 export default class PluginLoader {
     definitions: PluginDefinition[];
-    fetchESM?: (url: string) => Promise<unknown>;
+    fetchESM?: (url: string) => Promise<LoadedPlugin>;
     fetchCJS?: (url: string) => Promise<LoadedPlugin>;
     constructor(defs?: PluginDefinition[], args?: {
-        fetchESM?: (url: string) => Promise<unknown>;
+        fetchESM?: (url: string) => Promise<LoadedPlugin>;
         fetchCJS?: (url: string) => Promise<LoadedPlugin>;
     });
     loadScript(scriptUrl: string): Promise<void>;
-    loadCJSPlugin(def: CJSPluginDefinition, windowHref: string): Promise<LoadedPlugin>;
-    loadESMPlugin(def: ESMPluginDefinition, windowHref: string): Promise<LoadedPlugin>;
-    loadUMDPlugin(def: UMDPluginDefinition | LegacyUMDPluginDefinition, windowHref: string): Promise<{
+    loadCJSPlugin(def: CJSPluginDefinition, baseUri?: string): Promise<LoadedPlugin>;
+    loadESMPlugin(def: ESMPluginDefinition, baseUri?: string): Promise<LoadedPlugin>;
+    loadUMDPlugin(def: UMDPluginDefinition | LegacyUMDPluginDefinition, baseUri?: string): Promise<{
         default: PluginConstructor;
     }>;
-    loadPlugin(def: PluginDefinition, windowHref: string): Promise<PluginConstructor>;
+    loadPlugin(def: PluginDefinition, baseUri?: string): Promise<PluginConstructor>;
     installGlobalReExports(target: WindowOrWorkerGlobalScope): void;
-    load(windowHref?: string): Promise<{
+    load(baseUri?: string): Promise<{
         plugin: PluginConstructor;
         definition: PluginDefinition;
     }[]>;

package/PluginLoader.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWindowPath = exports.isCJSPluginDefinition = exports.isESMPluginDefinition = exports.isUMDPluginDefinition = void 0;
+exports.isCJSPluginDefinition = exports.isESMPluginDefinition = exports.isUMDPluginDefinition = void 0;
 const load_script2_1 = __importDefault(require("load-script2"));
 const ReExports_1 = __importDefault(require("./ReExports"));
 const util_1 = require("./util");
@@ -23,10 +23,6 @@ function isCJSPluginDefinition(def) {
     return def.cjsUrl !== undefined;
 }
 exports.isCJSPluginDefinition = isCJSPluginDefinition;
-function getWindowPath(windowHref) {
-    return window.location.href + windowHref;
-}
-exports.getWindowPath = getWindowPath;
 function getGlobalObject() {
     // Based on window-or-global
     // https://github.com/purposeindustries/window-or-global/blob/322abc71de0010c9e5d9d0729df40959e1ef8775/lib/index.js
@@ -60,8 +56,8 @@ class PluginLoader {
         }
         throw new Error('cannot figure out how to load external JS scripts in this environment');
     }
-    async loadCJSPlugin(def, windowHref) {
-        const parsedUrl = new URL(def.cjsUrl, windowHref);
+    async loadCJSPlugin(def, baseUri) {
+        const parsedUrl = new URL(def.cjsUrl, baseUri);
         if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
             throw new Error(`Cannot load plugins using protocol "${parsedUrl.protocol}"`);
         }
@@ -70,25 +66,27 @@ class PluginLoader {
         }
         return this.fetchCJS(parsedUrl.href);
     }
-    async loadESMPlugin(def, windowHref) {
-        var _a;
+    async loadESMPlugin(def, baseUri) {
         const parsedUrl = 'esmUrl' in def
-            ? new URL(def.esmUrl, windowHref)
+            ? new URL(def.esmUrl, baseUri)
             : new URL(def.esmLoc.uri, def.esmLoc.baseUri);
         if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
             throw new Error(`cannot load plugins using protocol "${parsedUrl.protocol}"`);
         }
-        const plugin = (await ((_a = this.fetchESM) === null || _a === void 0 ? void 0 : _a.call(this, parsedUrl.href)));
+        if (!this.fetchESM) {
+            throw new Error(`No ESM fetcher installed`);
+        }
+        const plugin = await this.fetchESM(parsedUrl.href);
         if (!plugin) {
             throw new Error(`Could not load ESM plugin: ${parsedUrl}`);
         }
         return plugin;
     }
-    async loadUMDPlugin(def, windowHref) {
+    async loadUMDPlugin(def, baseUri) {
         const parsedUrl = 'url' in def
-            ? new URL(def.url, windowHref)
+            ? new URL(def.url, baseUri)
             : 'umdUrl' in def
-                ? new URL(def.umdUrl, windowHref)
+                ? new URL(def.umdUrl, baseUri)
                 : new URL(def.umdLoc.uri, def.umdLoc.baseUri);
         if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
             throw new Error(`cannot load plugins using protocol "${parsedUrl.protocol}"`);
@@ -104,16 +102,16 @@ class PluginLoader {
         }
         return plugin;
     }
-    async loadPlugin(def, windowHref) {
+    async loadPlugin(def, baseUri) {
         let plugin;
         if (util_1.isElectron && isCJSPluginDefinition(def)) {
-            plugin = await this.loadCJSPlugin(def, windowHref);
+            plugin = await this.loadCJSPlugin(def, baseUri);
         }
         else if (isESMPluginDefinition(def)) {
-            plugin = await this.loadESMPlugin(def, windowHref);
+            plugin = await this.loadESMPlugin(def, baseUri);
         }
         else if (isUMDPluginDefinition(def)) {
-            plugin = await this.loadUMDPlugin(def, windowHref);
+            plugin = await this.loadUMDPlugin(def, baseUri);
         }
         else if (!util_1.isElectron && isCJSPluginDefinition(def)) {
             throw new Error(`CommonJS plugin found, but not in a NodeJS environment: ${JSON.stringify(def)}`);
@@ -129,9 +127,9 @@ class PluginLoader {
             return [moduleName, module];
         }));
     }
-    async load(windowHref = '') {
+    async load(baseUri) {
         return Promise.all(this.definitions.map(async (definition) => ({
-            plugin: await this.loadPlugin(definition, windowHref),
+            plugin: await this.loadPlugin(definition, baseUri),
             definition,
         })));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -74,5 +74,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "283e0387ccd5acc9f092cf00804d1fcac212e68d"
+  "gitHead": "98ae48be91ee2371e1b2768a907b4997995e9915"
 }