Ensure consistent versions in monorepo deps

GMOD · Oct 6, 2023 · 7feec48 · 7feec48
1 parent f053e87
commit 7feec48
Show file tree

Hide file tree

Showing 13 changed files with 292 additions and 2,454 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn constraints
diff --git a/.yarn/plugins/@yarnpkg/plugin-constraints.cjs b/.yarn/plugins/@yarnpkg/plugin-constraints.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -32,5 +32,7 @@ plugins:
     spec: "@yarnpkg/plugin-workspace-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
+  - path: .yarn/plugins/@yarnpkg/plugin-constraints.cjs
+    spec: "@yarnpkg/plugin-constraints"
 
 yarnPath: .yarn/releases/yarn-3.6.4.cjs
diff --git a/README.md b/README.md
@@ -2,9 +2,11 @@
 
 Monorepo for Apollo3 development
 
-| Package                                                                | Description                              |
-| ---------------------------------------------------------------------- | ---------------------------------------- |
-| [apollo-collaboration-server](./packages/apollo-collaboration-server/) | Server-side code                         |
-| [apollo-schemas](./packages/apollo-schemas/)                           | MongoDB schemas                          |
-| [apollo-shared](./packages/apollo-shared/)                             | Code shared between server and client    |
-| [jbrowse-plugin-apollo](./packages/jbrowse-plugin-apollo/)             | Client-side code (as a JBrowse 2 plugin) |
+| Package                                                                | Description                                                |
+| ---------------------------------------------------------------------- | ---------------------------------------------------------- |
+| [apollo-collaboration-server](./packages/apollo-collaboration-server/) | Server-side code                                           |
+| [apollo-common](./packages/apollo-common/)                             | Public base classes for developers creating Apollo plugins |
+| [apollo-mst](./packages/apollo-mst/)                                   | mobx-state-tree models                                     |
+| [apollo-schemas](./packages/apollo-schemas/)                           | MongoDB schemas                                            |
+| [apollo-shared](./packages/apollo-shared/)                             | Internal code shared between server and client             |
+| [jbrowse-plugin-apollo](./packages/jbrowse-plugin-apollo/)             | Client-side code (as a JBrowse 2 plugin)                   |
diff --git a/constraints.pro b/constraints.pro
@@ -0,0 +1,9 @@
+%gen_enforced_dependency(WorkspaceCwd, '@jbrowse/core', '^2.6.3', _) :-
+%  workspace_has_dependency(WorkspaceCwd, '@jbrowse/core', _, _).
+%gen_enforced_dependency(WorkspaceCwd, 'typescript', '^5.1.6', devDependencies) :-
+%  workspace_has_dependency(WorkspaceCwd, 'typescript', _, devDependencies).
+
+gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange2, DependencyType) :-
+  workspace_has_dependency(WorkspaceCwd, DependencyIdent, DependencyRange, DependencyType),
+  workspace_has_dependency(OtherWorkspaceCwd, DependencyIdent, DependencyRange2, DependencyType2),
+  DependencyRange \= DependencyRange2.
diff --git a/package.json b/package.json
@@ -30,13 +30,14 @@
     "eslint-plugin-sort-destructure-keys": "^1.5.0",
     "eslint-plugin-tsdoc": "^0.2.17",
     "eslint-plugin-unicorn": "^48.0.0",
+    "husky": "^8.0.3",
     "import-sort-parser-typescript": "^6.0.0",
     "import-sort-style-module": "^6.0.0",
-    "jest": "^29.6.1",
+    "jest": "^29.6.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.0",
     "prettier-plugin-import-sort": "^0.0.7",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "typescript": "^5.1.6"
   },
   "private": true

diff --git a/packages/apollo-collaboration-server/package.json b/packages/apollo-collaboration-server/package.json
@@ -28,7 +28,7 @@
     "@emotion/styled": "^11.10.6",
     "@gmod/gff": "^1.2.0",
     "@gmod/indexedfasta": "^2.0.4",
-    "@jbrowse/core": "^2.3.4",
+    "@jbrowse/core": "2.6.3",
     "@mui/base": "^5.0.0-alpha.118",
     "@mui/material": "^5.11.10",
     "@nestjs/common": "^10.1.0",
@@ -55,7 +55,7 @@
     "mobx": "^6.6.1",
     "mobx-react": "^7.2.1",
     "mobx-state-tree": "^5.1.7",
-    "mongoose": "^6.2.6",
+    "mongoose": "^6.12.0",
     "mongoose-id-validator": "^0.6.0",
     "multer": "^1.4.4",
     "node-fetch": "^2.6.7",
@@ -65,7 +65,7 @@
     "passport-local": "^1.0.0",
     "passport-microsoft": "^1.0.0",
     "pm2": "^5.3.0",
-    "prop-types": "^15.0.0",
+    "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "reflect-metadata": "^0.1.13",
@@ -84,7 +84,7 @@
     "@types/express-session": "^1",
     "@types/jest": "^27.0.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.14.2",
     "@types/node-fetch": "^2.6.2",
     "@types/passport-google-oauth20": "^2.0.11",
     "@types/passport-jwt": "^3.0.6",
@@ -93,9 +93,9 @@
     "@types/react": "^17.0.34",
     "@types/supertest": "^2.0.11",
     "apollo-mst": "workspace:^",
-    "jest": "^27.0.6",
+    "jest": "^29.6.2",
     "mongodb": "^4.7.0",
-    "prettier": "^2.3.2",
+    "prettier": "^3.0.0",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.3",

diff --git a/packages/apollo-common/package.json b/packages/apollo-common/package.json
@@ -11,30 +11,30 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@gmod/gff": "^1.3.0",
-    "@jbrowse/core": "^2.3.4",
+    "@gmod/gff": "^1.2.0",
+    "@jbrowse/core": "2.6.3",
     "apollo-schemas": "workspace:^",
     "bson-objectid": "^2.0.4",
     "tslib": "^2.3.1"
   },
   "peerDependencies": {
-    "@mui/material": "^5.0.0",
-    "@mui/x-data-grid": "^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": "^7.0.0",
-    "tss-react": "^4.0.0"
+    "@mui/material": "^5.11.10",
+    "@mui/x-data-grid": "^6.0.1",
+    "mobx": "^6.6.1",
+    "mobx-react": "^7.2.1",
+    "mobx-state-tree": "^5.1.7",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "rxjs": "^7.4.0",
+    "tss-react": "^4.6.1"
   },
   "devDependencies": {
     "@nestjs/common": "^10.1.0",
     "@nestjs/core": "^10.1.0",
     "@types/node": "^18.14.2",
     "apollo-mst": "workspace:^",
-    "mongoose": "^7.0.0",
+    "mongoose": "^6.12.0",
     "typescript": "^5.1.6"
   },
   "private": true

diff --git a/packages/apollo-mst/package.json b/packages/apollo-mst/package.json
@@ -6,10 +6,10 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@jbrowse/core": "^2.3.4",
+    "@jbrowse/core": "2.6.3",
     "mobx": "^6.6.1",
-    "mobx-state-tree": "^5.1.5",
-    "rxjs": "^6.0.0",
+    "mobx-state-tree": "^5.1.7",
+    "rxjs": "^7.4.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {

diff --git a/packages/apollo-schemas/package.json b/packages/apollo-schemas/package.json
@@ -9,14 +9,14 @@
     "@nestjs/common": "^10.1.0",
     "@nestjs/core": "^10.1.0",
     "@nestjs/mongoose": "^10.0.0",
-    "mongoose": "^6.2.6",
+    "mongoose": "^6.12.0",
     "reflect-metadata": "^0.1.13",
     "regenerator-runtime": "^0.13.9",
     "rxjs": "^7.4.0",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.14.2",
     "apollo-mst": "workspace:^",
     "typescript": "^5.1.6"
   },

diff --git a/packages/apollo-shared/package.json b/packages/apollo-shared/package.json
@@ -10,11 +10,11 @@
   "dependencies": {
     "@gmod/gff": "^1.2.0",
     "@gmod/indexedfasta": "^2.0.4",
-    "@jbrowse/core": "^2.3.4",
+    "@jbrowse/core": "2.6.3",
     "apollo-common": "workspace:^",
     "apollo-mst": "workspace:^",
     "apollo-schemas": "workspace:^",
-    "bson-objectid": "^2.0.3",
+    "bson-objectid": "^2.0.4",
     "generic-filehandle": "^3.0.0",
     "jwt-decode": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
@@ -24,24 +24,24 @@
   "devDependencies": {
     "@nestjs/common": "^10.1.0",
     "@nestjs/core": "^10.1.0",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.14.2",
     "@types/rimraf": "^3",
     "mobx": "^6.6.1",
-    "mobx-state-tree": "^5.1.5",
-    "mongoose": "^6.2.10",
+    "mobx-state-tree": "^5.1.7",
+    "mongoose": "^6.12.0",
     "rimraf": "^3.0.2",
     "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "@mui/material": "^5.9.1",
-    "@mui/x-data-grid": "^4.0.0",
+    "@mui/material": "^5.11.10",
+    "@mui/x-data-grid": "^6.0.1",
     "mobx": "^6.6.1",
     "mobx-react": "^7.2.1",
-    "mobx-state-tree": "^5.1.5",
-    "prop-types": "^15.0.0",
-    "react": "^17.0.0",
-    "react-dom": "^17.0.0",
-    "rxjs": "^6.0.0"
+    "mobx-state-tree": "^5.1.7",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "rxjs": "^7.4.0"
   },
   "private": true
 }
diff --git a/packages/jbrowse-plugin-apollo/package.json b/packages/jbrowse-plugin-apollo/package.json
@@ -51,8 +51,8 @@
     "name": "Apollo"
   },
   "dependencies": {
-    "@emotion/react": "^11.9.3",
-    "@emotion/styled": "^11.9.3",
+    "@emotion/react": "^11.10.6",
+    "@emotion/styled": "^11.10.6",
     "@gmod/gff": "^1.2.0",
     "@jbrowse/plugin-authentication": "^2.0.1",
     "@jbrowse/plugin-linear-genome-view": "^2.0.1",
@@ -62,7 +62,7 @@
     "apollo-mst": "workspace:^",
     "apollo-shared": "workspace:^",
     "autosuggest-highlight": "^3.3.4",
-    "bson-objectid": "^2.0.3",
+    "bson-objectid": "^2.0.4",
     "clsx": "^1.1.1",
     "fast-deep-equal": "^3.1.3",
     "file-saver": "^2.0.5",
@@ -71,32 +71,31 @@
     "jsonpath": "^1.1.1",
     "nanoid": "^4.0.2",
     "regenerator-runtime": "^0.13.9",
-    "socket.io-client": "^4.5.3",
-    "tslib": "^2.0.3"
+    "socket.io-client": "^4.5.4",
+    "tslib": "^2.3.1"
   },
   "peerDependencies": {
-    "@jbrowse/core": "^2.6.2",
-    "@mui/material": "^5.9.1",
+    "@jbrowse/core": "2.6.3",
+    "@mui/material": "^5.11.10",
     "mobx": "^6.6.1",
     "mobx-react": "^7.2.1",
-    "mobx-state-tree": "^5.1.5",
+    "mobx-state-tree": "^5.1.7",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rxjs": "^6.5.2",
-    "tss-react": "^3.7.1"
+    "rxjs": "^7.4.0",
+    "tss-react": "^4.6.1"
   },
   "devDependencies": {
     "@jbrowse/cli": "^2.6.2",
-    "@jbrowse/core": "^2.6.2",
+    "@jbrowse/core": "2.6.3",
     "@jbrowse/development-tools": "^2.1.1",
     "@jest/globals": "^29.0.3",
-    "@mui/material": "^5.9.1",
+    "@mui/material": "^5.11.10",
     "@mui/x-data-grid": "^6.0.1",
     "@types/autosuggest-highlight": "^3",
-    "@types/cypress": "^1.1.3",
     "@types/file-saver": "^2",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.14.2",
     "@types/prop-types": "^15",
     "@types/react": "^17.0.34",
     "@types/react-dom": "^18",
@@ -107,20 +106,20 @@
     "jest-fetch-mock": "^3.0.3",
     "mobx": "^6.6.1",
     "mobx-react": "^7.2.1",
-    "mobx-state-tree": "^5.1.5",
-    "npm-run-all": "4.1.5",
+    "mobx-state-tree": "^5.1.7",
+    "npm-run-all": "^4.1.5",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.59.0",
-    "rxjs": "^6.5.2",
+    "rxjs": "^7.4.0",
     "serve": "^14.0.1",
     "shx": "^0.3.3",
     "start-server-and-test": "^1.11.7",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.3.0",
-    "tss-react": "^3.7.1",
+    "tss-react": "^4.6.1",
     "typescript": "^5.1.6"
   },
   "private": true,