Fix import path in icon and illustration .d.ts files (adobe#6912)

p1pah · Aug 20, 2024 · 1067aff · 1067aff
1 parent faf0e18
commit 1067aff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -107,7 +107,7 @@ build:
 		do node scripts/buildEsm.js $$pkg; \
 	done
 	node scripts/buildI18n.js
-	node scripts/copyIconDts.js
+	node scripts/generateIconDts.js
 
 website:
 	yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

diff --git a/packages/@react-spectrum/s2/icon.d.ts b/packages/@react-spectrum/s2/icon.d.ts
diff --git a/scripts/copyIconDts.js → scripts/generateIconDts.js b/scripts/copyIconDts.js → scripts/generateIconDts.js
@@ -12,8 +12,15 @@
 
 const glob = require('glob').sync;
 const fs = require('fs');
+const path = require('path');
 
-// We have to copy icon.d.ts for each icon/illustration so TypeScript's import autocomplete works.
+// Generate types for each icon/illustration so TypeScript's import autocomplete works.
 for (let file of glob('packages/@react-spectrum/s2/{icons,illustrations/**}/*.mjs')) {
-  fs.copyFileSync('packages/@react-spectrum/s2/icon.d.ts', file.replace('.mjs', '.d.ts'));
+  let relative = path.relative(path.dirname(file), 'packages/@react-spectrum/s2/dist/types').replaceAll('\\', '/');
+  fs.writeFileSync(file.replace('.mjs', '.d.ts'), `import type {IconProps} from '${relative}';
+import type {ReactNode} from 'react';
+
+declare function Icon(props: IconProps): ReactNode;
+export default Icon;
+`);
 }