2.7.0-beta-7 (0.17.6-22) Modified rollup to load packages in new Func…

…tion instead of window.eval
zsviczian · Dec 16, 2024 · b0a9cf8 · b0a9cf8
1 parent 37e06ef
commit b0a9cf8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/manifest-beta.json b/manifest-beta.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.7.0-beta-6",
+	"version": "2.7.0-beta-7",
 	"minAppVersion": "1.1.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.6-21",
+    "@zsviczian/excalidraw": "0.17.6-22",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
     "@zsviczian/colormaster": "^1.2.2",

diff --git a/rollup.config.js b/rollup.config.js
@@ -91,15 +91,10 @@ const packageString = isLib
   '\nlet REACT_PACKAGES = `' +
   jsesc(react_pkg + reactdom_pkg, { quotes: 'backtick' }) +
   '`;\n' +
-/*  'let EXCALIDRAW_PACKAGE = `' +
-  jsesc(excalidraw_pkg, { quotes: 'backtick' }) +
-  '`;\n' +*/
   'const unpackExcalidraw = () => LZString.decompressFromBase64("' + LZString.compressToBase64(excalidraw_pkg) + '");\n' +
-  'let {react, reactDOM } = window.eval.call(window, `(function() {' + '${REACT_PACKAGES};' + 'return {react: React, reactDOM: ReactDOM};})();`);\n' +
+  'let {react, reactDOM } = new Function(`${REACT_PACKAGES}; return {react: React, reactDOM: ReactDOM};`)();\n' +
   'let excalidrawLib = {};\n' +
-  'const loadMathjaxToSVG = () => window.eval.call(window, `(function() {' + 
-  '${LZString.decompressFromBase64("' + LZString.compressToBase64(mathjaxtosvg_pkg) + '")}' +
-  'return MathjaxToSVG;})();`);\n' +
+  'const loadMathjaxToSVG = () => new Function(`${LZString.decompressFromBase64("' + LZString.compressToBase64(mathjaxtosvg_pkg) + '")}; return MathjaxToSVG;`)();\n' +
   `const PLUGIN_LANGUAGES = {${LANGUAGES.map(lang => `"${lang}": "${compressLanguageFile(lang)}"`).join(",")}};\n` +
   'const PLUGIN_VERSION="' + manifest.version + '";';
 

diff --git a/src/Managers/PackageManager.ts b/src/Managers/PackageManager.ts
@@ -42,7 +42,7 @@ export class PackageManager {
     if(this.packageMap.has(win)) {
       return this.packageMap.get(win);
     }
-    
+
     const {react:r, reactDOM:rd, excalidrawLib:e} = win.eval.call(win,
       `(function() {
         ${REACT_PACKAGES + this.EXCALIDRAW_PACKAGE};