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 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/vite.config.js deleted file mode 100644 index 48b5cfe28a0..00000000000 --- a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vite.config.js +++ /dev/null @@ -1,8 +0,0 @@ -import { defineConfig } from 'vite' - -export default defineConfig({ - test: { - include: ['**/*.spec.ts'], - globals: true - }, -}) 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 new file mode 100644 index 00000000000..e7147d3ac9e --- /dev/null +++ b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/vitest.config.mts @@ -0,0 +1,8 @@ +import { defineConfig } from "vite"; + +export default defineConfig({ + test: { + include: ["**/*.spec.ts"], + globals: true, + }, +}); 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