Merge pull request #9 from whats-good/kerem/single-entry

Kerem/single entry
whats-good · Nov 20, 2023 · a63a4d8 · a63a4d8
2 parents 609ce87 + fd24420
commit a63a4d8
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 304 deletions.
diff --git a/.changeset/tidy-pandas-collect.md b/.changeset/tidy-pandas-collect.md
@@ -0,0 +1,5 @@
+---
+"@whatsgood/nexus": patch
+---
+
+Reverted back to single-entrypoint module, in alignment with whatwg-node/server
diff --git a/packages/nexus/package.json b/packages/nexus/package.json
@@ -20,20 +20,10 @@
     "url": "https://github.com/whats-good/nexus"
   },
   "exports": {
-    "./fetch": {
-      "require": "./dist/fetch/index.js",
-      "import": "./dist/fetch/index.mjs",
-      "types": "./dist/fetch/index.d.ts"
-    },
-    "./node": {
-      "require": "./dist/node/index.js",
-      "import": "./dist/node/index.mjs",
-      "types": "./dist/node/index.d.ts"
-    },
     ".": {
-      "require": "./dist/lib/index.js",
-      "import": "./dist/lib/index.mjs",
-      "types": "./dist/lib/index.d.ts"
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
     },
     "./package.json": "./package.json"
   },

diff --git a/...ges/nexus/src/lib/chain/chain-registry.ts → packages/nexus/src/chain/chain-registry.ts b/...ges/nexus/src/lib/chain/chain-registry.ts → packages/nexus/src/chain/chain-registry.ts
diff --git a/packages/nexus/src/lib/chain/chain.ts → packages/nexus/src/chain/chain.ts b/packages/nexus/src/lib/chain/chain.ts → packages/nexus/src/chain/chain.ts
diff --git a/packages/nexus/src/lib/config.ts → packages/nexus/src/config.ts b/packages/nexus/src/lib/config.ts → packages/nexus/src/config.ts
diff --git a/packages/nexus/src/fetch/index.ts b/packages/nexus/src/fetch/index.ts
diff --git a/packages/nexus/src/fetch/request-handler/index.ts b/packages/nexus/src/fetch/request-handler/index.ts
diff --git a/packages/nexus/src/lib/index.ts → packages/nexus/src/index.ts b/packages/nexus/src/lib/index.ts → packages/nexus/src/index.ts
diff --git a/packages/nexus/src/lib/request-handler/abstract-request-handler.ts b/packages/nexus/src/lib/request-handler/abstract-request-handler.ts
diff --git a/packages/nexus/src/lib/nexus/index.ts → packages/nexus/src/nexus/index.ts b/packages/nexus/src/lib/nexus/index.ts → packages/nexus/src/nexus/index.ts
diff --git a/packages/nexus/src/lib/nexus/nexus.ts → packages/nexus/src/nexus/nexus.ts b/packages/nexus/src/lib/nexus/nexus.ts → packages/nexus/src/nexus/nexus.ts
@@ -1,5 +1,5 @@
 import { createServerAdapter } from "@whatwg-node/server";
-import { RequestHandler } from "../../fetch";
+import { RequestHandler } from "../request-handler/request-handler";
 import type { ChainRegistry } from "../chain/chain-registry";
 import { Config } from "../config";
 import type { ConfigConstructorParams } from "../config";

diff --git a/packages/nexus/src/node/index.ts b/packages/nexus/src/node/index.ts
diff --git a/packages/nexus/src/node/request-handler/index.ts b/packages/nexus/src/node/request-handler/index.ts
diff --git a/packages/nexus/src/node/request-handler/request-handler.ts b/packages/nexus/src/node/request-handler/request-handler.ts
diff --git a/...ndler/fetch-request-handler.relay.test.ts → ...est-handler/request-handler.relay.test.ts b/...ndler/fetch-request-handler.relay.test.ts → ...est-handler/request-handler.relay.test.ts
@@ -1,9 +1,9 @@
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import { setupServer } from "msw/node";
+import { Config } from "@src/config";
+import { Nexus } from "@src/nexus";
 import { handlers } from "@test/mock-server-handlers";
 import { retry } from "@test/utils";
-import { Config } from "@lib/config";
-import { Nexus } from "@lib/nexus";
 import { RequestHandler } from "./request-handler";
 
 const sharedConfig = {
@@ -50,7 +50,7 @@ const blockNumberRequestHelper = (config: Config) => {
   return requestHandler.handle();
 };
 
-describe("fetch request handler - relay", () => {
+describe("request handler - relay", () => {
   describe("all providers up", () => {
     const server = setupServer(
       handlers.alchemyReturnsBlockNumber,

diff --git a/...dler/fetch-request-handler.status.test.ts → ...st-handler/request-handler.status.test.ts b/...dler/fetch-request-handler.status.test.ts → ...st-handler/request-handler.status.test.ts
@@ -1,8 +1,8 @@
 import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
 import { setupServer } from "msw/node";
+import { Config } from "@src/config";
+import { Nexus } from "@src/nexus";
 import { handlers } from "@test/mock-server-handlers";
-import { Config } from "@lib/config";
-import { Nexus } from "@lib/nexus";
 import { RequestHandler } from "./request-handler";
 
 export const requestHelper = async (endpoint: string, config: Config) => {
@@ -17,7 +17,7 @@ export const requestHelper = async (endpoint: string, config: Config) => {
   return data;
 };
 
-describe("fetch request handler - status", () => {
+describe("request handler - status", () => {
   describe("providers are up", () => {
     const server = setupServer(
       handlers.alchemyReturnsBlockNumber,