Updated exports/imports

Neo-Ciber94 · Sep 25, 2023 · c8efff8 · c8efff8
1 parent 1303ae7
commit c8efff8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/examples/next-mal-auth/src/app/layout.tsx b/examples/next-mal-auth/src/app/layout.tsx
@@ -1,7 +1,7 @@
 import "./globals.css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import { SessionProvider } from "@animelist/auth-next";
+import Providers from "./providers";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -18,7 +18,7 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body className={inter.className}>
-        <SessionProvider>{children}</SessionProvider>
+        <Providers>{children}</Providers>
       </body>
     </html>
   );

diff --git a/examples/next-mal-auth/src/app/page.tsx b/examples/next-mal-auth/src/app/page.tsx
@@ -1,5 +1,7 @@
+"use client";
+
 import { useSession } from "@animelist/auth-next";
-import { signIn, signOut } from "@animelist/auth";
+import { signIn, signOut } from "@animelist/auth/client";
 
 export default function Home() {
   const { user, isLoading } = useSession();
@@ -9,7 +11,7 @@ export default function Home() {
       {isLoading && <p>Loading...</p>}
       {!isLoading && user == null && <button onClick={signIn}>Login</button>}
       {!isLoading && user != null && <button onClick={signOut}>Logout</button>}
-      {user && <p>{`Welcome ${user.username}`}</p>}
+      {user && <p>{`Welcome ${user.name}`}</p>}
     </div>
   );
 }
diff --git a/examples/next-mal-auth/src/app/providers.tsx b/examples/next-mal-auth/src/app/providers.tsx
@@ -0,0 +1,7 @@
+"use client";
+
+import { SessionProvider } from "@animelist/auth-next";
+
+export default function Providers({ children }: { children: React.ReactNode }) {
+  return <SessionProvider>{children}</SessionProvider>;
+}
diff --git a/packages/animelist-auth-next/esbuild.mts b/packages/animelist-auth-next/esbuild.mts
@@ -5,7 +5,7 @@ import { fileURLToPath } from "url";
 const packageDir = path.dirname(fileURLToPath(import.meta.url));
 
 await esbuildProject({
-  inputs: ["src/**/*.ts"],
+  inputs: ["src/**/*.ts", "src/**/*.tsx"],
   exclude: ["**/*.test.ts"],
   packageDir,
 });
diff --git a/packages/animelist-auth-next/package.json b/packages/animelist-auth-next/package.json
@@ -32,10 +32,10 @@
     "access": "public"
   },
   "./package.json": "./package.json",
-  "./client": {
-    "import": "./dist/client/index.mjs",
-    "require": "./dist/client/index.js",
-    "default": "./dist/client/index.js"
+  ".": {
+    "import": "./dist/index.mjs",
+    "require": "./dist/index.js",
+    "default": "./dist/index.js"
   },
   "./server": {
     "import": "./dist/server/index.mjs",

diff --git a/.../animelist-auth-next/src/client/index.tsx → ...nimelist-auth-next/src/client/session.tsx b/.../animelist-auth-next/src/client/index.tsx → ...nimelist-auth-next/src/client/session.tsx
diff --git a/packages/animelist-auth-next/src/index.ts b/packages/animelist-auth-next/src/index.ts
@@ -0,0 +1,3 @@
+'use client';
+
+export { SessionProvider, useSession } from "./client/session";
diff --git a/scripts/entrypoints.ts b/scripts/entrypoints.ts
@@ -12,17 +12,20 @@ function writeFileSync(filePath: string, contents: string) {
     fse.writeFileSync(filePath, contents)
 }
 
-export function generateEntrypoints(packageDir: string) {
+export function generateEntrypoints(packageDir: string, additionalInputs?: string[]) {
     const srcDir = path.resolve(packageDir, 'src');
 
     if (!fse.existsSync(srcDir)) {
         throw new Error(`'src' directory does not exist on ${srcDir}`);
     }
 
     cleanUpEntrypoints(packageDir);
+
+    const additionalFiles = (additionalInputs || []).map(file => path.resolve(packageDir, file));
+
     const indexFiles = [
         ...glob.sync(`${srcDir}/**/index.ts`),
-        ...glob.sync(`${srcDir}/**/index.tsx`)
+        ...additionalFiles
     ];
 
     for (const indexFile of indexFiles) {