diff --git a/.eslintrc b/.eslintrc index b2936a0ef5..855b16e0d6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,7 +14,8 @@ "parser": "babel-eslint", "plugins": [ "react", - "import" + "import", + "prefer-object-spread" ], "settings": { "import/ignore": [ @@ -260,6 +261,8 @@ "import/no-duplicates": 2, "import/newline-after-import": 2, "import/unambiguous": 2, - "import/extensions": [ 0, "always" ] + "import/extensions": [ 0, "always" ], + + "prefer-object-spread/prefer-object-spread": 2 } } diff --git a/common/models/promo.js b/common/models/promo.js index ec4970d461..c561914bc9 100644 --- a/common/models/promo.js +++ b/common/models/promo.js @@ -41,7 +41,10 @@ export default function promo(Promo) { .then(function({ count = 0 } = {}) { log('job', count); if (count) { - return Object.assign({}, promo, { name: `${code} Discount` }); + return { + ...promo, + name: `${code} Discount` + }; } return Promise.reject(new Error( `Job ${id} not found` diff --git a/common/utils/jsonp$.js b/common/utils/jsonp$.js index 99dbbe2eb4..febcbf7ade 100644 --- a/common/utils/jsonp$.js +++ b/common/utils/jsonp$.js @@ -15,15 +15,12 @@ export function jsonp$(options) { } return new AnonymousObservable(function(o) { - const settings = Object.assign( - {}, - { - jsonp: 'JSONPCallback', - async: true, - jsonpCallback: 'rxjsjsonpCallbackscallback_' + (id++).toString(36) - }, - options - ); + const settings = { + jsonp: 'JSONPCallback', + async: true, + jsonpCallback: 'rxjsjsonpCallbackscallback_' + (id++).toString(36), + ...options + }; let script = root.document.createElement('script'); script.type = 'text/javascript'; diff --git a/package.json b/package.json index 308fb3af9e..2290b5a05b 100644 --- a/package.json +++ b/package.json @@ -132,6 +132,7 @@ "del": "^2.2.0", "eslint": "^3.1.0", "eslint-plugin-import": "^2.0.1", + "eslint-plugin-prefer-object-spread": "^1.1.0", "eslint-plugin-react": "^6.2.0", "gulp": "^3.9.0", "gulp-babel": "^6.1.1", diff --git a/server/boot/commit.js b/server/boot/commit.js index f600218116..dc8607c215 100644 --- a/server/boot/commit.js +++ b/server/boot/commit.js @@ -106,22 +106,20 @@ export default function commit(app) { req.flash('info', { msg: dedent` Looks like you already have a pledge to ${pledge.displayName}. - Clicking "Commit" here will replace your old commitment. If you - do change your commitment, please remember to cancel your + Clicking "Commit" here will replace your old commitment. If you + do change your commitment, please remember to cancel your previous recurring donation directly with ${pledge.displayName}. ` }); } res.render( 'commit/', - Object.assign( - { - title: 'Commit to a nonprofit. Commit to your goal.', - pledge - }, - commitGoals, - nonprofit - ) + { + title: 'Commit to a nonprofit. Commit to your goal.', + pledge, + ...commitGoals, + ...nonprofit + } ); }, next @@ -143,14 +141,12 @@ export default function commit(app) { .flatMap(oldPledge => { // create new pledge for user const pledge = Pledge( - Object.assign( - { - amount, - goal, - userId: user.id - }, - nonprofit - ) + { + amount, + goal, + userId: user.id, + ...nonprofit + } ); if (oldPledge) { @@ -173,7 +169,7 @@ export default function commit(app) { msg: dedent` Congratulations, you have committed to giving ${displayName} $${amount} each month until you have completed - your ${goal}. Please remember to cancel your pledge directly + your ${goal}. Please remember to cancel your pledge directly with ${displayName} once you finish. ` }); @@ -223,13 +219,13 @@ export default function commit(app) { .subscribe( pledge => { let msg = dedent` - You have successfully stopped your pledge. Please - rememberto cancel your recurring donation directly + You have successfully stopped your pledge. Please + remember to cancel your recurring donation directly with the nonprofit if you haven't already done so. `; if (!pledge) { msg = dedent` - It doesn't look like you had an active pledge, so + It doesn't look like you had an active pledge, so there's no pledge to stop. `; }