Node 8 (WIP)

.babelrc

@@ -1,10 +1,6 @@
 {
-  "presets": ["es2015"],
   "plugins": [
-    "transform-object-rest-spread",
-    ["transform-async-to-module-method", {
-      "module": "bluebird",
-      "method": "coroutine"
-    }]
+    "transform-es2015-modules-commonjs",
+    "syntax-object-rest-spread",
   ]
 }

.nodemonignore

@@ -4,6 +4,7 @@ node_modules/**
 .bower-registry/**
 website/client-old/**
 website/client/**
+website/client/store/**
 website/views/**
 website/build/**
 dist/**

.nvmrc

@@ -1 +1 @@
-6
+8

.travis.yml

@@ -1,15 +1,13 @@
 language: node_js
 node_js:
-  - '6'
+  - '8'
 services:
   - mongodb
 cache:
   directories:
     - 'node_modules'
 addons:
   chrome: stable
-before_install:
-  - npm install -g npm@5
 before_script:
   - npm run test:build
   - cp config.json.example config.json

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:boron
+FROM node:8
 
 # Upgrade NPM to v5 (Yarn is needed because of this bug https://github.com/npm/npm/issues/16807)
 # The used solution is suggested here https://github.com/npm/npm/issues/16807#issuecomment-313591975

Dockerfile-Production

@@ -1,4 +1,4 @@
-FROM node:boron
+FROM node:8
 
 ENV ADMIN_EMAIL admin@habitica.com
 ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e

gulp/taskHelper.js

@@ -2,7 +2,6 @@ import { exec }                   from 'child_process';
 import psTree                     from 'ps-tree';
 import nconf                      from 'nconf';
 import net                        from 'net';
-import Bluebird                   from 'bluebird';
 import { post }                   from 'superagent';
 import { sync as glob }           from 'glob';
 import Mocha                      from 'mocha';
@@ -45,7 +44,7 @@ export function kill (proc) {
  * before failing.
  */
 export function awaitPort (port, max = 60) {
-  return new Bluebird((rej, res) => {
+  return new Promise((rej, res) => {
     let socket;
     let timeout;
     let interval;

migrations/archive/2016/20160529_fix_challenges.js

@@ -16,7 +16,6 @@
 const authorName = 'Blade';
 const authorUuid = '75f270e8-c5db-4722-a5e6-a83f1b23f76b';
 
-global.Promise = require('bluebird');
 const MongoClient = require('mongodb').MongoClient;
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');

migrations/archive/2016/20160530_fix_tasks_from_null_value_in_challenges_broken.js

@@ -11,7 +11,6 @@
  * pm'ed each user asking if they would like their tasks reset to the previous day
  ***************************************/
 
-global.Promise = require('bluebird');
 const MongoClient = require('mongodb').MongoClient;
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');

migrations/archive/2016/20160602_convert_quest_collection.js

@@ -12,7 +12,6 @@
  * from an object to a number, hence this migration.
  ***************************************/
 
-global.Promise = require('bluebird');
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');
 const Timer = require('./utils/timer');

migrations/archive/2016/20160605_convert_quest_collection_again.js

@@ -9,7 +9,6 @@
  * and transfers a group's progress to it
  ***************************************/
 
-global.Promise = require('bluebird');
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');
 const Timer = require('./utils/timer');

migrations/archive/2016/20160615_fix_bad_emails.js

@@ -12,7 +12,6 @@
  * <userid>@example.com
  ***************************************/
 
-global.Promise = require('bluebird');
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');
 const Timer = require('./utils/timer');

migrations/archive/2016/20161002_add_missing_webhook_type.js

@@ -9,7 +9,6 @@
  * they support a type and options and label
 * ***************************************/
 
-global.Promise = require('bluebird');
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');
 const Timer = require('./utils/timer');

migrations/archive/2017/20170111_announce_collection_quest_change_in_parties.js

@@ -12,7 +12,6 @@
  * message into the chat for affected parties.
  ***************************************/
 
-global.Promise = require('bluebird');
 const uuid = require('uuid');
 const TaskQueue = require('cwait').TaskQueue;
 const logger = require('./utils/logger');

migrations/archive/README.md

@@ -1,4 +1,6 @@
 If you need to use a migration from this folder, move it to /migrations.
 
 Note that /migrations files (excluding /archive) are linted, so to pass test you'll have to make sure
-that the file is written correctly.
+that the file is written correctly.
+
+They might also be using some old deps that we don't use anymore like Bluebird, mongoskin, ...

migrations/challenges/sync-all-challenges.js

@@ -1,5 +1,3 @@
-import Bluebird from 'Bluebird';
-
 import { model as Challenges } from '../../website/server/models/challenge';
 import { model as User } from '../../website/server/models/user';
 
@@ -17,10 +15,10 @@ async function syncChallengeToMembers (challenges) {
       promises.push(user.save());
     });
 
-    return Bluebird.all(promises);
+    return Promise.all(promises);
   });
 
-  return await Bluebird.all(challengSyncPromises);
+  return await Promise.all(challengSyncPromises);
 }
 
 async function syncChallenges (lastChallengeDate) {

migrations/groups/create-group.js

@@ -1,5 +1,3 @@
-import Bluebird from 'bluebird';
-
 import { model as Group } from '../../website/server/models/group';
 import { model as User } from '../../website/server/models/user';
 
@@ -16,7 +14,7 @@ async function createGroup (name, privacy, type, leaderId) {
   group.leader = user._id;
   user.guilds.push(group._id);
 
-  return Bluebird.all([group.save(), user.save()]);
+  return Promise.all([group.save(), user.save()]);
 }
 
 module.exports = async function groupCreator () {

migrations/groups/habitrpg-jackalopes.js

@@ -3,7 +3,6 @@
 /*
  * This migration will find users with unlimited subscriptions who are also eligible for Jackalope mounts, and award them
  */
-import Bluebird from 'bluebird';
 
 import { model as Group } from '../../website/server/models/group';
 import { model as User } from '../../website/server/models/user';
@@ -38,7 +37,7 @@ async function handOutJackalopes () {
 
   cursor.on('close', async () => {
     console.log('done');
-    return await Bluebird.all(promises);
+    return await Promise.all(promises);
   });
 }
 

migrations/groups/update-groups-with-group-plans.js

@@ -9,8 +9,6 @@ let authorUuid = ''; // ... own data is done
  * subscription to all members
  */
 
-import Bluebird from 'bluebird';
-
 import { model as Group } from '../../website/server/models/group';
 import * as payments from '../../website/server/libs/payments';
 
@@ -28,7 +26,7 @@ async function updateGroupsWithGroupPlans () {
   });
 
   cursor.on('close', async () => {
-    return await Bluebird.all(promises);
+    return await Promise.all(promises);
   });
 }
 

migrations/migration-runner.js

@@ -1,14 +1,14 @@
 require('babel-register');
-require('babel-polyfill');
 
 // This file must use ES5, everything required can be in ES6
 
 function setUpServer () {
   const nconf = require('nconf'); // eslint-disable-line global-require, no-unused-vars
   const mongoose = require('mongoose'); // eslint-disable-line global-require, no-unused-vars
-  const Bluebird = require('bluebird'); // eslint-disable-line global-require, no-unused-vars
   const setupNconf = require('../website/server/libs/setupNconf'); // eslint-disable-line global-require
+
   setupNconf();
+
   // We require src/server and npt src/index because
   // 1. nconf is already setup
   // 2. we don't need clustering

migrations/s3-upload.js

@@ -1,4 +1,3 @@
-let Bluebird = require('bluebird');
 let request = require('superagent');
 let last = require('lodash/last');
 let AWS = require('aws-sdk');
@@ -74,7 +73,7 @@ function uploadToS3 (start, end, filesUrls) {
   });
   console.log(promises.length);
 
-  return Bluebird.all(promises)
+  return Promise.all(promises)
     .then(() => {
       currentIndex += 50;
       uploadToS3(currentIndex, currentIndex + 50, filesUrls);