use shorthand for Object.assign where applicable

diff --git a/gulp.d/tasks/build-preview-pages.js b/gulp.d/tasks/build-preview-pages.js
index 12f3219..74d61ae 100644 (file)
--- a/gulp.d/tasks/build-preview-pages.js
+++ b/gulp.d/tasks/build-preview-pages.js
@@ -30,15 +30,15 @@ module.exports = (src, previewSrc, previewDest, sink = () => map(), layouts = {}
       )
     ),
   ])
-    .then(([baseUiModel]) => Object.assign(baseUiModel, { env: process.env }))
+    .then(([baseUiModel]) => ({ ...baseUiModel, env: process.env }))
     .then((baseUiModel) =>
       vfs
         .src('**/*.adoc', { base: previewSrc, cwd: previewSrc })
         .pipe(
           map((file, enc, next) => {
             const siteRootPath = path.relative(ospath.dirname(file.path), ospath.resolve(previewSrc))
-            const uiModel = Object.assign({}, baseUiModel)
-            uiModel.page = Object.assign({}, uiModel.page)
+            const uiModel = { ...baseUiModel }
+            uiModel.page = { ...uiModel.page }
             uiModel.siteRootPath = siteRootPath
             uiModel.siteRootUrl = path.join(siteRootPath, 'index.html')
             uiModel.uiRootPath = path.join(siteRootPath, '_')

diff --git a/gulp.d/tasks/build.js b/gulp.d/tasks/build.js
index e5f9e86..89ff28d 100644 (file)
--- a/gulp.d/tasks/build.js
+++ b/gulp.d/tasks/build.js
@@ -48,7 +48,7 @@ module.exports = (src, dest, preview) => () => {
       .pipe(uglify())
       .pipe(concat('js/site.js')),
     vfs
-      .src('js/vendor/*.js', Object.assign({ read: false }, opts))
+      .src('js/vendor/*.js', { ...opts, read: false })
       .pipe(
         // see https://gulpjs.org/recipes/browserify-multiple-destination.html
         map((file, enc, next) => {