From 463ba81468aecfc7e4ad1b06b9709755a34868e4 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 11 Apr 2016 19:46:48 +0200
Subject: [PATCH] fix(build) only require/import the main common file

---
 common/script/ops/blockUser.js           | 2 +-
 common/script/ops/sell.js                | 2 +-
 website/src/controllers/api-v3/quests.js | 3 ++-
 website/src/libs/api-v3/errors.js        | 2 +-
 website/src/middlewares/api-v3/auth.js   | 4 +++-
 website/src/middlewares/api-v3/cron.js   | 7 +++----
 website/src/models/group.js              | 3 ++-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/common/script/ops/blockUser.js b/common/script/ops/blockUser.js
index 9663eb57e7..3546d412ab 100644
--- a/common/script/ops/blockUser.js
+++ b/common/script/ops/blockUser.js
@@ -1,5 +1,5 @@
 import validator from 'validator';
-import i18n from '../../../common/script/i18n';
+import i18n from '../i18n';
 import {
   BadRequest,
 } from '../libs/errors';
diff --git a/common/script/ops/sell.js b/common/script/ops/sell.js
index 7e4eee902f..fc3aa9632b 100644
--- a/common/script/ops/sell.js
+++ b/common/script/ops/sell.js
@@ -1,5 +1,5 @@
 import content from '../content/index';
-import i18n from '../../../common/script/i18n';
+import i18n from '../i18n';
 import _ from 'lodash';
 import splitWhitespace from '../libs/splitWhitespace';
 import {
diff --git a/website/src/controllers/api-v3/quests.js b/website/src/controllers/api-v3/quests.js
index 8ba5ca16d2..9c0cf44502 100644
--- a/website/src/controllers/api-v3/quests.js
+++ b/website/src/controllers/api-v3/quests.js
@@ -16,10 +16,11 @@ import {
   getUserInfo,
   sendTxn as sendTxnEmail,
 } from '../../libs/api-v3/email';
-import { quests as questScrolls } from '../../../../common/script/content';
 import common from '../../../../common';
 import sendPushNotification from '../../libs/api-v3/pushNotifications';
 
+const questScrolls = common.content.quests;
+
 function canStartQuestAutomatically (group)  {
   // If all members are either true (accepted) or false (rejected) return true
   // If any member is null/undefined (undecided) return false
diff --git a/website/src/libs/api-v3/errors.js b/website/src/libs/api-v3/errors.js
index 0667dafcd9..2b6d52bbe3 100644
--- a/website/src/libs/api-v3/errors.js
+++ b/website/src/libs/api-v3/errors.js
@@ -1,4 +1,4 @@
-import common from '../../../../common/script';
+import common from '../../../../common';
 
 export const CustomError = common.errors.CustomError;
 
diff --git a/website/src/middlewares/api-v3/auth.js b/website/src/middlewares/api-v3/auth.js
index b3ed6d9485..ab948626cb 100644
--- a/website/src/middlewares/api-v3/auth.js
+++ b/website/src/middlewares/api-v3/auth.js
@@ -2,11 +2,13 @@ import {
   NotAuthorized,
   BadRequest,
 } from '../../libs/api-v3/errors';
-import i18n from '../../../../common/script/i18n';
+import common from '../../../../common';
 import {
   model as User,
 } from '../../models/user';
 
+const i18n = common.i18n;
+
 // Authenticate a request through the x-api-user and x-api key header
 // If optional is true, don't error on missing authentication
 export function authWithHeaders (optional = false) {
diff --git a/website/src/middlewares/api-v3/cron.js b/website/src/middlewares/api-v3/cron.js
index 9a6ab40280..81f69c6d21 100644
--- a/website/src/middlewares/api-v3/cron.js
+++ b/website/src/middlewares/api-v3/cron.js
@@ -1,9 +1,5 @@
 import _ from 'lodash';
 import moment from 'moment';
-import {
-  daysSince,
-  shouldDo,
-} from '../../../../common/script/cron';
 import common from '../../../../common';
 import * as Tasks from '../../models/task';
 import Q from 'q';
@@ -11,6 +7,9 @@ import { model as Group } from '../../models/group';
 import { model as User } from '../../models/user';
 import { preenUserHistory } from '../../libs/api-v3/preening';
 
+const daysSince = common.daysSince;
+const shouldDo = common.shouldDo;
+
 const scoreTask = common.ops.scoreTask;
 
 let clearBuffs = {
diff --git a/website/src/models/group.js b/website/src/models/group.js
index cebebb1900..99a12ce908 100644
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -12,11 +12,12 @@ import { InternalServerError } from '../libs/api-v3/errors';
 import * as firebase from '../libs/api-v2/firebase';
 import baseModel from '../libs/api-v3/baseModel';
 import { sendTxn as sendTxnEmail } from '../libs/api-v3/email';
-import { quests as questScrolls } from '../../../common/script/content';
 import Q from 'q';
 import nconf from 'nconf';
 import sendPushNotification from '../libs/api-v3/pushNotifications';
 
+const questScrolls = shared.content.quests;
+
 let Schema = mongoose.Schema;
 
 // NOTE once Firebase is enabled any change to groups' members in MongoDB will have to be run through the API