From 7733e8eec4cf77069b7f341999de2086bd85dcb2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 18 Jun 2024 17:14:34 -0700 Subject: [PATCH 1/4] fix: update various dependencies --- gax/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gax/package.json b/gax/package.json index 78531eb89..4bd1a4f4a 100644 --- a/gax/package.json +++ b/gax/package.json @@ -10,7 +10,7 @@ "!build/src/**/*.map" ], "dependencies": { - "@grpc/grpc-js": "~1.10.3", + "@grpc/grpc-js": "^1.10.9", "@grpc/proto-loader": "^0.7.13", "@types/long": "^4.0.0", "abort-controller": "^3.0.0", @@ -18,10 +18,10 @@ "google-auth-library": "^9.3.0", "node-fetch": "^2.6.1", "object-hash": "^3.0.0", - "proto3-json-serializer": "^2.0.0", + "proto3-json-serializer": "^2.0.2", "retry-request": "^7.0.0", "uuid": "^9.0.1", - "protobufjs": "7.3.0" + "protobufjs": "^7.3.2" }, "devDependencies": { "@types/uuid": "^9.0.7", @@ -51,7 +51,7 @@ "proxyquire": "^2.0.1", "pumpify": "^2.0.0", "rimraf": "^5.0.1", - "sinon": "^17.0.0", + "sinon": "^18.0.0", "stream-events": "^1.0.4", "ts-loader": "^8.0.0", "typescript": "^5.1.6", From d893a431ec103c5140babaffa67ac1229072734a Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 18 Jun 2024 17:28:46 -0700 Subject: [PATCH 2/4] retry lint --- gax/src/fallbackRest.ts | 2 +- gax/src/featureDetection.ts | 4 ++-- gax/test/browser-test/karma.conf.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gax/src/fallbackRest.ts b/gax/src/fallbackRest.ts index 62a8b5993..587504a07 100644 --- a/gax/src/fallbackRest.ts +++ b/gax/src/fallbackRest.ts @@ -83,7 +83,7 @@ export function decodeResponse( ok: boolean, response: Buffer | ArrayBuffer ): {} { - // eslint-disable-next-line node/no-unsupported-features/node-builtins + // eslint-disable-next-line n/no-unsupported-features/node-builtins const decodedString = new TextDecoder().decode(response); const json = JSON.parse(decodedString); if (!ok) { diff --git a/gax/src/featureDetection.ts b/gax/src/featureDetection.ts index 5a0c0309e..e4bc42f64 100644 --- a/gax/src/featureDetection.ts +++ b/gax/src/featureDetection.ts @@ -21,9 +21,9 @@ const features = { typeof window !== 'undefined' && window?.fetch && typeof window?.fetch === 'function', - // eslint-disable-next-line node/no-unsupported-features/node-builtins + // eslint-disable-next-line node/n-unsupported-features/node-builtins textEncoder: typeof TextEncoder !== 'undefined', - // eslint-disable-next-line node/no-unsupported-features/node-builtins + // eslint-disable-next-line node/n-unsupported-features/node-builtins textDecoder: typeof TextDecoder !== 'undefined', nodeJS: typeof process !== 'undefined' && process?.versions?.node, abortController: typeof AbortController !== 'undefined', diff --git a/gax/test/browser-test/karma.conf.js b/gax/test/browser-test/karma.conf.js index 5754262b1..c40b84526 100644 --- a/gax/test/browser-test/karma.conf.js +++ b/gax/test/browser-test/karma.conf.js @@ -22,7 +22,7 @@ const isDocker = require('is-docker')(); const webpackConfig = require('./webpack.config.js'); webpackConfig.performance = {hints: false}; delete webpackConfig.entry; -// eslint-disable-next-line node/no-missing-require +// eslint-disable-next-line node/n-missing-require process.env.CHROME_BIN = require('puppeteer').executablePath(); module.exports = function (config) { @@ -38,7 +38,7 @@ module.exports = function (config) { childProcess: { path: path.relative( process.cwd(), - // eslint-disable-next-line node/no-missing-require + // eslint-disable-next-line node/n-missing-require require.resolve('showcase-server/build/src/index.js') ), args: [], From 902d6850f7edd11684c17621e586c3c4aec16ed6 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 18 Jun 2024 17:29:36 -0700 Subject: [PATCH 3/4] update linting --- tools/src/replaceImportMetaUrl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/replaceImportMetaUrl.ts b/tools/src/replaceImportMetaUrl.ts index 4354b870c..7d75f581d 100644 --- a/tools/src/replaceImportMetaUrl.ts +++ b/tools/src/replaceImportMetaUrl.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// eslint-disable-next-line node/no-extraneous-import +// eslint-disable-next-line node/n-extraneous-import import {smart} from '@babel/template'; import {Statement} from '@babel/types'; import {Visitor} from '@babel/core'; From 7c88facf68db25dba2bbc40c7764edcd485b953f Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Tue, 18 Jun 2024 17:34:45 -0700 Subject: [PATCH 4/4] update linting --- gax/src/featureDetection.ts | 4 ++-- gax/test/browser-test/karma.conf.js | 4 ++-- tools/src/compileProtos.ts | 2 +- tools/src/minify.ts | 2 +- tools/src/prepublish.ts | 2 +- tools/src/replaceImportMetaUrl.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gax/src/featureDetection.ts b/gax/src/featureDetection.ts index e4bc42f64..63ae29271 100644 --- a/gax/src/featureDetection.ts +++ b/gax/src/featureDetection.ts @@ -21,9 +21,9 @@ const features = { typeof window !== 'undefined' && window?.fetch && typeof window?.fetch === 'function', - // eslint-disable-next-line node/n-unsupported-features/node-builtins + // eslint-disable-next-line n/no-unsupported-features/node-builtins textEncoder: typeof TextEncoder !== 'undefined', - // eslint-disable-next-line node/n-unsupported-features/node-builtins + // eslint-disable-next-line n/no-unsupported-features/node-builtins textDecoder: typeof TextDecoder !== 'undefined', nodeJS: typeof process !== 'undefined' && process?.versions?.node, abortController: typeof AbortController !== 'undefined', diff --git a/gax/test/browser-test/karma.conf.js b/gax/test/browser-test/karma.conf.js index c40b84526..07858a6a8 100644 --- a/gax/test/browser-test/karma.conf.js +++ b/gax/test/browser-test/karma.conf.js @@ -22,7 +22,7 @@ const isDocker = require('is-docker')(); const webpackConfig = require('./webpack.config.js'); webpackConfig.performance = {hints: false}; delete webpackConfig.entry; -// eslint-disable-next-line node/n-missing-require +// eslint-disable-next-line n/no-missing-require process.env.CHROME_BIN = require('puppeteer').executablePath(); module.exports = function (config) { @@ -38,7 +38,7 @@ module.exports = function (config) { childProcess: { path: path.relative( process.cwd(), - // eslint-disable-next-line node/n-missing-require + // eslint-disable-next-line n/no-missing-require require.resolve('showcase-server/build/src/index.js') ), args: [], diff --git a/tools/src/compileProtos.ts b/tools/src/compileProtos.ts index 623554d1b..4c09d32fe 100644 --- a/tools/src/compileProtos.ts +++ b/tools/src/compileProtos.ts @@ -452,7 +452,7 @@ function usage() { if (require.main === module) { if (process.argv.length <= 2) { usage(); - // eslint-disable-next-line no-process-exit + // eslint-disable-next-line n/no-process-exit process.exit(1); } // argv[0] is node.js binary, argv[1] is script path diff --git a/tools/src/minify.ts b/tools/src/minify.ts index c0f87a747..d12931314 100644 --- a/tools/src/minify.ts +++ b/tools/src/minify.ts @@ -72,7 +72,7 @@ if (require.main === module) { if (process.argv[2] === '--help') { usage(); - // eslint-disable-next-line no-process-exit + // eslint-disable-next-line n/no-process-exit process.exit(1); } diff --git a/tools/src/prepublish.ts b/tools/src/prepublish.ts index 05895f35d..371a9b77e 100755 --- a/tools/src/prepublish.ts +++ b/tools/src/prepublish.ts @@ -67,7 +67,7 @@ if (require.main === module) { if (process.argv[2] === '--help') { usage(); - // eslint-disable-next-line no-process-exit + // eslint-disable-next-line n/no-process-exit process.exit(1); } diff --git a/tools/src/replaceImportMetaUrl.ts b/tools/src/replaceImportMetaUrl.ts index 7d75f581d..454ac631d 100644 --- a/tools/src/replaceImportMetaUrl.ts +++ b/tools/src/replaceImportMetaUrl.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// eslint-disable-next-line node/n-extraneous-import +// eslint-disable-next-line n/no-extraneous-import import {smart} from '@babel/template'; import {Statement} from '@babel/types'; import {Visitor} from '@babel/core';