Skip to content

Commit 330964a

Browse files
committed
feat(codegen): ts-ignore packageInfo imports in codegen
Avoids postprocessing generated clients in favor of ignoring the import at codegen time.
1 parent 10d64df commit 330964a

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddUserAgentDependency.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
7373
writer.addDependency(AwsDependency.AWS_SDK_UTIL_USER_AGENT_NODE.dependency);
7474
writer.addImport("defaultUserAgent", "defaultUserAgent",
7575
AwsDependency.AWS_SDK_UTIL_USER_AGENT_NODE.packageName);
76-
writer.addDefaultImport("packageInfo", "./package.json");
76+
writer.addIgnoredDefaultImport("packageInfo", "./package.json",
77+
"package.json will be imported from dist folders");
7778
writeDefaultUserAgentProvider(writer, settings, model);
7879
}
7980
);
@@ -83,7 +84,8 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
8384
writer.addDependency(AwsDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER.dependency);
8485
writer.addImport("defaultUserAgent", "defaultUserAgent",
8586
AwsDependency.AWS_SDK_UTIL_USER_AGENT_BROWSER.packageName);
86-
writer.addDefaultImport("packageInfo", "./package.json");
87+
writer.addIgnoredDefaultImport("packageInfo", "./package.json",
88+
"package.json will be imported from dist folders");
8789
writeDefaultUserAgentProvider(writer, settings, model);
8890
}
8991
);

scripts/generate-clients/copy-to-clients.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,6 @@ const copyToClients = async (sourceDir, destinationDir) => {
136136
});
137137
}
138138
}
139-
140-
// Add @ts-ignore to packageInfo import from AddUserAgentDependency.java
141-
["src/runtimeConfig.ts", "src/runtimeConfig.browser.ts"].forEach((runtimeConfigFileName) => {
142-
const runtimeConfigFilepath = join(destPath, runtimeConfigFileName);
143-
const content = readFileSync(runtimeConfigFilepath).toString();
144-
writeFileSync(
145-
runtimeConfigFilepath,
146-
content.replace(
147-
`import packageInfo`,
148-
`// @ts-ignore: package.json will be imported from dist folders\nimport packageInfo`
149-
)
150-
);
151-
});
152139
}
153140
};
154141

0 commit comments

Comments
 (0)