From 3ac8210cc10d749bb79488aa08e52b22e223e46e Mon Sep 17 00:00:00 2001
From: Ryan Carniato <ryansolid@gmail.com>
Date: Mon, 5 Feb 2024 10:58:18 -0800
Subject: [PATCH] fix storage export

---
 .changeset/metal-icons-learn.md                   |  5 +++++
 packages/solid/package.json                       | 11 ++++++++---
 packages/solid/rollup.config.js                   |  6 +++---
 packages/solid/web/storage/package.json           | 15 +++++++++++++++
 .../web/storage/{storage.ts => src/index.ts}      |  0
 packages/solid/web/storage/storage.d.ts           |  2 --
 packages/solid/web/storage/tsconfig.build.json    | 14 ++++++++++++++
 packages/solid/web/storage/tsconfig.json          |  4 ++++
 8 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/metal-icons-learn.md
 create mode 100644 packages/solid/web/storage/package.json
 rename packages/solid/web/storage/{storage.ts => src/index.ts} (100%)
 delete mode 100644 packages/solid/web/storage/storage.d.ts
 create mode 100644 packages/solid/web/storage/tsconfig.build.json
 create mode 100644 packages/solid/web/storage/tsconfig.json

diff --git a/.changeset/metal-icons-learn.md b/.changeset/metal-icons-learn.md
new file mode 100644
index 000000000..e0aa50bf9
--- /dev/null
+++ b/.changeset/metal-icons-learn.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix storage export
diff --git a/packages/solid/package.json b/packages/solid/package.json
index f36f24064..c5342573d 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -27,6 +27,9 @@
     "web/dist",
     "web/types",
     "web/package.json",
+    "web/storage/dist",
+    "web/storage/types",
+    "web/storage/package.json",
     "h/dist",
     "h/types",
     "h/package.json",
@@ -162,8 +165,9 @@
       "require": "./web/dist/web.cjs"
     },
     "./web/storage": {
-      "import": "./web/dist/storage.js",
-      "require": "./web/dist/storage.cjs"
+      "types": "./web/storage/types/index.d.ts",
+      "import": "./web/storage/dist/index.js",
+      "require": "./web/storage/dist/index.cjs"
     },
     "./web/dist/*": "./web/dist/*",
     "./web/types/*": "./web/types/*",
@@ -213,7 +217,8 @@
     "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/src/jsx.d.ts",
     "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts",
     "types:web": "tsc --project ./web/tsconfig.build.json",
-    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./web/types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./web/types/server.d.ts && ncp ./web/storage/storage.d.ts ./web/types/storage.d.ts",
+    "types:web-storage": "tsc --project ./web/storage/tsconfig.build.json",
+    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./web/types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./web/types/server.d.ts",
     "types:store": "tsc --project ./store/tsconfig.build.json",
     "types:html": "tsc --project ./html/tsconfig.json && ncp ../../node_modules/lit-dom-expressions/types/index.d.ts ./html/types/lit.d.ts",
     "types:h": "tsc --project ./h/tsconfig.json && ncp ../../node_modules/hyper-dom-expressions/types/index.d.ts ./h/types/hyperscript.d.ts",
diff --git a/packages/solid/rollup.config.js b/packages/solid/rollup.config.js
index 83a6c04f6..270b22f40 100644
--- a/packages/solid/rollup.config.js
+++ b/packages/solid/rollup.config.js
@@ -173,15 +173,15 @@ export default [
     plugins: [replaceDev(true)].concat(plugins)
   },
   {
-    input: "web/storage/storage.ts",
+    input: "web/storage/src/index.ts",
     output: [
       {
-        file: "web/dist/storage.cjs",
+        file: "web/storage/dist/storage.cjs",
         format: "cjs",
         exports: "auto"
       },
       {
-        file: "web/dist/storage.js",
+        file: "web/storage/dist/storage.js",
         format: "es"
       }
     ],
diff --git a/packages/solid/web/storage/package.json b/packages/solid/web/storage/package.json
new file mode 100644
index 000000000..f36b1ab09
--- /dev/null
+++ b/packages/solid/web/storage/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "solid-js/web/storage",
+  "main": "./dist/storage.cjs",
+  "module": "./dist/storage.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "import": "./dist/storage.js",
+      "require": "./dist/storage.cjs"
+    }
+  }
+}
diff --git a/packages/solid/web/storage/storage.ts b/packages/solid/web/storage/src/index.ts
similarity index 100%
rename from packages/solid/web/storage/storage.ts
rename to packages/solid/web/storage/src/index.ts
diff --git a/packages/solid/web/storage/storage.d.ts b/packages/solid/web/storage/storage.d.ts
deleted file mode 100644
index 76705947c..000000000
--- a/packages/solid/web/storage/storage.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import type { RequestEvent } from "solid-js/web";
-export function provideRequestEvent<T extends RequestEvent, U>(init: T, cb: () => U): U;
diff --git a/packages/solid/web/storage/tsconfig.build.json b/packages/solid/web/storage/tsconfig.build.json
new file mode 100644
index 000000000..13c7d9d1e
--- /dev/null
+++ b/packages/solid/web/storage/tsconfig.build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./types",
+    "baseUrl": "src",
+    "paths": {
+      "solid-js": ["../../.."],
+      "solid-js/web": ["../.."],
+      "solid-js/jsx-runtime": ["../../../src/jsx"],
+      "solid-js/jsx-dev-runtime": ["../../../src/jsx"],
+    }
+  },
+  "include": ["./src"]
+}
diff --git a/packages/solid/web/storage/tsconfig.json b/packages/solid/web/storage/tsconfig.json
new file mode 100644
index 000000000..6002e89e7
--- /dev/null
+++ b/packages/solid/web/storage/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.build.json",
+  "include": ["./src"]
+}