From b489935b7cb4273644518004abb950f4a4028862 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Tue, 14 Apr 2020 13:58:12 -0700 Subject: [PATCH] grpc-js: Fix how package.json is loaded --- packages/grpc-js/.eslintrc | 3 ++- packages/grpc-js/src/index.ts | 3 +-- packages/grpc-js/src/subchannel.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grpc-js/.eslintrc b/packages/grpc-js/.eslintrc index b18ad0ed2..64585682c 100644 --- a/packages/grpc-js/.eslintrc +++ b/packages/grpc-js/.eslintrc @@ -5,6 +5,7 @@ "node/no-unpublished-import": ["error", { "tryExtensions": [".ts", ".js", ".json", ".node"] }], - "@typescript-eslint/no-unused-vars": "off" + "@typescript-eslint/no-unused-vars": "off", + "node/no-unpublished-require": "off" } } diff --git a/packages/grpc-js/src/index.ts b/packages/grpc-js/src/index.ts index e4bb3658e..661e0efd3 100644 --- a/packages/grpc-js/src/index.ts +++ b/packages/grpc-js/src/index.ts @@ -62,8 +62,7 @@ import { ServerDuplexStream, } from './server-call'; -import { engines as supportedEngines } from '../package.json'; -const supportedNodeVersions = supportedEngines.node; +const supportedNodeVersions = require('../../package.json').engines.node; if (!semver.satisfies(process.version, supportedNodeVersions)) { throw new Error(`@grpc/grpc-js only works on Node ${supportedNodeVersions}`); } diff --git a/packages/grpc-js/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts index 3f71720e6..de69c4869 100644 --- a/packages/grpc-js/src/subchannel.ts +++ b/packages/grpc-js/src/subchannel.ts @@ -29,7 +29,7 @@ import { LogVerbosity } from './constants'; import { shouldUseProxy, getProxiedConnection } from './http_proxy'; import * as net from 'net'; -import { version as clientVersion } from '../package.json'; +const clientVersion = require('../../package.json').version; const TRACER_NAME = 'subchannel';