Enhance TS options (#496)

iconoir-icons · Dec 15, 2024 · e7919b7 · e7919b7
1 parent 401a53c
commit e7919b7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/bin/build/lib/ts.js b/bin/build/lib/ts.js
@@ -1,6 +1,14 @@
 import ts from 'typescript';
 
+/**
+ *
+ * @param {string} path
+ * @param {string} content
+ * @param {import('types-tsconfig').TSConfigJSON['compilerOptions']} options
+ */
 export function getDts(path, content, options) {
+  options = ts.convertCompilerOptionsFromJson(options, '').options;
+
   let output;
 
   const host = ts.createCompilerHost(options);

diff --git a/bin/build/targets/react/index.js b/bin/build/targets/react/index.js
@@ -36,9 +36,8 @@ const jsTargets = [
 /** @type {import('esbuild').TransformOptions} */
 const defaultEsbuildOptions = { target: 'es6', minify: true };
 
-/** @type {import('typescript').CompilerOptions} */
+/** @type {import('types-tsconfig').TSConfigJSON['compilerOptions']} */
 const defaultTsOptions = {
-  jsx: 'react',
   declaration: true,
   emitDeclarationOnly: true,
   target: 'es6',
@@ -90,6 +89,7 @@ export default async (ctx, target) => {
       iconoirContextDtsPath,
       iconoirContext,
       jsTarget.module,
+      target.native,
     );
 
     for (const variant of Object.keys(ctx.icons)) {
@@ -152,6 +152,7 @@ export default async (ctx, target) => {
             dtsPath,
             reactComponent,
             jsTarget.module,
+            target.native,
           );
 
           promises.push(iconDts);
@@ -180,10 +181,12 @@ async function getReactComponent(iconPath, native, template) {
   return svgr.transform(iconContent, options);
 }
 
-async function generateDts(inputPath, outputPath, input, module) {
+async function generateDts(inputPath, outputPath, input, module, native) {
   const dts = getDts(inputPath, await input, {
     ...defaultTsOptions,
+    jsx: native ? 'react-native' : 'react',
     module,
+    ...(module === 'esnext' && { moduleResolution: 'bundler' }),
   });
 
   return fs.writeFile(outputPath, dts);