diff --git a/package-lock.json b/package-lock.json index ee4c94e0b..3a64357f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5320,11 +5320,6 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, - "pjson": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/pjson/-/pjson-1.0.9.tgz", - "integrity": "sha512-4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ==" - }, "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", diff --git a/package.json b/package.json index 3bdae8b42..60feb9faf 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "p-cancelable": "^0.3.0", "p-queue": "^2.3.0", "p-retry": "^1.0.0", - "pjson": "^1.0.9", "retry": "^0.10.1", "url-join": "^4.0.0", "ws": "^4.1.0" diff --git a/src/KeepAlive.ts b/src/KeepAlive.ts index b77cc8b15..6d7390818 100644 --- a/src/KeepAlive.ts +++ b/src/KeepAlive.ts @@ -1,8 +1,8 @@ import { RTMClient, ErrorCode } from './'; import EventEmitter = require('eventemitter3'); // tslint:disable-line:import-name no-require-imports -import * as pjson from 'pjson'; import { LogLevel, Logger, LoggingFunc, getLogger, loggerFromLoggingFunc } from './logger'; import { errorWithCode } from './errors'; +const pkg = require('../package.json'); // tslint:disable-line:no-require-imports no-var-requires export interface KeepAliveOptions { logger?: LoggingFunc; @@ -50,7 +50,7 @@ export class KeepAlive extends EventEmitter { /** * The name used to prefix all logging generated from this object */ - private static loggerName = `${pjson.name}:KeepAlive`; + private static loggerName = `${pkg.name}:KeepAlive`; /** * This object's logger instance diff --git a/src/RTMClient.ts b/src/RTMClient.ts index def4faed3..088ab4a63 100644 --- a/src/RTMClient.ts +++ b/src/RTMClient.ts @@ -1,5 +1,4 @@ import { Agent } from 'http'; -import * as pjson from 'pjson'; import objectValues = require('object.values'); // tslint:disable-line:import-name no-require-imports import EventEmitter = require('eventemitter3'); // tslint:disable-line:import-name no-require-imports import WebSocket = require('ws'); // tslint:disable-line:import-name no-require-imports @@ -13,6 +12,7 @@ import { WebClient, WebAPICallResult, WebAPICallError, ErrorCode, CodedError } f import * as methods from './methods'; // tslint:disable-line:import-name import { errorWithCode } from './errors'; import { callbackify, TLSOptions } from './util'; +const pkg = require('../package.json'); // tslint:disable-line:no-require-imports no-var-requires /** * An RTMClient allows programs to communicate with the {@link https://api.slack.com/rtm|Slack Platform's RTM API}. @@ -272,7 +272,7 @@ export class RTMClient extends EventEmitter { /** * The name used to prefix all logging generated from this object */ - private static loggerName = `${pjson.name}:RTMClient`; + private static loggerName = `${pkg.name}:RTMClient`; /** diff --git a/src/WebClient.ts b/src/WebClient.ts index b21f23848..6b4fa4cad 100644 --- a/src/WebClient.ts +++ b/src/WebClient.ts @@ -1,6 +1,5 @@ import { Readable } from 'stream'; import objectEntries = require('object.entries'); // tslint:disable-line:no-require-imports -import * as pjson from 'pjson'; import urlJoin = require('url-join'); // tslint:disable-line:no-require-imports import isStream = require('is-stream'); // tslint:disable-line:no-require-imports import EventEmitter = require('eventemitter3'); // tslint:disable-line:import-name no-require-imports @@ -15,6 +14,7 @@ import { CodedError, errorWithCode, ErrorCode } from './errors'; import { LogLevel, Logger, LoggingFunc, getLogger, loggerFromLoggingFunc } from './logger'; import retryPolicies, { RetryOptions } from './retry-policies'; import Method, * as methods from './methods'; // tslint:disable-line:import-name +const pkg = require('../package.json'); // tslint:disable-line:no-require-imports no-var-requires /** * A client for Slack's Web API @@ -58,7 +58,7 @@ export class WebClient extends EventEmitter { /** * The name used to prefix all logging generated from this object */ - private static loggerName = `${pjson.name}:WebClient`; + private static loggerName = `${pkg.name}:WebClient`; /** * This object's logger instance diff --git a/src/util.ts b/src/util.ts index 1ead7f65b..878ffcf8e 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,8 +1,8 @@ import * as util from 'util'; import * as os from 'os'; -import * as pjson from 'pjson'; import { Agent } from 'http'; import objectEntries = require('object.entries'); // tslint:disable-line:no-require-imports +const pkg = require('../package.json'); // tslint:disable-line:no-require-imports no-var-requires /** * For when you need a function that does nothing @@ -17,7 +17,7 @@ function replaceSlashes(s: string): string { return s.replace('/', ':'); } -const baseUserAgent = `${replaceSlashes(pjson.name)}/${pjson.version} ` + +const baseUserAgent = `${replaceSlashes(pkg.name)}/${pkg.version} ` + `node/${process.version.replace('v', '')} ` + `${os.platform()}/${os.release()}`;