Continue converting base to typescript

gatsbyjs · Jul 20, 2020 · 63acc67 · 63acc67
1 parent 0315737
commit 63acc67
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 307 deletions.
diff --git a/...elemetry/src/showAnalyticsNotification.js → ...emetry/src/show-analytics-notification.ts b/...elemetry/src/showAnalyticsNotification.js → ...emetry/src/show-analytics-notification.ts
@@ -1,9 +1,9 @@
-const boxen = require(`boxen`)
+import boxen, { BorderStyle } from "boxen"
 
 const defaultConfig = {
   padding: 1,
   borderColor: `blue`,
-  borderStyle: `double`,
+  borderStyle: BorderStyle.Double,
 }
 
 const defaultMessage =
@@ -15,14 +15,10 @@ const defaultMessage =
 
 /**
  * Analytics notice for the end-user
- * @param {Object} config - The configuration that boxen accepts. https://github.com/sindresorhus/boxen#api
- * @param {string} message - Message shown to the end-user
  */
-const showAnalyticsNotification = (
-  config = defaultConfig,
-  message = defaultMessage
-) => {
+export function showAnalyticsNotification(
+  config: boxen.Options = defaultConfig,
+  message: string = defaultMessage
+): void {
   console.log(boxen(message, config))
 }
-
-module.exports = showAnalyticsNotification
diff --git a/packages/gatsby-telemetry/src/telemetry.js b/packages/gatsby-telemetry/src/telemetry.js
diff --git a/packages/gatsby-telemetry/src/telemetry.ts b/packages/gatsby-telemetry/src/telemetry.ts
@@ -1,18 +1,22 @@
-const uuidv4 = require(`uuid/v4`)
-const EventStorage = require(`./event-storage`)
-const { cleanPaths } = require(`./error-helpers`)
-const { isCI, getCIName } = require(`gatsby-core-utils`)
-const os = require(`os`)
-const { join, sep } = require(`path`)
-const isDocker = require(`is-docker`)
-const showAnalyticsNotification = require(`./showAnalyticsNotification`)
-const lodash = require(`lodash`)
-const dbEngine = `redux`
+import uuidV4 from "uuid/v4"
+import { isCI, getCIName } from "gatsby-core-utils"
 
 import {
   getRepositoryId as _getRepositoryId,
   IRepositoryId,
 } from "./repository-id"
+import os from "os"
+
+import { join, sep } from "path"
+import isDocker from "is-docker"
+import { showAnalyticsNotification } from "./show-analytics-notification"
+import lodash from "lodash"
+
+// TODO convert to TypeScript
+const EventStorage = require(`./event-storage`)
+const { cleanPaths } = require(`./error-helpers`)
+
+const dbEngine = `redux`
 
 type UUID = string
 type SemVer = string | undefined
@@ -39,7 +43,7 @@ interface IAggregateStats {
   skewness: number
 }
 
-module.exports = class AnalyticsTracker {
+export class AnalyticsTracker {
   store = new EventStorage()
   debouncer = {}
   metadataCache = {}
@@ -75,7 +79,7 @@ module.exports = class AnalyticsTracker {
   getSessionId(): UUID {
     return (
       process.gatsbyTelemetrySessionId ||
-      (process.gatsbyTelemetrySessionId = uuidv4())
+      (process.gatsbyTelemetrySessionId = uuidV4())
     )
   }
 
@@ -86,7 +90,7 @@ module.exports = class AnalyticsTracker {
     return this.repositoryId
   }
 
-  getTagsFromEnv(): Record<string, any> {
+  getTagsFromEnv(): Record<string, unknown> {
     if (process.env.GATSBY_TELEMETRY_TAGS) {
       try {
         return JSON.parse(process.env.GATSBY_TELEMETRY_TAGS)
@@ -236,7 +240,7 @@ module.exports = class AnalyticsTracker {
     }
     let machineId = this.store.getConfig(`telemetry.machineId`)
     if (!machineId) {
-      machineId = uuidv4()
+      machineId = uuidV4()
       this.store.updateConfig(`telemetry.machineId`, machineId)
     }
     this.machineId = machineId