chore(ts): convert prefer-default to TS

gatsbyjs · May 1, 2020 · 8bc5d47 · 8bc5d47
1 parent 96ef2ed
commit 8bc5d47
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/packages/gatsby/src/bootstrap/index.js b/packages/gatsby/src/bootstrap/index.js
@@ -20,7 +20,7 @@ const loadThemes = require(`./load-themes`)
 const report = require(`gatsby-cli/lib/reporter`)
 import { getConfigFile } from "./get-config-file"
 const tracer = require(`opentracing`).globalTracer()
-const preferDefault = require(`./prefer-default`)
+import { preferDefault } from "./prefer-default"
 import { removeStaleJobs } from "./remove-stale-jobs"
 
 // Show stack trace on unhandled promises.

diff --git a/packages/gatsby/src/bootstrap/load-themes/index.js b/packages/gatsby/src/bootstrap/load-themes/index.js
@@ -3,7 +3,7 @@ const mergeGatsbyConfig = require(`../../utils/merge-gatsby-config`)
 const Promise = require(`bluebird`)
 const _ = require(`lodash`)
 const debug = require(`debug`)(`gatsby:load-themes`)
-const preferDefault = require(`../prefer-default`)
+import { preferDefault } from "../prefer-default"
 import { getConfigFile } from "../get-config-file"
 const { resolvePlugin } = require(`../load-plugins/load`)
 const reporter = require(`gatsby-cli/lib/reporter`)

diff --git a/packages/gatsby/src/bootstrap/prefer-default.ts b/packages/gatsby/src/bootstrap/prefer-default.ts
@@ -0,0 +1 @@
+export const preferDefault = (m: any): any => (m && m.default) || m
diff --git a/packages/gatsby/src/commands/serve.ts b/packages/gatsby/src/commands/serve.ts
@@ -12,7 +12,7 @@ import telemetry from "gatsby-telemetry"
 
 import { detectPortInUseAndPrompt } from "../utils/detect-port-in-use-and-prompt"
 import { getConfigFile } from "../bootstrap/get-config-file"
-import preferDefault from "../bootstrap/prefer-default"
+import { preferDefault } from "../bootstrap/prefer-default"
 import { IProgram } from "./types"
 
 interface IMatchPath {