From 14cc215f1fd869a579adfb75df9ab3d41334ad7d Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@users.noreply.github.com>
Date: Wed, 18 May 2022 20:15:53 -0700
Subject: [PATCH] fix: jsx dts

---
 packages/qwik/src/api-extractor.json       | 9 ++++++++-
 packages/qwik/src/build/api-extractor.json | 2 +-
 scripts/api.ts                             | 9 ++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/qwik/src/api-extractor.json b/packages/qwik/src/api-extractor.json
index 12704cd0f7e..2dc7c2bcf12 100644
--- a/packages/qwik/src/api-extractor.json
+++ b/packages/qwik/src/api-extractor.json
@@ -2,7 +2,14 @@
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "bundledPackages": [],
   "compiler": {
-    "tsconfigFilePath": "<projectFolder>/tsconfig.json"
+    "overrideTsconfig": {
+      "compilerOptions": {
+        "isolatedModules": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true
+      },
+      "include": ["dist-dev/dts-out/packages/qwik/src"]
+    }
   },
   "docModel": {
     "enabled": false
diff --git a/packages/qwik/src/build/api-extractor.json b/packages/qwik/src/build/api-extractor.json
index 835a5c61fe9..107feb0d3e8 100644
--- a/packages/qwik/src/build/api-extractor.json
+++ b/packages/qwik/src/build/api-extractor.json
@@ -10,6 +10,6 @@
   },
   "dtsRollup": {
     "enabled": true,
-    "untrimmedFilePath": "<projectFolder>/packages/dist/build/index.d.ts"
+    "untrimmedFilePath": "<projectFolder>/packages/qwik/dist/build/index.d.ts"
   }
 }
diff --git a/scripts/api.ts b/scripts/api.ts
index cd9f461abf9..d0b32e1c0e0 100644
--- a/scripts/api.ts
+++ b/scripts/api.ts
@@ -10,7 +10,7 @@ import { readFileSync, writeFileSync } from 'fs';
 export function apiExtractor(config: BuildConfig) {
   // Run the api extractor for each of the submodules
   createTypesApi(config, 'core', 'core.d.ts', './core');
-  createTypesApi(config, 'jsx-runtime', 'jsx-runtime.d.ts', './jsx-runtime');
+  createTypesApi(config, 'jsx-runtime', 'jsx-runtime.d.ts', './core');
   createTypesApi(config, 'optimizer', 'optimizer.d.ts', './core');
   createTypesApi(config, 'server', 'server.d.ts', './core');
   createTypesApi(config, 'testing', 'testing/index.d.ts', '../core');
@@ -27,9 +27,8 @@ function createTypesApi(
   outFileName: string,
   corePath: string
 ) {
-  const extractorConfig = ExtractorConfig.loadFileAndPrepare(
-    join(config.srcDir, submodule, 'api-extractor.json')
-  );
+  const extractorConfigPath = join(config.srcDir, submodule, 'api-extractor.json');
+  const extractorConfig = ExtractorConfig.loadFileAndPrepare(extractorConfigPath);
   const result = Extractor.invoke(extractorConfig, {
     localBuild: !!config.dev,
     showVerboseMessages: true,
@@ -42,7 +41,7 @@ function createTypesApi(
       if (msg.text.includes('Analysis will use')) {
         return;
       }
-      console.log(`❌ API Extractor, submodule: "${submodule}"\n`, msg);
+      console.error(`❌ API Extractor, submodule: "${submodule}"\n${extractorConfigPath}\n`, msg);
     },
   });
   if (!result.succeeded) {