From 1d8a5e119ccee24352990ac9ec43feebd97f9528 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 2 Feb 2024 23:35:30 -0500 Subject: [PATCH 1/3] Fix import in ScreenSizer The broken import causes a type error in the TS declaration files. --- src/core/ScreenSizer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/ScreenSizer.tsx b/src/core/ScreenSizer.tsx index 57bc6563e..fa2519906 100644 --- a/src/core/ScreenSizer.tsx +++ b/src/core/ScreenSizer.tsx @@ -1,5 +1,5 @@ import { Object3DProps, useFrame } from '@react-three/fiber' -import { ForwardRefComponent } from 'helpers/ts-utils' +import { ForwardRefComponent } from '../helpers/ts-utils' import * as React from 'react' import { forwardRef, useRef } from 'react' import mergeRefs from 'react-merge-refs' From 8a4a8d95da9b4b4753df98f70facf3cb25b3c999 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 2 Feb 2024 23:37:16 -0500 Subject: [PATCH 2/3] Move it down --- src/core/ScreenSizer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/ScreenSizer.tsx b/src/core/ScreenSizer.tsx index fa2519906..81c950a7c 100644 --- a/src/core/ScreenSizer.tsx +++ b/src/core/ScreenSizer.tsx @@ -1,10 +1,10 @@ import { Object3DProps, useFrame } from '@react-three/fiber' -import { ForwardRefComponent } from '../helpers/ts-utils' import * as React from 'react' import { forwardRef, useRef } from 'react' import mergeRefs from 'react-merge-refs' import { Object3D, Vector3 } from 'three' import { calculateScaleFactor } from './calculateScaleFactor' +import { ForwardRefComponent } from '../helpers/ts-utils' const worldPos = /* @__PURE__ */ new Vector3() From fcf6f28165fdd87c55d3af4b4ac5f742dfa76247 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 2 Feb 2024 23:45:08 -0500 Subject: [PATCH 3/3] Remove baseUrl from tsconfig This was preventing the type error that was fixed in https://github.com/pmndrs/drei/pull/1810 from being caught. --- tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 2d2b9dd4d..1b1f81f20 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,8 +16,7 @@ "outDir": "dist", "resolveJsonModule": true, "noImplicitAny": false, - "noImplicitThis": false, - "baseUrl": "./src" + "noImplicitThis": false }, "include": ["./src", "custom.d.ts"], "exclude": ["./node_modules/**/*"]