Merge branch 'release' into sabrecat/customizations

website/common/script/index.js

@@ -85,7 +85,7 @@ import reset from './ops/reset';
 import revive from './ops/revive';
 import scoreTask from './ops/scoreTask';
 import sell from './ops/sell';
-import sleep from './ops/sleep';
+import { sleep } from './ops/sleep';
 import allocate from './ops/stats/allocate';
 import allocateBulk from './ops/stats/allocateBulk';
 import allocateNow from './ops/stats/allocateNow';

website/common/script/libs/errorMessage.js

@@ -5,7 +5,7 @@ import _template from 'lodash/template';
 
 import messages from '../errors/commonErrorMessages';
 
-export default function errorMessage (msgKey, vars = {}) {
+function errorMessage (msgKey, vars = {}) {
   const message = messages[msgKey];
   if (!message) throw new Error(`Error processing the common message "${msgKey}".`);
 
@@ -14,3 +14,7 @@ export default function errorMessage (msgKey, vars = {}) {
   // TODO cache the result of template() ? More memory usage, faster output
   return _template(message)(clonedVars);
 }
+
+export {
+  errorMessage,
+};

website/common/script/ops/buy/buy.js

@@ -10,7 +10,7 @@ import { BuyQuestWithGoldOperation } from './buyQuestGold';
 import { BuySpellOperation } from './buySpell';
 import purchaseOp from './purchase';
 import hourglassPurchase from './hourglassPurchase';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import { BuyGemOperation } from './buyGem';
 import { BuyQuestWithGemOperation } from './buyQuestGem';
 import { BuyPetWithGemOperation } from './buyPetGem';

website/common/script/ops/buy/buyMarketGear.js

@@ -14,7 +14,7 @@ import ultimateGear from '../../fns/ultimateGear';
 import { removePinnedGearAddPossibleNewOnes } from '../pinnedGearUtils';
 
 import { AbstractGoldItemOperation } from './abstractBuyOperation';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 
 export class BuyMarketGearOperation extends AbstractGoldItemOperation { // eslint-disable-line import/prefer-default-export, max-len
   multiplePurchaseAllowed () { // eslint-disable-line class-methods-use-this

website/common/script/ops/buy/buyMysterySet.js

@@ -7,7 +7,7 @@ import {
   NotAuthorized,
   NotFound,
 } from '../../libs/errors';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import updateUserHourglasses from '../updateUserHourglasses';
 import { removeItemByPath } from '../pinnedGearUtils';
 import getItemInfo from '../../libs/getItemInfo';

website/common/script/ops/buy/buyPetGem.js

@@ -5,7 +5,7 @@ import {
 } from '../../libs/errors';
 import content from '../../content/index';
 
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import { AbstractGemItemOperation } from './abstractBuyOperation';
 
 export class BuyPetWithGemOperation extends AbstractGemItemOperation { // eslint-disable-line import/prefer-default-export, max-len

website/common/script/ops/buy/buyQuestGem.js

@@ -6,7 +6,7 @@ import {
 } from '../../libs/errors';
 import content from '../../content/index';
 
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import { AbstractGemItemOperation } from './abstractBuyOperation';
 
 export class BuyQuestWithGemOperation extends AbstractGemItemOperation { // eslint-disable-line import/prefer-default-export, max-len

website/common/script/ops/buy/buyQuestGold.js

@@ -7,7 +7,7 @@ import {
 import content from '../../content/index';
 
 import { AbstractGoldItemOperation } from './abstractBuyOperation';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 
 export class BuyQuestWithGoldOperation extends AbstractGoldItemOperation { // eslint-disable-line import/prefer-default-export, max-len
   multiplePurchaseAllowed () { // eslint-disable-line class-methods-use-this

website/common/script/ops/buy/buySpell.js

@@ -7,7 +7,7 @@ import {
   NotFound,
 } from '../../libs/errors';
 import { AbstractGoldItemOperation } from './abstractBuyOperation';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 
 export class BuySpellOperation extends AbstractGoldItemOperation { // eslint-disable-line import/prefer-default-export, max-len
   getItemKey () {

website/common/script/ops/buy/hourglassPurchase.js

@@ -7,7 +7,7 @@ import {
   BadRequest,
   NotAuthorized,
 } from '../../libs/errors';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import getItemInfo from '../../libs/getItemInfo';
 import { removeItemByPath } from '../pinnedGearUtils';
 import updateUserHourglasses from '../updateUserHourglasses';

website/common/script/ops/equip.js

@@ -6,7 +6,7 @@ import {
   NotFound,
   BadRequest,
 } from '../libs/errors';
-import errorMessage from '../libs/errorMessage';
+import { errorMessage } from '../libs/errorMessage';
 
 export default function equip (user, req = {}) {
   // Being type a parameter followed by another parameter

website/common/script/ops/feed.js

@@ -11,7 +11,7 @@ import {
   NotAuthorized,
   NotFound,
 } from '../libs/errors';
-import errorMessage from '../libs/errorMessage';
+import { errorMessage } from '../libs/errorMessage';
 import { checkOnboardingStatus } from '../libs/onboarding';
 
 function evolve (user, pet, req) {

website/common/script/ops/hatch.js

@@ -11,7 +11,7 @@ import {
   NotAuthorized,
   NotFound,
 } from '../libs/errors';
-import errorMessage from '../libs/errorMessage';
+import { errorMessage } from '../libs/errorMessage';
 import { checkOnboardingStatus } from '../libs/onboarding';
 
 export default function hatch (user, req = {}, analytics) {

website/common/script/ops/index.js

@@ -1,4 +1,4 @@
-import sleep from './sleep';
+import { sleep } from './sleep';
 import revive from './revive';
 import reset from './reset';
 import reroll from './reroll';

website/common/script/ops/sleep.js

@@ -1,4 +1,4 @@
-export default function sleep (user, req = {}, analytics) {
+export function sleep (user, req = {}, analytics) {
   user.preferences.sleep = !user.preferences.sleep;
 
   if (analytics) {

website/common/script/ops/stats/allocate.js

@@ -7,7 +7,7 @@ import {
   NotAuthorized,
 } from '../../libs/errors';
 import i18n from '../../i18n';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import hasClass from '../../libs/hasClass';
 
 export default function allocate (user, req = {}) {

website/common/script/ops/stats/allocateBulk.js

@@ -7,7 +7,7 @@ import {
   NotAuthorized,
 } from '../../libs/errors';
 import i18n from '../../i18n';
-import errorMessage from '../../libs/errorMessage';
+import { errorMessage } from '../../libs/errorMessage';
 import hasClass from '../../libs/hasClass';
 
 export default function allocateBulk (user, req = {}) {

website/common/script/ops/unequip.js

@@ -4,7 +4,7 @@ import i18n from '../i18n';
 import {
   BadRequest,
 } from '../libs/errors';
-import errorMessage from '../libs/errorMessage';
+import { errorMessage } from '../libs/errorMessage';
 
 export const UNEQUIP_PET_MOUNT = 'pet';
 export const UNEQUIP_BACKGROUND = 'background';