Use nodenext to fix TypeScript 6 builds

cristianrgreco · cristianrgreco · commit a30adf6dba93 · 2026-04-20T16:37:31.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/modules/vault/package.json b/packages/modules/vault/package.json
@@ -29,10 +29,10 @@
     "prepack": "shx cp ../../../README.md . && shx cp ../../../LICENSE .",
     "build": "tsc --project tsconfig.build.json"
   },
-  "devDependencies": {
-    "@litehex/node-vault": "^1.1.4"
-  },
   "dependencies": {
     "testcontainers": "^11.14.0"
+  },
+  "devDependencies": {
+    "node-vault": "^0.12.0"
   }
 }
diff --git a/packages/modules/vault/src/vault-container.test.ts b/packages/modules/vault/src/vault-container.test.ts
@@ -1,4 +1,4 @@
-import { Client } from "@litehex/node-vault";
+import vault from "node-vault";
 import { getImage } from "../../../testcontainers/src/utils/test-helper";
 import { VaultContainer } from "./vault-container";
 
@@ -10,31 +10,21 @@ describe("VaultContainer", { timeout: 180_000 }, () => {
     // inside_block:readWrite {
     await using container = await new VaultContainer(IMAGE).withVaultToken(VAULT_TOKEN).start();
 
-    const client = new Client({
+    const client = vault({
+      apiVersion: "v1",
       endpoint: container.getAddress(),
       token: container.getRootToken(),
     });
 
-    const writeResult = await client.kv2.write({
-      mountPath: "secret",
-      path: "hello",
+    await client.write("secret/data/hello", {
       data: {
         message: "world",
         other: "vault",
       },
     });
-    expect(writeResult.error).toBeUndefined();
 
-    const readResult = await client.kv2.read({
-      mountPath: "secret",
-      path: "hello",
-    });
-
-    if (readResult.error) {
-      throw readResult.error;
-    }
-
-    const data = readResult.data.data.data;
+    const result = await client.read("secret/data/hello");
+    const data = result?.data?.data;
 
     expect(data.message).toBe("world");
     expect(data.other).toBe("vault");
diff --git a/packages/testcontainers/src/common/file-lock.ts b/packages/testcontainers/src/common/file-lock.ts
@@ -1,6 +1,7 @@
 import { writeFile } from "fs/promises";
 import path from "path";
 import lockFile from "proper-lockfile";
+import tmp from "tmp";
 import { log } from "./logger";
 
 export async function withFileLock<T>(fileName: string, fn: () => T): Promise<T> {
@@ -24,7 +25,6 @@ export async function withFileLock<T>(fileName: string, fn: () => T): Promise<T>
 }
 
 async function createEmptyTmpFile(fileName: string): Promise<string> {
-  const tmp = await import("tmp");
   const file = path.resolve(tmp.tmpdir, fileName);
   await writeFile(file, "");
   return file;
diff --git a/packages/testcontainers/src/container-runtime/auth/get-auth-config.test.ts b/packages/testcontainers/src/container-runtime/auth/get-auth-config.test.ts
@@ -30,7 +30,7 @@ describe.sequential("get auth config", () => {
         },
       })
     );
-    const { getAuthConfig } = await import("./get-auth-config");
+    const { getAuthConfig } = await import("./get-auth-config.js");
     expect(await getAuthConfig("https://registry.example.com")).toEqual({
       username: "user",
       password: "pass",
@@ -54,7 +54,7 @@ describe.sequential("get auth config", () => {
         })
       )
     );
-    const { getAuthConfig } = await import("./get-auth-config");
+    const { getAuthConfig } = await import("./get-auth-config.js");
     expect(await getAuthConfig("https://registry.example.com")).toEqual({
       username: "user",
       password: "pass",
@@ -65,7 +65,7 @@ describe.sequential("get auth config", () => {
 
   it("should return empty auth when docker config file does not exist", async () => {
     mockExistsSync.mockReturnValue(false);
-    const { getAuthConfig } = await import("./get-auth-config");
+    const { getAuthConfig } = await import("./get-auth-config.js");
     expect(await getAuthConfig("https://registry.example.com")).toBeUndefined();
   });
 });
diff --git a/packages/testcontainers/src/container-runtime/strategies/utils/config.test.ts b/packages/testcontainers/src/container-runtime/strategies/utils/config.test.ts
@@ -9,7 +9,7 @@ describe.sequential("Config", () => {
   let getContainerRuntimeConfig: GetContainerRuntimeConfig;
 
   beforeEach(async () => {
-    getContainerRuntimeConfig = (await import("./config")).getContainerRuntimeConfig;
+    getContainerRuntimeConfig = (await import("./config.js")).getContainerRuntimeConfig;
   });
 
   afterEach(() => {
diff --git a/packages/testcontainers/src/container-runtime/utils/image-exists.test.ts b/packages/testcontainers/src/container-runtime/utils/image-exists.test.ts
@@ -21,7 +21,7 @@ describe.sequential("imageExists", () => {
   });
 
   it("returns true when image exists", async () => {
-    const { imageExists } = await import("./image-exists");
+    const { imageExists } = await import("./image-exists.js");
     mockImageInspect.mockResolvedValue({});
 
     const imageName = ImageName.fromString("imageName");
@@ -31,7 +31,7 @@ describe.sequential("imageExists", () => {
   });
 
   it("returns previous result from cache", async () => {
-    const { imageExists } = await import("./image-exists");
+    const { imageExists } = await import("./image-exists.js");
     mockImageInspect.mockResolvedValue({});
 
     const imageName = ImageName.fromString("imageName");
@@ -43,7 +43,7 @@ describe.sequential("imageExists", () => {
   });
 
   it("returns false when image inspect fails because image does not exist", async () => {
-    const { imageExists } = await import("./image-exists");
+    const { imageExists } = await import("./image-exists.js");
     mockImageInspect.mockRejectedValue(new Error("no such image"));
 
     const imageName = ImageName.fromString("imageName");
@@ -53,7 +53,7 @@ describe.sequential("imageExists", () => {
   });
 
   it("throws when unable to inspect image", async () => {
-    const { imageExists } = await import("./image-exists");
+    const { imageExists } = await import("./image-exists.js");
     mockImageInspect.mockRejectedValue(new Error("unknown error"));
 
     const imageName = ImageName.fromString("imageName");
diff --git a/packages/testcontainers/src/port-forwarder/port-forwarder-reuse.test.ts b/packages/testcontainers/src/port-forwarder/port-forwarder-reuse.test.ts
@@ -6,16 +6,16 @@ describe.sequential("Port Forwarder reuse", { timeout: 180_000 }, () => {
   const portGen = new RandomPortGenerator();
 
   it("should expose additional ports", async () => {
-    const { TestContainers: TC1 } = await import("../test-containers");
-    const { PortForwarderInstance: PFI1 } = await import("../port-forwarder/port-forwarder");
+    const { TestContainers: TC1 } = await import("../test-containers.js");
+    const { PortForwarderInstance: PFI1 } = await import("../port-forwarder/port-forwarder.js");
     const port1 = await portGen.generatePort();
     const server1 = await createTestServer(port1);
     await TC1.exposeHostPorts(port1);
     const portForwarder1ContainerId = (await PFI1.getInstance()).getContainerId();
 
     vi.resetModules();
-    const { TestContainers: TC2 } = await import("../test-containers");
-    const { PortForwarderInstance: PFI2 } = await import("../port-forwarder/port-forwarder");
+    const { TestContainers: TC2 } = await import("../test-containers.js");
+    const { PortForwarderInstance: PFI2 } = await import("../port-forwarder/port-forwarder.js");
     const port2 = await portGen.generatePort();
     const server2 = await createTestServer(port2);
     await TC2.exposeHostPorts(port2);
@@ -37,14 +37,14 @@ describe.sequential("Port Forwarder reuse", { timeout: 180_000 }, () => {
     const port = await portGen.generatePort();
     const server = await createTestServer(port);
 
-    const { TestContainers: TC1 } = await import("../test-containers");
-    const { PortForwarderInstance: PFI1 } = await import("../port-forwarder/port-forwarder");
+    const { TestContainers: TC1 } = await import("../test-containers.js");
+    const { PortForwarderInstance: PFI1 } = await import("../port-forwarder/port-forwarder.js");
     await TC1.exposeHostPorts(port);
     const portForwarder1ContainerId = (await PFI1.getInstance()).getContainerId();
 
     vi.resetModules();
-    const { TestContainers: TC2 } = await import("../test-containers");
-    const { PortForwarderInstance: PFI2 } = await import("../port-forwarder/port-forwarder");
+    const { TestContainers: TC2 } = await import("../test-containers.js");
+    const { PortForwarderInstance: PFI2 } = await import("../port-forwarder/port-forwarder.js");
     await TC2.exposeHostPorts(port);
     const portForwarder2ContainerId = (await PFI2.getInstance()).getContainerId();
 
diff --git a/packages/testcontainers/src/reaper/reaper.test.ts b/packages/testcontainers/src/reaper/reaper.test.ts
@@ -4,7 +4,7 @@ import { RandomPortGenerator } from "../utils/port-generator";
 describe.sequential("Reaper", { timeout: 120_000 }, () => {
   let client: ContainerRuntimeClient;
 
-  const getReaper = async () => await (await import("./reaper")).getReaper(client);
+  const getReaper = async () => await (await import("./reaper.js")).getReaper(client);
 
   beforeEach(async () => {
     vi.resetModules();
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -6,11 +6,11 @@
     "types": [
       "vitest/globals"
     ],
-    "module": "commonjs",
+    "module": "nodenext",
     "declaration": true,
     "sourceMap": false,
     "strict": true,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@`
`29`	`29`	`"prepack": "shx cp ../../../README.md . && shx cp ../../../LICENSE .",`
`30`	`30`	`"build": "tsc --project tsconfig.build.json"`
`31`	`31`	`},`
`32`		`- "devDependencies": {`
`33`		`- "@litehex/node-vault": "^1.1.4"`
`34`		`- },`
`35`	`32`	`"dependencies": {`
`36`	`33`	`"testcontainers": "^11.14.0"`
	`34`	`+ },`
	`35`	`+ "devDependencies": {`
	`36`	`+ "node-vault": "^0.12.0"`
`37`	`37`	`}`
`38`	`38`	`}`