diff --git a/.eslintrc.base.json b/.eslintrc.base.json index f41b8716ab..649bbb7133 100644 --- a/.eslintrc.base.json +++ b/.eslintrc.base.json @@ -28,15 +28,13 @@ "@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-unused-vars": ["warn"], "@typescript-eslint/no-unused-expressions": "off", - "no-use-before-define": "off", "@typescript-eslint/no-use-before-define": "off", "@typescript-eslint/no-var-requires": "off", "@typescript-eslint/no-redeclare": "off", + + "no-use-before-define": "off", "curly": "error", "no-global-assign": "warn", - "react/no-danger": "warn", - "import/no-anonymous-default-export": "off", - "monorepo/no-internal-import": "off", "no-console": [ "warn", { @@ -46,6 +44,12 @@ "no-debugger": "warn", "no-undef": "error", "no-underscore-dangle": "warn", + + "import/no-extraneous-dependencies": "error", + "import/no-anonymous-default-export": "off", + "monorepo/no-internal-import": "off", + + "react/no-danger": "warn", "react/destructuring-assignment": "error", "react/no-unused-prop-types": "error", "react/no-unused-state": "error", @@ -59,13 +63,6 @@ } ] }, - "settings": { - "import/resolver": { - "node": { - "extensions": [".js", ".jsx", ".ts", ".tsx"] - } - } - }, "overrides": [ { "files": ["**/*.ts", "**/*.tsx"], @@ -80,7 +77,16 @@ } }, { - "files": ["**/test/**", "**/*.test.[t,j]s", "**/*.test.[t,j]sx"], + "files": [ + "**/test/**", + "**/*.test.[t,j]s", + "**/*.test.[t,j]sx", + "**/rescripts/*", + "**/tests/util.js", + "**/webpack.config.js", + "**/scripts/notarize.js", + "**/src/testUtil.ts" + ], "env": { "jest": true }, diff --git a/plugins/authentication/package.json b/plugins/authentication/package.json index 0ae089f7e8..81125b7439 100644 --- a/plugins/authentication/package.json +++ b/plugins/authentication/package.json @@ -1,6 +1,6 @@ { "name": "@jbrowse/plugin-authentication", - "version": "1.3.0", + "version": "1.4.4", "description": "JBrowse 2 Authentication", "keywords": [ "jbrowse", @@ -41,6 +41,7 @@ "peerDependencies": { "@jbrowse/core": "^1.0.0", "@material-ui/core": "^4.9.13", + "electron": "^15.0.0", "mobx": "^5.0.0", "mobx-react": "^6.0.0", "mobx-state-tree": "3.14.1", diff --git a/plugins/grid-bookmark/package.json b/plugins/grid-bookmark/package.json index 5f78b180b8..d6c5f357c8 100644 --- a/plugins/grid-bookmark/package.json +++ b/plugins/grid-bookmark/package.json @@ -35,11 +35,13 @@ "useSrc": "node ../../scripts/useSrc.js" }, "dependencies": { + "file-saver": "^2.0.0", "@material-ui/icons": "^4.9.1" }, "peerDependencies": { "@jbrowse/core": "^1.0.0", "@jbrowse/plugin-config": "^1.0.0", + "@jbrowse/plugin-linear-genome-view": "^1.4.4", "@material-ui/core": "^4.9.13", "@material-ui/data-grid": "^4.0.0-alpha.37", "@material-ui/lab": "^4.0.0-alpha.45", diff --git a/plugins/legacy-jbrowse/package.json b/plugins/legacy-jbrowse/package.json index a050434590..7b87f10561 100644 --- a/plugins/legacy-jbrowse/package.json +++ b/plugins/legacy-jbrowse/package.json @@ -38,7 +38,8 @@ "@gmod/nclist": "^0.1.1", "get-value": "^3.0.1", "set-value": "^4.0.1", - "buffer-crc32": "^0.2.13" + "buffer-crc32": "^0.2.13", + "generic-filehandle": "^2.2.0" }, "peerDependencies": { "@jbrowse/core": "^1.0.0", diff --git a/products/jbrowse-desktop/package.json b/products/jbrowse-desktop/package.json index a58c386fc0..688f87db9f 100644 --- a/products/jbrowse-desktop/package.json +++ b/products/jbrowse-desktop/package.json @@ -42,6 +42,7 @@ "dependencies": { "@jbrowse/core": "^1.4.4", "@jbrowse/plugin-alignments": "^1.4.4", + "@jbrowse/plugin-authentication": "^1.4.4", "@jbrowse/plugin-bed": "^1.4.4", "@jbrowse/plugin-breakpoint-split-view": "^1.4.4", "@jbrowse/plugin-circular-view": "^1.4.4", @@ -62,6 +63,7 @@ "@jbrowse/plugin-sv-inspector": "^1.4.4", "@jbrowse/plugin-svg": "^1.4.4", "@jbrowse/plugin-trackhub-registry": "^1.4.4", + "@jbrowse/plugin-trix": "^1.4.4", "@jbrowse/plugin-variants": "^1.4.4", "@jbrowse/plugin-wiggle": "^1.4.4", "@material-ui/core": "^4.12.2", @@ -70,6 +72,7 @@ "@material-ui/lab": "^4.0.0-alpha.45", "clsx": "^1.0.4", "deepmerge": "^4.2.2", + "electron": "15.0.0", "electron-debug": "^3.0.1", "electron-is-dev": "^1.1.0", "electron-updater": "^4.3.9", @@ -88,7 +91,8 @@ "react-error-boundary": "^3.0.0", "react-sizeme": "^2.6.7", "rxjs": "^6.5.2", - "timeago.js": "^4.0.2" + "timeago.js": "^4.0.2", + "use-query-params": "1.1.3" }, "browserslist": [ "last 1 chrome version" diff --git a/products/jbrowse-img/package.json b/products/jbrowse-img/package.json index 0a439f7a30..4744749dc2 100644 --- a/products/jbrowse-img/package.json +++ b/products/jbrowse-img/package.json @@ -26,6 +26,8 @@ }, "dependencies": { "@jbrowse/react-linear-genome-view": "^1.4.4", + "@jbrowse/plugin-linear-genome-view": "^1.4.4", + "mobx": "^5.10.1", "react": "^17.0.1", "react-dom": "^17.0.1", "tmp": "^0.2.1", diff --git a/products/jbrowse-img/src/index.js b/products/jbrowse-img/src/index.js index 61574618e8..1c0a5808b8 100644 --- a/products/jbrowse-img/src/index.js +++ b/products/jbrowse-img/src/index.js @@ -1,5 +1,4 @@ /* eslint-disable no-console */ -import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only' import fs from 'fs' import yargs from 'yargs' import { standardizeArgv, parseArgv } from './parseArgv' diff --git a/products/jbrowse-img/src/renderRegion.js b/products/jbrowse-img/src/renderRegion.js index 3763e2d835..b47b57f299 100644 --- a/products/jbrowse-img/src/renderRegion.js +++ b/products/jbrowse-img/src/renderRegion.js @@ -1,4 +1,3 @@ -import 'regenerator-runtime/runtime' import { createViewState } from '@jbrowse/react-linear-genome-view' import { renderToSvg } from '@jbrowse/plugin-linear-genome-view' import { when } from 'mobx' diff --git a/products/jbrowse-web/package.json b/products/jbrowse-web/package.json index cb12175e36..e290ad3cdc 100644 --- a/products/jbrowse-web/package.json +++ b/products/jbrowse-web/package.json @@ -18,6 +18,7 @@ "dependencies": { "@jbrowse/core": "^1.4.4", "@jbrowse/plugin-alignments": "^1.4.4", + "@jbrowse/plugin-authentication": "^1.4.4", "@jbrowse/plugin-bed": "^1.4.4", "@jbrowse/plugin-breakpoint-split-view": "^1.4.4", "@jbrowse/plugin-circular-view": "^1.4.4", @@ -38,6 +39,7 @@ "@jbrowse/plugin-sv-inspector": "^1.4.4", "@jbrowse/plugin-svg": "^1.4.4", "@jbrowse/plugin-trackhub-registry": "^1.4.4", + "@jbrowse/plugin-trix": "^1.4.4", "@jbrowse/plugin-variants": "^1.4.4", "@jbrowse/plugin-wiggle": "^1.4.4", "@material-ui/core": "^4.12.2", @@ -49,6 +51,7 @@ "copy-to-clipboard": "^3.3.1", "core-js": "^3.2.1", "crypto-js": "^3.0.0", + "file-saver": "^2.0.0", "fontsource-roboto": "3.0.3", "json-stable-stringify": "^1.0.1", "librpc-web-mod": "^1.1.2",