diff --git a/packages/__mocks__/@testing-library/react.js b/packages/__mocks__/@testing-library/react.js index c4cdfb6b36..8774907983 100644 --- a/packages/__mocks__/@testing-library/react.js +++ b/packages/__mocks__/@testing-library/react.js @@ -1,5 +1,5 @@ import { createTheme, ThemeProvider } from '@mui/material/styles' -// eslint-disable-next-line import/no-extraneous-dependencies + import React from 'react' const react = jest.requireActual('@testing-library/react') diff --git a/packages/core/ui/PrerenderedCanvas.tsx b/packages/core/ui/PrerenderedCanvas.tsx index 3eac3940e1..514a23063a 100644 --- a/packages/core/ui/PrerenderedCanvas.tsx +++ b/packages/core/ui/PrerenderedCanvas.tsx @@ -1,22 +1,21 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import ReactPropTypes from 'prop-types' import React, { useState, useRef, useEffect } from 'react' import { drawImageOntoCanvasContext } from '../util/offscreenCanvasPonyfill' function PrerenderedCanvas(props: { width: number height: number - highResolutionScaling: number + highResolutionScaling?: number style: any - imageData: any + imageData?: any showSoftClip?: boolean blockKey?: string }) { const { width, height, - highResolutionScaling, - style, + highResolutionScaling = 1, + style = {}, imageData, blockKey, showSoftClip, @@ -57,19 +56,4 @@ function PrerenderedCanvas(props: { ) } -PrerenderedCanvas.propTypes = { - height: ReactPropTypes.number.isRequired, - width: ReactPropTypes.number.isRequired, - highResolutionScaling: ReactPropTypes.number, - style: ReactPropTypes.objectOf(ReactPropTypes.any), - imageData: ReactPropTypes.any, - // config: ReactPropTypes.objectOf(ReactPropTypes.any), -} -PrerenderedCanvas.defaultProps = { - imageData: undefined, - highResolutionScaling: 1, - style: {}, - // config: {}, -} - export default PrerenderedCanvas diff --git a/plugins/alignments/package.json b/plugins/alignments/package.json index 9d7434508c..dfff5f1965 100644 --- a/plugins/alignments/package.json +++ b/plugins/alignments/package.json @@ -55,7 +55,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "rxjs": "^6.0.0", "tss-react": "^4.0.0" diff --git a/plugins/arc/package.json b/plugins/arc/package.json index 4c9fa7a7be..d6271572bc 100644 --- a/plugins/arc/package.json +++ b/plugins/arc/package.json @@ -47,8 +47,8 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", + "react-dom": ">=16.8.0", "rxjs": "^6.0.0" }, "private": true, diff --git a/plugins/authentication/package.json b/plugins/authentication/package.json index 142811cddc..98a067c437 100644 --- a/plugins/authentication/package.json +++ b/plugins/authentication/package.json @@ -37,18 +37,16 @@ "clean": "rimraf dist esm *.tsbuildinfo" }, "dependencies": { + "generic-filehandle": "^3.0.0", "jwt-decode": "^3.1.2" }, "peerDependencies": { "@jbrowse/core": "^2.0.0", "@mui/material": "^5.0.0", "crypto-js": "^3.0.0", - "electron": ">=22.0.0", - "generic-filehandle": "^3.0.0", "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "react-dom": ">=16.8.0", "rxjs": "^6.0.0" diff --git a/plugins/config/package.json b/plugins/config/package.json index fa5d1c6671..629761c27b 100644 --- a/plugins/config/package.json +++ b/plugins/config/package.json @@ -46,7 +46,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "react-dom": ">=16.8.0", "rxjs": "^6.0.0", diff --git a/plugins/data-management/package.json b/plugins/data-management/package.json index e459f0c9ec..f60e9d4efc 100644 --- a/plugins/data-management/package.json +++ b/plugins/data-management/package.json @@ -51,7 +51,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "tss-react": "^4.0.0" }, diff --git a/plugins/dotplot-view/package.json b/plugins/dotplot-view/package.json index a082c56a08..abb41edf5c 100644 --- a/plugins/dotplot-view/package.json +++ b/plugins/dotplot-view/package.json @@ -44,12 +44,11 @@ }, "peerDependencies": { "@jbrowse/core": "^2.0.0", - "@jbrowse/plugin-alignments": "^4.12.2", + "@jbrowse/plugin-alignments": "^2.0.0", "@mui/material": "^5.0.0", "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "react-dom": ">=16.8.0", "rxjs": "^6.0.0", diff --git a/plugins/gccontent/package.json b/plugins/gccontent/package.json index f17a70501a..6afe485dd5 100644 --- a/plugins/gccontent/package.json +++ b/plugins/gccontent/package.json @@ -45,7 +45,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "rxjs": "^6.0.0" }, diff --git a/plugins/gff3/package.json b/plugins/gff3/package.json index a95d587266..615f56d30f 100644 --- a/plugins/gff3/package.json +++ b/plugins/gff3/package.json @@ -47,10 +47,7 @@ "@jbrowse/plugin-linear-genome-view": "^2.0.0", "@mui/material": "^5.0.0", "mobx": "^6.0.0", - "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", - "react": ">=16.8.0", "rxjs": "^6.0.0" }, "publishConfig": { diff --git a/plugins/grid-bookmark/package.json b/plugins/grid-bookmark/package.json index 76d1fcf67d..37c5a46f5d 100644 --- a/plugins/grid-bookmark/package.json +++ b/plugins/grid-bookmark/package.json @@ -49,7 +49,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "tss-react": "^4.0.0" }, diff --git a/plugins/gtf/package.json b/plugins/gtf/package.json index f82da0df3d..23d4b91864 100644 --- a/plugins/gtf/package.json +++ b/plugins/gtf/package.json @@ -48,7 +48,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "rxjs": "^6.0.0" }, diff --git a/plugins/hic/package.json b/plugins/hic/package.json index da6e2d7d3e..4165129b91 100644 --- a/plugins/hic/package.json +++ b/plugins/hic/package.json @@ -47,7 +47,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "rxjs": "^6.0.0" }, diff --git a/plugins/jobs-management/package.json b/plugins/jobs-management/package.json index 73fa56e600..886d9822f5 100644 --- a/plugins/jobs-management/package.json +++ b/plugins/jobs-management/package.json @@ -46,7 +46,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "tss-react": "^4.0.0" }, diff --git a/plugins/linear-comparative-view/package.json b/plugins/linear-comparative-view/package.json index 7170cc6667..d5ce94e787 100644 --- a/plugins/linear-comparative-view/package.json +++ b/plugins/linear-comparative-view/package.json @@ -38,6 +38,7 @@ }, "dependencies": { "@mui/icons-material": "^5.0.1", + "@popperjs/core": "^2.0.0", "clone": "^2.1.2", "copy-to-clipboard": "^3.3.1", "react-popper": "^2.0.0" @@ -50,7 +51,6 @@ "mobx": "^6.0.0", "mobx-react": "^7.0.0", "mobx-state-tree": "^5.0.0", - "prop-types": "^15.0.0", "react": ">=16.8.0", "react-dom": ">=16.8.0", "rxjs": "^6.0.0", diff --git a/plugins/linear-comparative-view/src/LinearComparativeDisplay/components/LinearComparativeDisplay.tsx b/plugins/linear-comparative-view/src/LinearComparativeDisplay/components/LinearComparativeDisplay.tsx index 9325ebb69a..21148a93d4 100644 --- a/plugins/linear-comparative-view/src/LinearComparativeDisplay/components/LinearComparativeDisplay.tsx +++ b/plugins/linear-comparative-view/src/LinearComparativeDisplay/components/LinearComparativeDisplay.tsx @@ -1,12 +1,13 @@ -import { observer, PropTypes as MobxPropTypes } from 'mobx-react' -import PropTypes from 'prop-types' import React from 'react' -import { LinearComparativeDisplay as LCD } from '../stateModelFactory' +import { observer } from 'mobx-react' -const LinearComparativeDisplay: React.FC<{ - model: LCD +// locals +import { LinearComparativeDisplay } from '../stateModelFactory' + +function Display(props: { + model: LinearComparativeDisplay children?: React.ReactNode -}> = props => { +}) { const { model, children } = props return (