chore(exports): Separate export for ServerAuthProvider (#10711)

redwoodjs · May 31, 2024 · 009dd04 · 009dd04
1 parent 8d51107
commit 009dd04
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -9,9 +9,26 @@
   "license": "MIT",
   "type": "module",
   "exports": {
-    "types": "./dist/index.d.ts",
-    "import": "./dist/index.js",
-    "default": "./dist/cjs/index.js"
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/cjs/index.js"
+    },
+    "./ServerAuthProvider": {
+      "types": "./dist/AuthProvider/ServerAuthProvider.d.ts",
+      "import": "./dist/AuthProvider/ServerAuthProvider.js",
+      "default": "./dist/cjs/AuthProvider/ServerAuthProvider.js"
+    },
+    "./dist/AuthProvider/ServerAuthProvider": {
+      "types": "./dist/AuthProvider/ServerAuthProvider.d.ts",
+      "import": "./dist/AuthProvider/ServerAuthProvider.js",
+      "default": "./dist/cjs/AuthProvider/ServerAuthProvider.js"
+    },
+    "./dist/AuthProvider/ServerAuthProvider.js": {
+      "types": "./dist/AuthProvider/ServerAuthProvider.d.ts",
+      "import": "./dist/AuthProvider/ServerAuthProvider.js",
+      "default": "./dist/cjs/AuthProvider/ServerAuthProvider.js"
+    }
   },
   "types": "./dist/index.d.ts",
   "files": [

diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -6,6 +6,5 @@ export type { CustomProviderHooks } from './authFactory.js'
 export type { AuthImplementation } from './AuthImplementation.js'
 
 export * from './AuthProvider/AuthProviderState.js'
-export * from './AuthProvider/ServerAuthProvider.js'
 
 export * from './getCurrentUserFromMiddleware.js'
diff --git a/packages/vite/src/middleware/MiddlewareRequest.ts b/packages/vite/src/middleware/MiddlewareRequest.ts
@@ -1,9 +1,7 @@
 import { Request as WhatWgRequest } from '@whatwg-node/fetch'
 
-import {
-  middlewareDefaultAuthProviderState,
-  type ServerAuthState,
-} from '@redwoodjs/auth'
+import { middlewareDefaultAuthProviderState } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 
 import { CookieJar } from './CookieJar.js'
 

diff --git a/packages/vite/src/middleware/invokeMiddleware.ts b/packages/vite/src/middleware/invokeMiddleware.ts
@@ -1,4 +1,4 @@
-import { type ServerAuthState } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 
 import { setServerAuthState } from '../serverStore.js'
 

diff --git a/packages/vite/src/rsc/rscWorkerCommunication.ts b/packages/vite/src/rsc/rscWorkerCommunication.ts
@@ -3,7 +3,7 @@ import type { Readable } from 'node:stream'
 import { PassThrough } from 'node:stream'
 import { Worker } from 'node:worker_threads'
 
-import type { ServerAuthState } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 
 import type { RscFetchProps } from './rscFetchForClientRouter'
 

diff --git a/packages/vite/src/serverStore.ts b/packages/vite/src/serverStore.ts
@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks'
 
-import type { ServerAuthState } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 
 import { CookieJar } from './middleware/CookieJar.js'
 

diff --git a/packages/vite/src/streaming/createReactStreamingHandler.ts b/packages/vite/src/streaming/createReactStreamingHandler.ts
@@ -6,8 +6,8 @@ import type { HTTPMethod } from 'find-my-way'
 import { createIsbotFromList, list as isbotList } from 'isbot'
 import type { ViteDevServer } from 'vite'
 
-import type { ServerAuthState } from '@redwoodjs/auth'
 import { middlewareDefaultAuthProviderState } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 import type { RouteSpec, RWRouteManifestItem } from '@redwoodjs/internal'
 import { getAppRouteHook, getConfig, getPaths } from '@redwoodjs/project-config'
 import { matchPath } from '@redwoodjs/router'

diff --git a/packages/vite/src/streaming/streamHelpers.ts b/packages/vite/src/streaming/streamHelpers.ts
@@ -8,8 +8,8 @@ import type {
 } from 'react-dom/server'
 import type { default as RDServerModule } from 'react-dom/server.edge'
 
-import type { ServerAuthState } from '@redwoodjs/auth'
-import { ServerAuthProvider } from '@redwoodjs/auth'
+import type { ServerAuthState } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
+import { ServerAuthProvider } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 import { getConfig, getPaths } from '@redwoodjs/project-config'
 import { LocationProvider } from '@redwoodjs/router'
 import type { TagDescriptor } from '@redwoodjs/web'

diff --git a/packages/web/src/apollo/suspense.tsx b/packages/web/src/apollo/suspense.tsx
@@ -34,7 +34,8 @@ import {
 import { buildManualDataTransport } from '@apollo/client-react-streaming/manual-transport'
 
 import type { UseAuth } from '@redwoodjs/auth'
-import { ServerAuthContext, useNoAuth } from '@redwoodjs/auth'
+import { useNoAuth } from '@redwoodjs/auth'
+import { ServerAuthContext } from '@redwoodjs/auth/dist/AuthProvider/ServerAuthProvider.js'
 import './typeOverride'
 
 import {