From 2a24c60b52872b2ac4336e56283b826ff01b4adf Mon Sep 17 00:00:00 2001 From: gabrieluizramos Date: Fri, 1 May 2020 12:20:03 -0300 Subject: [PATCH 1/2] chore(ts): convert log-line-function to TS --- packages/gatsby/src/bootstrap/index.js | 2 +- .../gatsby/src/bootstrap/log-line-function.js | 12 ----------- .../gatsby/src/bootstrap/log-line-function.ts | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 packages/gatsby/src/bootstrap/log-line-function.js create mode 100644 packages/gatsby/src/bootstrap/log-line-function.ts diff --git a/packages/gatsby/src/bootstrap/index.js b/packages/gatsby/src/bootstrap/index.js index bd2d0f85dcad7..9b8574ed208dc 100644 --- a/packages/gatsby/src/bootstrap/index.js +++ b/packages/gatsby/src/bootstrap/index.js @@ -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, diff --git a/packages/gatsby/src/bootstrap/log-line-function.js b/packages/gatsby/src/bootstrap/log-line-function.js deleted file mode 100644 index b6e8ee936d8f0..0000000000000 --- a/packages/gatsby/src/bootstrap/log-line-function.js +++ /dev/null @@ -1,12 +0,0 @@ -;[`log`, `warn`].forEach(function (method) { - var old = console[method] - console[method] = function () { - var stack = new Error().stack.split(/\n/) - // Chrome includes a single "Error" line, FF doesn't. - if (stack[0].indexOf(`Error`) === 0) { - stack = stack.slice(1) - } - var args = [].slice.apply(arguments).concat([stack[1].trim()]) - return old.apply(console, args) - } -}) diff --git a/packages/gatsby/src/bootstrap/log-line-function.ts b/packages/gatsby/src/bootstrap/log-line-function.ts new file mode 100644 index 0000000000000..44efb53f99b25 --- /dev/null +++ b/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) + } +}) From 0317b5336f7ccf30bda8f3308fe7fdb35c5e6e06 Mon Sep 17 00:00:00 2001 From: gabrieluizramos Date: Fri, 1 May 2020 12:20:36 -0300 Subject: [PATCH 2/2] chore(ts): convert prefer-default to TS --- packages/gatsby/src/bootstrap/index.js | 2 +- packages/gatsby/src/bootstrap/load-themes/index.js | 2 +- packages/gatsby/src/bootstrap/prefer-default.js | 1 - packages/gatsby/src/bootstrap/prefer-default.ts | 1 + packages/gatsby/src/commands/serve.ts | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 packages/gatsby/src/bootstrap/prefer-default.js create mode 100644 packages/gatsby/src/bootstrap/prefer-default.ts diff --git a/packages/gatsby/src/bootstrap/index.js b/packages/gatsby/src/bootstrap/index.js index 9b8574ed208dc..4f6dd5eaa16d4 100644 --- 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 index 3ce77bd406896..94e909e6e6ee3 100644 --- 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.js b/packages/gatsby/src/bootstrap/prefer-default.js deleted file mode 100644 index 13b0f0fcede97..0000000000000 --- a/packages/gatsby/src/bootstrap/prefer-default.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = m => (m && m.default) || m diff --git a/packages/gatsby/src/bootstrap/prefer-default.ts b/packages/gatsby/src/bootstrap/prefer-default.ts new file mode 100644 index 0000000000000..603441436b008 --- /dev/null +++ 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 index 9189c6fe9a4c9..76b8f76e840b6 100644 --- 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 {