Merge pull request #534 from Yonava/yva/build-pass

chore(monorepo): remove circular ts references

Author: Yonava

packages/canvas/package.json

@@ -9,10 +9,9 @@
     "vue": "^3.5.18"
   },
   "dependencies": {
-    "@vueuse/core": "^13.6.0",
-    "tailwind-merge": "^3.3.1",
     "@magic/utils": "workspace:*",
-    "@magic/shapes": "workspace:*"
+    "@vueuse/core": "^13.6.0",
+    "tailwind-merge": "^3.3.1"
   },
   "devDependencies": {
     "vue": "^3.5.18"

packages/canvas/pnpm-lock.yaml

@@ -1,8 +1,7 @@
 import { getMagicCoordinates } from './coordinates';
 
 import type { Camera } from './camera';
-import type { DrawFns } from './types';
-import { Coordinate } from '@magic/shapes/types/utility';
+import type { Coordinate, DrawFns } from './types';
 
 const STAGGER = 100;
 

packages/canvas/src/backgroundPattern.ts

@@ -1,8 +1,8 @@
-import { Coordinate } from '@magic/shapes/types/utility';
 import { getDevicePixelRatio } from '../camera/utils';
 import { getCtx } from '@magic/utils/ctx'
 
 import { type Ref, onMounted, ref } from 'vue';
+import { Coordinate } from '../types';
 
 export const getCanvasTransform = (ctx: CanvasRenderingContext2D) => {
   const { a, e, f } = ctx.getTransform();

packages/canvas/src/coordinates/index.ts

@@ -3,7 +3,11 @@ import type { Ref } from 'vue';
 
 import type { DrawPattern } from './backgroundPattern';
 import type { Camera } from './camera';
-import { Coordinate } from '@magic/shapes/types/utility';
+
+export type Coordinate = {
+  x: number,
+  y: number,
+}
 
 export type DrawContent = (ctx: CanvasRenderingContext2D) => void;
 

packages/canvas/src/types.ts

@@ -6,9 +6,6 @@
   "references": [
     {
       "path": "../utils"
-    },
-    {
-      "path": "../shapes"
     }
   ],
   "include": ["src"]

packages/canvas/tsconfig.json

@@ -22,7 +22,6 @@
   "dependencies": {
     "@magic/ui": "workspace:*",
     "@magic/products": "workspace:*",
-    "@magic/graph": "workspace:*",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@mdi/font": "^7.4.47",