parameter1 · zarathustra323 · Apr 8, 2021 · Apr 8, 2021 · Apr 8, 2021 · Apr 8, 2021
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
-node_js: "10.15"
+node_js: "14.16"
 cache: yarn
 
 _production-job: &production-job

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.15
+FROM node:14.16-alpine
 WORKDIR /identity-x
 ENV NODE_ENV production
 ARG SERVICE

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,7 @@ x-env-defaults: &env
 x-node-defaults: &node
   tty: true
   init: true
-  image: node:10.15
+  image: node:14.16-alpine
   working_dir: /identity-x
   restart: always
   volumes:

diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "private": true,
   "repository": "https://github.com/base-cms/id-me.git",
   "scripts": {
+    "lerna": "lerna",
     "test": "lerna run test",
     "lint": "lerna run lint"
   },
@@ -13,6 +14,9 @@
     "services/*"
   ],
   "devDependencies": {
-    "lerna": "^3.14.1"
+    "lerna": "^4.0.0"
+  },
+  "resolutions": {
+    "eslint": "^7.23.0"
   }
 }
diff --git a/packages/mongoose-plugins/.eslintrc.js b/packages/mongoose-plugins/.eslintrc.js
@@ -1,9 +1,9 @@
 module.exports = {
   extends: 'airbnb-base',
   plugins: [
-    'import'
+    'import',
   ],
   rules: {
-    'no-underscore-dangle': [ 'error', { allow: ['_id'] } ],
+    'no-underscore-dangle': ['error', { allow: ['_id'] }],
   },
 };
diff --git a/packages/mongoose-plugins/package.json b/packages/mongoose-plugins/package.json
@@ -10,12 +10,12 @@
   "dependencies": {
     "@identity-x/pagination": "^1.0.0",
     "@identity-x/utils": "^1.0.0",
-    "mongoose": "^5.5.11",
-    "validator": "^11.0.0"
+    "mongoose": "^5.12.3",
+    "validator": "^13.5.2"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2"
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1"
   }
 }
diff --git a/packages/mongoose-plugins/src/domain-validator.js b/packages/mongoose-plugins/src/domain-validator.js
@@ -4,7 +4,7 @@ const { isArray } = Array;
 
 module.exports = {
   validator(value) {
-    if (isArray(value)) return value.every(v => validator.isFQDN(v));
+    if (isArray(value)) return value.every((v) => validator.isFQDN(v));
     return validator.isFQDN(value);
   },
   message: 'Invalid domain name address {VALUE}',

diff --git a/packages/mongoose-plugins/src/ip-validator.js b/packages/mongoose-plugins/src/ip-validator.js
@@ -4,7 +4,7 @@ const { isArray } = Array;
 
 module.exports = {
   validator(value) {
-    if (isArray(value)) return value.every(v => validator.isIP(v));
+    if (isArray(value)) return value.every((v) => validator.isIP(v));
     return validator.isIP(value);
   },
   message: 'Invalid IP address {VALUE}',

diff --git a/packages/pagination/.eslintrc.js b/packages/pagination/.eslintrc.js
@@ -1,9 +1,9 @@
 module.exports = {
   extends: 'airbnb-base',
   plugins: [
-    'import'
+    'import',
   ],
   rules: {
-    'no-underscore-dangle': [ 'error', { allow: ['_id'] } ],
+    'no-underscore-dangle': ['error', { allow: ['_id'] }],
   },
 };
diff --git a/packages/pagination/package.json b/packages/pagination/package.json
@@ -8,13 +8,13 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "base64-url": "^2.2.2",
-    "deepmerge": "^3.2.1",
-    "mongodb-extended-json": "^1.10.1"
+    "base64-url": "^2.3.3",
+    "lodash.merge": "^4.6.2",
+    "mongodb-extended-json": "^1.11.0"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2"
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1"
   }
 }
diff --git a/packages/pagination/src/find.js b/packages/pagination/src/find.js
@@ -32,7 +32,7 @@ module.exports = async (Model, {
     [$sort.field]: 1,
   } : undefined;
   if ($projection && isArray(excludeProjection)) {
-    excludeProjection.forEach(key => delete $projection[key]);
+    excludeProjection.forEach((key) => delete $projection[key]);
   }
 
   const params = {

diff --git a/packages/pagination/src/limit.js b/packages/pagination/src/limit.js
@@ -1,5 +1,3 @@
-const { assign } = Object;
-
 class Limit {
   /**
    * Contructor.
@@ -32,7 +30,7 @@ class Limit {
    * @return {object}
    */
   get options() {
-    return assign({}, this.opts);
+    return { ...this.opts };
   }
 
   /**

diff --git a/packages/pagination/src/sort.js b/packages/pagination/src/sort.js
@@ -1,6 +1,6 @@
-const deepMerge = require('deepmerge');
+const merge = require('lodash.merge');
 
-const { assign, keys } = Object;
+const { keys } = Object;
 
 class Sort {
   /**
@@ -38,7 +38,7 @@ class Sort {
    * @return {object}
    */
   get options() {
-    return deepMerge({}, this.opts);
+    return merge({}, this.opts);
   }
 
   /**
@@ -60,7 +60,7 @@ class Sort {
    */
   get valueReversed() {
     const { value } = this;
-    return keys(value).reduce((obj, key) => assign(obj, { [key]: value[key] === 1 ? -1 : 1 }), {});
+    return keys(value).reduce((obj, key) => ({ ...obj, [key]: value[key] === 1 ? -1 : 1 }), {});
   }
 
   /**
@@ -123,7 +123,7 @@ class Sort {
    */
   set collation(options) {
     const defaults = { locale: 'en_US' };
-    this.opts.collation = assign({}, defaults, options);
+    this.opts.collation = { ...defaults, ...options };
   }
 
   /**

diff --git a/packages/pagination/src/utils.js b/packages/pagination/src/utils.js
@@ -23,7 +23,7 @@ module.exports = {
     };
     return {
       ...additionalData,
-      edges: results.map(node => ({ node, cursor: () => cursor.encode(node._id) })),
+      edges: results.map((node) => ({ node, cursor: () => cursor.encode(node._id) })),
       pageInfo,
       totalCount,
     };

diff --git a/packages/service-clients/.eslintrc.js b/packages/service-clients/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   extends: 'airbnb-base',
   plugins: [
-    'import'
+    'import',
   ],
 };
diff --git a/packages/service-clients/package.json b/packages/service-clients/package.json
@@ -8,13 +8,13 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "@base-cms/env": "^1.0.0",
-    "@base-cms/micro": "^1.21.5",
+    "@base-cms/env": "^1.37.0",
+    "@base-cms/micro": "^1.37.0",
     "micro": "^9.3.4"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2"
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1"
   }
 }
diff --git a/packages/service-clients/src/create-env-var.js b/packages/service-clients/src/create-env-var.js
@@ -1 +1 @@
-module.exports = key => `${key.toUpperCase()}_SERVICE_URL`;
+module.exports = (key) => `${key.toUpperCase()}_SERVICE_URL`;
diff --git a/packages/utils/.eslintrc.js b/packages/utils/.eslintrc.js
@@ -1,9 +1,9 @@
 module.exports = {
   extends: 'airbnb-base',
   plugins: [
-    'import'
+    'import',
   ],
   rules: {
-    'no-underscore-dangle': [ 'error', { allow: ['_id'] } ],
+    'no-underscore-dangle': ['error', { allow: ['_id'] }],
   },
 };
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -8,14 +8,14 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "escape-string-regexp": "^2.0.0"
+    "escape-string-regexp": "^4.0.0"
   },
   "peerDependencies": {
-    "@base-cms/micro": "^1.21.5"
+    "@base-cms/micro": "^1.37.0"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2"
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1"
   }
 }
diff --git a/packages/utils/src/mongoose/handle-error.js b/packages/utils/src/mongoose/handle-error.js
@@ -4,7 +4,7 @@ const isValidationError = require('./is-validation-error');
 module.exports = (createError, e, statusCode = 422) => {
   if (isValidationError(e)) {
     const fields = e.errors && typeof e.errors === 'object' ? e.errors : {};
-    const messages = Object.keys(fields).map(name => fields[name]);
+    const messages = Object.keys(fields).map((name) => fields[name]);
     const error = createError(422, `${messages.join('\n')}`, e);
     error.isValidationError = true;
     return error;

diff --git a/packages/utils/src/mongoose/start.js b/packages/utils/src/mongoose/start.js
@@ -9,21 +9,21 @@ const start = (promise, name, url) => {
   });
 };
 
-const indexModel = Model => new Promise((resolve, reject) => {
+const indexModel = (Model) => new Promise((resolve, reject) => {
   Model.on('index', (err) => {
     if (err) { reject(err); } else { resolve(); }
   });
 });
 
-const indexModels = models => Promise
-  .all(Object.keys(models).map(name => indexModel(models[name])));
+const indexModels = (models) => Promise
+  .all(Object.keys(models).map((name) => indexModel(models[name])));
 
 module.exports = ({
   connection,
   models,
 } = {}) => () => {
   const p = [];
   if (models) p.push(indexModels(models).then(() => log('> Model indexes created.')));
-  if (connection) p.push(start(connection, 'MongoDB', m => m.client.s.url));
+  if (connection) p.push(start(connection, 'MongoDB', (m) => m.client.s.url));
   return Promise.all(p);
 };
diff --git a/services/application/.eslintrc.js b/services/application/.eslintrc.js
@@ -1,9 +1,9 @@
 module.exports = {
   extends: 'airbnb-base',
   plugins: [
-    'import'
+    'import',
   ],
   rules: {
-    'no-underscore-dangle': [ 'error', { allow: ['_id'] } ],
+    'no-underscore-dangle': ['error', { allow: ['_id'] }],
   },
 };
diff --git a/services/application/package.json b/services/application/package.json
@@ -13,26 +13,26 @@
     "test": "yarn lint"
   },
   "dependencies": {
-    "@base-cms/env": "^1.0.0",
-    "@base-cms/micro": "^1.21.5",
-    "@base-cms/object-path": "^1.9.0",
-    "@base-cms/utils": "^1.9.0",
+    "@base-cms/env": "^1.37.0",
+    "@base-cms/micro": "^1.37.0",
+    "@base-cms/object-path": "^1.37.0",
+    "@base-cms/utils": "^1.37.0",
     "@identity-x/mongoose-plugins": "^1.0.0",
     "@identity-x/pagination": "^1.0.0",
     "@identity-x/service-clients": "^1.0.0",
     "@identity-x/utils": "^1.0.0",
-    "burner-email-providers": "^1.0.13",
+    "burner-email-providers": "^1.0.41",
     "micro": "^9.3.4",
-    "mongoose": "^5.5.11",
-    "newrelic": "^6.4.0",
-    "validator": "^11.0.0"
+    "mongoose": "^5.12.3",
+    "newrelic": "^7.3.0",
+    "validator": "^13.5.2"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.2",
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1",
     "gulp": "^4.0.2",
     "gulp-cached": "^1.1.1",
-    "gulp-eslint": "^5.0.0"
+    "gulp-eslint": "^6.0.0"
   }
 }
diff --git a/services/application/src/actions/access-level/index.js b/services/application/src/actions/access-level/index.js
@@ -8,12 +8,11 @@ const create = require('./create');
 const updateOne = require('./update-one');
 const AccessLevel = require('../../mongodb/models/access-level');
 
-
 module.exports = {
   create,
   find: ({ query, fields }) => find(AccessLevel, { query, fields }),
   findById: ({ id, fields }) => findById(AccessLevel, { id, fields }),
-  listForApp: params => listForApp(AccessLevel, params),
-  matchForApp: params => matchForApp(AccessLevel, params),
+  listForApp: (params) => listForApp(AccessLevel, params),
+  matchForApp: (params) => matchForApp(AccessLevel, params),
   updateOne,
 };
diff --git a/services/application/src/actions/check-access.js b/services/application/src/actions/check-access.js
@@ -4,7 +4,7 @@ const loadContext = require('./load-context');
 
 const { isArray } = Array;
 
-const getAsArray = v => (isArray(v) ? v : []);
+const getAsArray = (v) => (isArray(v) ? v : []);
 
 const isLoggedIn = ({ hasUser, hasTeams }) => (hasUser || hasTeams);
 
@@ -36,14 +36,14 @@ module.exports = async ({
   const requiresAccessLevel = Boolean(requiredAccessLevels.length);
 
   // The access level IDs found in the current context.
-  const foundAccessLevelIds = context.mergedAccessLevels.map(level => `${level.id}`);
+  const foundAccessLevelIds = context.mergedAccessLevels.map((level) => `${level.id}`);
 
   // The required access level IDs (that were found/verified in the database).
-  const verifiedAccessLevelIds = requiredAccessLevels.map(level => `${level.id}`);
+  const verifiedAccessLevelIds = requiredAccessLevels.map((level) => `${level.id}`);
 
   // Whether the context contains at least one required access level.
   const hasRequiredAccessLevel = verifiedAccessLevelIds
-    .some(id => foundAccessLevelIds.includes(id));
+    .some((id) => foundAccessLevelIds.includes(id));
 
   return {
     canAccess: canAccess(isEnabled, {

diff --git a/services/application/src/actions/comment-stream/index.js b/services/application/src/actions/comment-stream/index.js
@@ -14,7 +14,7 @@ module.exports = {
   findByIdentifier,
   find: ({ query, fields }) => find(CommentStream, { query, fields }),
   findById: ({ id, fields }) => findById(CommentStream, { id, fields }),
-  listForApp: params => listForApp(CommentStream, params),
-  matchForApp: params => matchForApp(CommentStream, params),
-  updateFieldWithApp: params => updateFieldWithApp(CommentStream, params),
+  listForApp: (params) => listForApp(CommentStream, params),
+  matchForApp: (params) => matchForApp(CommentStream, params),
+  updateFieldWithApp: (params) => updateFieldWithApp(CommentStream, params),
 };
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = key => `${key.toUpperCase()}_SERVICE_URL`;
		module.exports = (key) => `${key.toUpperCase()}_SERVICE_URL`;