Skip to content

Commit

Permalink
use @darkroom.engineering suite
Browse files Browse the repository at this point in the history
  • Loading branch information
clementroche committed Apr 22, 2024
1 parent 0d80387 commit dcf4e1c
Show file tree
Hide file tree
Showing 15 changed files with 65 additions and 93 deletions.
2 changes: 1 addition & 1 deletion app/(pages)/r3f/(components)/box/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { useFrame } from '@darkroom.engineering/hamo'
import { OrbitControls } from '@react-three/drei'
import { useFrame } from '@studio-freight/hamo'
import { WebGLTunnel } from 'libs/webgl/components/tunnel'
import { useRef } from 'react'

Expand Down
2 changes: 1 addition & 1 deletion components/accordion/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useResizeObserver } from '@studio-freight/hamo'
import { useResizeObserver } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import {
createContext,
Expand Down
2 changes: 1 addition & 1 deletion components/gsap/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import Tempus from '@studio-freight/tempus'
import Tempus from '@darkroom.engineering/tempus'
import gsap from 'gsap'
import { useLayoutEffect } from 'react'
import { ScrollTriggerConfig } from './scroll-trigger'
Expand Down
2 changes: 1 addition & 1 deletion components/scrollbar/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useRect } from '@studio-freight/hamo'
import { useRect } from '@darkroom.engineering/hamo'
import { useLenis } from '@studio-freight/react-lenis'
import { mapRange } from 'libs/maths'
import { useEffect, useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion components/split-text/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useResizeObserver } from '@studio-freight/hamo'
import { useResizeObserver } from '@darkroom.engineering/hamo'
import { gsap } from 'gsap'
// import { SplitText as GSAPSplitText } from 'gsap/dist/SplitText'
import cn from 'clsx'
Expand Down
2 changes: 1 addition & 1 deletion hooks/use-device-detection.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useMediaQuery } from '@studio-freight/hamo'
import { useMediaQuery } from '@darkroom.engineering/hamo'
import variables from 'styles/config.js'

export function useDeviceDetection() {
Expand Down
2 changes: 1 addition & 1 deletion libs/orchestra/grid/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useWindowSize } from '@studio-freight/hamo'
import { useWindowSize } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useMemo } from 'react'
import s from './grid.module.scss'
Expand Down
2 changes: 1 addition & 1 deletion libs/orchestra/stats/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useFrame } from '@studio-freight/hamo'
import { useFrame } from '@darkroom.engineering/hamo'
import { useCanvas } from 'libs/webgl/components/canvas'
import { useEffect, useMemo } from 'react'
import _Stats from 'stats-gl'
Expand Down
2 changes: 1 addition & 1 deletion libs/react-lenis/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
'use client'

export { Lenis, useLenis } from '@studio-freight/react-lenis'
export { Lenis, useLenis } from 'lenis/react'
2 changes: 1 addition & 1 deletion libs/webgl/components/background/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useRect } from '@studio-freight/hamo'
import { useRect } from '@darkroom.engineering/hamo'
import { types } from '@theatre/core'
import { SheetProvider, useSheet } from 'libs/theatre'
import { useTheatre } from 'libs/theatre/hooks/use-theatre'
Expand Down
2 changes: 1 addition & 1 deletion libs/webgl/components/image/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useRect } from '@studio-freight/hamo'
import { useRect } from '@darkroom.engineering/hamo'
import { Image as NextImage } from 'components/image'
import { useDeviceDetection } from 'hooks/use-device-detection'
import dynamic from 'next/dynamic'
Expand Down
2 changes: 1 addition & 1 deletion libs/webgl/components/postprocessing/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useWindowSize } from '@darkroom.engineering/hamo'
import { useFrame, useThree } from '@react-three/fiber'
import { useWindowSize } from '@studio-freight/hamo'
import { EffectComposer, RenderPass } from 'postprocessing'
import { useEffect, useMemo } from 'react'
import { HalfFloatType } from 'three'
Expand Down
2 changes: 1 addition & 1 deletion libs/webgl/components/raf/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useFrame } from '@darkroom.engineering/hamo'
import { useThree } from '@react-three/fiber'
import { useFrame } from '@studio-freight/hamo'

export function RAF({ render = true }) {
const { advance } = useThree()
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@
"@react-three/drei": "^9.97.6",
"@react-three/fiber": "^8.15.19",
"@storyblok/js": "^3.0.7",
"@studio-freight/hamo": "0.6.32",
"@studio-freight/lenis-test": "0.0.6",
"@studio-freight/react-lenis": "0.0.47",
"@studio-freight/tempus": "^0.0.44",
"@darkroom.engineering/hamo": "^0.6.35",
"@darkroom.engineering/tempus": "^0.0.46",
"@theatre/core": "^0.7.0",
"@theatre/studio": "^0.7.0",
"clsx": "^2.1.0",
"gsap": "^3.12.5",
"lenis": "^1.0.44",
"next": "14.2.1",
"next-sitemap": "^4.2.3",
"postprocessing": "^6.35.3",
Expand Down Expand Up @@ -67,9 +66,8 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"scheduler": "0.23.0",
"@studio-freight/tempus": "0.0.44",
"@studio-freight/react-lenis": "0.0.47",
"@studio-freight/hamo": "0.6.32"
"@darkroom.engineering/tempus": "0.0.46",
"@darkroom.engineering/hamo": "0.6.35"
}
},
"lint-staged": {
Expand Down
120 changes: 47 additions & 73 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dcf4e1c

Please sign in to comment.