chore: resolve conflicts

Author: CodyJasonBennett

src/effects/LensFlare.tsx

@@ -2,13 +2,13 @@
 // From https://github.com/ektogamat/R3F-Ultimate-Lens-Flare
 
 import * as THREE from 'three'
-import { useEffect, useState, useContext, useRef } from 'react'
+import React, { useEffect, useState, useContext, useRef } from 'react'
 import { useFrame, useThree } from '@react-three/fiber'
 import { BlendFunction, Effect } from 'postprocessing'
 import { easing } from 'maath'
 
-import { EffectComposerContext } from '../EffectComposer'
-import { wrapEffect } from '../util'
+import { EffectComposerContext } from '../EffectComposer.tsx'
+import { wrapEffect } from '../util.tsx'
 
 const LensFlareShader = {
   fragmentShader: /* glsl */ `
@@ -586,7 +586,6 @@ export const LensFlare = ({
 
   return (
     <LensFlareWrapped
-      // @ts-expect-error fixed with React 19
       ref={ref}
       blendFunction={blendFunction}
       enabled={enabled}

src/effects/Ramp.tsx

@@ -1,6 +1,6 @@
 import { Uniform } from 'three'
 import { Effect } from 'postprocessing'
-import { wrapEffect } from '../util'
+import { wrapEffect } from '../util.tsx'
 
 const RampShader = {
   fragmentShader: /* glsl */ `

src/index.ts

@@ -25,6 +25,7 @@ export * from './effects/Sepia.tsx'
 export * from './effects/SSAO.tsx'
 export * from './effects/SMAA.tsx'
 export * from './effects/FXAA.tsx'
+export * from './effects/Ramp.tsx'
 export * from './effects/Texture.tsx'
 export * from './effects/ToneMapping.tsx'
 export * from './effects/Vignette.tsx'