diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/LanguageTarget.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/LanguageTarget.java index 2c24626d216..2cffd571bd8 100644 --- a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/LanguageTarget.java +++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/LanguageTarget.java @@ -47,7 +47,7 @@ String getTemplateFileName() { REACT_NATIVE { @Override String getTemplateFileName() { - return "runtimeConfig.rn.ts.template"; + return "runtimeConfig.native.ts.template"; } }, 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 120a48887c9..a55c33c1115 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 @@ -56,7 +56,7 @@ static void writePackageJson( .withMember("./runtimeConfig", "./runtimeConfig.browser")); // Add the ReactNative hook. node = node.withMember("react-native", Node.objectNode() - .withMember("./runtimeConfig", "./runtimeConfig.rn")); + .withMember("./runtimeConfig", "./runtimeConfig.native")); // Expand template parameters. String template = Node.prettyPrintJson(node); diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java index 6e5c96203b1..7731a697bf0 100644 --- a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java +++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptDependency.java @@ -47,7 +47,7 @@ public enum TypeScriptDependency implements SymbolDependencyContainer { AWS_SDK_STREAM_COLLECTOR_NODE("dependencies", "@aws-sdk/stream-collector-node", "^1.0.0-alpha.1", true), AWS_SDK_STREAM_COLLECTOR_BROWSER("dependencies", "@aws-sdk/stream-collector-browser", "^1.0.0-alpha.1", true), - AWS_SDK_STREAM_COLLECTOR_RN("dependencies", "@aws-sdk/stream-collector-rn", "^1.0.0-alpha.0", true), + AWS_SDK_STREAM_COLLECTOR_RN("dependencies", "@aws-sdk/stream-collector-native", "^1.0.0-alpha.0", true), AWS_SDK_URL_PARSER_BROWSER("dependencies", "@aws-sdk/url-parser-browser", "^1.0.0-alpha.1", true), AWS_SDK_URL_PARSER_NODE("dependencies", "@aws-sdk/url-parser-node", "^1.0.0-alpha.1", true), diff --git a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json index abae38f4c01..2e09a23ccbd 100644 --- a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json +++ b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json @@ -24,7 +24,7 @@ "./runtimeConfig": "./runtimeConfig.browser" }, "react-native": { - "./runtimeConfig": "./runtimeConfig.rn" + "./runtimeConfig": "./runtimeConfig.native" }, "sideEffects": false, "dependencies": { diff --git a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.rn.ts.template b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.native.ts.template similarity index 90% rename from smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.rn.ts.template rename to smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.native.ts.template index 3807aec0055..78c6ed978bf 100644 --- a/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.rn.ts.template +++ b/smithy-typescript-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/runtimeConfig.native.ts.template @@ -1,6 +1,6 @@ import { FetchHttpHandler } from "@aws-sdk/fetch-http-handler"; import { Sha256 } from "@aws-crypto/sha256-js"; -import { streamCollector } from "@aws-sdk/stream-collector-rn"; +import { streamCollector } from "@aws-sdk/stream-collector-native"; import { parseUrl } from "@aws-sdk/url-parser-node"; import { name, version } from "./package.json"; import { ClientDefaults } from "${clientModuleName}"; diff --git a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGeneratorTest.java b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGeneratorTest.java index 04d63e3d188..8f3cc50a652 100644 --- a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGeneratorTest.java +++ b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGeneratorTest.java @@ -51,7 +51,7 @@ public void addRuntimeConfigValues( Assertions.assertTrue(manifest.hasFile("runtimeConfig.ts")); Assertions.assertTrue(manifest.hasFile("runtimeConfig.browser.ts")); - Assertions.assertTrue(manifest.hasFile("runtimeConfig.rn.ts")); + Assertions.assertTrue(manifest.hasFile("runtimeConfig.native.ts")); Assertions.assertTrue(manifest.hasFile("runtimeConfig.shared.ts")); // Does the runtimeConfig.shared.ts file expand the template properties properly? @@ -71,11 +71,11 @@ public void addRuntimeConfigValues( containsString("import { ClientDefaults } from \"./ExampleClient\";")); assertThat(runtimeConfigContents, containsString("syn: 'ack',")); - // Does the runtimeConfig.rn.ts file expand the browser template properties properly? - String runtimeConfigRNContents = manifest.getFileString("runtimeConfig.rn.ts").get(); - assertThat(runtimeConfigRNContents, + // Does the runtimeConfig.native.ts file expand the browser template properties properly? + String runtimeConfigNativeContents = manifest.getFileString("runtimeConfig.native.ts").get(); + assertThat(runtimeConfigNativeContents, containsString("import { ClientDefaults } from \"./ExampleClient\";")); - assertThat(runtimeConfigRNContents, + assertThat(runtimeConfigNativeContents, containsString("import { ClientDefaultValues as BrowserDefaults } from \"./runtimeConfig.browser\";")); assertThat(runtimeConfigContents, containsString("syn: 'ack',")); }