Merge branch 'master' of github.com:graphql/swapi-graphql into gg/flow-to-ts

Author: gagoar

jest.config.js

@@ -7,13 +7,22 @@ module.exports = {
   name: packageJSON.name,
   displayName: packageJSON.name,
   transform: {
+<<<<<<< HEAD
     '^.+\\.[jt]sx?$': 'ts-jest',
   },
   preset: 'ts-jest',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   testURL: 'http://localhost',
   transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$'],
   testMatch: ['**/*.(spec|test).[jt]s'],
+=======
+    '\\.[jt]sx?$': 'babel-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  testURL: 'http://localhost',
+  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$'],
+  testMatch: ['**/*.(spec|test).js'],
+>>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
   collectCoverage: true,
   coverageDirectory: './coverage/',
 };