krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +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

10
website/server/libs/spells.js
View File

@@ -1,5 +1,3 @@
import Bluebird from 'bluebird';
import { model as User } from '../models/user';
import * as Tasks from '../models/task';
import {
@@ -24,7 +22,7 @@ async function castTaskSpell (res, req, targetId, user, spell, quantity = 1) {
spell.cast(user, task, req);
}
const results = await Bluebird.all([
const results = await Promise.all([
user.save(),
task.save(),
]);
@@ -46,7 +44,7 @@ async function castMultiTaskSpell (req, user, spell, quantity = 1) {
.filter(t => t.isModified())
.map(t => t.save());
toSave.unshift(user.save());
const saved = await Bluebird.all(toSave);
const saved = await Promise.all(toSave);
const response = {
tasks: saved,
@@ -82,7 +80,7 @@ async function castPartySpell (req, party, partyMembers, user, spell, quantity =
for (let i = 0; i < quantity; i += 1) {
spell.cast(user, partyMembers, req);
}
await Bluebird.all(partyMembers.map(m => m.save()));
await Promise.all(partyMembers.map(m => m.save()));
return partyMembers;
}
@@ -107,7 +105,7 @@ async function castUserSpell (res, req, party, partyMembers, targetId, user, spe
}
if (partyMembers !== user) {
await Bluebird.all([
await Promise.all([
user.save(),
partyMembers.save(),
]);