From 7e48daa8e88ea08ec5531d024383f5b57db7d8d1 Mon Sep 17 00:00:00 2001
From: Pedro Duarte <contact@peduarte.com>
Date: Mon, 15 Jan 2018 14:13:28 +0000
Subject: [PATCH] Fix default `pluginOptions` parameter

This PR fixes https://github.com/gatsbyjs/gatsby/issues/3484

Correctly merge `defaultOptions` with `pluginOptions`
---
 .../src/gatsby-browser.js                       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/gatsby-plugin-nprogress/src/gatsby-browser.js b/packages/gatsby-plugin-nprogress/src/gatsby-browser.js
index 86caff7f7d453..36509ca80b1a2 100644
--- a/packages/gatsby-plugin-nprogress/src/gatsby-browser.js
+++ b/packages/gatsby-plugin-nprogress/src/gatsby-browser.js
@@ -1,8 +1,13 @@
 import NProgress from "nprogress"
 
-exports.onClientEntry = (a, pluginOptions = { color: `#29d` }) => {
+const defaultOptions = { color: `#29d` }
+
+exports.onClientEntry = (a, pluginOptions = defaultOptions) => {
+  // Merge default options with user defined options via `gatsby-config.js`
+  const options = { ...defaultOptions, ...pluginOptions }
+
   window.___emitter.on(`onDelayedLoadPageResources`, () => {
-    NProgress.configure(pluginOptions)
+    NProgress.configure(options)
     NProgress.start()
   })
   window.___emitter.on(`onPostLoadPageResources`, () => {
@@ -14,7 +19,7 @@ exports.onClientEntry = (a, pluginOptions = { color: `#29d` }) => {
     pointer-events: none;
 }
 #nprogress .bar {
-    background: ${pluginOptions.color};
+    background: ${options.color};
     position: fixed;
     z-index: 1031;
     top: 0;
@@ -28,7 +33,7 @@ exports.onClientEntry = (a, pluginOptions = { color: `#29d` }) => {
     right: 0px;
     width: 100px;
     height: 100%;
-    box-shadow: 0 0 10px ${pluginOptions.color}, 0 0 5px ${pluginOptions.color};
+    box-shadow: 0 0 10px ${options.color}, 0 0 5px ${options.color};
     opacity: 1.0;
     -webkit-transform: rotate(3deg) translate(0px, -4px);
     -ms-transform: rotate(3deg) translate(0px, -4px);
@@ -46,8 +51,8 @@ exports.onClientEntry = (a, pluginOptions = { color: `#29d` }) => {
     height: 18px;
     box-sizing: border-box;
     border: solid 2px transparent;
-    border-top-color: ${pluginOptions.color};
-    border-left-color: ${pluginOptions.color};
+    border-top-color: ${options.color};
+    border-left-color: ${options.color};
     border-radius: 50%;
     -webkit-animation: nprogress-spinner 400ms linear infinite;
     animation: nprogress-spinner 400ms linear infinite;