Skip to content

Commit

Permalink
Upgrade a bunch of stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
timdorr committed Oct 25, 2021
1 parent 9890491 commit 27e2332
Show file tree
Hide file tree
Showing 7 changed files with 25,276 additions and 11,580 deletions.
7 changes: 2 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"eslint:recommended",
"plugin:import/recommended",
"plugin:react/recommended",
"plugin:prettier/recommended"
"prettier"
],
"settings": {
"react": {
Expand All @@ -31,8 +31,5 @@
"react/jsx-wrap-multilines": 2,
"react/no-string-refs": 0
},
"plugins": [
"import",
"react"
]
"plugins": ["import", "react"]
}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v2
with:
node-version: 14.x
cache: npm
node-version: '14.x'
cache: 'npm'

- name: Install dependencies
run: npm ci
Expand Down
13 changes: 7 additions & 6 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
const defaults = {
coverageDirectory: './coverage/',
collectCoverage: true,
testURL: 'http://localhost'
testURL: 'http://localhost',
}

const testFolderPath = folderName => `<rootDir>/test/${folderName}/**/*.js`
const testFolderPath = (folderName) => `<rootDir>/test/${folderName}/**/*.js`

const NORMAL_TEST_FOLDERS = ['components', 'hooks', 'integration', 'utils']

const standardConfig = {
...defaults,
displayName: 'ReactDOM',
testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath)
testEnvironment: 'jsdom',
testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath),
}

const rnConfig = {
Expand All @@ -20,10 +21,10 @@ const rnConfig = {
testMatch: [testFolderPath('react-native')],
preset: 'react-native',
transform: {
'^.+\\.js$': '<rootDir>/node_modules/react-native/jest/preprocessor.js'
}
'^.+\\.js$': '<rootDir>/node_modules/react-native/jest/preprocessor.js',
},
}

module.exports = {
projects: [standardConfig, rnConfig]
projects: [standardConfig, rnConfig],
}
Loading

0 comments on commit 27e2332

Please sign in to comment.