From 4f2891836e4d2464663ea21517520494442c1097 Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Fri, 20 Nov 2020 14:41:18 -0500 Subject: [PATCH 1/2] fix conflicts --- src/express/admin.ts | 10 +++++----- src/express/middleware/authenticate.ts | 4 ++-- src/express/middleware/identifyAPI.ts | 2 +- src/express/middleware/index.ts | 24 ++++++++++++------------ src/mongoose/connect.ts | 9 +++++---- src/webpack/getWebpackDevConfig.ts | 10 +++++----- src/webpack/init.ts | 10 +++++----- 7 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/express/admin.ts b/src/express/admin.ts index f8a49cd033..1bc5e7b600 100644 --- a/src/express/admin.ts +++ b/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(); diff --git a/src/express/middleware/authenticate.ts b/src/express/middleware/authenticate.ts index d015c476a9..91d29fa4ed 100644 --- a/src/express/middleware/authenticate.ts +++ b/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]; diff --git a/src/express/middleware/identifyAPI.ts b/src/express/middleware/identifyAPI.ts index 9bd9b4c044..47b2447f69 100644 --- a/src/express/middleware/identifyAPI.ts +++ b/src/express/middleware/identifyAPI.ts @@ -5,4 +5,4 @@ const identifyAPI = (api) => { }; }; -module.exports = identifyAPI; +export default identifyAPI; diff --git a/src/express/middleware/index.ts b/src/express/middleware/index.ts index f8beef2384..30d409d70d 100644 --- a/src/express/middleware/index.ts +++ b/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; diff --git a/src/mongoose/connect.ts b/src/mongoose/connect.ts index 7c53e1bfc4..8c58c113a9 100644 --- a/src/mongoose/connect.ts +++ b/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; diff --git a/src/webpack/getWebpackDevConfig.ts b/src/webpack/getWebpackDevConfig.ts index 6ec8f227a8..c3109c9d9d 100644 --- a/src/webpack/getWebpackDevConfig.ts +++ b/src/webpack/getWebpackDevConfig.ts @@ -1,8 +1,8 @@ -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'); diff --git a/src/webpack/init.ts b/src/webpack/init.ts index fc15dc8823..b01a6bc0c6 100644 --- a/src/webpack/init.ts +++ b/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(); From 3bea32883db58c75d6c523aa506a25e47dc3f82d Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Fri, 20 Nov 2020 14:42:36 -0500 Subject: [PATCH 2/2] more module conversion --- src/auth/getExtractJWT.ts | 2 +- src/auth/init.ts | 8 ++++---- src/auth/strategies/apiKey.ts | 4 ++-- src/auth/strategies/jwt.ts | 6 +++--- src/babel.config.js | 2 +- src/collections/buildSchema.ts | 8 ++++---- src/collections/init.ts | 14 +++++++------- src/express/admin.ts | 2 +- src/mongoose/buildQuery.ts | 4 ++-- src/webpack/getWebpackDevConfig.ts | 4 ++-- src/webpack/init.ts | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/auth/getExtractJWT.ts b/src/auth/getExtractJWT.ts index 8759ca01b4..055e81093f 100644 --- a/src/auth/getExtractJWT.ts +++ b/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) { diff --git a/src/auth/init.ts b/src/auth/init.ts index 4bc4f841af..f71b903d34 100644 --- a/src/auth/init.ts +++ b/src/auth/init.ts @@ -1,10 +1,10 @@ -const passport = require('passport'); -const AnonymousStrategy = require('passport-anonymous'); -const jwtStrategy = require('./strategies/jwt'); +import passport from 'passport'; +import AnonymousStrategy from 'passport-anonymous'; +import jwtStrategy from './strategies/jwt'; function initAuth() { passport.use(new AnonymousStrategy.Strategy()); passport.use('jwt', jwtStrategy(this)); } -module.exports = initAuth; +export default initAuth; diff --git a/src/auth/strategies/apiKey.ts b/src/auth/strategies/apiKey.ts index 2b733e8681..cda22609a9 100644 --- a/src/auth/strategies/apiKey.ts +++ b/src/auth/strategies/apiKey.ts @@ -1,7 +1,7 @@ const PassportAPIKey = require('passport-headerapikey').HeaderAPIKeyStrategy; -const crypto = require('crypto'); +import crypto from 'crypto'; -module.exports = ({ operations, config: { secret } }, { Model, config }) => { +export default ({ operations, config: { secret } }, { Model, config }) => { const opts = { header: 'Authorization', prefix: `${config.labels.singular} API-Key `, diff --git a/src/auth/strategies/jwt.ts b/src/auth/strategies/jwt.ts index 84f56bcbe9..c59f36db67 100644 --- a/src/auth/strategies/jwt.ts +++ b/src/auth/strategies/jwt.ts @@ -1,9 +1,9 @@ -const passportJwt = require('passport-jwt'); -const getExtractJWT = require('../getExtractJWT'); +import passportJwt from 'passport-jwt'; +import getExtractJWT from '../getExtractJWT'; const JwtStrategy = passportJwt.Strategy; -module.exports = ({ config, collections, operations }) => { +export default ({ config, collections, operations }) => { const opts = { session: false, passReqToCallback: true, diff --git a/src/babel.config.js b/src/babel.config.js index 68da5b8124..26b6b00f01 100644 --- a/src/babel.config.js +++ b/src/babel.config.js @@ -1,4 +1,4 @@ -module.exports = { +export default { presets: [ '@babel/typescript', [ diff --git a/src/collections/buildSchema.ts b/src/collections/buildSchema.ts index 6a2fd5def7..ad1a884543 100644 --- a/src/collections/buildSchema.ts +++ b/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 }); diff --git a/src/collections/init.ts b/src/collections/init.ts index 29cc5ee447..e793dc7b5f 100644 --- a/src/collections/init.ts +++ b/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) => { diff --git a/src/express/admin.ts b/src/express/admin.ts index 1bc5e7b600..cb69f6679a 100644 --- a/src/express/admin.ts +++ b/src/express/admin.ts @@ -33,4 +33,4 @@ function initAdmin() { } } -module.exports = initAdmin; +export default initAdmin; diff --git a/src/mongoose/buildQuery.ts b/src/mongoose/buildQuery.ts index a0eb8eb44b..6a4459b4a4 100644 --- a/src/mongoose/buildQuery.ts +++ b/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; diff --git a/src/webpack/getWebpackDevConfig.ts b/src/webpack/getWebpackDevConfig.ts index c3109c9d9d..460f158e18 100644 --- a/src/webpack/getWebpackDevConfig.ts +++ b/src/webpack/getWebpackDevConfig.ts @@ -2,11 +2,11 @@ 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'; +import babelConfig from '../babel.config'; const mockModulePath = path.resolve(__dirname, '../mocks/emptyModule.js'); -module.exports = (config) => { +export default (config) => { let webpackConfig = { entry: { main: [ diff --git a/src/webpack/init.ts b/src/webpack/init.ts index b01a6bc0c6..8af451e064 100644 --- a/src/webpack/init.ts +++ b/src/webpack/init.ts @@ -20,4 +20,4 @@ function initWebpack() { return router; } -module.exports = initWebpack; +export default initWebpack;