From 65bd1421143894b1aa5a3cf6ae09aaecf04f7daf Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 1 Nov 2018 16:56:57 -0400
Subject: [PATCH] grpc-js: rename grpc-js-core to match npm

This commit renames grpc-js-core to grpc-js to more closely
match the name used on npm.
---
 README.md                                                     | 2 +-
 gulpfile.ts                                                   | 2 +-
 package.json                                                  | 2 +-
 packages/{grpc-js-core => grpc-js}/README.md                  | 0
 packages/{grpc-js-core => grpc-js}/gulpfile.ts                | 0
 packages/{grpc-js-core => grpc-js}/package.json               | 2 +-
 .../{grpc-js-core => grpc-js}/src/call-credentials-filter.ts  | 0
 packages/{grpc-js-core => grpc-js}/src/call-credentials.ts    | 0
 packages/{grpc-js-core => grpc-js}/src/call-stream.ts         | 0
 packages/{grpc-js-core => grpc-js}/src/call.ts                | 0
 packages/{grpc-js-core => grpc-js}/src/channel-credentials.ts | 0
 packages/{grpc-js-core => grpc-js}/src/channel-options.ts     | 0
 packages/{grpc-js-core => grpc-js}/src/channel.ts             | 0
 packages/{grpc-js-core => grpc-js}/src/client.ts              | 0
 packages/{grpc-js-core => grpc-js}/src/compression-filter.ts  | 0
 packages/{grpc-js-core => grpc-js}/src/constants.ts           | 0
 packages/{grpc-js-core => grpc-js}/src/deadline-filter.ts     | 0
 packages/{grpc-js-core => grpc-js}/src/events.ts              | 0
 packages/{grpc-js-core => grpc-js}/src/filter-stack.ts        | 0
 packages/{grpc-js-core => grpc-js}/src/filter.ts              | 0
 packages/{grpc-js-core => grpc-js}/src/index.ts               | 0
 packages/{grpc-js-core => grpc-js}/src/logging.ts             | 0
 packages/{grpc-js-core => grpc-js}/src/make-client.ts         | 0
 .../{grpc-js-core => grpc-js}/src/metadata-status-filter.ts   | 0
 packages/{grpc-js-core => grpc-js}/src/metadata.ts            | 0
 packages/{grpc-js-core => grpc-js}/src/object-stream.ts       | 0
 packages/{grpc-js-core => grpc-js}/src/status-builder.ts      | 0
 packages/{grpc-js-core => grpc-js}/src/subchannel.ts          | 0
 packages/{grpc-js-core => grpc-js}/test/common.ts             | 0
 packages/{grpc-js-core => grpc-js}/test/fixtures/README       | 0
 packages/{grpc-js-core => grpc-js}/test/fixtures/ca.pem       | 0
 packages/{grpc-js-core => grpc-js}/test/fixtures/server1.key  | 0
 packages/{grpc-js-core => grpc-js}/test/fixtures/server1.pem  | 0
 .../{grpc-js-core => grpc-js}/test/test-call-credentials.ts   | 0
 packages/{grpc-js-core => grpc-js}/test/test-call-stream.ts   | 0
 .../test/test-channel-credentials.ts                          | 0
 packages/{grpc-js-core => grpc-js}/test/test-logging.ts       | 0
 packages/{grpc-js-core => grpc-js}/test/test-metadata.ts      | 0
 .../{grpc-js-core => grpc-js}/test/test-status-builder.ts     | 0
 packages/{grpc-js-core => grpc-js}/tsconfig.json              | 0
 test/client-libraries-integration/use-grpc-js.js              | 4 ++--
 41 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/{grpc-js-core => grpc-js}/README.md (100%)
 rename packages/{grpc-js-core => grpc-js}/gulpfile.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/package.json (98%)
 rename packages/{grpc-js-core => grpc-js}/src/call-credentials-filter.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/call-credentials.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/call-stream.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/call.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/channel-credentials.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/channel-options.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/channel.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/client.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/compression-filter.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/constants.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/deadline-filter.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/events.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/filter-stack.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/filter.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/index.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/logging.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/make-client.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/metadata-status-filter.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/metadata.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/object-stream.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/status-builder.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/src/subchannel.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/common.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/fixtures/README (100%)
 rename packages/{grpc-js-core => grpc-js}/test/fixtures/ca.pem (100%)
 rename packages/{grpc-js-core => grpc-js}/test/fixtures/server1.key (100%)
 rename packages/{grpc-js-core => grpc-js}/test/fixtures/server1.pem (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-call-credentials.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-call-stream.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-channel-credentials.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-logging.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-metadata.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/test/test-status-builder.ts (100%)
 rename packages/{grpc-js-core => grpc-js}/tsconfig.json (100%)

diff --git a/README.md b/README.md
index dd9ce972..b3917920 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This is the existing, feature-rich implementation of gRPC using a C++ addon. It
 
 ### Pure JavaScript Client
 
-Directory: [`packages/grpc-js-core`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js-core)
+Directory: [`packages/grpc-js`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js)
 
 npm package: [@grpc/grpc-js](https://www.npmjs.com/package/@grpc/grpc-js)
 
diff --git a/gulpfile.ts b/gulpfile.ts
index dac1421e..fe87389f 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -49,7 +49,7 @@ function loadGulpTasksWithPrefix(path: string, prefix: string) {
 
 [
   ['./packages/grpc-health-check/gulpfile', 'health-check'],
-  ['./packages/grpc-js-core/gulpfile', 'js.core'],
+  ['./packages/grpc-js/gulpfile', 'js.core'],
   ['./packages/grpc-native-core/gulpfile', 'native.core'],
   ['./packages/grpc-protobufjs/gulpfile', 'protobuf'],
   ['./test/gulpfile', 'internal.test'],
diff --git a/package.json b/package.json
index e8d7a112..75aaf5e9 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   "nyc": {
     "include": [
       "packages/grpc-health-check/health.js",
-      "packages/grpc-js-core/build/src/*",
+      "packages/grpc-js/build/src/*",
       "packages/grpc-native-core/index.js",
       "packages/grpc-native-core/src/*.js",
       "packages/grpc-protobufjs/build/src/*"
diff --git a/packages/grpc-js-core/README.md b/packages/grpc-js/README.md
similarity index 100%
rename from packages/grpc-js-core/README.md
rename to packages/grpc-js/README.md
diff --git a/packages/grpc-js-core/gulpfile.ts b/packages/grpc-js/gulpfile.ts
similarity index 100%
rename from packages/grpc-js-core/gulpfile.ts
rename to packages/grpc-js/gulpfile.ts
diff --git a/packages/grpc-js-core/package.json b/packages/grpc-js/package.json
similarity index 98%
rename from packages/grpc-js-core/package.json
rename to packages/grpc-js/package.json
index 166c649d..bf6376bc 100644
--- a/packages/grpc-js-core/package.json
+++ b/packages/grpc-js/package.json
@@ -3,7 +3,7 @@
   "version": "0.3.2",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
-  "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js-core",
+  "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
   "main": "build/src/index.js",
   "engines": {
     "node": "^8.11.2 || >=9.4"
diff --git a/packages/grpc-js-core/src/call-credentials-filter.ts b/packages/grpc-js/src/call-credentials-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-credentials-filter.ts
rename to packages/grpc-js/src/call-credentials-filter.ts
diff --git a/packages/grpc-js-core/src/call-credentials.ts b/packages/grpc-js/src/call-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-credentials.ts
rename to packages/grpc-js/src/call-credentials.ts
diff --git a/packages/grpc-js-core/src/call-stream.ts b/packages/grpc-js/src/call-stream.ts
similarity index 100%
rename from packages/grpc-js-core/src/call-stream.ts
rename to packages/grpc-js/src/call-stream.ts
diff --git a/packages/grpc-js-core/src/call.ts b/packages/grpc-js/src/call.ts
similarity index 100%
rename from packages/grpc-js-core/src/call.ts
rename to packages/grpc-js/src/call.ts
diff --git a/packages/grpc-js-core/src/channel-credentials.ts b/packages/grpc-js/src/channel-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel-credentials.ts
rename to packages/grpc-js/src/channel-credentials.ts
diff --git a/packages/grpc-js-core/src/channel-options.ts b/packages/grpc-js/src/channel-options.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel-options.ts
rename to packages/grpc-js/src/channel-options.ts
diff --git a/packages/grpc-js-core/src/channel.ts b/packages/grpc-js/src/channel.ts
similarity index 100%
rename from packages/grpc-js-core/src/channel.ts
rename to packages/grpc-js/src/channel.ts
diff --git a/packages/grpc-js-core/src/client.ts b/packages/grpc-js/src/client.ts
similarity index 100%
rename from packages/grpc-js-core/src/client.ts
rename to packages/grpc-js/src/client.ts
diff --git a/packages/grpc-js-core/src/compression-filter.ts b/packages/grpc-js/src/compression-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/compression-filter.ts
rename to packages/grpc-js/src/compression-filter.ts
diff --git a/packages/grpc-js-core/src/constants.ts b/packages/grpc-js/src/constants.ts
similarity index 100%
rename from packages/grpc-js-core/src/constants.ts
rename to packages/grpc-js/src/constants.ts
diff --git a/packages/grpc-js-core/src/deadline-filter.ts b/packages/grpc-js/src/deadline-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/deadline-filter.ts
rename to packages/grpc-js/src/deadline-filter.ts
diff --git a/packages/grpc-js-core/src/events.ts b/packages/grpc-js/src/events.ts
similarity index 100%
rename from packages/grpc-js-core/src/events.ts
rename to packages/grpc-js/src/events.ts
diff --git a/packages/grpc-js-core/src/filter-stack.ts b/packages/grpc-js/src/filter-stack.ts
similarity index 100%
rename from packages/grpc-js-core/src/filter-stack.ts
rename to packages/grpc-js/src/filter-stack.ts
diff --git a/packages/grpc-js-core/src/filter.ts b/packages/grpc-js/src/filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/filter.ts
rename to packages/grpc-js/src/filter.ts
diff --git a/packages/grpc-js-core/src/index.ts b/packages/grpc-js/src/index.ts
similarity index 100%
rename from packages/grpc-js-core/src/index.ts
rename to packages/grpc-js/src/index.ts
diff --git a/packages/grpc-js-core/src/logging.ts b/packages/grpc-js/src/logging.ts
similarity index 100%
rename from packages/grpc-js-core/src/logging.ts
rename to packages/grpc-js/src/logging.ts
diff --git a/packages/grpc-js-core/src/make-client.ts b/packages/grpc-js/src/make-client.ts
similarity index 100%
rename from packages/grpc-js-core/src/make-client.ts
rename to packages/grpc-js/src/make-client.ts
diff --git a/packages/grpc-js-core/src/metadata-status-filter.ts b/packages/grpc-js/src/metadata-status-filter.ts
similarity index 100%
rename from packages/grpc-js-core/src/metadata-status-filter.ts
rename to packages/grpc-js/src/metadata-status-filter.ts
diff --git a/packages/grpc-js-core/src/metadata.ts b/packages/grpc-js/src/metadata.ts
similarity index 100%
rename from packages/grpc-js-core/src/metadata.ts
rename to packages/grpc-js/src/metadata.ts
diff --git a/packages/grpc-js-core/src/object-stream.ts b/packages/grpc-js/src/object-stream.ts
similarity index 100%
rename from packages/grpc-js-core/src/object-stream.ts
rename to packages/grpc-js/src/object-stream.ts
diff --git a/packages/grpc-js-core/src/status-builder.ts b/packages/grpc-js/src/status-builder.ts
similarity index 100%
rename from packages/grpc-js-core/src/status-builder.ts
rename to packages/grpc-js/src/status-builder.ts
diff --git a/packages/grpc-js-core/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts
similarity index 100%
rename from packages/grpc-js-core/src/subchannel.ts
rename to packages/grpc-js/src/subchannel.ts
diff --git a/packages/grpc-js-core/test/common.ts b/packages/grpc-js/test/common.ts
similarity index 100%
rename from packages/grpc-js-core/test/common.ts
rename to packages/grpc-js/test/common.ts
diff --git a/packages/grpc-js-core/test/fixtures/README b/packages/grpc-js/test/fixtures/README
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/README
rename to packages/grpc-js/test/fixtures/README
diff --git a/packages/grpc-js-core/test/fixtures/ca.pem b/packages/grpc-js/test/fixtures/ca.pem
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/ca.pem
rename to packages/grpc-js/test/fixtures/ca.pem
diff --git a/packages/grpc-js-core/test/fixtures/server1.key b/packages/grpc-js/test/fixtures/server1.key
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/server1.key
rename to packages/grpc-js/test/fixtures/server1.key
diff --git a/packages/grpc-js-core/test/fixtures/server1.pem b/packages/grpc-js/test/fixtures/server1.pem
similarity index 100%
rename from packages/grpc-js-core/test/fixtures/server1.pem
rename to packages/grpc-js/test/fixtures/server1.pem
diff --git a/packages/grpc-js-core/test/test-call-credentials.ts b/packages/grpc-js/test/test-call-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-call-credentials.ts
rename to packages/grpc-js/test/test-call-credentials.ts
diff --git a/packages/grpc-js-core/test/test-call-stream.ts b/packages/grpc-js/test/test-call-stream.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-call-stream.ts
rename to packages/grpc-js/test/test-call-stream.ts
diff --git a/packages/grpc-js-core/test/test-channel-credentials.ts b/packages/grpc-js/test/test-channel-credentials.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-channel-credentials.ts
rename to packages/grpc-js/test/test-channel-credentials.ts
diff --git a/packages/grpc-js-core/test/test-logging.ts b/packages/grpc-js/test/test-logging.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-logging.ts
rename to packages/grpc-js/test/test-logging.ts
diff --git a/packages/grpc-js-core/test/test-metadata.ts b/packages/grpc-js/test/test-metadata.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-metadata.ts
rename to packages/grpc-js/test/test-metadata.ts
diff --git a/packages/grpc-js-core/test/test-status-builder.ts b/packages/grpc-js/test/test-status-builder.ts
similarity index 100%
rename from packages/grpc-js-core/test/test-status-builder.ts
rename to packages/grpc-js/test/test-status-builder.ts
diff --git a/packages/grpc-js-core/tsconfig.json b/packages/grpc-js/tsconfig.json
similarity index 100%
rename from packages/grpc-js-core/tsconfig.json
rename to packages/grpc-js/tsconfig.json
diff --git a/test/client-libraries-integration/use-grpc-js.js b/test/client-libraries-integration/use-grpc-js.js
index 68c6597d..47fcd15d 100644
--- a/test/client-libraries-integration/use-grpc-js.js
+++ b/test/client-libraries-integration/use-grpc-js.js
@@ -2,8 +2,8 @@ require('source-map-support/register');
 const Module = require('module');
 const shimmer = require('shimmer');
 
-const grpcPJson = require('../../packages/grpc-js-core/package');
-const grpcImpl = require('../../packages/grpc-js-core');
+const grpcPJson = require('../../packages/grpc-js/package');
+const grpcImpl = require('../../packages/grpc-js');
 const grpcProtobuf = require('../../packages/grpc-protobufjs');
 
 if (!process.env.USE_GRPC_NATIVE) {