mirror of
https://github.com/neynarxyz/create-farcaster-mini-app.git
synced 2025-11-15 15:48:56 -05:00
fix imports
This commit is contained in:
parent
bade04b785
commit
882e4f166f
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@neynar/create-farcaster-mini-app",
|
||||
"version": "1.7.10",
|
||||
"version": "1.7.11",
|
||||
"type": "module",
|
||||
"private": false,
|
||||
"access": "public",
|
||||
|
||||
@ -22,8 +22,8 @@ export default async function RootLayout({
|
||||
let session = null;
|
||||
if (shouldUseSession) {
|
||||
try {
|
||||
const authModule = eval('require("~/auth")');
|
||||
session = await authModule.getSession();
|
||||
const { getSession } = await import('~/auth');
|
||||
session = await getSession();
|
||||
} catch (error) {
|
||||
console.warn('Failed to get session:', error);
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import dynamic from 'next/dynamic';
|
||||
import { MiniAppProvider } from '@neynar/react';
|
||||
import { SafeFarcasterSolanaProvider } from '~/components/providers/SafeFarcasterSolanaProvider';
|
||||
import { ANALYTICS_ENABLED } from '~/lib/constants';
|
||||
import React, { useState, useEffect } from 'react';
|
||||
|
||||
const WagmiProvider = dynamic(
|
||||
() => import('~/components/providers/WagmiProvider'),
|
||||
@ -12,72 +13,107 @@ const WagmiProvider = dynamic(
|
||||
}
|
||||
);
|
||||
|
||||
// Helper component to conditionally render auth providers
|
||||
function AuthProviders({
|
||||
children,
|
||||
session,
|
||||
shouldUseSession,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
session: any;
|
||||
shouldUseSession: boolean;
|
||||
}) {
|
||||
const [authComponents, setAuthComponents] = useState<{
|
||||
SessionProvider: React.ComponentType<any> | null;
|
||||
AuthKitProvider: React.ComponentType<any> | null;
|
||||
loaded: boolean;
|
||||
}>({
|
||||
SessionProvider: null,
|
||||
AuthKitProvider: null,
|
||||
loaded: false,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!shouldUseSession) {
|
||||
setAuthComponents({
|
||||
SessionProvider: null,
|
||||
AuthKitProvider: null,
|
||||
loaded: true,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const loadAuthComponents = async () => {
|
||||
try {
|
||||
// Dynamic imports for auth modules
|
||||
let SessionProvider = null;
|
||||
let AuthKitProvider = null;
|
||||
|
||||
try {
|
||||
const nextAuth = await import('next-auth/react');
|
||||
SessionProvider = nextAuth.SessionProvider;
|
||||
} catch (error) {
|
||||
console.warn('NextAuth not available:', error);
|
||||
}
|
||||
|
||||
try {
|
||||
const authKit = await import('@farcaster/auth-kit');
|
||||
AuthKitProvider = authKit.AuthKitProvider;
|
||||
} catch (error) {
|
||||
console.warn('Farcaster AuthKit not available:', error);
|
||||
}
|
||||
|
||||
setAuthComponents({
|
||||
SessionProvider,
|
||||
AuthKitProvider,
|
||||
loaded: true,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Error loading auth components:', error);
|
||||
setAuthComponents({
|
||||
SessionProvider: null,
|
||||
AuthKitProvider: null,
|
||||
loaded: true,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
loadAuthComponents();
|
||||
}, [shouldUseSession]);
|
||||
|
||||
if (!authComponents.loaded) {
|
||||
return <div>Loading...</div>;
|
||||
}
|
||||
|
||||
if (!shouldUseSession || !authComponents.SessionProvider) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
const { SessionProvider, AuthKitProvider } = authComponents;
|
||||
|
||||
if (AuthKitProvider) {
|
||||
return (
|
||||
<SessionProvider session={session}>
|
||||
<AuthKitProvider config={{}}>{children}</AuthKitProvider>
|
||||
</SessionProvider>
|
||||
);
|
||||
}
|
||||
|
||||
return <SessionProvider session={session}>{children}</SessionProvider>;
|
||||
}
|
||||
|
||||
export function Providers({
|
||||
session,
|
||||
children,
|
||||
shouldUseSession = false,
|
||||
}: {
|
||||
session: unknown | null;
|
||||
session: any | null;
|
||||
children: React.ReactNode;
|
||||
shouldUseSession?: boolean;
|
||||
}) {
|
||||
const solanaEndpoint =
|
||||
process.env.SOLANA_RPC_ENDPOINT || 'https://solana-rpc.publicnode.com';
|
||||
|
||||
// Only wrap with SessionProvider if next auth is used
|
||||
if (shouldUseSession) {
|
||||
// Dynamic import for auth components - will work if modules exist, fallback if not
|
||||
const AuthWrapper = dynamic(
|
||||
() => {
|
||||
return Promise.resolve().then(() => {
|
||||
// Use eval to avoid build-time module resolution
|
||||
try {
|
||||
const nextAuth = eval('require("next-auth/react")');
|
||||
const authKit = eval('require("@farcaster/auth-kit")');
|
||||
|
||||
const AuthWrapper = ({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) => (
|
||||
<nextAuth.SessionProvider session={session}>
|
||||
<authKit.AuthKitProvider config={{}}>
|
||||
{children}
|
||||
</authKit.AuthKitProvider>
|
||||
</nextAuth.SessionProvider>
|
||||
);
|
||||
AuthWrapper.displayName = 'AuthWrapper';
|
||||
return AuthWrapper;
|
||||
} catch (_error) {
|
||||
// Fallback component when auth modules aren't available
|
||||
const FallbackWrapper = ({
|
||||
children,
|
||||
}: {
|
||||
children: React.ReactNode;
|
||||
}) => <>{children}</>;
|
||||
FallbackWrapper.displayName = 'FallbackWrapper';
|
||||
return FallbackWrapper;
|
||||
}
|
||||
});
|
||||
},
|
||||
{ ssr: false }
|
||||
);
|
||||
|
||||
return (
|
||||
<WagmiProvider>
|
||||
<MiniAppProvider
|
||||
analyticsEnabled={ANALYTICS_ENABLED}
|
||||
backButtonEnabled={true}
|
||||
>
|
||||
<SafeFarcasterSolanaProvider endpoint={solanaEndpoint}>
|
||||
<AuthWrapper>{children}</AuthWrapper>
|
||||
</SafeFarcasterSolanaProvider>
|
||||
</MiniAppProvider>
|
||||
</WagmiProvider>
|
||||
);
|
||||
}
|
||||
|
||||
// Return without SessionProvider if no session
|
||||
return (
|
||||
<WagmiProvider>
|
||||
<MiniAppProvider
|
||||
@ -85,7 +121,9 @@ export function Providers({
|
||||
backButtonEnabled={true}
|
||||
>
|
||||
<SafeFarcasterSolanaProvider endpoint={solanaEndpoint}>
|
||||
{children}
|
||||
<AuthProviders session={session} shouldUseSession={shouldUseSession}>
|
||||
{children}
|
||||
</AuthProviders>
|
||||
</SafeFarcasterSolanaProvider>
|
||||
</MiniAppProvider>
|
||||
</WagmiProvider>
|
||||
|
||||
@ -9,19 +9,12 @@ import { SignIn } from '../wallet/SignIn';
|
||||
import { type Haptics } from '@farcaster/miniapp-sdk';
|
||||
import { APP_URL } from '~/lib/constants';
|
||||
|
||||
// Optional import for NeynarAuthButton - may not exist in all templates
|
||||
// Import NeynarAuthButton
|
||||
const NeynarAuthButton = dynamic(
|
||||
() => {
|
||||
return Promise.resolve().then(() => {
|
||||
try {
|
||||
const authModule = eval('require("../NeynarAuthButton/index")');
|
||||
return authModule.default || authModule.NeynarAuthButton;
|
||||
} catch (_error) {
|
||||
// Return null component when module doesn't exist
|
||||
return () => null;
|
||||
}
|
||||
});
|
||||
},
|
||||
() =>
|
||||
import('../NeynarAuthButton').then((module) => ({
|
||||
default: module.NeynarAuthButton,
|
||||
})),
|
||||
{ ssr: false }
|
||||
);
|
||||
|
||||
@ -156,7 +149,7 @@ export function ActionsTab() {
|
||||
<SignIn />
|
||||
|
||||
{/* Neynar Authentication */}
|
||||
{NeynarAuthButton && <NeynarAuthButton />}
|
||||
<NeynarAuthButton />
|
||||
|
||||
{/* Mini app actions */}
|
||||
<Button
|
||||
|
||||
@ -22,25 +22,25 @@ export const APP_URL: string = process.env.NEXT_PUBLIC_URL!;
|
||||
* The name of the mini app as displayed to users.
|
||||
* Used in titles, headers, and app store listings.
|
||||
*/
|
||||
export const APP_NAME = 'idk2';
|
||||
export const APP_NAME: string = 'Starter Kit';
|
||||
|
||||
/**
|
||||
* A brief description of the mini app's functionality.
|
||||
* Used in app store listings and metadata.
|
||||
*/
|
||||
export const APP_DESCRIPTION = 'A Farcaster mini app created with Neynar';
|
||||
export const APP_DESCRIPTION: string = 'A demo of the Neynar Starter Kit';
|
||||
|
||||
/**
|
||||
* The primary category for the mini app.
|
||||
* Used for app store categorization and discovery.
|
||||
*/
|
||||
export const APP_PRIMARY_CATEGORY = '';
|
||||
export const APP_PRIMARY_CATEGORY: string = 'developer-tools';
|
||||
|
||||
/**
|
||||
* Tags associated with the mini app.
|
||||
* Used for search and discovery in app stores.
|
||||
*/
|
||||
export const APP_TAGS = ['neynar', 'starter-kit', 'demo'];
|
||||
export const APP_TAGS: string[] = ['neynar', 'starter-kit', 'demo'];
|
||||
|
||||
// --- Asset URLs ---
|
||||
/**
|
||||
|
||||
@ -14,7 +14,6 @@ import {
|
||||
APP_URL,
|
||||
APP_WEBHOOK_URL,
|
||||
APP_ACCOUNT_ASSOCIATION,
|
||||
APP_REQUIRED_CHAINS,
|
||||
} from './constants';
|
||||
|
||||
export function cn(...inputs: ClassValue[]) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user