diff --git a/examples/package.json b/examples/package.json index 6e717dadb..f53855490 100644 --- a/examples/package.json +++ b/examples/package.json @@ -2,13 +2,13 @@ "name": "grpc-examples", "version": "0.1.0", "dependencies": { - "@grpc/proto-loader": "^0.6.0", - "async": "^1.5.2", - "google-protobuf": "^3.0.0", "@grpc/grpc-js": "^1.10.2", "@grpc/grpc-js-xds": "^1.10.0", + "@grpc/proto-loader": "^0.6.0", "@grpc/reflection": "^1.0.0", - "lodash": "^4.6.1", + "async": "^1.5.2", + "es-toolkit": "^1.39.7", + "google-protobuf": "^3.0.0", "minimist": "^1.2.0" } } diff --git a/examples/routeguide/dynamic_codegen/route_guide_client.js b/examples/routeguide/dynamic_codegen/route_guide_client.js index 781464e6d..b180b46c3 100644 --- a/examples/routeguide/dynamic_codegen/route_guide_client.js +++ b/examples/routeguide/dynamic_codegen/route_guide_client.js @@ -22,7 +22,7 @@ var async = require('async'); var fs = require('fs'); var parseArgs = require('minimist'); var path = require('path'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var grpc = require('@grpc/grpc-js'); var protoLoader = require('@grpc/proto-loader'); var packageDefinition = protoLoader.loadSync( diff --git a/examples/routeguide/dynamic_codegen/route_guide_server.js b/examples/routeguide/dynamic_codegen/route_guide_server.js index a303b825b..b6b9da916 100644 --- a/examples/routeguide/dynamic_codegen/route_guide_server.js +++ b/examples/routeguide/dynamic_codegen/route_guide_server.js @@ -21,7 +21,7 @@ var PROTO_PATH = __dirname + '/../../protos/route_guide.proto'; var fs = require('fs'); var parseArgs = require('minimist'); var path = require('path'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var grpc = require('@grpc/grpc-js'); var protoLoader = require('@grpc/proto-loader'); var packageDefinition = protoLoader.loadSync( diff --git a/examples/routeguide/static_codegen/route_guide_client.js b/examples/routeguide/static_codegen/route_guide_client.js index 0ab40a8a5..695a67ca3 100644 --- a/examples/routeguide/static_codegen/route_guide_client.js +++ b/examples/routeguide/static_codegen/route_guide_client.js @@ -23,7 +23,7 @@ var async = require('async'); var fs = require('fs'); var parseArgs = require('minimist'); var path = require('path'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var grpc = require('@grpc/grpc-js'); var client = new services.RouteGuideClient('localhost:50051', diff --git a/examples/routeguide/static_codegen/route_guide_server.js b/examples/routeguide/static_codegen/route_guide_server.js index eb1fd283d..a551b6540 100644 --- a/examples/routeguide/static_codegen/route_guide_server.js +++ b/examples/routeguide/static_codegen/route_guide_server.js @@ -22,7 +22,7 @@ var services = require('./route_guide_grpc_pb'); var fs = require('fs'); var parseArgs = require('minimist'); var path = require('path'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var grpc = require('@grpc/grpc-js'); var COORD_FACTOR = 1e7; diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json index ebd0b3d0b..011161d52 100644 --- a/packages/grpc-js/package.json +++ b/packages/grpc-js/package.json @@ -18,7 +18,6 @@ "@grpc/proto-loader": "file:../proto-loader", "@types/gulp": "^4.0.17", "@types/gulp-mocha": "0.0.37", - "@types/lodash": "^4.14.202", "@types/mocha": "^10.0.6", "@types/ncp": "^2.0.8", "@types/node": ">=20.11.20", @@ -28,6 +27,7 @@ "@typescript-eslint/parser": "^7.1.0", "@typescript-eslint/typescript-estree": "^7.1.0", "clang-format": "^1.8.0", + "es-toolkit": "^1.39.7", "eslint": "^8.42.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-node": "^11.1.0", @@ -35,7 +35,6 @@ "execa": "^2.0.3", "gulp": "^4.0.2", "gulp-mocha": "^6.0.0", - "lodash": "^4.17.21", "madge": "^5.0.1", "mocha-jenkins-reporter": "^0.4.1", "ncp": "^2.0.0", diff --git a/packages/grpc-js/test/test-metadata.ts b/packages/grpc-js/test/test-metadata.ts index 44182ef39..fb0e4f306 100644 --- a/packages/grpc-js/test/test-metadata.ts +++ b/packages/grpc-js/test/test-metadata.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as http2 from 'http2'; -import { range } from 'lodash'; +import { range } from 'es-toolkit/compat'; import { Metadata, MetadataObject, MetadataValue } from '../src/metadata'; class TestMetadata extends Metadata { diff --git a/packages/proto-loader/bin/proto-loader-gen-types.ts b/packages/proto-loader/bin/proto-loader-gen-types.ts index 14850a7e7..4c2cf5fc5 100644 --- a/packages/proto-loader/bin/proto-loader-gen-types.ts +++ b/packages/proto-loader/bin/proto-loader-gen-types.ts @@ -23,7 +23,7 @@ import * as path from 'path'; import * as Protobuf from 'protobufjs'; import * as yargs from 'yargs'; -import camelCase = require('lodash.camelcase'); +import { camelCase } from 'es-toolkit/compat'; import { loadProtosWithOptions, addCommonProtos } from '../src/util'; const templateStr = "%s"; diff --git a/packages/proto-loader/package.json b/packages/proto-loader/package.json index c14a7bb41..99f25c17d 100644 --- a/packages/proto-loader/package.json +++ b/packages/proto-loader/package.json @@ -45,13 +45,12 @@ "proto-loader-gen-types": "./build/bin/proto-loader-gen-types.js" }, "dependencies": { - "lodash.camelcase": "^4.3.0", + "es-toolkit": "^1.39.7", "long": "^5.0.0", "protobufjs": "^7.5.3", "yargs": "^17.7.2" }, "devDependencies": { - "@types/lodash.camelcase": "^4.3.4", "@types/mkdirp": "^1.0.1", "@types/mocha": "^5.2.7", "@types/node": "^10.17.26", diff --git a/packages/proto-loader/src/index.ts b/packages/proto-loader/src/index.ts index c56b29215..9a2694be4 100644 --- a/packages/proto-loader/src/index.ts +++ b/packages/proto-loader/src/index.ts @@ -16,7 +16,7 @@ * */ -import camelCase = require('lodash.camelcase'); +import { camelCase } from 'es-toolkit/compat'; import * as Protobuf from 'protobufjs'; import * as descriptor from 'protobufjs/ext/descriptor'; diff --git a/test/any_grpc.js b/test/any_grpc.js index 5dcbf0111..2c2677568 100644 --- a/test/any_grpc.js +++ b/test/any_grpc.js @@ -19,7 +19,7 @@ // a single object, the tests should be re-written in a way that makes it clear // that two separate implementations are being tested against one another. -const _ = require('lodash'); +const _ = require('es-toolkit/compat'); function getImplementation(globalField) { const impl = global[globalField] ?? 'js'; diff --git a/test/api/client_interceptors_test.js b/test/api/client_interceptors_test.js index 74a7adc47..299210e7b 100644 --- a/test/api/client_interceptors_test.js +++ b/test/api/client_interceptors_test.js @@ -25,7 +25,7 @@ const options = { defaults: true, oneofs: true }; -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var assert = require('assert'); const anyGrpc = require('../any_grpc'); const clientGrpc = anyGrpc.client diff --git a/test/api/connectivity_test.js b/test/api/connectivity_test.js index 64764d7d4..fa3e1a59e 100644 --- a/test/api/connectivity_test.js +++ b/test/api/connectivity_test.js @@ -25,7 +25,7 @@ const options = { const path = require('path'); const fs = require('fs'); const assert = require('assert'); -const _ = require('lodash'); +const _ = require('es-toolkit/compat'); const anyGrpc = require('../any_grpc'); const clientGrpc = anyGrpc.client; const serverGrpc = anyGrpc.server; diff --git a/test/api/error_test.js b/test/api/error_test.js index 4dbf1ada1..17680ebb9 100644 --- a/test/api/error_test.js +++ b/test/api/error_test.js @@ -23,7 +23,7 @@ const options = { oneofs: true }; const assert = require('assert'); -const _ = require('lodash'); +const _ = require('es-toolkit/compat'); const anyGrpc = require('../any_grpc'); const clientGrpc = anyGrpc.client; const serverGrpc = anyGrpc.server; diff --git a/test/interop/async_delay_queue.js b/test/interop/async_delay_queue.js index f9a39b59a..fa2aca3e5 100644 --- a/test/interop/async_delay_queue.js +++ b/test/interop/async_delay_queue.js @@ -18,7 +18,7 @@ 'use strict'; -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); /** * This class represents a queue of callbacks that must happen sequentially, diff --git a/test/interop/interop_server.js b/test/interop/interop_server.js index b67ec5a8a..9cd2570cc 100644 --- a/test/interop/interop_server.js +++ b/test/interop/interop_server.js @@ -21,7 +21,7 @@ var assert = require('assert'); var fs = require('fs'); var path = require('path'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var AsyncDelayQueue = require('./async_delay_queue'); var grpc = require('../any_grpc').server; // TODO(murgatroid99): do this import more cleanly diff --git a/test/package.json b/test/package.json index 963093bc0..6a0bdd99a 100644 --- a/test/package.json +++ b/test/package.json @@ -14,9 +14,9 @@ } ], "dependencies": { + "es-toolkit": "^1.39.7", "express": "^4.16.3", "google-auth-library": "^6.1.0", - "lodash": "^4.17.4", "poisson-process": "^1.0.0" }, "optionalDependencies": { diff --git a/test/performance/benchmark_client.js b/test/performance/benchmark_client.js index 7b2a689a7..c8e2463c8 100644 --- a/test/performance/benchmark_client.js +++ b/test/performance/benchmark_client.js @@ -29,7 +29,7 @@ var util = require('util'); var EventEmitter = require('events'); var async = require('async'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var PoissonProcess = require('poisson-process'); var Histogram = require('./histogram'); diff --git a/test/performance/benchmark_client_express.js b/test/performance/benchmark_client_express.js index b21346399..cd7c2ca35 100644 --- a/test/performance/benchmark_client_express.js +++ b/test/performance/benchmark_client_express.js @@ -31,7 +31,7 @@ var http = require('http'); var https = require('https'); var async = require('async'); -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); var PoissonProcess = require('poisson-process'); var Histogram = require('./histogram'); diff --git a/test/performance/generic_service.js b/test/performance/generic_service.js index 8e76c50d5..081e9ee48 100644 --- a/test/performance/generic_service.js +++ b/test/performance/generic_service.js @@ -16,7 +16,7 @@ * */ -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); module.exports = { 'unaryCall' : { diff --git a/test/stress/metrics_server.js b/test/stress/metrics_server.js index d8e39086f..282cdf9cf 100644 --- a/test/stress/metrics_server.js +++ b/test/stress/metrics_server.js @@ -18,7 +18,7 @@ 'use strict'; -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); // TODO(murgatroid99): use multiple grpc implementations var grpc = require('grpc'); diff --git a/test/stress/stress_client.js b/test/stress/stress_client.js index 35f6510b1..df25d011b 100644 --- a/test/stress/stress_client.js +++ b/test/stress/stress_client.js @@ -18,7 +18,7 @@ 'use strict'; -var _ = require('lodash'); +var _ = require('es-toolkit/compat'); // TODO(murgatroid99): use multiple grpc implementations var grpc = require('grpc');