fix(ts): migrate log.ts

.eslintrc

@@ -8,14 +8,17 @@
     "valid-jsdoc": "off",
     "import/extensions": [
       "error",
-      "always",
       {
-        "ignorePackages": true
+        "ignorePackages": true,
+        "pattern": {
+          "js": "always",
+          "ts": "never"
+        }
       }
     ],
     // temp during mig
     "jsdoc/require-param-description": "off",
     "jsdoc/require-description": "off",
-    "jsdoc/no-undefined-types": "off"
+    "jsdoc/no-undefined-types": "off",
   }
 }

src/__tests__/config.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/first */
 process.env.apiKey = 'fake-api-key';
 
-import { config } from '../config.ts';
+import { config } from '../config';
 
 it('gets the correct keys from env variables', () => {
   // from mocked .env

src/bootstrap.js

@@ -1,11 +1,11 @@
 import ms from 'ms';
 
 import * as algolia from './algolia/index.js';
-import { config } from './config.ts';
-import { datadog } from './datadog.ts';
-import log from './log.js';
+import { config } from './config';
+import { datadog } from './datadog';
 import * as npm from './npm/index.js';
 import saveDocs from './saveDocs.js';
+import { log } from './utils/log';
 
 let loopStart;
 

src/changelog.js

@@ -1,7 +1,7 @@
 import race from 'promise-rat-race';
 
-import { config } from './config.ts';
-import { datadog } from './datadog.ts';
+import { config } from './config';
+import { datadog } from './datadog';
 import { request } from './utils/request.js';
 
 export const baseUrlMap = new Map([

src/createStateManager.js

@@ -1,5 +1,5 @@
-import { config } from './config.ts';
-import { datadog } from './datadog.ts';
+import { config } from './config';
+import { datadog } from './datadog';
 
 const defaultState = {
   seq: config.seq,

src/datadog.ts

@@ -1,6 +1,6 @@
 import StatsD from 'hot-shots';
 
-import log from './log.js';
+import { log } from './utils/log';
 
 const env = process.env.NODE_ENV === 'production' ? 'prod' : 'dev';
 

src/formatPkg.js

@@ -7,7 +7,7 @@ import sizeof from 'object-sizeof';
 import traverse from 'traverse';
 import truncate from 'truncate-utf8-bytes';
 
-import { config } from './config.ts';
+import { config } from './config';
 
 const defaultGravatar = 'https://www.gravatar.com/avatar/';
 

src/index.js

@@ -1,10 +1,10 @@
 import * as algolia from './algolia/index.js';
 import * as bootstrap from './bootstrap.js';
-import { config } from './config.ts';
+import { config } from './config';
 import createStateManager from './createStateManager.js';
-import { datadog } from './datadog.ts';
+import { datadog } from './datadog';
 import * as jsDelivr from './jsDelivr/index.js';
-import log from './log.js';
+import { log } from './utils/log';
 import * as sentry from './utils/sentry.js';
 import * as watch from './watch.js';
 

src/jsDelivr/__test__/index.test.js

@@ -1,10 +1,12 @@
-import log from '../../log.js';
+import { log } from '../../utils/log';
 import * as api from '../index.js';
 
-jest.mock('../../log.js', () => {
+jest.mock('../../utils/log', () => {
   return {
-    info: jest.fn(),
-    warn: jest.fn(),
+    log: {
+      info: jest.fn(),
+      warn: jest.fn(),
+    },
   };
 });
 

src/jsDelivr/index.js

@@ -1,6 +1,6 @@
-import { config } from '../config.ts';
-import { datadog } from '../datadog.ts';
-import log from '../log.js';
+import { config } from '../config';
+import { datadog } from '../datadog';
+import { log } from '../utils/log';
 import { request } from '../utils/request.js';
 
 const hits = new Map();

src/npm/index.js

@@ -2,9 +2,9 @@ import chunk from 'lodash/chunk.js';
 import nano from 'nano';
 import numeral from 'numeral';
 
-import { config } from '../config.ts';
-import { datadog } from '../datadog.ts';
-import log from '../log.js';
+import { config } from '../config';
+import { datadog } from '../datadog';
+import { log } from '../utils/log';
 import { request } from '../utils/request.js';
 
 const registry = nano({

src/saveDocs.js

@@ -1,10 +1,10 @@
 import { getChangelogs } from './changelog.js';
-import { datadog } from './datadog.ts';
+import { datadog } from './datadog';
 import formatPkg from './formatPkg.js';
 import * as jsDelivr from './jsDelivr/index.js';
-import log from './log.js';
 import * as npm from './npm/index.js';
 import { getTSSupport } from './typescriptSupport.js';
+import { log } from './utils/log';
 
 export default async function saveDocs({ docs, index }) {
   const start = Date.now();

src/typescriptSupport.js

@@ -1,4 +1,4 @@
-import { datadog } from './datadog.ts';
+import { datadog } from './datadog';
 import * as npm from './npm/index.js';
 import { fileExistsInUnpkg } from './unpkg.js';
 

src/unpkg.js

@@ -1,4 +1,4 @@
-import { config } from './config.ts';
+import { config } from './config';
 import { request } from './utils/request.js';
 
 // make a head request to a route like:

src/log.js → src/utils/log.ts

@@ -8,7 +8,7 @@ const stream = bunyanDebugStream({
   showPid: process.env.NODE_ENV !== 'production',
 });
 
-const logger = bunyan.createLogger({
+export const log = bunyan.createLogger({
   name: 'npm-search',
   streams: [
     {
@@ -19,5 +19,3 @@ const logger = bunyan.createLogger({
   ],
   serializers: bunyanDebugStream.serializers,
 });
-
-export default logger;

src/utils/sentry.js

@@ -1,6 +1,6 @@
 import Sentry from '@sentry/node';
 
-import log from '../log.js';
+import { log } from './log';
 
 Sentry.init({
   dsn: process.env.SENTRY_DSN,

src/watch.js

@@ -1,11 +1,11 @@
 import queue from 'async/queue.js';
 import ms from 'ms';
 
-import { config } from './config.ts';
-import { datadog } from './datadog.ts';
-import log from './log.js';
+import { config } from './config';
+import { datadog } from './datadog';
 import * as npm from './npm/index.js';
 import saveDocs from './saveDocs.js';
+import { log } from './utils/log';
 import * as sentry from './utils/sentry.js';
 
 let loopStart = Date.now();