Skip to content

Commit

Permalink
Merge pull request #88 from bcgsc/release/v4.3.0
Browse files Browse the repository at this point in the history
GraphKB Client Release v4.3.0
  • Loading branch information
bnguyen-bcgsc authored Sep 4, 2024
2 parents c2273db + 6be5780 commit 057d2b7
Show file tree
Hide file tree
Showing 232 changed files with 27,965 additions and 27,631 deletions.
27 changes: 0 additions & 27 deletions .babelrc

This file was deleted.

46 changes: 26 additions & 20 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
{
"env": {
"browser": true,
"cypress/globals": true,
"es6": true,
"jest": true,
"node": true
},
"extends": [
"eslint:recommended",
"airbnb",
"airbnb-typescript",
"airbnb/hooks",
"plugin:@typescript-eslint/recommended",
"plugin:jest/recommended",
"plugin:jest-formatting/recommended"
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
"project": "./tsconfig.json"
},
"plugins": [
"cypress",
"react",
"babel",
"react-hooks",
Expand Down Expand Up @@ -93,15 +88,6 @@
"forbid": []
}
],
"react/jsx-filename-extension": [
"warn",
{
"extensions": [
".js",
".jsx"
]
}
],
"react/jsx-sort-props": [
"error",
{
Expand All @@ -128,8 +114,28 @@
"react/jsx-one-expression-per-line": "off",
"react/no-did-update-set-state": "warn",
"react/sort-comp": "warn",
"simple-import-sort/sort": "error",
"sort-imports": "off"
"react/jsx-props-no-spreading": "off",
"sort-imports": "off",
"simple-import-sort/exports": "error",
"simple-import-sort/imports": "error",
// all rules below are temporarily disabled in order for eslint to pass
// after updating. these should be fixed and re-enabled
"react/function-component-definition": "off",
"react/jsx-no-constructed-context-values": "off",
"react/jsx-no-useless-fragment": "off",
// Default props deprecated in React v16, to be removed v18
"react/require-default-props": "off",
"jest/no-conditional-expect": "off",
"max-classes-per-file": "off",
"no-mixed-operators": "off",
"react/prop-types": "off",
"react/no-unstable-nested-components": "off",
"prefer-object-spread": "off",
"react/static-property-placement": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-shadow": "off",
"@typescript-eslint/default-param-last": "off",
"@typescript-eslint/no-use-before-define": "off"
},
"settings": {
"import/resolver": {
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/npm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 16
- run: npm ci
- run: npm run lint
- run: npm test
- name: Publish Unit Test Results
uses: EnricoMi/[email protected]
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Thumbs.db
/src/index.css
/jsdoc
/build
/cypress/videos
/cypress/screenshots

# webpack build
/public/*
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 0, "build-stage", based on Node.js, to build and compile the frontend
FROM node:12 as build-stage
FROM node:16 as build-stage

ARG API_BASE_URL
ARG KEYCLOAK_URL
Expand Down
31 changes: 31 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
modules: false,
loose: false,
targets: {
node: 'current',
},
},
],
'@babel/preset-typescript',
'@babel/preset-react',
],
plugins: [
'@babel/plugin-transform-runtime',
['@babel/plugin-proposal-decorators',
{ legacy: true }
],
'@babel/plugin-transform-class-properties',
],
env: {
test: {
presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react'],
},
local: {
presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react'],
},
},
};
24 changes: 14 additions & 10 deletions config/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
const path = require('path');

const BASE_DIR = path.resolve(__dirname, '..');
const libsToConvert = [
'd3-force', 'd3-drag', 'd3-selection', 'd3-zoom', 'd3-interpolate', 'd3-color', 'd3-ease', 'ag-grid-community'
].join("|");


module.exports = {
rootDir: BASE_DIR,
collectCoverage: true,
coverageDirectory: 'coverage',
collectCoverageFrom: [
'<rootDir>/src/services/**/**.{js,jsx,mjs}',
'<rootDir>/src/**/**components/**/**.{js,jsx,mjs}',
'<rootDir>/src/services/**/**.{js,jsx,mjs,ts,tsx}',
'<rootDir>/src/**/**components/**/**.{js,jsx,mjs,ts,tsx}',
],
coverageReporters: [
'clover',
Expand All @@ -23,28 +27,26 @@ module.exports = {
[
'jest-junit',
{
output: '<rootDir>/coverage/junit.xml',
outputFile: '<rootDir>/coverage/junit.xml',
},
],
],
setupFiles: [
'<rootDir>/src/polyfills.js',
'<rootDir>/config/jest/browserMock.js',
'<rootDir>/config/jest/enzymeInit.js',
'<rootDir>/config/jest/windowEnvMock.js',
'jest-canvas-mock',
],
testRegex: 'src.*__tests__.*.jsx?$',
testEnvironment: 'jest-environment-jsdom-fourteen',
testRegex: 'src.*__tests__.*.[tj]sx?$',
testEnvironment: 'jsdom',
testURL: 'http://localhost',
transform: {
'^.+\\.(js|jsx|mjs)$': '<rootDir>/node_modules/babel-jest',
'^.+\\.js$': 'babel-jest',
'^.+\\.(js|jsx|mjs|ts|tsx)$': '<rootDir>/node_modules/babel-jest',
'^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
'^(?!.*\\.(js|jsx|mjs|css|json)$)': '<rootDir>/config/jest/fileTransform.js',
'^(?!.*\\.(js|jsx|mjs|css|json|ts|tsx)$)': '<rootDir>/config/jest/fileTransform.js',
},
transformIgnorePatterns: [
'[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$',
`<rootDir>/node_modules/(?!(${libsToConvert})/)`,
],
moduleNameMapper: {
'@/(.*)$': '<rootDir>/src/$1',
Expand All @@ -57,5 +59,7 @@ module.exports = {
'jsx',
'node',
'mjs',
'ts',
'tsx',
],
};
11 changes: 11 additions & 0 deletions config/jest/browserMock.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,14 @@ Object.defineProperty(window, 'localStorage', {
Object.defineProperty(window, 'URL', {
value: URLMock,
});

if (global.document) {
document.createRange = () => ({
setStart: () => { },
setEnd: () => { },
commonAncestorContainer: {
nodeName: 'BODY',
ownerDocument: document,
},
});
}
15 changes: 0 additions & 15 deletions config/jest/enzymeInit.js

This file was deleted.

Loading

0 comments on commit 057d2b7

Please sign in to comment.