Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce peerDependency warnings from installing dev environment #3400

Merged
merged 2 commits into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.3.3",
"@craco/craco": "^7.0.0",
"@electron/notarize": "^1.2.3",
"@emotion/cache": "^11.7.1",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/material": "^5.10.17",
"@mui/x-data-grid": "^5.0.0",
"@oclif/dev-cli": "^1.26.9",
"@oclif/test": "^1.2.7",
"@storybook/addon-actions": "^6.5.13",
Expand Down Expand Up @@ -100,11 +102,12 @@
"chai": "^4.3.4",
"cross-env": "^7.0.2",
"cross-spawn": "^7.0.1",
"crypto-js": "^3.0.0",
"dependency-graph": "^0.11.0",
"electron": "22.0.0",
"electron-builder": "^23.0.3",
"electron-mock-ipc": "^0.3.8",
"electron-notarize": "^1.0.0",
"eslint": "^8.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "^7.0.0",
"eslint-plugin-cypress": "^2.12.1",
Expand All @@ -130,6 +133,8 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"prop-types": "^15.0.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-scripts": "^5.0.1",
"requestidlecallback-polyfill": "^1.0.2",
"rimraf": "^3.0.2",
Expand All @@ -139,9 +144,11 @@
"ts-loader": "^9.3.0",
"ts-node": "^10.4.0",
"tslib": "^2.0.1",
"tss-react": "^4.0.0",
"typescript": "^4.9.3",
"wait-on": "^6.0.0",
"web-encoding": "^1.1.5",
"webpack": "^5.0.0",
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.7.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/__mocks__/@testing-library/react.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
"rxjs": "^6.0.0",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public",
Expand Down
26 changes: 5 additions & 21 deletions packages/core/ui/PrerenderedCanvas.tsx
Original file line number Diff line number Diff line change
@@ -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
style: any
imageData: any
highResolutionScaling?: number
style?: any
imageData?: any
showSoftClip?: boolean
blockKey?: string
}) {
const {
width,
height,
highResolutionScaling,
style,
highResolutionScaling = 1,
style = {},
imageData,
blockKey,
showSoftClip,
Expand Down Expand Up @@ -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
5 changes: 2 additions & 3 deletions packages/text-indexing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
"node-fetch": "^2.6.0"
},
"peerDependencies": {
"mobx": "^5.0.0",
"mobx-react": "^6.0.0",
"mobx": "^6.0.0",
"mobx-react": "^7.0.0",
"mobx-state-tree": "^5.0.0",
"prop-types": "^15.0.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"rxjs": "^6.0.0"
Expand Down
3 changes: 1 addition & 2 deletions plugins/alignments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@
"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": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion plugins/arc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions plugins/authentication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "^15.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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/breakpoint-split-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"mobx-react": "^7.0.0",
"mobx-state-tree": "^5.0.0",
"react": ">=16.8.4",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"private": true,
"distModule": "esm/index.js",
Expand Down
2 changes: 1 addition & 1 deletion plugins/circular-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"mobx-state-tree": "^5.0.0",
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 1 addition & 2 deletions plugins/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@
"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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 1 addition & 2 deletions plugins/data-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 2 additions & 3 deletions plugins/dotplot-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@
},
"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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"private": true,
"distModule": "esm/index.js",
Expand Down
1 change: 0 additions & 1 deletion plugins/gccontent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 0 additions & 3 deletions plugins/gff3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 1 addition & 2 deletions plugins/grid-bookmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
1 change: 0 additions & 1 deletion plugins/gtf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 0 additions & 1 deletion plugins/hic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 1 addition & 2 deletions plugins/jobs-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"private": true,
"distModule": "esm/index.js",
Expand Down
4 changes: 2 additions & 2 deletions plugins/linear-comparative-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -50,11 +51,10 @@
"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",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"private": true,
"distModule": "esm/index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 (
<div>
Expand All @@ -16,12 +17,5 @@ const LinearComparativeDisplay: React.FC<{
</div>
)
}
LinearComparativeDisplay.propTypes = {
model: MobxPropTypes.objectOrObservableObject.isRequired,
children: PropTypes.element,
}

LinearComparativeDisplay.defaultProps = {
children: null,
}
export default observer(LinearComparativeDisplay)
export default observer(Display)
5 changes: 2 additions & 3 deletions plugins/linear-genome-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"file-saver": "^2.0.0",
"material-ui-popup-state": "^3.0.0",
"normalize-wheel": "^1.0.1",
"react-error-boundary": "^3.0.0",
"react-popper": "^2.0.0"
},
"peerDependencies": {
Expand All @@ -55,11 +56,9 @@
"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",
"react-error-boundary": "^3.0.0",
"tss-react": "^3.0.0"
"tss-react": "^4.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
Loading