From 221d6f416593f0fa8ed3a3a73dff24e4193e51ea Mon Sep 17 00:00:00 2001 From: jjangga0214 Date: Wed, 9 Oct 2024 19:24:13 +0900 Subject: [PATCH] build: pure ESM (#106) --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- agents/src/cli.ts | 2 +- agents/src/http_server.ts | 2 +- agents/src/ipc/job_main.ts | 8 ++++---- agents/src/ipc/proc_job_executor.ts | 4 ++-- agents/src/multimodal/agent_playout.ts | 2 +- agents/src/multimodal/multimodal_agent.ts | 2 +- agents/src/utils.ts | 2 +- agents/src/worker.ts | 4 ++-- tsconfig.json | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a300386..2a201c66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: node-version: 20 cache: pnpm - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Lint run: pnpm lint - name: Prettier @@ -45,6 +45,6 @@ jobs: node-version: 20 cache: pnpm - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0acac9fe..3c739d7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,9 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 - cache: 'pnpm' + cache: pnpm - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Create Release Pull Request or Publish to npm id: changesets uses: changesets/action@v1 diff --git a/agents/src/cli.ts b/agents/src/cli.ts index 430ced2f..226690a9 100644 --- a/agents/src/cli.ts +++ b/agents/src/cli.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 import { Command, Option } from 'commander'; -import type { EventEmitter } from 'events'; +import type { EventEmitter } from 'node:events'; import { initializeLogger, log } from './log.js'; import { version } from './version.js'; import { Worker, WorkerOptions } from './worker.js'; diff --git a/agents/src/http_server.ts b/agents/src/http_server.ts index 76a0cb0c..66300afa 100644 --- a/agents/src/http_server.ts +++ b/agents/src/http_server.ts @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import { type IncomingMessage, type Server, type ServerResponse, createServer } from 'http'; +import { type IncomingMessage, type Server, type ServerResponse, createServer } from 'node:http'; import { log } from './log.js'; const healthCheck = async (res: ServerResponse) => { diff --git a/agents/src/ipc/job_main.ts b/agents/src/ipc/job_main.ts index ff0951ce..4ce15f66 100644 --- a/agents/src/ipc/job_main.ts +++ b/agents/src/ipc/job_main.ts @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 import { Room, RoomEvent } from '@livekit/rtc-node'; -import type { ChildProcess } from 'child_process'; -import { fork } from 'child_process'; -import { EventEmitter, once } from 'events'; +import type { ChildProcess } from 'node:child_process'; +import { fork } from 'node:child_process'; +import { EventEmitter, once } from 'node:events'; +import { pathToFileURL } from 'node:url'; import type { Logger } from 'pino'; -import { pathToFileURL } from 'url'; import { type Agent, isAgent } from '../generator.js'; import type { RunningJobInfo } from '../job.js'; import { JobContext } from '../job.js'; diff --git a/agents/src/ipc/proc_job_executor.ts b/agents/src/ipc/proc_job_executor.ts index 605fe281..e494fc07 100644 --- a/agents/src/ipc/proc_job_executor.ts +++ b/agents/src/ipc/proc_job_executor.ts @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import type { ChildProcess } from 'child_process'; -import { once } from 'events'; +import type { ChildProcess } from 'node:child_process'; +import { once } from 'node:events'; import type { RunningJobInfo } from '../job.js'; import { log, loggerOptions } from '../log.js'; import { Future } from '../utils.js'; diff --git a/agents/src/multimodal/agent_playout.ts b/agents/src/multimodal/agent_playout.ts index f60d03c7..25f4edd0 100644 --- a/agents/src/multimodal/agent_playout.ts +++ b/agents/src/multimodal/agent_playout.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 import type { AudioFrame } from '@livekit/rtc-node'; import { type AudioSource } from '@livekit/rtc-node'; -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import { AudioByteStream } from '../audio.js'; import type { TranscriptionForwarder } from '../transcription.js'; import { type AsyncIterableQueue, CancellablePromise, Future, gracefullyCancel } from '../utils.js'; diff --git a/agents/src/multimodal/multimodal_agent.ts b/agents/src/multimodal/multimodal_agent.ts index 16571d71..4ab66c18 100644 --- a/agents/src/multimodal/multimodal_agent.ts +++ b/agents/src/multimodal/multimodal_agent.ts @@ -15,7 +15,7 @@ import { TrackPublishOptions, TrackSource, } from '@livekit/rtc-node'; -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; import { AudioByteStream } from '../audio.js'; import type * as llm from '../llm/index.js'; import { log } from '../log.js'; diff --git a/agents/src/utils.ts b/agents/src/utils.ts index 4506d9d6..417b15f4 100644 --- a/agents/src/utils.ts +++ b/agents/src/utils.ts @@ -8,7 +8,7 @@ import type { TrackPublication, } from '@livekit/rtc-node'; import { AudioFrame, TrackSource } from '@livekit/rtc-node'; -import { EventEmitter, once } from 'events'; +import { EventEmitter, once } from 'node:events'; /** Union of a single and a list of {@link AudioFrame}s */ export type AudioBuffer = AudioFrame[] | AudioFrame; diff --git a/agents/src/worker.ts b/agents/src/worker.ts index 95e47ad7..a179c8a8 100644 --- a/agents/src/worker.ts +++ b/agents/src/worker.ts @@ -15,9 +15,9 @@ import { WorkerMessage, WorkerStatus, } from '@livekit/protocol'; -import { EventEmitter } from 'events'; import { AccessToken, RoomServiceClient } from 'livekit-server-sdk'; -import os from 'os'; +import { EventEmitter } from 'node:events'; +import os from 'node:os'; import { WebSocket } from 'ws'; import { HTTPServer } from './http_server.js'; import { ProcPool } from './ipc/proc_pool.js'; diff --git a/tsconfig.json b/tsconfig.json index eb0840e8..f27a4107 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "target": "ES2017", - "module": "ES2022", - "moduleResolution": "node", + "module": "Node16", + "moduleResolution": "Node16", "declaration": true, "declarationMap": true, "allowJs": false,