fix: setBabelOptions (#7838)

gatsbyjs · Sep 3, 2018 · 66101ca · 66101ca
1 parent 72b83ee
commit 66101ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/packages/gatsby/src/redux/actions.js b/packages/gatsby/src/redux/actions.js
@@ -893,7 +893,9 @@ actions.replaceWebpackConfig = (config: Object, plugin?: ?Plugin = null) => {
  * @param {Object} config An options object in the shape of a normal babelrc javascript object
  * @example
  * setBabelOptions({
- *   sourceMaps: `inline`,
+ *   options: {
+ *     sourceMaps: `inline`,
+ *   }
  * })
  */
 actions.setBabelOptions = (options: Object, plugin?: ?Plugin = null) => {

diff --git a/packages/gatsby/src/utils/babel-loader-helpers.js b/packages/gatsby/src/utils/babel-loader-helpers.js
@@ -1,14 +1,25 @@
 const path = require(`path`)
 const _ = require(`lodash`)
 
-const prepareOptions = (babel, resolve = require.resolve) => {
+const loadCachedConfig = () => {
   let pluginBabelConfig = { test: { plugins: [], presets: [] } }
   if (process.env.NODE_ENV !== `test`) {
     pluginBabelConfig = require(path.join(
       process.cwd(),
       `./.cache/babelState.json`
     ))
   }
+  return pluginBabelConfig
+}
+
+const getCustomOptions = () => {
+  const pluginBabelConfig = loadCachedConfig()
+  const stage = process.env.GATSBY_BUILD_STAGE || `test`
+  return pluginBabelConfig[stage].options
+}
+
+const prepareOptions = (babel, resolve = require.resolve) => {
+  let pluginBabelConfig = loadCachedConfig()
 
   const stage = process.env.GATSBY_BUILD_STAGE || `test`
 
@@ -178,6 +189,8 @@ const mergeConfigItemOptions = ({ items, itemToMerge, type, babel }) => {
   return items
 }
 
+exports.getCustomOptions = getCustomOptions
+
 // Export helper functions for testing
 exports.prepareOptions = prepareOptions
 exports.mergeConfigItemOptions = mergeConfigItemOptions
diff --git a/packages/gatsby/src/utils/babel-loader.js b/packages/gatsby/src/utils/babel-loader.js
@@ -2,6 +2,7 @@ const babelLoader = require(`babel-loader`)
 
 const {
   prepareOptions,
+  getCustomOptions,
   mergeConfigItemOptions,
 } = require(`./babel-loader-helpers`)
 
@@ -28,6 +29,7 @@ module.exports = babelLoader.custom(babel => {
         loader: {
           cacheDirectory: true,
           sourceType: `unambiguous`,
+          ...getCustomOptions(),
           ...options,
         },
       }