Skip to content

Commit

Permalink
proto-loader: rename grpc-protobufjs to match npm
Browse files Browse the repository at this point in the history
This commit renames grpc-protobufjs to proto-loader to more
closely match the name used on npm.
  • Loading branch information
cjihrig committed Nov 1, 2018
1 parent 65bd142 commit 489305d
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This library implements the core functionality of gRPC purely in JavaScript, wit

### gRPC Protobuf Loader

Directory: [`packages/grpc-protobufjs`](https://github.com/grpc/grpc-node/tree/master/packages/grpc-protobufjs)
Directory: [`packages/proto-loader`](https://github.com/grpc/grpc-node/tree/master/packages/proto-loader)

npm package: [@grpc/proto-loader](https://www.npmjs.com/package/@grpc/proto-loader)

Expand Down
2 changes: 1 addition & 1 deletion gulpfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function loadGulpTasksWithPrefix(path: string, prefix: string) {
['./packages/grpc-health-check/gulpfile', 'health-check'],
['./packages/grpc-js/gulpfile', 'js.core'],
['./packages/grpc-native-core/gulpfile', 'native.core'],
['./packages/grpc-protobufjs/gulpfile', 'protobuf'],
['./packages/proto-loader/gulpfile', 'protobuf'],
['./test/gulpfile', 'internal.test'],
].forEach((args) => loadGulpTasksWithPrefix(args[0], args[1]));

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"packages/grpc-js/build/src/*",
"packages/grpc-native-core/index.js",
"packages/grpc-native-core/src/*.js",
"packages/grpc-protobufjs/build/src/*"
"packages/proto-loader/build/src/*"
],
"cache": true,
"all": true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions test/api/error_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const _ = require('lodash');
const anyGrpc = require('../any_grpc');
const clientGrpc = anyGrpc.client;
const serverGrpc = anyGrpc.server;
const protoLoader = require('../../packages/grpc-protobufjs', options);
const protoLoader = require('../../packages/proto-loader', options);
const testServiceDef = protoLoader.loadSync(__dirname + '/../proto/test_service.proto');
const TestServiceClient = clientGrpc.loadPackageDefinition(testServiceDef).TestService;
const clientInsecureCreds = clientGrpc.credentials.createInsecure();
Expand Down Expand Up @@ -526,4 +526,4 @@ describe('Client malformed response handling', function() {
});
});
});
});
});
2 changes: 1 addition & 1 deletion test/client-libraries-integration/use-grpc-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const shimmer = require('shimmer');

const grpcPJson = require('../../packages/grpc-js/package');
const grpcImpl = require('../../packages/grpc-js');
const grpcProtobuf = require('../../packages/grpc-protobufjs');
const grpcProtobuf = require('../../packages/proto-loader');

if (!process.env.USE_GRPC_NATIVE) {
shimmer.wrap(Module, '_load', (moduleLoad) => {
Expand Down
2 changes: 1 addition & 1 deletion test/interop/interop_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
var fs = require('fs');
var path = require('path');
var grpc = require('../any_grpc').client;
var protoLoader = require('../../packages/grpc-protobufjs');
var protoLoader = require('../../packages/proto-loader');
var GoogleAuth = require('google-auth-library');

var protoPackage = protoLoader.loadSync(
Expand Down
2 changes: 1 addition & 1 deletion test/interop/interop_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = require('lodash');
var AsyncDelayQueue = require('./async_delay_queue');
var grpc = require('../any_grpc').server;
// TODO(murgatroid99): do this import more cleanly
var protoLoader = require('../../packages/grpc-protobufjs');
var protoLoader = require('../../packages/proto-loader');
var protoPackage = protoLoader.loadSync(
'src/proto/grpc/testing/test.proto',
{keepCase: true,
Expand Down
2 changes: 1 addition & 1 deletion test/performance/benchmark_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var genericService = require('./generic_service');

// TODO(murgatroid99): use multiple grpc implementations
var grpc = require('../any_grpc').client;
var protoLoader = require('../../packages/grpc-protobufjs');
var protoLoader = require('../../packages/proto-loader');
var protoPackage = protoLoader.loadSync(
'src/proto/grpc/testing/benchmark_service.proto',
{keepCase: true,
Expand Down
2 changes: 1 addition & 1 deletion test/performance/benchmark_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var util = require('util');
var genericService = require('./generic_service');

var grpc = require('../any_grpc').server;
var protoLoader = require('../../packages/grpc-protobufjs');
var protoLoader = require('../../packages/proto-loader');
var protoPackage = protoLoader.loadSync(
'src/proto/grpc/testing/benchmark_service.proto',
{keepCase: true,
Expand Down
2 changes: 1 addition & 1 deletion test/performance/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var console = require('console');
var WorkerServiceImpl = require('./worker_service_impl');

var grpc = require('../any_grpc').server;
var protoLoader = require('../../packages/grpc-protobufjs');
var protoLoader = require('../../packages/proto-loader');
var protoPackage = protoLoader.loadSync(
'src/proto/grpc/testing/worker_service.proto',
{keepCase: true,
Expand Down

0 comments on commit 489305d

Please sign in to comment.