merge master into branch

# Conflicts: # docs/blog/2018-04-04-gatsby-contentful-starter-tutorial/index.md # docs/blog/2020-01-08-git-workflows/index.md
gatsbyjs · May 21, 2020 · 488a0cb · 488a0cb
2 parents df7ad89 + 37f18c7
commit 488a0cb
Show file tree

Hide file tree

Showing 1,902 changed files with 219,316 additions and 179,223 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -9,11 +9,5 @@ if (process.env.NODE_ENV !== `test`) {
 module.exports = {
   sourceMaps: true,
   presets: ["babel-preset-gatsby-package"],
-  overrides: [
-    {
-      test: "**/*.ts",
-      plugins: [["@babel/plugin-transform-typescript", { isTSX: true }]],
-    },
-  ],
   ignore,
 }