Skip to content

Commit 27e2332

Browse files
committed
Upgrade a bunch of stuff.
1 parent 9890491 commit 27e2332

File tree

7 files changed

+25276
-11580
lines changed

7 files changed

+25276
-11580
lines changed

Diff for: .eslintrc

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"eslint:recommended",
55
"plugin:import/recommended",
66
"plugin:react/recommended",
7-
"plugin:prettier/recommended"
7+
"prettier"
88
],
99
"settings": {
1010
"react": {
@@ -31,8 +31,5 @@
3131
"react/jsx-wrap-multilines": 2,
3232
"react/no-string-refs": 0
3333
},
34-
"plugins": [
35-
"import",
36-
"react"
37-
]
34+
"plugins": ["import", "react"]
3835
}

Diff for: .github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- name: Set up Node
1919
uses: actions/setup-node@v2
2020
with:
21-
node-version: 14.x
22-
cache: npm
21+
node-version: '14.x'
22+
cache: 'npm'
2323

2424
- name: Install dependencies
2525
run: npm ci

Diff for: jest.config.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
const defaults = {
22
coverageDirectory: './coverage/',
33
collectCoverage: true,
4-
testURL: 'http://localhost'
4+
testURL: 'http://localhost',
55
}
66

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

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

1111
const standardConfig = {
1212
...defaults,
1313
displayName: 'ReactDOM',
14-
testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath)
14+
testEnvironment: 'jsdom',
15+
testMatch: NORMAL_TEST_FOLDERS.map(testFolderPath),
1516
}
1617

1718
const rnConfig = {
@@ -20,10 +21,10 @@ const rnConfig = {
2021
testMatch: [testFolderPath('react-native')],
2122
preset: 'react-native',
2223
transform: {
23-
'^.+\\.js$': '<rootDir>/node_modules/react-native/jest/preprocessor.js'
24-
}
24+
'^.+\\.js$': '<rootDir>/node_modules/react-native/jest/preprocessor.js',
25+
},
2526
}
2627

2728
module.exports = {
28-
projects: [standardConfig, rnConfig]
29+
projects: [standardConfig, rnConfig],
2930
}

0 commit comments

Comments
 (0)