From 76725f8650faccfd44f01a9aaab2bd91916516e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 12:39:44 +0000 Subject: [PATCH 1/2] Bump @tsconfig/node14 from 1.0.3 to 14.1.2 Bumps [@tsconfig/node14](https://github.com/tsconfig/bases/tree/HEAD/bases) from 1.0.3 to 14.1.2. - [Commits](https://github.com/tsconfig/bases/commits/HEAD/bases) --- updated-dependencies: - dependency-name: "@tsconfig/node14" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a673eb5..f6015c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@nasa-gcn/eslint-config-gitignore": "^0.0.2", - "@tsconfig/node14": "^1.0.3", + "@tsconfig/node14": "^14.1.2", "@types/dockerode": "^3.3.23", "@types/lodash": "^4.14.202", "@types/make-fetch-happen": "^10.0.1", @@ -1625,9 +1625,9 @@ } }, "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-14.1.2.tgz", + "integrity": "sha512-1vncsbfCZ3TBLPxesRYz02Rn7SNJfbLoDVkcZ7F/ixOV6nwxwgdhD1mdPcc5YQ413qBJ8CvMxXMFfJ7oawjo7Q==", "dev": true }, "node_modules/@types/docker-modem": { diff --git a/package.json b/package.json index 52f2175..347c34b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@nasa-gcn/eslint-config-gitignore": "^0.0.2", - "@tsconfig/node14": "^1.0.3", + "@tsconfig/node14": "^14.1.2", "@types/dockerode": "^3.3.23", "@types/lodash": "^4.14.202", "@types/make-fetch-happen": "^10.0.1", From 2e3a93f0023752c9b2446292afc07ad032c90c11 Mon Sep 17 00:00:00 2001 From: Leo Singer Date: Thu, 18 Jul 2024 09:17:40 -0400 Subject: [PATCH 2/2] Add node: prefix and .js suffix to imports --- data.ts | 8 ++++---- index.ts | 6 +++--- install.ts | 6 +++--- paths.ts | 4 ++-- processes.ts | 4 ++-- run.ts | 4 ++-- runDocker.ts | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data.ts b/data.ts index 3e6bcfb..9c12d0c 100644 --- a/data.ts +++ b/data.ts @@ -6,12 +6,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { readFile } from 'fs/promises' -import { join } from 'path' -import { pathToFileURL } from 'url' +import { readFile } from 'node:fs/promises' +import { join } from 'node:path' +import { pathToFileURL } from 'node:url' import { Client } from '@opensearch-project/opensearch' import type { ClientOptions } from '@opensearch-project/opensearch' -import { exists } from './paths' +import { exists } from './paths.js' import chunk from 'lodash/chunk.js' const jsonFilename = 'sandbox-search.json' diff --git a/index.ts b/index.ts index 4442503..b737005 100644 --- a/index.ts +++ b/index.ts @@ -6,9 +6,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { exists } from './paths' -import { join } from 'path' -import { pathToFileURL } from 'url' +import { exists } from './paths.js' +import { join } from 'node:path' +import { pathToFileURL } from 'node:url' import { launch } from './run.js' import { populate } from './data.js' import { search as getSearchClient } from '@nasa-gcn/architect-functions-search' diff --git a/install.ts b/install.ts index 95327fb..ab4d610 100644 --- a/install.ts +++ b/install.ts @@ -6,9 +6,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import os from 'os' -import { pipeline } from 'stream/promises' -import { join, posix } from 'path' +import os from 'node:os' +import { pipeline } from 'node:stream/promises' +import { join, posix } from 'node:path' import fetch from 'make-fetch-happen' import { Extract as unzip } from 'unzip-stream' import { x as untar } from 'tar' diff --git a/paths.ts b/paths.ts index ceff635..4d2448d 100644 --- a/paths.ts +++ b/paths.ts @@ -6,10 +6,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { access, mkdir } from 'fs/promises' +import { access, mkdir } from 'node:fs/promises' import envPaths from 'env-paths' import { name } from './package.json' -import type { PathLike } from 'fs' +import type { PathLike } from 'node:fs' export const { cache, temp } = envPaths(name) diff --git a/processes.ts b/processes.ts index 818d6b6..6715254 100644 --- a/processes.ts +++ b/processes.ts @@ -6,8 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { spawn as node_spawn } from 'child_process' -import type { ChildProcess } from 'child_process' +import { spawn as node_spawn } from 'node:child_process' +import type { ChildProcess } from 'node:child_process' export async function spawn(...args: Parameters) { const child = node_spawn(...args) diff --git a/run.ts b/run.ts index aa97ccb..ac84df5 100644 --- a/run.ts +++ b/run.ts @@ -6,10 +6,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { join } from 'path' +import { join } from 'node:path' import waitPort from 'wait-port' import { install } from './install.js' -import { mkdtemp } from 'fs/promises' +import { mkdtemp } from 'node:fs/promises' import { mkdirP, temp } from './paths.js' import rimraf from 'rimraf' import type { SandboxEngine } from './engines.js' diff --git a/runDocker.ts b/runDocker.ts index c2ffefb..c1e6989 100644 --- a/runDocker.ts +++ b/runDocker.ts @@ -7,7 +7,7 @@ */ import Dockerode from 'dockerode' -import { fork } from 'child_process' +import { fork } from 'node:child_process' import { type SearchEngineLauncherFunction } from './run.js' const [, , command, jsonifiedArgs] = process.argv