Virtual whiteboard for sketching hand-drawn like diagrams
fix: use excalidraw asset path in fonts when exporting to svg (#5065)
Aakansha Doshida94eb1284b9
diff --git a/src/packages/excalidraw/CHANGELOG.md b/src/packages/excalidraw/CHANGELOG.mdindex b4ed48cbad..450239effd 100644--- a/src/packages/excalidraw/CHANGELOG.md+++ b/src/packages/excalidraw/CHANGELOG.md@@ -23,6 +23,7 @@ Please add the latest change on the top under the correct section.#### Fixes+- Use `window.EXCALIDRAW_ASSET_PATH` for fonts when exporting to svg [#5065](https://github.com/excalidraw/excalidraw/pull/5065).- Library menu now properly rerenders if open when library is updated using `updateScene({ libraryItems })` [#4995](https://github.com/excalidraw/excalidraw/pull/4995).#### Refactordiff --git a/src/packages/excalidraw/env.js b/src/packages/excalidraw/env.jsindex 7ca6283e2f..6c5fd56e5c 100644--- a/src/packages/excalidraw/env.js+++ b/src/packages/excalidraw/env.js@@ -1,14 +1,18 @@const dotenv = require("dotenv");const { readFileSync } = require("fs");-+const pkg = require("./package.json");const parseEnvVariables = (filepath) => {- return Object.entries(dotenv.parse(readFileSync(filepath))).reduce(+ const envVars = Object.entries(dotenv.parse(readFileSync(filepath))).reduce((env, [key, value]) => {env[key] = JSON.stringify(value);return env;},{},);+ envVars.PKG_NAME = JSON.stringify(pkg.name);+ envVars.PKG_VERSION = JSON.stringify(pkg.version);+ envVars.IS_EXCALIDRAW_NPM_PACKAGE = JSON.stringify(true);+ return envVars;};module.exports = { parseEnvVariables };diff --git a/src/packages/excalidraw/publicPath.js b/src/packages/excalidraw/publicPath.jsindex 93660ee667..0e1f8c3dba 100644--- a/src/packages/excalidraw/publicPath.js+++ b/src/packages/excalidraw/publicPath.js@@ -1,9 +1,8 @@import { ENV } from "../../constants";-import pkg from "./package.json";if (process.env.NODE_ENV !== ENV.TEST) {/* eslint-disable *//* global __webpack_public_path__:writable */__webpack_public_path__ =window.EXCALIDRAW_ASSET_PATH ||- `https://unpkg.com/${pkg.name}@${pkg.version}/dist/`;+ `https://unpkg.com/${process.env.PKG_NAME}@${process.env.PKG_VERSION}/dist/`;}diff --git a/src/scene/export.ts b/src/scene/export.tsindex d404e822bd..9dacc755b2 100644--- a/src/scene/export.ts+++ b/src/scene/export.ts@@ -115,6 +115,19 @@ export const exportToSvg = async (svgRoot.setAttribute("filter", THEME_FILTER);}+ let assetPath = "https://excalidraw.com/";++ // Asset path needs to be determined only when using package+ if (process.env.IS_EXCALIDRAW_NPM_PACKAGE) {+ assetPath =+ window.EXCALIDRAW_ASSET_PATH ||+ `https://unpkg.com/${process.env.PKG_NAME}@${process.env.PKG_VERSION}`;++ if (assetPath?.startsWith("/")) {+ assetPath = assetPath.replace("/", `${window.location.origin}/`);+ }+ assetPath = `${assetPath}/dist/excalidraw-assets/`;+ }svgRoot.innerHTML = `${SVG_EXPORT_TAG}${metadata}@@ -122,16 +135,15 @@ export const exportToSvg = async (<style>@font-face {font-family: "Virgil";- src: url("https://excalidraw.com/Virgil.woff2");+ src: url("${assetPath}Virgil.woff2");}@font-face {font-family: "Cascadia";- src: url("https://excalidraw.com/Cascadia.woff2");+ src: url("${assetPath}Cascadia.woff2");}</style></defs>`;-// render background rectif (appState.exportBackground && viewBackgroundColor) {const rect = svgRoot.ownerDocument!.createElementNS(SVG_NS, "rect");diff --git a/src/tests/scene/export.test.ts b/src/tests/scene/export.test.tsindex 1b6f72113b..bab87a15c8 100644--- a/src/tests/scene/export.test.ts+++ b/src/tests/scene/export.test.ts@@ -7,6 +7,7 @@ import {} from "../fixtures/elementFixture";describe("exportToSvg", () => {+ window.EXCALIDRAW_ASSET_PATH = "/";const ELEMENT_HEIGHT = 100;const ELEMENT_WIDTH = 100;const ELEMENTS = [diff --git a/src/utils.ts b/src/utils.tsindex 91b67fd2bf..fd20f75358 100644--- a/src/utils.ts+++ b/src/utils.ts@@ -575,6 +575,9 @@ export const arrayToMap = <T extends { id: string } | string>(export const isTestEnv = () =>typeof process !== "undefined" && process.env?.NODE_ENV === "test";+export const isProdEnv = () =>+ typeof process !== "undefined" && process.env?.NODE_ENV === "production";+export const wrapEvent = <T extends Event>(name: EVENT, nativeEvent: T) => {return new CustomEvent(name, {detail: {