Merge branch 'release-2.10.0' into release

Rachel Lim · Rachel Lim · commit d376ad2cf52e · 2023-11-29T17:06:45.000-05:00
diff --git a/client/modules/IDE/components/Editor/index.jsx b/client/modules/IDE/components/Editor/index.jsx
@@ -23,6 +23,7 @@ import 'codemirror/addon/fold/comment-fold';
 import 'codemirror/addon/fold/foldcode';
 import 'codemirror/addon/fold/foldgutter';
 import 'codemirror/addon/fold/indent-fold';
+import 'codemirror/addon/fold/xml-fold';
 import 'codemirror/addon/comment/comment';
 import 'codemirror/keymap/sublime';
 import 'codemirror/addon/search/searchcursor';
diff --git a/client/modules/IDE/components/Header/Toolbar.jsx b/client/modules/IDE/components/Header/Toolbar.jsx
@@ -87,6 +87,9 @@ const Toolbar = (props) => {
           checked={autorefresh}
           onChange={(event) => {
             dispatch(setAutorefresh(event.target.checked));
+            if (event.target.checked) {
+              dispatch(startSketch());
+            }
           }}
         />
         <label htmlFor="autorefresh" className="toolbar__autorefresh-label">
diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss
@@ -170,7 +170,7 @@ $themes: (
     input-selection-text-color: $darkest,
     input-selection-background-color: $lightest,
     input-border-color: $middle-dark,
-    search-background-color: $lightest,
+    search-background-color: $darker,
     search-clear-background-color: $medium-dark,
     search-hover-text-color: $lightest,
     search-hover-background-color: $p5js-pink,
@@ -264,7 +264,7 @@ $themes: (
     input-selection-text-color: $darkest,
     input-selection-background-color: $lightest,
     input-border-color: $middle-dark,
-    search-background-color: $white,
+    search-background-color: $darker,
     search-clear-background-color: $medium-dark,
     search-hover-text-color: $dark,
     search-hover-background-color: $yellow,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.9.3",
+  "version": "2.10.0",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
diff --git a/server/controllers/session.controller.js b/server/controllers/session.controller.js
@@ -36,6 +36,12 @@ export function destroySession(req, res, next) {
       next(err);
       return;
     }
-    res.json({ success: true });
+    req.session.destroy((error) => {
+      if (error) {
+        next(error);
+        return;
+      }
+      res.json({ success: true });
+    });
   });
 }
diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js
@@ -9,8 +9,8 @@ function draw() {
 export const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.8.0/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.8.0/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.0/p5.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.0/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "p5.js-web-editor",`
`3`		`- "version": "2.9.3",`
	`3`	`+ "version": "2.10.0",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ export function destroySession(req, res, next) {`
`36`	`36`	`next(err);`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`		`- res.json({ success: true });`
	`39`	`+ req.session.destroy((error) => {`
	`40`	`+ if (error) {`
	`41`	`+ next(error);`
	`42`	`+ return;`
	`43`	`+ }`
	`44`	`+ res.json({ success: true });`
	`45`	`+ });`
`40`	`46`	`});`
`41`	`47`	`}`