Skip to content

Commit

Permalink
Merge discvr-23.7 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bbimber committed Oct 18, 2023
2 parents c884b30 + 9a7610f commit daa209b
Show file tree
Hide file tree
Showing 7 changed files with 1,958 additions and 14,715 deletions.
26 changes: 26 additions & 0 deletions jbrowse/jest.config.js
Original file line number Diff line number Diff line change
@@ -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',
}
],
},
};
16,589 changes: 1,922 additions & 14,667 deletions jbrowse/package-lock.json

Large diffs are not rendered by default.

27 changes: 4 additions & 23 deletions jbrowse/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
}
5 changes: 5 additions & 0 deletions jbrowse/src/client/test/jest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'regenerator-runtime/runtime';
import { configure } from 'enzyme';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

configure({ adapter: new Adapter() });
File renamed without changes.
12 changes: 0 additions & 12 deletions jbrowse/test/jest.setup.ts

This file was deleted.

14 changes: 1 addition & 13 deletions jbrowse/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit daa209b

Please sign in to comment.