Merge pull request #421 from gparlakov:fix-ts2742-on-generated-files

fix(kit-headless): fix the TS2742 errors on dts generation

Author: shairez

apps/website/.eslintrc.json

@@ -7,7 +7,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": ["apps/website/tsconfig.*?.json"],
+    "project": ["apps/website/tsconfig.app.json"],
     "ecmaVersion": 2021,
     "sourceType": "module",
     "ecmaFeatures": {

apps/website/vite.config.ts

@@ -9,6 +9,7 @@ export default defineConfig({
     qwikNxVite(),
     qwikCity(),
     qwikVite({
+      tsconfigFileNames: ['tsconfig.app.json'],
       client: {
         outDir: '../../dist/apps/website/client',
       },

packages/kit-fluffy/vite.config.ts

@@ -9,15 +9,15 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
   plugins: [
-    macroPlugin({
-      filter: (ident, id) => {
-        return (
-          id.includes('/styled-system/') &&
-          !id.includes('/jsx') &&
-          (id.startsWith('.') || id.startsWith('~'))
-        );
-      },
-    }),
+    // macroPlugin({
+    //   filter: (ident, id) => {
+    //     return (
+    //       id.includes('/styled-system/') &&
+    //       !id.includes('/jsx') &&
+    //       (id.startsWith('.') || id.startsWith('~'))
+    //     );
+    //   },
+    // }),
     qwikNxVite(),
     qwikVite({
       vendorRoots: [join(__dirname, '../kit-headless/src')],

packages/kit-headless/src/components/tabs/tab.tsx

@@ -27,7 +27,7 @@ export type TabProps = {
   /** @deprecated Internal use only */
 } & QwikIntrinsicElements['button'];
 
-export const preventedKeys = [
+const preventedKeys = [
   KeyCode.Home,
   KeyCode.End,
   KeyCode.PageDown,

packages/kit-headless/src/index.ts

@@ -2,9 +2,8 @@ export * from './components/accordion/';
 export * from './components/badge/badge';
 export * from './components/button-group/button-group';
 export * from './components/card';
-export * from './components/autocomplete/autocomplete-root';
-export * from './components/autocomplete/';
-export * from './components/combobox/';
+export * from './components/autocomplete';
+export * from './components/combobox';
 export * as Carousel from './components/carousel/carousel';
 export * from './components/carousel/use';
 export * from './components/pagination/pagination';

packages/kit-headless/vite.config.ts

@@ -15,6 +15,16 @@ export default defineConfig({
     tsconfigPaths({ root: '../../' }),
     dts({
       tsconfigPath: join(dirname(fileURLToPath(import.meta.url)), 'tsconfig.lib.json'),
+
+      afterDiagnostic(ds) {
+        const nonPortableTypeErrors = ds.filter((d) => d.code === 2742);
+        if (nonPortableTypeErrors.length > 0) {
+          // stop the build - yes with an empty promise - that's what the func expects
+          return Promise.reject(nonPortableTypeErrors);
+        }
+
+        return;
+      },
     }),
   ],
   server: {

packages/primitives/src/lib/button/button.tsx

@@ -1,9 +1,10 @@
 import { QwikIntrinsicElements, JSXChildren } from '@builder.io/qwik';
+import { JSX } from '@builder.io/qwik/jsx-runtime';
 
 export type ButtonProps = QwikIntrinsicElements['button'] & {
   children: JSXChildren;
 };
 
-export const Button = ({ children, ...props }: ButtonProps) => {
+export const Button = ({ children, ...props }: ButtonProps): JSX.Element => {
   return <button {...props}>{children}</button>;
 };

packages/primitives/src/lib/progress/progress.tsx

@@ -1,7 +1,11 @@
-import { QwikIntrinsicElements } from '@builder.io/qwik';
+import { ProgressHTMLAttributes, QwikIntrinsicElements } from '@builder.io/qwik';
+import { JSX } from '@builder.io/qwik/jsx-runtime';
+export type { ProgressHTMLAttributes } from '@builder.io/qwik/core';
 
 export type ProgressProps = QwikIntrinsicElements['progress'];
 
-export const Progress = (props: ProgressProps) => {
+export const Progress: (
+  props: ProgressHTMLAttributes<HTMLProgressElement>,
+) => JSX.Element = (props) => {
   return <progress {...props} />;
 };

packages/primitives/src/lib/radio/radio.tsx

@@ -1,5 +1,8 @@
-import { QwikIntrinsicElements } from '@builder.io/qwik';
+import { InputHTMLAttributes, QwikIntrinsicElements } from '@builder.io/qwik';
+import { JSX } from '@builder.io/qwik/jsx-runtime';
 
 export type RadioProps = QwikIntrinsicElements['input'];
 
-export const Radio = (props: RadioProps) => <input {...props} type="radio" />;
+export const Radio: (props: InputHTMLAttributes<HTMLInputElement>) => JSX.Element = (
+  props,
+) => <input {...props} type="radio" />;

packages/primitives/src/lib/toast/toast.tsx

@@ -1,10 +1,14 @@
 import { QwikIntrinsicElements } from '@builder.io/qwik';
+import { JSX } from '@builder.io/qwik/jsx-runtime';
 
 export type ToastProps = QwikIntrinsicElements['div'] & {
   label?: string;
 };
 
-export const Toast = ({ label = 'New Message', ...toastProps }: ToastProps) => {
+export const Toast = ({
+  label = 'New Message',
+  ...toastProps
+}: ToastProps): JSX.Element => {
   return (
     <div {...toastProps}>
       <span>{label}</span>