Merge branch 'master' into feature/multi-map

Author: jbolda

examples/markdown-docs/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "markdown-docs-example",
   "dependencies": {
-    "gatsby": "2.17.11",
+    "gatsby": "2.18.3",
     "gatsby-source-airtable": "2.0.10",
-    "gatsby-source-filesystem": "2.1.36",
-    "gatsby-transformer-remark": "2.6.33",
-    "react": "16.11.0",
-    "react-dom": "16.11.0",
+    "gatsby-source-filesystem": "2.1.38",
+    "gatsby-transformer-remark": "2.6.37",
+    "react": "16.12.0",
+    "react-dom": "16.12.0",
     "remark-html": "10.0.0"
   },
   "keywords": [

examples/markdown-docs/package.json

@@ -20,9 +20,9 @@ module.exports = {
     {
       resolve: `gatsby-source-airtable`,
       options: {
+        apiKey: process.env.AIRTABLE_API_KEY, //(set via environment variable for this example)
         tables: [
           {
-            apiKey: process.env.AIRTABLE_API_KEY, //(set via environment variable for this example)
             baseId: `appM8D8wmSJX9WJDE`,
             tableName: `Recipes`,
             tableView: `List`,

examples/markdown-docs/yarn.lock

@@ -5,16 +5,16 @@
   "repository": "[email protected]:jbolda/gatsby-source-airtable.git",
   "author": "Jacob Bolda <[email protected]>",
   "dependencies": {
-    "gatsby": "2.17.11",
-    "gatsby-image": "2.2.31",
-    "gatsby-link": "2.2.23",
-    "gatsby-plugin-react-helmet": "3.1.14",
-    "gatsby-plugin-sharp": "2.2.37",
+    "gatsby": "2.18.3",
+    "gatsby-image": "2.2.33",
+    "gatsby-link": "2.2.24",
+    "gatsby-plugin-react-helmet": "3.1.15",
+    "gatsby-plugin-sharp": "2.3.3",
     "gatsby-source-airtable": "2.0.10",
-    "gatsby-source-filesystem": "2.1.36",
-    "gatsby-transformer-sharp": "2.3.3",
-    "react": "16.11.0",
-    "react-dom": "16.11.0",
+    "gatsby-source-filesystem": "2.1.38",
+    "gatsby-transformer-sharp": "2.3.5",
+    "react": "16.12.0",
+    "react-dom": "16.12.0",
     "react-helmet": "5.2.1"
   },
   "keywords": [

examples/recipes-with-photos/gatsby-config.js

@@ -1,12 +1,12 @@
 {
   "name": "testing-options",
   "dependencies": {
-    "gatsby": "2.17.11",
+    "gatsby": "2.18.3",
     "gatsby-source-airtable": "2.0.10",
-    "gatsby-source-filesystem": "2.1.36",
-    "gatsby-transformer-remark": "2.6.33",
-    "react": "16.11.0",
-    "react-dom": "16.11.0",
+    "gatsby-source-filesystem": "2.1.38",
+    "gatsby-transformer-remark": "2.6.37",
+    "react": "16.12.0",
+    "react-dom": "16.12.0",
     "remark-html": "10.0.0"
   },
   "keywords": [