From 915ed9f89da22c39736dc62213ed6a682ea89998 Mon Sep 17 00:00:00 2001
From: Caleb Perry <caleb@foxtrotperry.com>
Date: Mon, 10 Jul 2023 23:59:06 -0400
Subject: [PATCH] Promoting debug types dev dep to regular dep, enhancing
 create script

---
 examples/hackernews/package.json        |  1 -
 examples/with-auth/package.json         |  1 -
 examples/with-solid-styled/package.json |  1 -
 packages/create-solid/cli/index.js      |  4 +++-
 packages/start/package.json             |  2 +-
 pnpm-lock.yaml                          | 15 +++------------
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 6ab57fdbf..dfe1a3af8 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -9,7 +9,6 @@
   "main": "./dist/index.js",
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
-    "@types/debug": "^4.1.7",
     "@types/node": "^18.11.18",
     "esbuild": "^0.14.54",
     "solid-start-node": "^0.2.19",
diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json
index acd1d687e..3a8fadd95 100644
--- a/examples/with-auth/package.json
+++ b/examples/with-auth/package.json
@@ -8,7 +8,6 @@
   "type": "module",
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
-    "@types/debug": "^4.1.7",
     "@types/node": "^18.11.18",
     "esbuild": "^0.14.54",
     "postcss": "^8.4.21",
diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json
index ee9a6004e..238046c19 100644
--- a/examples/with-solid-styled/package.json
+++ b/examples/with-solid-styled/package.json
@@ -9,7 +9,6 @@
   "devDependencies": {
     "solid-start-node": "^0.2.19",
     "typescript": "^4.9.4",
-    "@types/debug": "^4.1.7",
     "@types/babel__core": "^7.20.0",
     "vite": "^4.1.4",
     "vite-plugin-solid-styled": "^0.8.1"
diff --git a/packages/create-solid/cli/index.js b/packages/create-solid/cli/index.js
index 626e0bb17..a2062433c 100644
--- a/packages/create-solid/cli/index.js
+++ b/packages/create-solid/cli/index.js
@@ -282,10 +282,12 @@ async function main() {
   ); // TODO ^${versions[name]}
 
   if (!ts_response) {
+    delete pkg_json.dependencies["@types/cookie"];
+    delete pkg_json.dependencies["@types/debug"];
     delete pkg_json.devDependencies["@types/babel__core"];
     delete pkg_json.devDependencies["@types/node"];
-    delete pkg_json.devDependencies["@types/debug"];
     delete pkg_json.devDependencies["typescript"];
+    delete pkg_json.devDependencies["@types/wait-on"];
   }
 
   fs.writeFileSync(pkg_file, JSON.stringify(pkg_json, null, 2));
diff --git a/packages/start/package.json b/packages/start/package.json
index 0c66c0025..f6a8d8962 100644
--- a/packages/start/package.json
+++ b/packages/start/package.json
@@ -90,6 +90,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@babel/template": "^7.20.7",
     "@types/cookie": "^0.5.1",
+    "@types/debug": "^4.1.7",
     "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "connect": "^3.7.0",
@@ -121,7 +122,6 @@
     "@solidjs/router": "^0.8.2",
     "@testing-library/jest-dom": "^5.16.5",
     "@types/babel__core": "^7.20.0",
-    "@types/debug": "^4.1.7",
     "@types/node": "^18.11.18",
     "@types/wait-on": "^5.3.1",
     "jsdom": "^20.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f99c21f51..81ed4ae7b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -161,9 +161,6 @@ importers:
       '@types/babel__core':
         specifier: ^7.20.0
         version: 7.20.0
-      '@types/debug':
-        specifier: ^4.1.7
-        version: 4.1.7
       '@types/node':
         specifier: ^18.11.18
         version: 18.11.18
@@ -244,9 +241,6 @@ importers:
       '@types/babel__core':
         specifier: ^7.20.0
         version: 7.20.0
-      '@types/debug':
-        specifier: ^4.1.7
-        version: 4.1.7
       '@types/node':
         specifier: ^18.11.18
         version: 18.11.18
@@ -407,9 +401,6 @@ importers:
       '@types/babel__core':
         specifier: ^7.20.0
         version: 7.20.0
-      '@types/debug':
-        specifier: ^4.1.7
-        version: 4.1.7
       solid-start-node:
         specifier: ^0.2.19
         version: link:../../packages/start-node
@@ -713,6 +704,9 @@ importers:
       '@types/cookie':
         specifier: ^0.5.1
         version: 0.5.1
+      '@types/debug':
+        specifier: ^4.1.7
+        version: 4.1.7
       chokidar:
         specifier: ^3.5.3
         version: 3.5.3
@@ -804,9 +798,6 @@ importers:
       '@types/babel__core':
         specifier: ^7.20.0
         version: 7.20.0
-      '@types/debug':
-        specifier: ^4.1.7
-        version: 4.1.7
       '@types/node':
         specifier: ^18.11.18
         version: 18.11.18