krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Node 8 (WIP) (#9946)

Browse Source 
* start upgrade to node 8

* upgrade travis

* improve travis

* Remove bluebird, babel (except for modules) from server (WIP) (#9947)

* remove bluebird, babel from server (except for modules)

* fixes

* fix path

* fix path

* fix export

* fix export

* fix test

* fix tests

* remove plugin for transform-object-rest-spread since it is supported in node8

* babel: correct syntax rest spread

* remove bluebird

* update migrations archive readme

* fix package-lock.json

* fix typo

* add package-loc
This commit is contained in:
Matteo Pagliazzi
2018-03-15 19:59:36 +01:00
committed by GitHub
parent b1b1e512f5
commit cb42a31c43
68 changed files with 786 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/server/models/user/hooks.js
View File

@@ -1,7 +1,6 @@
import common from '../../../common';
import _ from 'lodash';
import moment from 'moment';
import Bluebird from 'bluebird';
import baseModel from '../../libs/baseModel';
import * as Tasks from '../task';
import {
@@ -58,7 +57,7 @@ function _populateDefaultTasks (user, taskTypes) {
// @TODO: default tasks are handled differently now, and not during registration. We should move this code
let tasksToCreate = [];
if (user.registeredThrough === 'habitica-web') return Bluebird.all(tasksToCreate);
if (user.registeredThrough === 'habitica-web') return Promise.all(tasksToCreate);
if (tagsI !== -1) {
taskTypes = _.clone(taskTypes);
@@ -89,7 +88,7 @@ function _populateDefaultTasks (user, taskTypes) {
tasksToCreate.push(...tasksOfType);
});
return Bluebird.all(tasksToCreate)
return Promise.all(tasksToCreate)
.then((tasksCreated) => {
_.each(tasksCreated, (task) => {
user.tasksOrder[`${task.type}s`].push(task._id);