merges

src/auth/getExtractJWT.ts

@@ -1,4 +1,4 @@
-const parseCookies = require('../utilities/parseCookies');
+import parseCookies from '../utilities/parseCookies';
 
 const getExtractJWT = (config) => (req) => {
   if (req && req.get) {

src/babel.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   presets: [
     '@babel/typescript',
     [

src/collections/buildSchema.ts

@@ -1,7 +1,7 @@
-const paginate = require('mongoose-paginate-v2');
-const buildQueryPlugin = require('../mongoose/buildQuery');
-const localizationPlugin = require('../localization/plugin');
-const buildSchema = require('../mongoose/buildSchema');
+import paginate from 'mongoose-paginate-v2';
+import buildQueryPlugin from '../mongoose/buildQuery';
+import localizationPlugin from '../localization/plugin';
+import buildSchema from '../mongoose/buildSchema';
 
 const buildCollectionSchema = (collection, config, schemaOptions = {}) => {
   const schema = buildSchema(collection.fields, { timestamps: collection.timestamps !== false, ...schemaOptions });

src/collections/init.ts

@@ -1,11 +1,11 @@
-const mongoose = require('mongoose');
-const express = require('express');
-const passport = require('passport');
-const passportLocalMongoose = require('passport-local-mongoose');
+import mongoose from 'mongoose';
+import express from 'express';
+import passport from 'passport';
+import passportLocalMongoose from 'passport-local-mongoose';
 const LocalStrategy = require('passport-local').Strategy;
-const apiKeyStrategy = require('../auth/strategies/apiKey');
-const buildSchema = require('./buildSchema');
-const bindCollectionMiddleware = require('./bindCollection');
+import apiKeyStrategy from '../auth/strategies/apiKey';
+import buildSchema from './buildSchema';
+import bindCollectionMiddleware from './bindCollection';
 
 function registerCollections() {
   this.config.collections = this.config.collections.map((collection) => {

src/express/admin.ts

@@ -1,8 +1,8 @@
-const express = require('express');
-const compression = require('compression');
-const history = require('connect-history-api-fallback');
-const path = require('path');
-const initWebpack = require('../webpack/init');
+import express from 'express';
+import compression from 'compression';
+import history from 'connect-history-api-fallback';
+import path from 'path';
+import initWebpack from '../webpack/init';
 
 const router = express.Router();
 
@@ -33,4 +33,4 @@ function initAdmin() {
   }
 }
 
-module.exports = initAdmin;
+export default initAdmin;

src/express/middleware/authenticate.ts

@@ -1,6 +1,6 @@
-const passport = require('passport');
+import passport from 'passport';
 
-module.exports = (config) => {
+export default (config) => {
   const methods = config.collections.reduce((enabledMethods, collection) => {
     if (collection.auth && collection.auth.useAPIKey) {
       const collectionMethods = [...enabledMethods];

src/express/middleware/identifyAPI.ts

@@ -5,4 +5,4 @@ const identifyAPI = (api) => {
   };
 };
 
-module.exports = identifyAPI;
+export default identifyAPI;

src/express/middleware/index.ts

@@ -1,14 +1,14 @@
-const express = require('express');
-const passport = require('passport');
-const compression = require('compression');
-const bodyParser = require('body-parser');
-const methodOverride = require('method-override');
-const qsMiddleware = require('qs-middleware');
-const fileUpload = require('express-fileupload');
-const rateLimit = require('express-rate-limit');
-const localizationMiddleware = require('../../localization/middleware');
-const authenticate = require('./authenticate');
-const identifyAPI = require('./identifyAPI');
+import express from 'express';
+import passport from 'passport';
+import compression from 'compression';
+import bodyParser from 'body-parser';
+import methodOverride from 'method-override';
+import qsMiddleware from 'qs-middleware';
+import fileUpload from 'express-fileupload';
+import rateLimit from 'express-rate-limit';
+import localizationMiddleware from '../../localization/middleware';
+import authenticate from './authenticate';
+import identifyAPI from './identifyAPI';
 
 const middleware = (payload) => {
   const rateLimitOptions = {
@@ -52,4 +52,4 @@ const middleware = (payload) => {
   ];
 };
 
-module.exports = middleware;
+export default middleware;

src/mongoose/buildQuery.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
-const mongoose = require('mongoose');
+import mongoose from 'mongoose';
 
 const validOperators = ['like', 'in', 'all', 'not_in', 'greater_than_equal', 'greater_than', 'less_than_equal', 'less_than', 'not_equals', 'equals', 'exists'];
 function addSearchParam(key, value, searchParams) {
@@ -201,4 +201,4 @@ function buildQueryPlugin(schema) {
   }
   modifiedSchema.statics.buildQuery = buildQuery;
 }
-module.exports = buildQueryPlugin;
+export default buildQueryPlugin;

src/mongoose/connect.ts

@@ -1,8 +1,9 @@
 /* eslint-disable no-console */
-const mongoose = require('mongoose');
-const logger = require('../utilities/logger')();
+import mongoose from 'mongoose';
+import Logger from '../utilities/logger';
+const logger = Logger();
 
-const connectMongoose = async (url) => {
+const connectMongoose = async (url: string) => {
   let urlToConnect = url;
   let successfulConnectionMessage = 'Connected to Mongo server successfully!';
 
@@ -33,4 +34,4 @@ const connectMongoose = async (url) => {
   }
 };
 
-module.exports = connectMongoose;
+export default connectMongoose;

src/webpack/getWebpackDevConfig.ts

@@ -1,12 +1,12 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const path = require('path');
-const webpack = require('webpack');
-const MiniCSSExtractPlugin = require('mini-css-extract-plugin');
-const babelConfig = require('../../babel.config');
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import path from 'path';
+import webpack from 'webpack';
+import MiniCSSExtractPlugin from 'mini-css-extract-plugin';
+import babelConfig from '../babel.config';
 
 const mockModulePath = path.resolve(__dirname, '../mocks/emptyModule.js');
 
-module.exports = (config) => {
+export default (config) => {
   let webpackConfig = {
     entry: {
       main: [

src/webpack/init.ts

@@ -1,8 +1,8 @@
-const webpack = require('webpack');
-const express = require('express');
-const webpackDevMiddleware = require('webpack-dev-middleware');
-const webpackHotMiddleware = require('webpack-hot-middleware');
-const getWebpackDevConfig = require('./getWebpackDevConfig');
+import webpack from 'webpack';
+import express from 'express';
+import webpackDevMiddleware from 'webpack-dev-middleware';
+import webpackHotMiddleware from 'webpack-hot-middleware';
+import getWebpackDevConfig from './getWebpackDevConfig';
 
 const router = express.Router();
 
@@ -20,4 +20,4 @@ function initWebpack() {
   return router;
 }
 
-module.exports = initWebpack;
+export default initWebpack;