From e7a85e59d9634214c8c5530632f9ee91df84034e Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sun, 5 Feb 2023 11:46:55 -0800
Subject: [PATCH] Move types into dist dir

---
 .prettierignore               | 1 -
 packages/webamp/.gitignore    | 1 -
 packages/webamp/package.json  | 8 ++------
 packages/webamp/tsconfig.json | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index ab4752e7..514a00e6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,6 +3,5 @@
 packages/webamp/demo/built/
 packages/webamp/built/
 packages/webamp/dist/
-packages/webamp/types/
 packages/webamp-modern/build/
 packages/webamp-modern/tools/eslint-rules/dist/
\ No newline at end of file
diff --git a/packages/webamp/.gitignore b/packages/webamp/.gitignore
index 07451efb..2d3f39b9 100644
--- a/packages/webamp/.gitignore
+++ b/packages/webamp/.gitignore
@@ -5,4 +5,3 @@
 /coverage
 /examples/webpack/bundle.js
 **/__diff_output__/
-/types
diff --git a/packages/webamp/package.json b/packages/webamp/package.json
index 5354a16f..9a187e79 100644
--- a/packages/webamp/package.json
+++ b/packages/webamp/package.json
@@ -4,13 +4,9 @@
   "description": "Winamp 2 implemented in HTML5 and JavaScript",
   "main": "dist/webamp-lazy/webampLazy.js",
   "files": [
-    "dist/webamp/webamp.js",
-    "dist/webamp/webamp.js.map",
-    "dist/webamp/webamp-lazy.js",
-    "dist/webamp/webamp-lazy.js.map",
-    "index.d.ts"
+    "dist/"
   ],
-  "types": "./types/js/webamp.d.ts",
+  "types": "./dist/types/js/webamp.d.ts",
   "browser": "dist/webamp-browser/webampBrowser.js",
   "browserslist": [
     "> 1%",
diff --git a/packages/webamp/tsconfig.json b/packages/webamp/tsconfig.json
index 3e32e049..9e764a1e 100644
--- a/packages/webamp/tsconfig.json
+++ b/packages/webamp/tsconfig.json
@@ -11,10 +11,10 @@
     "jsx": "preserve",
     "declaration": true,
     "emitDeclarationOnly": true,
-    "declarationDir": "./types",
+    "declarationDir": "./dist/types",
     "pretty": true,
     "types": ["react/experimental", "react-dom/experimental", "jest"]
   },
   "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules", "demo/built", "types"]
+  "exclude": ["node_modules", "demo/built", "dist"]
 }