Merge pull request #250 from LabKey/fb_merge_23.7_to_develop

Merge discvr-23.7 to develop

Author: bbimber

jbrowse/jest.config.js

@@ -0,0 +1,26 @@
+module.exports = {
+    globals: {
+        LABKEY: {},
+    },
+    moduleFileExtensions: ['ts', 'tsx', 'js'],
+    moduleNameMapper: {
+        '\\.(css)$': '<rootDir>/src/client/test/styleMock.ts',
+    },
+    roots: ['<rootDir>'],
+    setupFilesAfterEnv: [
+        './src/client/test/jest.setup.ts'
+    ],
+    testEnvironment: 'jsdom',
+    testPathIgnorePatterns: [
+        '/node_modules/'
+    ],
+    testRegex: '(\\.(spec))\\.(ts|tsx)$',
+    transform: {
+        '^.+\\.tsx?$': [
+            'ts-jest',
+            {
+                tsconfig: 'node_modules/@labkey/build/webpack/tsconfig.json',
+            }
+        ],
+    },
+};

jbrowse/package-lock.json

@@ -21,8 +21,8 @@
     "@jbrowse/plugin-svg": "^2.6.2",
     "@jbrowse/plugin-variants": "^2.6.2",
     "@jbrowse/react-linear-genome-view": "^2.6.2",
-    "@labkey/api": "^1.22.0",
-    "@labkey/components": "^2.355.0",
+    "@labkey/api": "^1.25.0",
+    "@labkey/components": "^2.381.1",
     "@mui/x-data-grid": "^6.0.1",
     "assert": "^2.0.0",
     "browserify-zlib": "^0.2.0",
@@ -48,7 +48,7 @@
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "devDependencies": {
-    "@labkey/build": "6.10.0",
+    "@labkey/build": "6.15.0",
     "@types/jest": "^29.0.0",
     "@types/jexl": "^2.3.1",
     "@types/jquery": "^3.0.0",
@@ -57,28 +57,9 @@
     "enzyme": "^3.11.0",
     "jest": "^29.0.0",
     "jest-cli": "^29.0.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-mock": "^29.0.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.0.0"
-  },
-  "jest": {
-    "globals": {
-      "LABKEY": {}
-    },
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/jest.setup.ts"
-    ],
-    "moduleNameMapper": {
-      "\\.(css|scss)$": "<rootDir>/test/styleMock.ts"
-    },
-    "testRegex": "(\\.(test|spec))\\.(ts|tsx)$",
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    }
   }
 }

jbrowse/package.json

@@ -0,0 +1,5 @@
+import 'regenerator-runtime/runtime';
+import { configure } from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+
+configure({ adapter: new Adapter() });

jbrowse/src/client/test/jest.setup.ts

@@ -1,16 +1,4 @@
 {
-  "compilerOptions": {
-    "target": "es6",
-    "jsx": "react",
-    "sourceMap": false,
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "types": ["jest"] // implicitly include only jest types; otherwise get those included via import
-  },
-  "exclude": [
-    "node_modules",
-    "resources"
-  ]
+  "extends": "./node_modules/@labkey/build/webpack/tsconfig.json"
 }