@jbrowse/core 2.10.2 → 2.11.0

package/PluginManager.d.ts

@@ -17,8 +17,6 @@ import ReExports from './ReExports';
 import { PluggableElementType, PluggableElementMember } from './pluggableElementTypes';
 import { AbstractRootModel } from './util';
 import { PluginDefinition } from './PluginLoader';
-/** little helper class that keeps groups of callbacks that are
-then run in a specified order by group */
 declare class PhasedScheduler<PhaseName extends string> {
     phaseCallbacks: Map<PhaseName, Function[]>;
     phaseOrder: PhaseName[];
@@ -44,11 +42,11 @@ declare class TypeRecord<ElementClass extends PluggableElementBase> {
 }
 type AnyFunction = (...args: any) => any;
 /**
- * free-form string-to-unknown mapping of metadata related to the instance
- * of this plugin. `isCore` is typically set to `Boolean(true)` if the plugin was
- * loaded as part of the "core" set of plugins for this application.
- * Can also use this metadata to stash other things about why the plugin is
- * loaded, such as where it came from, what plugin depends on it, etc.
+ * free-form string-to-unknown mapping of metadata related to the instance of
+ * this plugin. `isCore` is typically set to `Boolean(true)` if the plugin was
+ * loaded as part of the "core" set of plugins for this application. Can also
+ * use this metadata to stash other things about why the plugin is loaded, such
+ * as where it came from, what plugin depends on it, etc.
  */
 export type PluginMetadata = Record<string, unknown>;
 export interface PluginLoadRecord {
@@ -260,8 +258,14 @@ export default class PluginManager {
             useTheme: typeof import("@mui/material").useTheme;
         };
         'prop-types': typeof import("prop-types");
-        '@mui/material/styles': typeof import("@mui/material/styles");
-        '@material-ui/core/styles': typeof import("@mui/material/styles");
+        '@mui/material/styles': {
+            MUIStyles: typeof import("@mui/material/styles");
+            makeStyles: (args: any) => () => Record<string, string>;
+        };
+        '@material-ui/core/styles': {
+            MUIStyles: typeof import("@mui/material/styles");
+            makeStyles: (args: any) => () => Record<string, string>;
+        };
     };
     load: <FTYPE extends AnyFunction>(lib: FTYPE) => ReturnType<FTYPE>;
     /**

package/PluginManager.js

@@ -19,8 +19,8 @@ const configuration_1 = require("./configuration");
 const ReExports_1 = __importDefault(require("./ReExports"));
 const CorePlugin_1 = __importDefault(require("./CorePlugin"));
 const jexl_1 = __importDefault(require("./util/jexl"));
-/** little helper class that keeps groups of callbacks that are
-then run in a specified order by group */
+// helper class that keeps groups of callbacks that are then run in a specified
+// order by group
 class PhasedScheduler {
     constructor(...phaseOrder) {
         this.phaseCallbacks = new Map();
@@ -119,7 +119,12 @@ class PluginManager {
             throw new TypeError('lib passed to jbrequire must be either a string or a function');
         };
         // add the core plugin
-        this.addPlugin({ plugin: new CorePlugin_1.default(), metadata: { isCore: true } });
+        this.addPlugin({
+            plugin: new CorePlugin_1.default(),
+            metadata: {
+                isCore: true,
+            },
+        });
         // add all the initial plugins
         initialPlugins.forEach(plugin => {
             this.addPlugin(plugin);

package/ReExports/modules.d.ts

@@ -166,7 +166,13 @@ declare const libs: {
         useTheme: typeof MUIStyles.useTheme;
     };
     'prop-types': typeof PropTypes;
-    '@mui/material/styles': typeof MUIStyles;
-    '@material-ui/core/styles': typeof MUIStyles;
+    '@mui/material/styles': {
+        MUIStyles: typeof MUIStyles;
+        makeStyles: (args: any) => () => Record<string, string>;
+    };
+    '@material-ui/core/styles': {
+        MUIStyles: typeof MUIStyles;
+        makeStyles: (args: any) => () => Record<string, string>;
+    };
 };
 export default libs;

package/ReExports/modules.js

@@ -295,9 +295,6 @@ const DataGridEntries = {
     GridPanelWrapper: (0, react_1.lazy)(() => Promise.resolve().then(() => __importStar(require('@mui/x-data-grid'))).then(module => ({
         default: module.GridPanelWrapper,
     }))),
-    GridPreferencesPanel: (0, react_1.lazy)(() => Promise.resolve().then(() => __importStar(require('@mui/x-data-grid'))).then(module => ({
-        default: module.GridPreferencesPanel,
-    }))),
     GridRemoveIcon: (0, react_1.lazy)(() => Promise.resolve().then(() => __importStar(require('@mui/x-data-grid'))).then(module => ({
         default: module.GridRemoveIcon,
     }))),
@@ -405,8 +402,22 @@ const libs = {
     'prop-types': prop_types_1.default,
     // end special case
     // material-ui subcomponents, should get rid of these
-    '@mui/material/styles': MUIStyles,
-    '@material-ui/core/styles': MUIStyles,
+    '@mui/material/styles': {
+        MUIStyles,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        makeStyles: (args) => {
+            const useStyles = (0, mui_1.makeStyles)()(args);
+            return () => useStyles().classes;
+        },
+    },
+    '@material-ui/core/styles': {
+        MUIStyles,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        makeStyles: (args) => {
+            const useStyles = (0, mui_1.makeStyles)()(args);
+            return () => useStyles().classes;
+        },
+    },
     ...MaterialPrefixMUI,
     ...MuiPrefixMUI,
     // these are core in @mui/material, but used to be in @material-ui/lab

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "2.10.2",
+  "version": "2.11.0",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "@mui/material": "^5.0.0",
-    "@mui/x-data-grid": "^6.0.1",
+    "@mui/x-data-grid": "^7.0.0",
     "mobx": "^6.0.0",
     "mobx-react": "^9.0.0",
     "mobx-state-tree": "^5.0.0",
@@ -72,5 +72,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "7ca3b7db337ebd88853e2d96cdab940ed550c4fb"
+  "gitHead": "3d43a820b9274a6160aa4dc15616147f390d9094"
 }

package/pluggableElementTypes/models/BaseTrackModel.d.ts

@@ -10,6 +10,7 @@ export declare function getCompatibleDisplays(self: IAnyStateTreeNode): ({
 /**
  * #stateModel BaseTrackModel
  * #category track
+ *
  * these MST models only exist for tracks that are *shown*. they should contain
  * only UI state for the track, and have a reference to a track configuration.
  * note that multiple displayed tracks could use the same configuration.

package/pluggableElementTypes/models/BaseTrackModel.js

@@ -20,6 +20,7 @@ exports.getCompatibleDisplays = getCompatibleDisplays;
 /**
  * #stateModel BaseTrackModel
  * #category track
+ *
  * these MST models only exist for tracks that are *shown*. they should contain
  * only UI state for the track, and have a reference to a track configuration.
  * note that multiple displayed tracks could use the same configuration.
@@ -97,7 +98,7 @@ function createBaseTrackModel(pm, trackType, baseTrackConfig) {
             const { sessionTracks, adminMode } = session;
             return ((0, types_1.isSessionModelWithConfigEditing)(session) &&
                 (adminMode ||
-                    (sessionTracks === null || sessionTracks === void 0 ? void 0 : sessionTracks.find(track => { var _a; return track.trackId === ((_a = self.configuration) === null || _a === void 0 ? void 0 : _a.trackId); }))));
+                    (sessionTracks === null || sessionTracks === void 0 ? void 0 : sessionTracks.find(t => { var _a; return t.trackId === ((_a = self.configuration) === null || _a === void 0 ? void 0 : _a.trackId); }))));
         },
     }))
         .actions(self => ({

package/pluggableElementTypes/models/InternetAccountModel.d.ts

@@ -156,6 +156,7 @@ export declare const InternetAccount: import("mobx-state-tree").IModelType<{
         keepalive?: boolean | undefined;
         method?: string | undefined;
         mode?: RequestMode | undefined;
+        priority?: RequestPriority | undefined;
         redirect?: RequestRedirect | undefined;
         referrer?: string | undefined;
         referrerPolicy?: ReferrerPolicy | undefined;

package/pluggableElementTypes/renderers/ServerSideRenderedContent.js

@@ -65,8 +65,9 @@ const NewHydrate = (0, mobx_react_1.observer)(function ServerSideRenderedContent
             });
         };
     }, [html, theme, rest, hydrateFn, RenderingComponent]);
-    // eslint-disable-next-line react/no-danger
-    return react_1.default.createElement("div", { ref: ref, dangerouslySetInnerHTML: { __html: html } });
+    return (react_1.default.createElement("div", { "data-testid": "hydrationContainer", ref: ref, 
+        // eslint-disable-next-line react/no-danger
+        dangerouslySetInnerHTML: { __html: html } }));
 });
 const OldHydrate = (0, mobx_react_1.observer)(function ({ theme, html, RenderingComponent, ...rest }) {
     const ref = (0, react_1.useRef)(null);

package/rpc/BaseRpcDriver.d.ts

@@ -3,8 +3,8 @@ import { AnyConfigurationModel } from '../configuration';
 export interface WorkerHandle {
     status?: string;
     error?: Error;
-    on?: (channel: string, callback: (message: string) => void) => void;
-    off?: (channel: string, callback: (message: string) => void) => void;
+    on?: (channel: string, callback: (message: unknown) => void) => void;
+    off?: (channel: string, callback: (message: unknown) => void) => void;
     destroy(): void;
     call(functionName: string, args?: unknown, options?: {
         statusCallback?(message: string): void;
@@ -38,7 +38,7 @@ export default abstract class BaseRpcDriver {
     getWorkerPool(): LazyWorker[];
     getWorker(sessionId: string): Promise<WorkerHandle>;
     call(pluginManager: PluginManager, sessionId: string, functionName: string, args: {
-        statusCallback?: (message: string) => void;
+        statusCallback?: (message: unknown) => void;
     }, options?: {}): Promise<unknown>;
 }
 export {};

package/rpc/BaseRpcDriver.js

@@ -12,6 +12,7 @@ function isClonable(thing) {
 // the worker times out
 async function watchWorker(worker, pingTime, rpcDriverClassName) {
     // after first ping succeeds, apply wait for timeout
+    // eslint-disable-next-line no-constant-condition
     while (true) {
         await worker.call('ping', [], {
             timeout: pingTime * 2,

package/rpc/WebWorkerRpcDriver.d.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../rpc/declaration.d.ts" />
 import Rpc from 'librpc-web-mod';
 import BaseRpcDriver, { RpcDriverConstructorArgs } from './BaseRpcDriver';
 import { PluginDefinition } from '../PluginLoader';
@@ -6,12 +5,12 @@ interface WebWorkerRpcDriverConstructorArgs extends RpcDriverConstructorArgs {
     makeWorkerInstance: () => Worker;
 }
 interface Options {
-    statusCallback?: (arg0: string) => void;
+    statusCallback?: (arg0: unknown) => void;
     rpcDriverClassName: string;
 }
 declare class WebWorkerHandle extends Rpc.Client {
     destroy(): void;
-    call(funcName: string, args: Record<string, unknown>, opts: Options): Promise<any>;
+    call(funcName: string, args: Record<string, unknown>, opts: Options): Promise<unknown>;
 }
 export default class WebWorkerRpcDriver extends BaseRpcDriver {
     workerBootConfiguration: {

package/rpc/WebWorkerRpcDriver.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const librpc_web_mod_1 = __importDefault(require("librpc-web-mod"));
 const serialize_error_1 = require("serialize-error");
+const librpc_web_mod_1 = __importDefault(require("librpc-web-mod"));
 // locals
 const nanoid_1 = require("../util/nanoid");
 const BaseRpcDriver_1 = __importDefault(require("./BaseRpcDriver"));

package/rpc/methods/CoreRender.d.ts

@@ -9,6 +9,6 @@ export default class CoreRender extends RpcMethodType {
     serializeArguments(args: RenderArgs, rpcDriver: string): Promise<import("../../pluggableElementTypes/renderers/ServerSideRendererType").RenderArgsSerialized | RenderArgs>;
     execute(args: RenderArgsSerialized & {
         signal?: RemoteAbortSignal;
-    }, rpcDriver: string): Promise<ResultsSerialized | RenderResults>;
+    }, rpcDriver: string): Promise<RenderResults | ResultsSerialized>;
     deserializeReturn(serializedReturn: RenderResults | ResultsSerialized, args: RenderArgs, rpcDriver: string): Promise<unknown>;
 }