fix: default options not properly merged (#34)

Author: chitoku-k

specs/gatsby-ssr.specs.js

@@ -8,61 +8,73 @@ describe("gatsby-ssr", () => {
   });
 
   it("executes when includeDefaultCss is default", () => {
-    onRenderBody({ setHeadComponents });
+    onRenderBody({ setHeadComponents }, { plugins: [] });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("executes when gistDefaultCssInclude is default", () => {
-    onRenderBody({ setHeadComponents });
+    onRenderBody({ setHeadComponents }, { plugins: [] });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("executes when includeDefaultCss is true", () => {
-    onRenderBody({ setHeadComponents }, { includeDefaultCss: true });
+    onRenderBody(
+      { setHeadComponents },
+      { plugins: [], includeDefaultCss: true }
+    );
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("executes when gistDefaultCssInclude is true", () => {
-    onRenderBody({ setHeadComponents }, { gistDefaultCssInclude: true });
+    onRenderBody(
+      { setHeadComponents },
+      { plugins: [], gistDefaultCssInclude: true }
+    );
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("doesn't execute when includeDefaultCss is false", () => {
-    onRenderBody({ setHeadComponents }, { includeDefaultCss: false });
+    onRenderBody(
+      { setHeadComponents },
+      { plugins: [], includeDefaultCss: false }
+    );
     expect(setHeadComponents).toHaveBeenCalledTimes(0);
   });
 
   it("doesn't execute when gistDefaultCssInclude is false", () => {
-    onRenderBody({ setHeadComponents }, { gistDefaultCssInclude: false });
+    onRenderBody(
+      { setHeadComponents },
+      { plugins: [], gistDefaultCssInclude: false }
+    );
     expect(setHeadComponents).toHaveBeenCalledTimes(0);
   });
 
   it("executes when gistCssPreload is missing", () => {
-    onRenderBody({ setHeadComponents });
+    onRenderBody({ setHeadComponents }, { plugins: [] });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("executes when gistCssPreload is false", () => {
-    onRenderBody({ setHeadComponents }, { gistCssPreload: false });
+    onRenderBody({ setHeadComponents }, { plugins: [], gistCssPreload: false });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
   });
 
   it("executes when gistCssPreload is true", () => {
-    onRenderBody({ setHeadComponents }, { gistCssPreload: true });
+    onRenderBody({ setHeadComponents }, { plugins: [], gistCssPreload: true });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
     expect(setHeadComponents.mock.calls[0][0].length).toBe(3);
   });
 
   it("executes when gistCssPreload is true", () => {
-    onRenderBody({ setHeadComponents }, { gistCssPreload: true });
+    onRenderBody({ setHeadComponents }, { plugins: [], gistCssPreload: true });
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
     expect(setHeadComponents.mock.calls[0][0].length).toBe(3);
   });
 
   it("updates the url when one is provided", () => {
     onRenderBody(
       { setHeadComponents },
-      { gistCssPreload: true, gistCssUrlAddress: "https://test" }
+      { plugins: [], gistCssPreload: true, gistCssUrlAddress: "https://test" }
     );
     expect(setHeadComponents).toHaveBeenCalledTimes(1);
 

src/gatsby-ssr.js

@@ -12,14 +12,16 @@ import React from "react";
  * @param {PluginOptions} options the options of the plugin.
  * @returns {*} rendered body.
  */
-export function onRenderBody(
-  { setHeadComponents },
+export function onRenderBody({ setHeadComponents }, options = {}) {
   options = {
-    gistCssPreload: false,
-    gistCssUrlAddress:
-      "https://github.githubassets.com/assets/gist-embed-b3b573358bfc66d89e1e95dbf8319c09.css"
-  }
-) {
+    ...{
+      gistCssPreload: false,
+      gistCssUrlAddress:
+        "https://github.githubassets.com/assets/gist-embed-b3b573358bfc66d89e1e95dbf8319c09.css"
+    },
+    ...options
+  };
+
   let includeCss = true;
   if (options.gistDefaultCssInclude != null) {
     includeCss = options.gistDefaultCssInclude;
@@ -54,7 +56,7 @@ export function onRenderBody(
               }}
             ></script>
           ]
-        : [<link href={options.gistCssUrlAddress} rel="stylesheet" />]
+        : [<link href={options.gistCssUrlAddress} key={key} rel="stylesheet" />]
     );
   }
 }