Merge pull request #1878 from reactioncommerce/lint-updates

Lint updates

.eslintrc

@@ -119,8 +119,8 @@
     /**
      * Best practices
      */
-    "consistent-return": [1, { // http://eslint.org/docs/rules/consistent-return
-      "treatUndefinedAsUnspecified": false
+    "consistent-return": [0, { // http://eslint.org/docs/rules/consistent-return
+      "treatUndefinedAsUnspecified": true
     }],
     "curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
     "default-case": 2, // http://eslint.org/docs/rules/default-case

imports/plugins/core/layout/client/templates/theme/theme.js

@@ -10,10 +10,10 @@ import { Packages, Shops } from "/lib/collections";
  * @returns {Object|null} The layout hash
  */
 function getRouteLayout(context) {
-  const package = Packages.findOne({ "registry.name": context.route.name, "enabled": true });
+  const pkg = Packages.findOne({ "registry.name": context.route.name, "enabled": true });
 
-  if(package) {
-    const registryRoute = package.registry.find((x) => {
+  if (pkg) {
+    const registryRoute = pkg.registry.find((x) => {
       return x.name === context.route.name;
     });
 
@@ -41,6 +41,7 @@ function getRouteLayout(context) {
  * addBodyClasses
  * Adds body classes to help themes distinguish pages and components based on the current route name and layout theme
  * @param  {Object} context - route context
+ * @returns {undefined}
  */
 function addBodyClasses(context) {
   let classes;
@@ -62,8 +63,7 @@ function addBodyClasses(context) {
   // add theme class for route layout or default
   if (currentLayout && currentLayout.theme) {
     classes.push(currentLayout.theme);
-  }
-  else {
+  } else {
     classes.push("default");
   }
 

imports/plugins/core/orders/client/templates/workflow/shippingTracking.js

@@ -37,7 +37,7 @@ Template.coreOrderShippingTracking.events({
     Meteor.call("shipping/status/refresh", orderId, (result) => {
       if (result.error) {
         instance.$("#btn-processing").addClass("hidden");
-        Alerts.toast(i18next.t("orderShipping.labelError", { err: result.error }), "error", { "timeout": 7000 });
+        Alerts.toast(i18next.t("orderShipping.labelError", { err: result.error }), "error", { timeout: 7000 });
       }
     });
   },

server/methods/accounts/accounts.js

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import moment from "moment";
 import path from "path";
-import { Accounts as MeteorAccounts } from "meteor/accounts-base"
+import { Accounts as MeteorAccounts } from "meteor/accounts-base";
 import { Accounts, Cart, Media, Shops, Packages } from "/lib/collections";
 import * as Schemas from "/lib/collections/schemas";
 import { Logger, Reaction } from "/server/api";