Skip to content

Commit 4ca2de2

Browse files
authored
ref(tests): Move top-level jest config to jest folder (#4978)
This moves our base jest config into a `jest` folder, in anticipation of more jest config files in future PRs. It also sets up those files to be linted, by adding the folder to our dev tsconfig and to our main eslint config.
1 parent 4176bcb commit 4ca2de2

File tree

16 files changed

+19
-15
lines changed

16 files changed

+19
-15
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = {
3434
},
3535
},
3636
{
37-
files: ['scripts/**/*.ts'],
37+
files: ['jest/**/*.ts', 'scripts/**/*.ts'],
3838
parserOptions: {
3939
project: ['tsconfig.dev.json'],
4040
},
File renamed without changes.

packages/browser/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const baseConfig = require('../../jest.config.js');
1+
const baseConfig = require('../../jest/jest.config.js');
22

33
module.exports = {
44
...baseConfig,

packages/core/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/gatsby/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const baseConfig = require('../../jest.config.js');
1+
const baseConfig = require('../../jest/jest.config.js');
22

33
module.exports = {
44
...baseConfig,

packages/hub/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/integrations/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/nextjs/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/node-integration-tests/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const baseConfig = require('../../jest.config.js');
1+
const baseConfig = require('../../jest/jest.config.js');
22

33
module.exports = {
44
globalSetup: '<rootDir>/setup-tests.ts',

packages/node/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/react/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const baseConfig = require('../../jest.config.js');
1+
const baseConfig = require('../../jest/jest.config.js');
22

33
module.exports = {
44
...baseConfig,

packages/serverless/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/tracing/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/utils/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = require('../../jest.config.js');
1+
module.exports = require('../../jest/jest.config.js');

packages/vue/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const baseConfig = require('../../jest.config.js');
1+
const baseConfig = require('../../jest/jest.config.js');
22

33
module.exports = {
44
...baseConfig,

tsconfig.dev.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
{
33
"extends": "./tsconfig.json",
44

5-
"include": ["**/scripts/**/*.ts"],
5+
"include": ["**/scripts/**/*.ts", "jest/**/*.ts"],
6+
7+
"compilerOptions": {
8+
"types": ["node", "jest"],
9+
}
610
}

0 commit comments

Comments
 (0)