@jbrowse/core 1.6.9 → 1.7.0

package/BaseFeatureWidget/BaseFeatureDetail.d.ts

@@ -39,8 +39,8 @@ export interface BaseInputProps extends BaseCardProps {
 export declare const FeatureDetails: (props: {
     model: IAnyStateTreeNode;
     feature: SimpleFeatureSerialized & {
-        name?: string | undefined;
-        id?: string | undefined;
+        name?: string;
+        id?: string;
     };
     depth?: number | undefined;
     omit?: string[] | undefined;

package/PluginLoader.d.ts

@@ -28,14 +28,22 @@ export interface LoadedPlugin {
 }
 export default class PluginLoader {
     definitions: PluginDefinition[];
-    constructor(pluginDefinitions?: PluginDefinition[]);
+    fetchESM?: (url: string) => Promise<unknown>;
+    fetchCJS?: (url: string) => Promise<LoadedPlugin>;
+    constructor(pluginDefinitions?: PluginDefinition[], args?: {
+        fetchESM?: (url: string) => Promise<unknown>;
+        fetchCJS?: (url: string) => Promise<LoadedPlugin>;
+    });
     loadScript(scriptUrl: string): Promise<void>;
-    loadCJSPlugin(pluginDefinition: CJSPluginDefinition): Promise<LoadedPlugin>;
+    loadCJSPlugin({ cjsUrl }: CJSPluginDefinition): Promise<LoadedPlugin>;
     loadESMPlugin(pluginDefinition: ESMPluginDefinition): Promise<LoadedPlugin>;
     loadUMDPlugin(pluginDefinition: UMDPluginDefinition | LegacyUMDPluginDefinition): Promise<{
         default: PluginConstructor;
     }>;
     loadPlugin(definition: PluginDefinition): Promise<PluginConstructor>;
     installGlobalReExports(target: WindowOrWorkerGlobalScope): void;
-    load(): Promise<PluginRecord[]>;
+    load(): Promise<{
+        plugin: PluginConstructor;
+        definition: PluginDefinition;
+    }[]>;
 }

package/PluginLoader.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -28,18 +26,12 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _loadScript = _interopRequireDefault(require("load-script2"));
 
-var _sanitizeFilename = _interopRequireDefault(require("sanitize-filename"));
-
 var _configuration = require("./configuration");
 
 var _ReExports = _interopRequireDefault(require("./ReExports"));
 
 var _util = require("./util");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var PluginSourceConfigurationSchema = (0, _configuration.ConfigurationSchema)('PluginSource', {
   name: {
     type: 'string',
@@ -67,8 +59,7 @@ function isCJSPluginDefinition(pluginDefinition) {
 function getGlobalObject() {
   // Based on window-or-global
   // https://github.com/purposeindustries/window-or-global/blob/322abc71de0010c9e5d9d0729df40959e1ef8775/lib/index.js
-  return (
-    /* eslint-disable-next-line no-restricted-globals */
+  return (// eslint-disable-next-line no-restricted-globals
     (typeof self === "undefined" ? "undefined" : (0, _typeof2.default)(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2.default)(global)) === 'object' && global.global === global && global || // @ts-ignore
     this
   );
@@ -81,8 +72,13 @@ function isInWebWorker(globalObject) {
 var PluginLoader = /*#__PURE__*/function () {
   function PluginLoader() {
     var pluginDefinitions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var args = arguments.length > 1 ? arguments[1] : undefined;
     (0, _classCallCheck2.default)(this, PluginLoader);
     (0, _defineProperty2.default)(this, "definitions", []);
+    (0, _defineProperty2.default)(this, "fetchESM", void 0);
+    (0, _defineProperty2.default)(this, "fetchCJS", void 0);
+    this.fetchESM = args === null || args === void 0 ? void 0 : args.fetchESM;
+    this.fetchCJS = args === null || args === void 0 ? void 0 : args.fetchCJS;
     this.definitions = JSON.parse(JSON.stringify(pluginDefinitions));
   }
 
@@ -115,95 +111,49 @@ var PluginLoader = /*#__PURE__*/function () {
   }, {
     key: "loadCJSPlugin",
     value: function () {
-      var _loadCJSPlugin = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(pluginDefinition) {
-        var parsedUrl, fs, path, os, http, fsPromises, systemTmp, tmpDir, plugin, pluginLocation, pluginLocationRelative, pluginDownload;
+      var _loadCJSPlugin = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+        var cjsUrl, parsedUrl;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.prev = 0;
-                parsedUrl = new URL(pluginDefinition.cjsUrl, getGlobalObject().location.href);
-                _context.next = 8;
+                cjsUrl = _ref.cjsUrl;
+                _context.prev = 1;
+                parsedUrl = new URL(cjsUrl, getGlobalObject().location.href);
+                _context.next = 9;
                 break;
 
-              case 4:
-                _context.prev = 4;
-                _context.t0 = _context["catch"](0);
+              case 5:
+                _context.prev = 5;
+                _context.t0 = _context["catch"](1);
                 console.error(_context.t0);
-                throw new Error("Error parsing URL: ".concat(pluginDefinition.cjsUrl));
+                throw new Error("Error parsing URL: ".concat(cjsUrl));
 
-              case 8:
+              case 9:
                 if (!(parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:')) {
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
                 }
 
-                throw new Error("cannot load plugins using protocol \"".concat(parsedUrl.protocol, "\""));
-
-              case 10:
-                fs = require('fs');
-                path = require('path');
-                os = require('os');
-                http = require('http');
-                fsPromises = fs.promises; // On macOS `os.tmpdir()` returns the path to a symlink, see:
-                // https://github.com/nodejs/node/issues/11422
-
-                _context.next = 17;
-                return fsPromises.realpath(os.tmpdir());
+                throw new Error("Cannot load plugins using protocol \"".concat(parsedUrl.protocol, "\""));
 
-              case 17:
-                systemTmp = _context.sent;
-                _context.next = 20;
-                return fsPromises.mkdtemp(path.join(systemTmp, 'jbrowse-plugin-'));
-
-              case 20:
-                tmpDir = _context.sent;
-                plugin = undefined;
-                _context.prev = 22;
-                pluginLocation = path.join(tmpDir, (0, _sanitizeFilename.default)(parsedUrl.href));
-                pluginLocationRelative = path.relative('.', pluginLocation);
-                pluginDownload = new Promise(function (resolve, reject) {
-                  var file = fs.createWriteStream(pluginLocation);
-                  http.get(parsedUrl.href, function (response) {
-                    response.pipe(file);
-                    file.on('finish', function () {
-                      resolve();
-                    });
-                  }).on('error', function (err) {
-                    fs.unlinkSync(pluginLocation);
-                    reject(err);
-                  });
-                });
-                _context.next = 28;
-                return pluginDownload;
-
-              case 28:
-                plugin = __non_webpack_require__(pluginLocationRelative);
-
-              case 29:
-                _context.prev = 29;
-                fsPromises.rmdir(tmpDir, {
-                  recursive: true
-                });
-                return _context.finish(29);
-
-              case 32:
-                if (plugin) {
-                  _context.next = 34;
+              case 11:
+                if (this.fetchCJS) {
+                  _context.next = 13;
                   break;
                 }
 
-                throw new Error("Could not load CJS plugin: ".concat(parsedUrl));
+                throw new Error('No fetchCJS callback provided');
 
-              case 34:
-                return _context.abrupt("return", plugin);
+              case 13:
+                return _context.abrupt("return", this.fetchCJS(parsedUrl.href));
 
-              case 35:
+              case 14:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[0, 4], [22,, 29, 32]]);
+        }, _callee, this, [[1, 5]]);
       }));
 
       function loadCJSPlugin(_x) {
@@ -216,6 +166,8 @@ var PluginLoader = /*#__PURE__*/function () {
     key: "loadESMPlugin",
     value: function () {
       var _loadESMPlugin = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pluginDefinition) {
+        var _this$fetchESM;
+
         var parsedUrl, plugin;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -242,11 +194,7 @@ var PluginLoader = /*#__PURE__*/function () {
 
               case 10:
                 _context2.next = 12;
-                return Promise.resolve("".concat(
-                /* webpackIgnore: true */
-                parsedUrl.href)).then(function (s) {
-                  return _interopRequireWildcard(require(s));
-                });
+                return (_this$fetchESM = this.fetchESM) === null || _this$fetchESM === void 0 ? void 0 : _this$fetchESM.call(this, parsedUrl.href);
 
               case 12:
                 plugin = _context2.sent;
@@ -266,7 +214,7 @@ var PluginLoader = /*#__PURE__*/function () {
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[0, 4]]);
+        }, _callee2, this, [[0, 4]]);
       }));
 
       function loadESMPlugin(_x2) {
@@ -421,10 +369,10 @@ var PluginLoader = /*#__PURE__*/function () {
     key: "installGlobalReExports",
     value: function installGlobalReExports(target) {
       // @ts-ignore
-      target.JBrowseExports = Object.fromEntries(Object.entries(_ReExports.default).map(function (_ref) {
-        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-            moduleName = _ref2[0],
-            module = _ref2[1];
+      target.JBrowseExports = Object.fromEntries(Object.entries(_ReExports.default).map(function (_ref2) {
+        var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+            moduleName = _ref3[0],
+            module = _ref3[1];
 
         return [moduleName, module];
       }));
@@ -440,7 +388,7 @@ var PluginLoader = /*#__PURE__*/function () {
             switch (_context6.prev = _context6.next) {
               case 0:
                 return _context6.abrupt("return", Promise.all(this.definitions.map( /*#__PURE__*/function () {
-                  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(definition) {
+                  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(definition) {
                     return _regenerator.default.wrap(function _callee5$(_context5) {
                       while (1) {
                         switch (_context5.prev = _context5.next) {
@@ -465,7 +413,7 @@ var PluginLoader = /*#__PURE__*/function () {
                   }));
 
                   return function (_x5) {
-                    return _ref3.apply(this, arguments);
+                    return _ref4.apply(this, arguments);
                   };
                 }())));
 

package/PluginManager.js

@@ -96,13 +96,11 @@ var PhasedScheduler = /*#__PURE__*/function () {
       var _this = this;
 
       this.phaseOrder.forEach(function (phaseName) {
-        var phaseCallbacks = _this.phaseCallbacks.get(phaseName);
+        var _this$phaseCallbacks$;
 
-        if (phaseCallbacks) {
-          phaseCallbacks.forEach(function (callback) {
-            return callback();
-          });
-        }
+        (_this$phaseCallbacks$ = _this.phaseCallbacks.get(phaseName)) === null || _this$phaseCallbacks$ === void 0 ? void 0 : _this$phaseCallbacks$.forEach(function (callback) {
+          return callback();
+        });
       });
     }
   }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "1.6.9",
+  "version": "1.7.0",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -22,14 +22,12 @@
   "scripts": {
     "test": "cd ../..; jest packages/core",
     "coverage": "yarn test --coverage",
-    "lint": "tsc --noEmit && eslint --ext .js,.ts,.jsx,.tsx .",
     "clean": "rimraf dist",
     "prebuild": "yarn clean",
     "prepack": "yarn build",
     "build": "babel . --root-mode upward --out-dir dist --extensions '.ts,.js,.tsx,.jsx' && cp package.json README.md ../../LICENSE dist/ && tsc"
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.3",
     "@material-ui/icons": "^4.0.1",
     "abortable-promise-cache": "^1.5.0",
     "base64-js": "^1.3.0",
@@ -44,18 +42,17 @@
     "fast-deep-equal": "^3.1.3",
     "file-uri-to-path": "^1.0.0",
     "generic-filehandle": "^2.2.2",
-    "http-range-fetcher": "^1.2.2",
+    "http-range-fetcher": "^1.4.0",
     "is-object": "^1.0.1",
     "jexl": "^2.3.0",
     "json-stable-stringify": "^1.0.1",
-    "librpc-web-mod": "^1.1.4",
+    "librpc-web-mod": "^1.1.5",
     "load-script2": "^2.0.5",
     "object.fromentries": "^2.0.0",
     "rbush": "^3.0.1",
     "react-error-boundary": "^3.0.0",
     "react-intersection-observer": "^8.32.5",
-    "react-sizeme": "^3.0.2",
-    "sanitize-filename": "^1.6.3",
+    "react-use-measure": "^2.1.1",
     "shortid": "^2.2.13",
     "svg-path-generator": "^1.1.0",
     "tenacious-fetch": "^2.1.0",
@@ -77,5 +74,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "f6c3d4edfadc26f7ac635a2fa7259f50f0c7e5e3"
+  "gitHead": "cc13844074d11881d211342a6a7eea113561b70b"
 }

package/pluggableElementTypes/WidgetType.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import { ComponentType, LazyExoticComponent } from 'react';
+import React, { ComponentType, LazyExoticComponent } from 'react';
 import { IAnyModelType, IAnyStateTreeNode } from 'mobx-state-tree';
 import PluggableElementBase from './PluggableElementBase';
 import { AnyConfigurationSchemaType } from '../configuration/configurationSchema';

package/pluggableElementTypes/models/BaseViewModel.js

@@ -37,6 +37,6 @@ var BaseViewModel = _mobxStateTree.types.model('BaseView', {
   };
 });
 
-var _default = BaseViewModel; // eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/interface-name-prefix
+var _default = BaseViewModel; // eslint-disable-next-line @typescript-eslint/no-empty-interface
 
 exports.default = _default;

package/pluggableElementTypes/models/InternetAccountModel.js

@@ -162,35 +162,35 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @returns A promise for the token
      */
     getToken: function getToken(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _location$internetAcc, _location$internetAcc2;
 
         var token;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 if (!tokenPromise) {
-                  _context3.next = 2;
+                  _context2.next = 2;
                   break;
                 }
 
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 2:
                 token = location === null || location === void 0 ? void 0 : (_location$internetAcc = location.internetAccountPreAuthorization) === null || _location$internetAcc === void 0 ? void 0 : (_location$internetAcc2 = _location$internetAcc.authInfo) === null || _location$internetAcc2 === void 0 ? void 0 : _location$internetAcc2.token;
 
                 if (!token) {
-                  _context3.next = 6;
+                  _context2.next = 6;
                   break;
                 }
 
                 tokenPromise = Promise.resolve(token);
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 6:
                 if (!inWebWorker) {
-                  _context3.next = 8;
+                  _context2.next = 8;
                   break;
                 }
 
@@ -200,53 +200,35 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
                 token = self.retrieveToken();
 
                 if (!token) {
-                  _context3.next = 12;
+                  _context2.next = 12;
                   break;
                 }
 
                 tokenPromise = Promise.resolve(token);
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 12:
-                tokenPromise = new Promise( /*#__PURE__*/function () {
-                  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(r, x) {
-                    var resolve, reject;
-                    return _regenerator.default.wrap(function _callee2$(_context2) {
-                      while (1) {
-                        switch (_context2.prev = _context2.next) {
-                          case 0:
-                            reject = function _reject(error) {
-                              self.removeToken();
-                              x(error);
-                            };
-
-                            resolve = function _resolve(token) {
-                              self.storeToken(token);
-                              r(token);
-                            };
-
-                            self.getTokenFromUser(resolve, reject);
-
-                          case 3:
-                          case "end":
-                            return _context2.stop();
-                        }
-                      }
-                    }, _callee2);
-                  }));
-
-                  return function (_x, _x2) {
-                    return _ref.apply(this, arguments);
-                  };
-                }());
-                return _context3.abrupt("return", tokenPromise);
+                tokenPromise = new Promise(function (r, x) {
+                  function resolve(token) {
+                    self.storeToken(token);
+                    r(token);
+                  }
+
+                  function reject(error) {
+                    self.removeToken();
+                    x(error);
+                  }
+
+                  self.getTokenFromUser(resolve, reject);
+                });
+                return _context2.abrupt("return", tokenPromise);
 
               case 14:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3);
+        }, _callee2);
       }))();
     }
   };
@@ -270,34 +252,34 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @returns
      */
     getPreAuthorizationInformation: function getPreAuthorizationInformation(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var authToken, validatedToken;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                _context4.next = 2;
+                _context3.next = 2;
                 return self.getToken(location);
 
               case 2:
-                authToken = _context4.sent;
-                _context4.prev = 3;
-                _context4.next = 6;
+                authToken = _context3.sent;
+                _context3.prev = 3;
+                _context3.next = 6;
                 return self.validateToken(authToken, location);
 
               case 6:
-                validatedToken = _context4.sent;
-                _context4.next = 13;
+                validatedToken = _context3.sent;
+                _context3.next = 13;
                 break;
 
               case 9:
-                _context4.prev = 9;
-                _context4.t0 = _context4["catch"](3);
+                _context3.prev = 9;
+                _context3.t0 = _context3["catch"](3);
                 self.removeToken();
-                throw _context4.t0;
+                throw _context3.t0;
 
               case 13:
-                return _context4.abrupt("return", {
+                return _context3.abrupt("return", {
                   internetAccountType: self.type,
                   authInfo: {
                     token: validatedToken,
@@ -307,10 +289,10 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
 
               case 14:
               case "end":
-                return _context4.stop();
+                return _context3.stop();
             }
           }
-        }, _callee4, null, [[3, 9]]);
+        }, _callee3, null, [[3, 9]]);
       }))();
     }
   };
@@ -325,30 +307,30 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      */
     getFetcher: function getFetcher(location) {
       return /*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(input, init) {
+        var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(input, init) {
           var authToken, newInit;
-          return _regenerator.default.wrap(function _callee5$(_context5) {
+          return _regenerator.default.wrap(function _callee4$(_context4) {
             while (1) {
-              switch (_context5.prev = _context5.next) {
+              switch (_context4.prev = _context4.next) {
                 case 0:
-                  _context5.next = 2;
+                  _context4.next = 2;
                   return self.getToken(location);
 
                 case 2:
-                  authToken = _context5.sent;
+                  authToken = _context4.sent;
                   newInit = self.addAuthHeaderToInit(init, authToken);
-                  return _context5.abrupt("return", fetch(input, newInit));
+                  return _context4.abrupt("return", fetch(input, newInit));
 
                 case 5:
                 case "end":
-                  return _context5.stop();
+                  return _context4.stop();
               }
             }
-          }, _callee5);
+          }, _callee4);
         }));
 
-        return function (_x3, _x4) {
-          return _ref2.apply(this, arguments);
+        return function (_x, _x2) {
+          return _ref.apply(this, arguments);
         };
       }();
     }

package/rpc/WebWorkerRpcDriver.d.ts

@@ -1,12 +1,8 @@
 import Rpc from 'librpc-web-mod';
 import BaseRpcDriver, { RpcDriverConstructorArgs } from './BaseRpcDriver';
 import { PluginDefinition } from '../PluginLoader';
-interface WebpackWorker {
-    new (): Worker;
-    prototype: Worker;
-}
 interface WebWorkerRpcDriverConstructorArgs extends RpcDriverConstructorArgs {
-    WorkerClass: WebpackWorker;
+    makeWorkerInstance: () => Worker;
 }
 declare class WebWorkerHandle extends Rpc.Client {
     destroy(): void;
@@ -20,7 +16,7 @@ export default class WebWorkerRpcDriver extends BaseRpcDriver {
         plugins: PluginDefinition[];
     };
     name: string;
-    WorkerClass: WebpackWorker;
+    makeWorkerInstance: () => Worker;
     constructor(args: WebWorkerRpcDriverConstructorArgs, workerBootConfiguration: {
         plugins: PluginDefinition[];
     });

package/rpc/WebWorkerRpcDriver.js

@@ -116,8 +116,8 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
     _this = _super2.call(this, args);
     _this.workerBootConfiguration = workerBootConfiguration;
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "name", 'WebWorkerRpcDriver');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "WorkerClass", void 0);
-    _this.WorkerClass = args.WorkerClass;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "makeWorkerInstance", void 0);
+    _this.makeWorkerInstance = args.makeWorkerInstance;
     return _this;
   }
 
@@ -127,7 +127,7 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
       var _makeWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _this2 = this;
 
-        var worker, p;
+        var instance, worker, p;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -135,8 +135,9 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
                 // note that we are making a Rpc.Client connection with a worker pool of
                 // one for each worker, because we want to do our own state-group-aware
                 // load balancing rather than using librpc's builtin round-robin
+                instance = this.makeWorkerInstance();
                 worker = new WebWorkerHandle({
-                  workers: [new this.WorkerClass()]
+                  workers: [instance]
                 }); // send the worker its boot configuration using info from the pluginManager
 
                 p = new Promise(function (resolve, reject) {
@@ -152,7 +153,7 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
                 });
                 return _context2.abrupt("return", p);
 
-              case 3:
+              case 4:
               case "end":
                 return _context2.stop();
             }