From b2ad6a4d1871b8f8604cf41414f64d119cea4648 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 29 Mar 2019 13:26:17 -0400 Subject: [PATCH] Bump node dependency to 8.9.0 6.9.0 is EOL next month and our defaultConfig stub already uses features not supported in 6.x, which means I either had to change that file to use Object.assign instead of spread, or bump our dependency. Would rather not have to write prehistoric JS just to support an almost-EOL version. --- package.json | 4 ++-- stubs/defaultConfig.stub.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 10b8ae207895..161b83a6c1ee 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@babel/preset-env", { "targets": { - "node": "6.9.0" + "node": "8.9.0" } } ] @@ -78,6 +78,6 @@ ] }, "engines": { - "node": ">=6.9.0" + "node": ">=8.9.0" } } diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index ea09661347ea..61cfabe82115 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -236,9 +236,10 @@ module.exports = { '4': '4px', '8': '8px', }, - borderColor: theme => { - return global.Object.assign({ default: theme('colors.gray.300', 'currentColor') }, theme('colors')) - }, + borderColor: theme => ({ + ...theme('colors'), + default: theme('colors.gray.300', 'currentColor'), + }), borderRadius: { none: '0', sm: '.125rem',