int tests pass

jest.config.js

@@ -6,10 +6,15 @@ module.exports = {
   testPathIgnorePatterns: [
     'node_modules',
     'src/admin/*',
+    'dist',
   ],
   testTimeout: 15000,
   moduleNameMapper: {
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/mocks/fileMock.js',
-    '\\.(css|scss)$': '<rootDir>/src/mocks/emptyModule.js',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/tests/mocks/fileMock.js',
+    '\\.(css|scss)$': '<rootDir>/tests/mocks/emptyModule.js',
+  },
+  transform: {
+    '\\.(css|less|scss)$': './tests/stub-transformer.js',
+    '\\.(js|jsx|ts|tsx)$': 'babel-jest',
   },
 };

jest.react.config.js

@@ -4,7 +4,7 @@ module.exports = {
   testRegex: '(/src/admin/.*\\.(test|spec))\\.[jt]sx?$',
   setupFilesAfterEnv: ['<rootDir>/tests/client/globalSetup.js'],
   moduleNameMapper: {
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/mocks/fileMock.js',
-    '\\.(css|scss)$': '<rootDir>/src/mocks/emptyModule.js',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/mocks/fileMock.ts',
+    '\\.(css|scss)$': '<rootDir>/src/mocks/emptyModule.ts',
   },
 };

package.json

@@ -72,7 +72,7 @@
     "is-url": "^1.2.4",
     "isomorphic-fetch": "^2.2.1",
     "isomorphic-style-loader": "^5.1.0",
-    "jest": "^25.3.0",
+    "jest": "26.6.3",
     "jsonwebtoken": "^8.5.1",
     "jwt-decode": "^3.0.0",
     "method-override": "^3.0.0",
@@ -210,6 +210,7 @@
     "graphql-request": "^2.0.0",
     "mongodb": "^3.6.2",
     "nodemon": "^1.19.4",
+    "ts-jest": "^26.4.4",
     "typescript": "^4.1.2",
     "webpack-cli": "^4.1.0"
   },

src/auth/auth.spec.ts

@@ -1,8 +1,10 @@
-require('isomorphic-fetch');
-const { MongoClient } = require('mongodb');
-const { email, password, mongo: { url: mongoURL, port: mongoPort, name: mongoDBName } } = require('../../tests/api/credentials');
+import { MongoClient } from 'mongodb';
+import getConfig from '../utilities/getConfig';
+import { email, password, mongo } from '../../tests/api/credentials';
 
-const getConfig = require('../utilities/getConfig');
+require('isomorphic-fetch');
+
+const { url: mongoURL, port: mongoPort, name: mongoDBName } = mongo;
 
 const { serverURL: url } = getConfig();
 

src/babel.config.js

@@ -17,5 +17,11 @@ module.exports = {
     require.resolve('@babel/plugin-transform-runtime'),
     require.resolve('@babel/plugin-proposal-class-properties'),
     require.resolve('@babel/plugin-proposal-optional-chaining'),
+    [
+      'babel-plugin-ignore-html-and-css-imports',
+      {
+        removeExtensions: ['.svg', '.css', '.scss', '.png', '.jpg'],
+      },
+    ],
   ],
 };

src/collections/graphql/resolvers/resolvers.spec.ts

@@ -1,11 +1,11 @@
 /**
  * @jest-environment node
  */
-// eslint-disable-next-line no-unused-vars
-const fetch = require('isomorphic-fetch');
-const { request, GraphQLClient } = require('graphql-request');
-const getConfig = require('../../../utilities/getConfig');
-const { email, password } = require('../../../../tests/api/credentials');
+import { request, GraphQLClient } from 'graphql-request';
+import getConfig from '../../../utilities/getConfig';
+import { email, password } from '../../../../tests/api/credentials';
+
+require('isomorphic-fetch');
 
 const config = getConfig();
 

src/collections/tests/collections.spec.ts

@@ -1,7 +1,8 @@
+import { v4 as uuid } from 'uuid';
+import getConfig from '../../utilities/getConfig';
+import { email, password } from '../../../tests/api/credentials';
+
 require('isomorphic-fetch');
-const uuid = require('uuid').v4;
-const getConfig = require('../../utilities/getConfig');
-const { email, password } = require('../../../tests/api/credentials');
 
 const { serverURL: url } = getConfig();
 

src/collections/tests/hooks.spec.ts

@@ -1,6 +1,7 @@
+import getConfig from '../../utilities/getConfig';
+import { email, password } from '../../../tests/api/credentials';
+
 require('isomorphic-fetch');
-const getConfig = require('../../utilities/getConfig');
-const { email, password } = require('../../../tests/api/credentials');
 
 const { serverURL: url } = getConfig();
 

src/collections/tests/relationships.spec.ts

@@ -1,6 +1,7 @@
+import getConfig from '../../utilities/getConfig';
+import { email, password } from '../../../tests/api/credentials';
+
 require('isomorphic-fetch');
-const getConfig = require('../../utilities/getConfig');
-const { email, password } = require('../../../tests/api/credentials');
 
 const { serverURL: url } = getConfig();
 

src/collections/tests/uploads.spec.ts

@@ -1,10 +1,11 @@
+import fs from 'fs';
+import path from 'path';
+import FormData from 'form-data';
+import getConfig from '../../utilities/getConfig';
+import fileExists from '../../../tests/api/utils/fileExists';
+import { email, password } from '../../../tests/api/credentials';
+
 require('isomorphic-fetch');
-const fs = require('fs');
-const path = require('path');
-const FormData = require('form-data');
-const getConfig = require('../../utilities/getConfig');
-const fileExists = require('../../../tests/api/utils/fileExists');
-const { email, password } = require('../../../tests/api/credentials');
 
 const { serverURL: url } = getConfig();
 

src/dev.js

@@ -1,21 +1,24 @@
 const babelConfig = require('./babel.config');
 
-require('@babel/register')({
-  ...babelConfig,
-  ignore: [
-    /node_modules[\\/](?!@payloadcms[\\/]payload[\\/]src[\\/]admin|@payloadcms[\\/]payload[\\/]components|@payloadcms[\\/]payload[\\/]hooks).*/,
-  ],
-  extensions: ['.js', '.jsx', '.ts', '.tsx'],
-  plugins: [
-    [
-      'babel-plugin-ignore-html-and-css-imports',
-      {
-        removeExtensions: ['.svg', '.css', '.scss', '.png', '.jpg'],
-      },
+if (process.env.NODE_ENV !== 'test') {
+  // eslint-disable-next-line global-require
+  require('@babel/register')({
+    ...babelConfig,
+    ignore: [
+      /node_modules[\\/](?!@payloadcms[\\/]payload[\\/]src[\\/]admin|@payloadcms[\\/]payload[\\/]components|@payloadcms[\\/]payload[\\/]hooks).*/,
     ],
-    ...babelConfig.plugins,
-  ],
-});
+    extensions: ['.js', '.jsx', '.ts', '.tsx'],
+    plugins: [
+      [
+        'babel-plugin-ignore-html-and-css-imports',
+        {
+          removeExtensions: ['.svg', '.css', '.scss', '.png', '.jpg'],
+        },
+      ],
+      ...babelConfig.plugins,
+    ],
+  });
+}
 
 const payload = require('./index.ts');
 

src/errors/errors.spec.ts

@@ -1,4 +1,4 @@
-const { APIError } = require('.');
+import { APIError } from '.';
 
 describe('Errors', () => {
   describe('APIError', () => {

src/express/middleware/errorHandler.spec.ts

@@ -1,6 +1,9 @@
+import Logger from '../../utilities/logger';
 import errorHandler from './errorHandler';
 import { APIError } from '../../errors';
 
+const logger = Logger();
+
 const testError = new APIError('test error', 503);
 
 const mockResponse = () => {
@@ -38,7 +41,7 @@ describe('errorHandler', () => {
   });
 
   it('should send the response with the error', async () => {
-    const handler = errorHandler({ debug: true, hooks: {} });
+    const handler = errorHandler({ debug: true, hooks: {} }, logger);
     await handler(testError, req, res);
     expect(res.send)
       .toHaveBeenCalledWith(
@@ -47,7 +50,7 @@ describe('errorHandler', () => {
   });
 
   it('should include stack trace when config debug is on', async () => {
-    const handler = errorHandler({ debug: true, hooks: {} });
+    const handler = errorHandler({ debug: true, hooks: {} }, logger);
     await handler(testError, req, res);
     expect(res.send)
       .toHaveBeenCalledWith(
@@ -56,7 +59,7 @@ describe('errorHandler', () => {
   });
 
   it('should not include stack trace when config debug is not set', async () => {
-    const handler = errorHandler({ hooks: {} });
+    const handler = errorHandler({ hooks: {} }, logger);
     await handler(testError, req, res);
     expect(res.send)
       .toHaveBeenCalledWith(
@@ -65,7 +68,7 @@ describe('errorHandler', () => {
   });
 
   it('should not include stack trace when config debug is false', async () => {
-    const handler = errorHandler({ debug: false, hooks: {} });
+    const handler = errorHandler({ debug: false, hooks: {} }, logger);
     await handler(testError, req, res);
     expect(res.send)
       .toHaveBeenCalledWith(
@@ -74,7 +77,7 @@ describe('errorHandler', () => {
   });
 
   it('should show the status code when given an error with a code', async () => {
-    const handler = errorHandler({ debug: false, hooks: {} });
+    const handler = errorHandler({ debug: false, hooks: {} }, logger);
     await handler(testError, req, res);
     expect(res.status)
       .toHaveBeenCalledWith(
@@ -83,7 +86,7 @@ describe('errorHandler', () => {
   });
 
   it('should default to 500 when an error does not have a status code', async () => {
-    const handler = errorHandler({ debug: false, hooks: {} });
+    const handler = errorHandler({ debug: false, hooks: {} }, logger);
     testError.status = undefined;
     await handler(testError, req, res);
     expect(res.status)
@@ -97,7 +100,7 @@ describe('errorHandler', () => {
     const handler = errorHandler({
       debug: false,
       hooks: { afterError },
-    });
+    }, logger);
     await handler(testError, req, res);
     expect(afterError)
       .toHaveBeenCalled();
@@ -107,7 +110,7 @@ describe('errorHandler', () => {
     const handler = errorHandler({
       debug: false,
       hooks: {},
-    });
+    }, logger);
     await handler(testError, req, res);
     expect(req.collection.config.hooks.afterError)
       .toHaveBeenCalled();

src/express/middleware/errorHandler.ts

@@ -1,13 +1,12 @@
 import httpStatus from 'http-status';
 import formatErrorResponse from '../responses/formatError';
 
-const errorHandler = (payload) => async (err, req, res, next) => {
-  const { config } = payload;
+const errorHandler = (config, logger) => async (err, req, res, next) => {
   const data = formatErrorResponse(err);
   let response;
   let status = err.status || httpStatus.INTERNAL_SERVER_ERROR;
 
-  payload.logger.error(err.stack);
+  logger.error(err.stack);
 
   if (config.debug && config.debug === true) {
     data.stack = err.stack;

src/fields/sanitize.spec.ts

@@ -1,6 +1,5 @@
-/* eslint-disable jest/require-to-throw-message */
-const sanitizeFields = require('./sanitize');
-const { MissingFieldType, InvalidFieldRelationship } = require('../errors');
+import sanitizeFields from './sanitize';
+import { MissingFieldType, InvalidFieldRelationship } from '../errors';
 
 describe('sanitizeFields', () => {
   it('should throw on missing type field', () => {

src/globals/requestHandlers/globals.spec.js

@@ -2,9 +2,10 @@
  * @jest-environment node
  */
 
+import getConfig from '../../utilities/getConfig';
+import { email, password } from '../../../tests/api/credentials';
+
 require('isomorphic-fetch');
-const getConfig = require('../../utilities/getConfig');
-const { email, password } = require('../../../tests/api/credentials');
 
 const { serverURL: url } = getConfig();
 

src/index.ts

@@ -136,7 +136,7 @@ class Payload {
       // Enable static routes for all collections permitting upload
       this.initStatic();
 
-      this.errorHandler = errorHandler(this);
+      this.errorHandler = errorHandler(this.config, this.logger);
       this.router.use(this.errorHandler);
 
       this.authenticate = authenticate(this.config);

src/mocks/emptyModule.ts

@@ -1 +0,0 @@
-export default {};

src/mocks/fileMock.ts

@@ -1 +0,0 @@
-export default 'file-stub';

src/utilities/logger.ts

@@ -2,13 +2,11 @@ import falsey from 'falsey';
 import pino from 'pino';
 import memoize from 'micro-memoize';
 
-export default memoize((name = 'payload') => {
-  return pino({
-    name,
-    enabled: falsey(process.env.DISABLE_LOGGING),
-    prettyPrint: {
-      ignore: 'pid,hostname',
-      translateTime: 'HH:MM:ss',
-    },
-  });
-});
+export default memoize((name = 'payload') => pino({
+  name,
+  enabled: falsey(process.env.DISABLE_LOGGING),
+  prettyPrint: {
+    ignore: 'pid,hostname',
+    translateTime: 'HH:MM:ss',
+  },
+}));

tests/api/globalSetup.js

@@ -1,7 +1,7 @@
 require('isomorphic-fetch');
 
 const server = require('../../demo/server');
-const getConfig = require('../../src/utilities/getConfig');
+const getConfig = require('../../src/utilities/getConfig').default;
 const { email, password } = require('./credentials');
 
 const { serverURL } = getConfig();

tests/mocks/emptyModule.js

@@ -0,0 +1 @@
+module.exports = {};

tests/mocks/fileMock.js

@@ -0,0 +1 @@
+module.exports = 'file-stub';

tests/stub-transformer.js

@@ -0,0 +1,8 @@
+module.exports = {
+  process() {
+    return 'module.exports = {};';
+  },
+  getCacheKey() {
+    return 'stub-transformer';
+  },
+};

tsconfig.json

@@ -41,13 +41,6 @@
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    "typeRoots": [
-      "types"
-    ], /* List of folders to include type definitions from. */
-    "types": [
-      "node",
-      "jest",
-    ], /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
@@ -66,7 +59,7 @@
     "forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
   },
   "include": [
-    "src/"
+    "src/",
   ],
   "exclude": [
     "demo",