Fixing conflicts

motiondivision · Jun 19, 2024 · 7a4706a · 7a4706a
1 parent 56b10e8
commit 7a4706a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/framer-motion/src/motion/index.tsx b/packages/framer-motion/src/motion/index.tsx
@@ -14,7 +14,7 @@ import { LayoutGroupContext } from "../context/LayoutGroupContext"
 import { LazyContext } from "../context/LazyContext"
 import { motionComponentSymbol } from "./utils/symbol"
 import { CreateVisualElement } from "../render/types"
-import { invariant, warning } from "../dom-entry"
+import { invariant, warning } from "../utils/errors"
 import { featureDefinitions } from "./features/definitions"
 
 export interface MotionComponentConfig<Instance, RenderState> {

diff --git a/packages/framer-motion/src/motion/utils/use-visual-element.ts b/packages/framer-motion/src/motion/utils/use-visual-element.ts
@@ -11,12 +11,12 @@ import { MotionConfigContext } from "../../context/MotionConfigContext"
 import type { VisualElement } from "../../render/VisualElement"
 import { optimizedAppearDataAttribute } from "../../animation/optimized-appear/data-id"
 import { microtask } from "../../frameloop/microtask"
+import { IProjectionNode } from "../../projection/node/types"
+import { isRefObject } from "../../utils/is-ref-object"
 import {
     InitialPromotionConfig,
     SwitchLayoutGroupContext,
 } from "../../context/SwitchLayoutGroupContext"
-import { IProjectionNode } from "../../projection/node/types"
-import { isRefObject } from "../../utils/is-ref-object"
 
 let scheduleHandoffComplete = false