Convert prefer-default and log-line-function to TS

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.
@@ -36,7 +36,7 @@ const { writeRedirects } = require(`./redirects-writer`)
 // Override console.log to add the source file + line number.
 // Useful for debugging if you lose a console.log somewhere.
 // Otherwise leave commented out.
-// require(`./log-line-function`)
+// import "./log-line-function"
 
 type BootstrapArgs = {
  directory: string,

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`)

packages/gatsby/src/bootstrap/log-line-function.ts

@@ -0,0 +1,20 @@
+;[`log`, `warn`].forEach((method: string): void => {
+ const old = console[method]
+
+ console[method] = (...methodArgs: []): void => {
+ const error: Error = new Error()
+ let stack = error.stack ? error.stack.split(/\n/) : []
+
+ // Chrome includes a single "Error" line, FF doesn't.
+ if (stack[0].indexOf(`Error`) === 0) {
+ stack = stack.slice(1)
+ }
+
+ const [, trace] = stack[1] || ``
+ const args: string[] = ([] as string[]).slice
+ .apply(methodArgs)
+ .concat([trace.trim()])
+
+ return old.apply(console, args)
+ }
+})

packages/gatsby/src/bootstrap/prefer-default.ts

@@ -0,0 +1 @@
+export const preferDefault = (m: any): any => (m && m.default) || m

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 {