From 5dc8eb1be5e98925774b6a853beebaa4bcc3eea0 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 20 Aug 2025 17:35:38 +0000 Subject: [PATCH 1/4] chore(codegen): rename vite.config.js to vitest.config.mts --- .../smithy/typescript/codegen/PackageJsonGenerator.java | 4 ++-- .../typescript/codegen/{vite.config.js => vitest.config.mts} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/{vite.config.js => vitest.config.mts} (100%) diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java index 5d1360470b5..766aace2289 100644 --- a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java +++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java @@ -32,7 +32,7 @@ final class PackageJsonGenerator { public static final String PACKAGE_JSON_FILENAME = "package.json"; public static final String TYPEDOC_FILE_NAME = "typedoc.json"; - public static final String VITEST_CONFIG_FILENAME = "vite.config.js"; + public static final String VITEST_CONFIG_FILENAME = "vitest.config.mts"; private PackageJsonGenerator() {} @@ -67,7 +67,7 @@ static void writePackageJson( node = node.withMember(depEntry.getKey(), builder.build()); } - // Add test script and vite.config.js if specs and their devDependency on vitest has been generated. + // Add test script and vitest.config.mts if specs and their devDependency on vitest has been generated. ObjectNode devDeps = node.getObjectMember("devDependencies").orElse(Node.objectNode()); if (devDeps.containsMember(TypeScriptDependency.VITEST.packageName)) { ObjectNode scripts = node.getObjectMember("scripts").orElse(Node.objectNode()); diff --git a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vite.config.js b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts similarity index 100% rename from smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vite.config.js rename to smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts From 818a8c687f5fff290576d2b188ef69e5bfa39ad1 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 20 Aug 2025 17:38:09 +0000 Subject: [PATCH 2/4] chore(protocols): rename vite.config.js to vitest.config.mts --- .../{vite.config.js => vitest.config.mts} | 0 private/smithy-rpcv2-cbor/{vite.config.js => vitest.config.mts} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename private/smithy-rpcv2-cbor-schema/{vite.config.js => vitest.config.mts} (100%) rename private/smithy-rpcv2-cbor/{vite.config.js => vitest.config.mts} (100%) diff --git a/private/smithy-rpcv2-cbor-schema/vite.config.js b/private/smithy-rpcv2-cbor-schema/vitest.config.mts similarity index 100% rename from private/smithy-rpcv2-cbor-schema/vite.config.js rename to private/smithy-rpcv2-cbor-schema/vitest.config.mts diff --git a/private/smithy-rpcv2-cbor/vite.config.js b/private/smithy-rpcv2-cbor/vitest.config.mts similarity index 100% rename from private/smithy-rpcv2-cbor/vite.config.js rename to private/smithy-rpcv2-cbor/vitest.config.mts From 54bd68b3524403371648efbb8c4553a2e3b766e8 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 20 Aug 2025 18:25:18 +0000 Subject: [PATCH 3/4] chore(codegen): format vitest.config.mts --- .../amazon/smithy/typescript/codegen/vitest.config.mts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts index 48b5cfe28a0..e7147d3ac9e 100644 --- a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts +++ b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts @@ -1,8 +1,8 @@ -import { defineConfig } from 'vite' +import { defineConfig } from "vite"; export default defineConfig({ test: { - include: ['**/*.spec.ts'], - globals: true + include: ["**/*.spec.ts"], + globals: true, }, -}) +}); From de513fa92055ff8f16072523ae3efbe9adf9433d Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 20 Aug 2025 18:30:34 +0000 Subject: [PATCH 4/4] test(codegen): use double quotes for testing vitest config file --- .../smithy/typescript/codegen/PackageJsonGeneratorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/PackageJsonGeneratorTest.java b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/PackageJsonGeneratorTest.java index e8cf07c62e8..2cdda9dff7e 100644 --- a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/PackageJsonGeneratorTest.java +++ b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/PackageJsonGeneratorTest.java @@ -130,7 +130,7 @@ void expectTestScriptAndTestConfigToBeAdded() { String configString = manifest.getFileString(PackageJsonGenerator.VITEST_CONFIG_FILENAME).get(); assertThat(packageJson, containsString("\"test\": \"yarn g:vitest run --passWithNoTests\"")); - assertThat(configString, containsString("include: ['**/*.spec.ts']")); + assertThat(configString, containsString("include: [\"**/*.spec.ts\"]")); } @Test