From b885d87bc5120a7acdae680a5341ba195f0fc19d Mon Sep 17 00:00:00 2001 From: dwelle Date: Sun, 9 Apr 2023 18:52:36 +0200 Subject: [PATCH] feat: remove notch for non-0 roughness ellipse --- package.json | 1 + public/index.html | 2 +- src/components/App.tsx | 4 ++-- src/element/bounds.ts | 4 ++-- src/element/collision.ts | 2 +- src/random.ts | 2 +- src/renderer/renderElement.ts | 10 +++++----- src/renderer/renderScene.ts | 4 ++-- src/scene/export.ts | 2 +- src/types.ts | 2 +- yarn.lock | 9 +++++++++ 11 files changed, 26 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 5816786e3..b7bc2db7c 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ }, "dependencies": { "@dwelle/tunnel-rat": "0.1.1", + "@excalidraw/roughjs": "4.5.3", "@sentry/browser": "6.2.5", "@sentry/integrations": "6.2.5", "@testing-library/jest-dom": "5.16.2", diff --git a/public/index.html b/public/index.html index 47a59624b..4738e6fc2 100644 --- a/public/index.html +++ b/public/index.html @@ -94,7 +94,7 @@ // if its present redirect document.cookie.includes("excplus-autoredirect=true") ) { - window.location.href = "https://app.excalidraw.com"; + // window.location.href = "https://app.excalidraw.com"; } diff --git a/src/components/App.tsx b/src/components/App.tsx index 9b4fc864d..2a83a6bc7 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -1,8 +1,8 @@ import React, { useContext } from "react"; import { flushSync } from "react-dom"; -import { RoughCanvas } from "roughjs/bin/canvas"; -import rough from "roughjs/bin/rough"; +import { RoughCanvas } from "@excalidraw/roughjs/bin/canvas"; +import rough from "@excalidraw/roughjs/bin/rough"; import clsx from "clsx"; import { nanoid } from "nanoid"; diff --git a/src/element/bounds.ts b/src/element/bounds.ts index 3245ca3fc..bcc5dcce5 100644 --- a/src/element/bounds.ts +++ b/src/element/bounds.ts @@ -7,8 +7,8 @@ import { ExcalidrawTextElementWithContainer, } from "./types"; import { distance2d, rotate } from "../math"; -import rough from "roughjs/bin/rough"; -import { Drawable, Op } from "roughjs/bin/core"; +import rough from "@excalidraw/roughjs/bin/rough"; +import { Drawable, Op } from "@excalidraw/roughjs/bin/core"; import { Point } from "../types"; import { getShapeForElement, diff --git a/src/element/collision.ts b/src/element/collision.ts index 0e7257d79..55784e6c7 100644 --- a/src/element/collision.ts +++ b/src/element/collision.ts @@ -30,7 +30,7 @@ import { import { getElementAbsoluteCoords, getCurvePathOps, Bounds } from "./bounds"; import { Point } from "../types"; -import { Drawable } from "roughjs/bin/core"; +import { Drawable } from "@excalidraw/roughjs/bin/core"; import { AppState } from "../types"; import { getShapeForElement } from "../renderer/renderElement"; import { hasBoundTextElement, isImageElement } from "./typeChecks"; diff --git a/src/random.ts b/src/random.ts index 851bc28ec..f869662c1 100644 --- a/src/random.ts +++ b/src/random.ts @@ -1,4 +1,4 @@ -import { Random } from "roughjs/bin/math"; +import { Random } from "@excalidraw/roughjs/bin/math"; import { nanoid } from "nanoid"; import { isTestEnv } from "./utils"; diff --git a/src/renderer/renderElement.ts b/src/renderer/renderElement.ts index 7adcc5840..e6f99e90d 100644 --- a/src/renderer/renderElement.ts +++ b/src/renderer/renderElement.ts @@ -21,15 +21,15 @@ import { getElementAbsoluteCoords, getArrowheadPoints, } from "../element/bounds"; -import { RoughCanvas } from "roughjs/bin/canvas"; -import { Drawable, Options } from "roughjs/bin/core"; -import { RoughSVG } from "roughjs/bin/svg"; -import { RoughGenerator } from "roughjs/bin/generator"; +import { RoughCanvas } from "@excalidraw/roughjs/bin/canvas"; +import { Drawable, Options } from "@excalidraw/roughjs/bin/core"; +import { RoughSVG } from "@excalidraw/roughjs/bin/svg"; +import { RoughGenerator } from "@excalidraw/roughjs/bin/generator"; import { RenderConfig } from "../scene/types"; import { distance, getFontString, getFontFamilyString, isRTL } from "../utils"; import { getCornerRadius, isPathALoop, isRightAngle } from "../math"; -import rough from "roughjs/bin/rough"; +import rough from "@excalidraw/roughjs/bin/rough"; import { AppState, BinaryFiles, Zoom } from "../types"; import { getDefaultAppState } from "../appState"; import { diff --git a/src/renderer/renderScene.ts b/src/renderer/renderScene.ts index c8b64b47b..7ed71b66b 100644 --- a/src/renderer/renderScene.ts +++ b/src/renderer/renderScene.ts @@ -1,5 +1,5 @@ -import { RoughCanvas } from "roughjs/bin/canvas"; -import { RoughSVG } from "roughjs/bin/svg"; +import { RoughCanvas } from "@excalidraw/roughjs/bin/canvas"; +import { RoughSVG } from "@excalidraw/roughjs/bin/svg"; import oc from "open-color"; import { AppState, BinaryFiles, Point, Zoom } from "../types"; diff --git a/src/scene/export.ts b/src/scene/export.ts index a6e4297ad..63dce9979 100644 --- a/src/scene/export.ts +++ b/src/scene/export.ts @@ -1,4 +1,4 @@ -import rough from "roughjs/bin/rough"; +import rough from "@excalidraw/roughjs/bin/rough"; import { NonDeletedExcalidrawElement } from "../element/types"; import { getCommonBounds } from "../element/bounds"; import { renderScene, renderSceneToSvg } from "../renderer/renderScene"; diff --git a/src/types.ts b/src/types.ts index 09848df1d..20cc70e7b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -16,7 +16,7 @@ import { StrokeRoundness, } from "./element/types"; import { SHAPES } from "./shapes"; -import { Point as RoughPoint } from "roughjs/bin/geometry"; +import { Point as RoughPoint } from "@excalidraw/roughjs/bin/geometry"; import { LinearElementEditor } from "./element/linearElementEditor"; import { SuggestedBinding } from "./element/binding"; import { ImportedDataState } from "./data/types"; diff --git a/yarn.lock b/yarn.lock index 31624f92b..69756ecf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1484,6 +1484,15 @@ resolved "https://registry.yarnpkg.com/@excalidraw/prettier-config/-/prettier-config-1.0.2.tgz#b7c061c99cee2f78b9ca470ea1fbd602683bba65" integrity sha512-rFIq8+A8WvkEzBsF++Rw6gzxE+hU3ZNkdg8foI+Upz2y/rOC/gUpWJaggPbCkoH3nlREVU59axQjZ1+F6ePRGg== +"@excalidraw/roughjs@4.5.3": + version "4.5.3" + resolved "https://registry.yarnpkg.com/@excalidraw/roughjs/-/roughjs-4.5.3.tgz#7d91897bfd1aaeb19a48d5272bd4776cb19f015b" + integrity sha512-X9HPfNjPLNHt+gN7t1LN7nN4h4o8M2EWuN/Y4YgG0ODsDZn51gRBeIPuhSo2hsDgLeTQHnkrmpPTm4XeeQVtoA== + dependencies: + path-data-parser "^0.1.0" + points-on-curve "^0.2.0" + points-on-path "^0.2.1" + "@firebase/analytics-types@0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.4.0.tgz#d6716f9fa36a6e340bc0ecfe68af325aa6f60508"