Merge pull request #23 from oslabs-beta/RachDebugAceEditor

rachelk585 · web-flow · commit b803ed17f913 · 2023-05-04T13:33:48.000-07:00
Fixed style editor/code preview worker bug
diff --git a/app/src/components/bottom/CodePreview.tsx b/app/src/components/bottom/CodePreview.tsx
@@ -103,6 +103,9 @@ const CodePreview: React.FC<{
         readOnly={false}
         fontSize={18}
         tabSize={2}
+        setOptions={{
+          useWorker: false
+        }}
       />
     </div>
   );
diff --git a/app/src/components/bottom/StylesEditor.tsx b/app/src/components/bottom/StylesEditor.tsx
@@ -87,8 +87,11 @@ const StylesEditor: React.FC<{
         name="Css_div"
         fontSize={16}
         tabSize={2}
-        enableBasicAutocompletion={true}
-        enableLiveAutocompletion={true}
+        setOptions={{
+          useWorker: false,
+          enableBasicAutocompletion: true,
+          enableLiveAutocompletion: true
+        }}
       />
       <Fab className='bttn' onClick={saveCss} color="secondary" aria-label="add">
         <SaveIcon />
diff --git a/app/src/helperFunctions/zipFiles.ts b/app/src/helperFunctions/zipFiles.ts
@@ -5,6 +5,7 @@ const zipFiles = (state) => {
   var zip = new JSZip();
   let reacTypeApp = zip.folder('ReacTypeApp');
   let componentFolder = reacTypeApp.folder('componentfolder');
+  reacTypeApp.file('index.html', '<!DOCTYPE html> <html>   <head>     <meta charset="UTF-8" />     <link rel="stylesheet" href="styles.css">     <title>ReacType App</title>   </head>   <body>     <div id="root"></div>   </body> </html>');
   for (let i in state.components){
     componentFolder.file(`${state.components[i].name}.jsx`, state.components[i].code);
   }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -112,7 +112,7 @@
     "@types/prettier": "^2.6.4",
     "@types/react-redux": "^7.1.24",
     "@types/react-router-dom": "^5.3.3",
-    "ace-builds": "^1.8.1",
+    "ace-builds": "^1.19.0",
     "app-root-path": "^3.0.0",
     "autoprefixer": "^10.4.8",
     "babel-polyfill": "^6.26.0",

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ const zipFiles = (state) => {`
`5`	`5`	`var zip = new JSZip();`
`6`	`6`	`let reacTypeApp = zip.folder('ReacTypeApp');`
`7`	`7`	`let componentFolder = reacTypeApp.folder('componentfolder');`
	`8`	`+ reacTypeApp.file('index.html', '<!DOCTYPE html> <html> <head> <meta charset="UTF-8" /> <link rel="stylesheet" href="styles.css"> <title>ReacType App</title> </head> <body> <div id="root"></div> </body> </html>');`
`8`	`9`	`for (let i in state.components){`
`9`	`10`	componentFolder.file(`${state.components[i].name}.jsx`, state.components[i].code);
`10`	`11`	`}`