cleanup merge conflicts

natemoo-re · Jun 6, 2023 · 184e4f2 · 184e4f2
1 parent fd70d82
commit 184e4f2
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 240 deletions.
diff --git a/packages/core/components/index.ts b/packages/core/components/index.ts
@@ -1,3 +1,2 @@
 /// <reference types="astro/astro-jsx" />
-
 export { default as Icon } from "./Icon.astro";
diff --git a/packages/core/src/components.mts b/packages/core/src/components.mts
diff --git a/packages/core/src/createLocalCollection.ts b/packages/core/src/createLocalCollection.ts
diff --git a/packages/core/src/error.d.ts b/packages/core/src/error.d.ts
diff --git a/packages/core/src/integration.mts b/packages/core/src/integration.mts
diff --git a/packages/core/src/loadIconifyCollections.mts b/packages/core/src/loadIconifyCollections.mts
diff --git a/packages/core/src/types.d.mts b/packages/core/src/types.d.mts
diff --git a/packages/core/src/virtual.d.ts b/packages/core/src/virtual.d.ts
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -1,17 +1,12 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src", "typings"],
+  "include": ["src", "typings", "components"],
   "compilerOptions": {
     "allowJs": true,
     "module": "ES2022",
     "outDir": "./dist",
     "target": "ES2021",
-    "jsx": "preserve",
-    "plugins": [
-      {
-        "name": "@astrojs/ts-plugin"
-      }
-    ]
+    "jsx": "preserve"
   },
   // NEW: Options for file/directory watching
   "watchOptions": {