Skip to content

Commit

Permalink
refac: upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
melchor629 committed Dec 20, 2024
1 parent 34f9ae6 commit 294f1d0
Show file tree
Hide file tree
Showing 16 changed files with 1,249 additions and 1,160 deletions.
2,326 changes: 1,204 additions & 1,122 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/2020/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"dependencies": {
"d3-ease": "^3.0.1",
"lodash-es": "^4.17.15",
"three": "0.160.0"
"three": "0.171.0"
},
"devDependencies": {
"@types/three": "0.160.0",
"@types/three": "0.171.0",
"@types/d3-ease": "^3.0.0",
"@types/lodash-es": "^4.17.4",
"@melchor629/hny-scripts": "^0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/2021/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />

<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="#000000" />
<meta name="theme-color" content="#000000" />
<link rel="shortcut icon" type="image/png" href="favicon.png" />
Expand Down
13 changes: 7 additions & 6 deletions packages/2021/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
"private": true,
"dependencies": {
"@react-spring/three": "~9.7.0",
"@react-three/drei": "~9.97.6",
"@react-three/fiber": "~8.15.0",
"@react-three/postprocessing": "~2.15.0",
"@react-three/drei": "~9.116.0",
"@react-three/fiber": "~8.17.0",
"@react-three/postprocessing": "~2.16.0",
"@styled-icons/material": "^10.28.0",
"detect-gpu": "^5.0.28",
"lodash-es": "^4.17.20",
"prop-types": "^15.7.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "0.160.0",
"three": "0.171.0",
"use-asset": "^1.0.4",
"zustand": "~4.4.0"
"use-sync-external-store": "^1.4.0",
"zustand": "^5.0.0"
},
"devDependencies": {
"@melchor629/hny-scripts": "^0.3.0",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/three": "0.160.0"
"@types/three": "0.171.0"
},
"scripts": {
"start": "hny-scripts start",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Html, useProgress } from '@react-three/drei'
import PropTypes from 'prop-types'
import React, { useLayoutEffect, useState } from 'react'
import shallow from 'zustand/shallow'
import { shallow } from 'zustand/shallow'
import { usePhasesStore } from '../../stores'
import styles from './loader-listener.module.css'

Expand Down
2 changes: 1 addition & 1 deletion packages/2021/src/components/loader/loader.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Html, useProgress } from '@react-three/drei'
import React from 'react'
import shallow from 'zustand/shallow'
import { shallow } from 'zustand/shallow'
import styles from './loader.module.css'

const Loader = ({ container }) => {
Expand Down
13 changes: 7 additions & 6 deletions packages/2022/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
"private": true,
"dependencies": {
"@react-spring/web": "~9.7.0",
"@react-three/drei": "~9.97.6",
"@react-three/fiber": "~8.15.0",
"@react-three/postprocessing": "~2.15.0",
"@react-three/drei": "~9.116.0",
"@react-three/fiber": "~8.17.0",
"@react-three/postprocessing": "~2.16.0",
"js-yaml": "^4.1.0",
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-merge-refs": "^2.1.1",
"suspend-react": "^0.1.3",
"three": "0.160.0",
"zustand": "~4.4.0"
"three": "0.171.0",
"use-sync-external-store": "^1.4.0",
"zustand": "^5.0.0"
},
"devDependencies": {
"@melchor629/hny-scripts": "^0.3.0",
"@types/lodash-es": "^4.17.5",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/three": "0.160.0"
"@types/three": "0.171.0"
},
"scripts": {
"start": "hny-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion packages/2022/src/components/the-object/the-object.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useRef } from 'react'
import shallow from 'zustand/shallow'
import { shallow } from 'zustand/shallow'
import TheFullObject from './the-full-object'
import TheBrokenObject from './the-broken-object'
import { usePartyStore } from '../../stores'
Expand Down
2 changes: 1 addition & 1 deletion packages/2022/src/components/the-part/the-part.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { animated, useTransition } from '@react-spring/web'
import { noop } from 'lodash-es'
import { useCallback, useEffect, useState } from 'react'
import shallow from 'zustand/shallow'
import { shallow } from 'zustand/shallow'
import { getTrackInfo } from '../../fns'
import { useParts } from '../../hooks'
import { usePartStore } from '../../stores'
Expand Down
11 changes: 6 additions & 5 deletions packages/2023/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
"private": true,
"dependencies": {
"@react-spring/web": "~9.7.0",
"@react-three/drei": "~9.97.6",
"@react-three/fiber": "~8.15.0",
"@react-three/drei": "~9.116.0",
"@react-three/fiber": "~8.17.0",
"byte-base64": "^1.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "0.160.0",
"three": "0.171.0",
"ts-chacha20": "^1.2.0",
"zustand": "~4.4.0"
"use-sync-external-store": "^1.4.0",
"zustand": "^5.0.0"
},
"devDependencies": {
"@melchor629/hny-scripts": "^0.3.0",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/three": "0.160.0",
"@types/three": "0.171.0",
"typescript": "^5.1.3"
},
"scripts": {
Expand Down
11 changes: 6 additions & 5 deletions packages/2024/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
"dependencies": {
"@react-spring/three": "~9.7.0",
"@react-spring/web": "~9.7.0",
"@react-three/drei": "~9.97.6",
"@react-three/fiber": "~8.15.0",
"@react-three/drei": "~9.116.0",
"@react-three/fiber": "~8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"three": "0.160.0",
"zustand": "~4.4.0"
"three": "0.171.0",
"use-sync-external-store": "^1.4.0",
"zustand": "^5.0.0"
},
"devDependencies": {
"@melchor629/hny-scripts": "^0.3.0",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/three": "0.160.0",
"@types/three": "0.171.0",
"typescript": "^5.1.3"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/2024/src/components/all-objects.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { AnimatedProps } from '@react-spring/three'
import type { GroupProps } from '@react-three/fiber'
import { forwardRef, useEffect, useState } from 'react'
import type { Group } from 'three'
import {
Caja1,
Catto,
Expand Down Expand Up @@ -53,7 +54,7 @@ const objects = Object.freeze([
Yubikey,
])

const AllObjects = forwardRef<THREE.Group, AnimatedProps<GroupProps>>(function AllObjects(
const AllObjects = forwardRef<Group, AnimatedProps<GroupProps>>(function AllObjects(
props,
ref,
) {
Expand Down
5 changes: 3 additions & 2 deletions packages/2024/src/objects/base-object.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ import { AnimatedProps, animated } from '@react-spring/three'
import { useGLTF } from '@react-three/drei'
import type { GroupProps } from '@react-three/fiber'
import { ForwardedRef, forwardRef, useImperativeHandle } from 'react'
import type { Group } from 'three'

const createBaseObject = (name: string) => {
const glbPath = `./${name}.glb`
useGLTF.preload(glbPath)

const BaseObject = (props: AnimatedProps<GroupProps>, ref: ForwardedRef<THREE.Group>) => {
const BaseObject = (props: AnimatedProps<GroupProps>, ref: ForwardedRef<Group>) => {
const { scene } = useGLTF(glbPath)

useImperativeHandle(ref, () => scene as unknown as THREE.Group, [scene])
useImperativeHandle(ref, () => scene as unknown as Group, [scene])

// @ts-ignore-error
return <animated.primitive {...props} object={scene} />
Expand Down
9 changes: 5 additions & 4 deletions packages/2024/src/objects/regalo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { AnimatedProps, animated } from '@react-spring/three'
import { useGLTF } from '@react-three/drei'
import type { GroupProps } from '@react-three/fiber'
import { forwardRef, useImperativeHandle, useMemo } from 'react'
import type { Group, Object3D } from 'three'

type RefType = {
caja: THREE.Object3D
tapa: THREE.Object3D
caja: Object3D
tapa: Object3D
}

type Props = AnimatedProps<GroupProps> & {
Expand All @@ -19,11 +20,11 @@ const Regalo = forwardRef<RefType, Props>(function Regalo({ cajaProps, tapaProps
const { scene } = useGLTF(glbPath)

const caja = useMemo(
() => scene.getObjectByName('caja_regalo')!.clone() as unknown as THREE.Group,
() => scene.getObjectByName('caja_regalo')!.clone() as unknown as Group,
[scene],
)
const tapa = useMemo(
() => scene.getObjectByName('tapa_regalo')!.clone() as unknown as THREE.Group,
() => scene.getObjectByName('tapa_regalo')!.clone() as unknown as Group,
[scene],
)

Expand Down
2 changes: 1 addition & 1 deletion packages/hny-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"fs-extra": "^11.1.0",
"klaw": "^4.0.1",
"sass": "^1.35.1",
"vite": "^5.3.6",
"vite": "^6.0.0",
"vite-plugin-checker": "^0.8.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/home/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"lodash-es": "^4.17.20",
"three": "0.160.0"
"three": "0.171.0"
},
"homepage": "/",
"browserslist": {
Expand Down

0 comments on commit 294f1d0

Please sign in to comment.