Merge pull request #122 from Speedrunyourknowledge/develop

fix mathquill imports and use custom patch-package

Author: Speedrunyourknowledge

calc-frontend/index.html

@@ -17,7 +17,6 @@
     <div id="root"></div>
     <script src="https://cdn.plot.ly/plotly-3.0.0.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    <script src="node_modules/mathquill/build/mathquill.js"></script>
 
     <script type="module" src="/src/main.tsx"></script>
   </body>

calc-frontend/package-lock.json

@@ -36,7 +36,7 @@
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.16",
     "globals": "^15.14.0",
-    "patch-package": "^8.0.0",
+    "patch-package": "github:Speedrunyourknowledge/patch-package-mod",
     "typescript": "~5.6.2",
     "typescript-eslint": "^8.18.2",
     "vite": "^6.1.1",

calc-frontend/package.json

@@ -0,0 +1,19 @@
+diff --git a/node_modules/mathquill/build/mathquill.js b/node_modules/mathquill/build/mathquill.js
+index a6f7939..5d05e69 100644
+--- a/node_modules/mathquill/build/mathquill.js
++++ b/node_modules/mathquill/build/mathquill.js
+@@ -8,7 +8,7 @@
+  * one at http://mozilla.org/MPL/2.0/.
+  */
+ 
+-(function() {
++export default function mathquillFunc() {
+ 
+ var jQuery = window.jQuery,
+   undefined,
+@@ -4979,4 +4979,4 @@ for (var key in MQ1) (function(key, val) {
+   else MathQuill[key] = val;
+ }(key, MQ1[key]));
+ 
+-}());
++};

calc-frontend/patches/mathquill+0.10.1-a.patch

@@ -6,9 +6,15 @@ import './widgets.css'
 
 import RoutesList from "./RoutesList";
 
+//@ts-ignore implicit any type
+import mathquillFunc from "../../node_modules/mathquill/build/mathquill";
+
 
 function App() {
 
+    // launch mathquill instance
+    mathquillFunc();
+
     // go to the RootLayout component to edit the visual layout
 
     // Handles all the routes

calc-frontend/src/App/App.tsx

@@ -4,6 +4,8 @@ import { ScrollRestoration } from "react-router";
 import ucfLogo from "../assets/ucf-logo.png"
 import CalcLogo from "../components/CalcLogo"
 
+
+
 function RootLayout(){
 
 

calc-frontend/src/App/RootLayout.tsx

@@ -42,6 +42,7 @@ import LimitDef from "../components/Limits/LimitDef";
 import CustomInt from "../pages/CustomIntegral";
 import CustomDeriv from "../pages/CustomDerivative";
 
+
 const RoutesList = 
 <Route path='/' element={<RootLayout/>} >
   <Route index element={<Home/>}/>

calc-frontend/src/App/RoutesList.tsx

@@ -4,8 +4,12 @@ import { createMemoryRouter, createRoutesFromElements, RouterProvider } from 're
 
 import RoutesList from '../App/RoutesList'
 
+//@ts-ignore implicit any type
+import mathquillFunc from "../../node_modules/mathquill/build/mathquill";
+
 test('full app rendering', () => {
 
+
   const router = createMemoryRouter(createRoutesFromElements(RoutesList), {
     initialEntries:['/'],
   })

calc-frontend/src/__tests__/App.test.tsx

@@ -21,7 +21,8 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true,
-    "noImplicitAny": true
+    "noImplicitAny": true,
+    "allowJs": true,
   },
   "include": ["src"]
 }