Merge branch 'release-2.9.1' into release

Rachel Lim · Rachel Lim · commit a4d790a0624a · 2023-10-31T10:41:34.000-04:00
diff --git a/README.md b/README.md
@@ -38,7 +38,9 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
 
 We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards: 
 
-PATCH Release: By October 31, 2023
+MINOR Release for [p5.js version 1.8.0](https://github.com/processing/p5.js/releases/tag/v1.8.0): By October 27, 2023
+
+PATCH Release: By November 2, 2023
 
 MINOR Release: By November 30, 2023
 
@@ -60,6 +62,11 @@ MINOR Release: By November 30, 2023
 
 Support for this project has come from [Processing Foundation](https://processingfoundation.org/), [NYU ITP](https://tisch.nyu.edu/itp), [CS4All, NYC DOE](http://cs4all.nyc/), [COSA at DU](https://liberalarts.du.edu/emergent-digital-practices/open-source-arts), [STUDIO for Creative Inquiry](https://studioforcreativeinquiry.org/), [Grant for the Web](https://www.grantfortheweb.org/), [New Media Rights](https://www.newmediarights.org/), and many others. 
 
-Hosting and technical support has come from: <br />
-<a href="https://releasehub.com/" target="_blank"><img width="100" src="https://assets.website-files.com/603dd147c5b0a480611bd348/603dd147c5b0a469bc1bd451_logo--dark.svg" /></a> 
+Hosting and technical support has come from: 
+<br />
+<br />
+<a href="https://releasehub.com/" target="_blank"><img width="100" src="https://assets.website-files.com/603dd147c5b0a480611bd348/603dd147c5b0a469bc1bd451_logo--dark.svg" /></a>
+<br />
 <a href="https://www.browserstack.com/" target="_blank"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976166-ab280a80-d096-11e8-983b-18dd38c8cc9b.png" /></a>
+<br />
+<a href="https://www.fastly.com/" target="_blank"><img width="100" src="https://cdn-assets-us.frontify.com/s3/frontify-enterprise-files-us/eyJwYXRoIjoiZmFzdGx5XC9hY2NvdW50c1wvYzJcLzQwMDEwMjNcL3Byb2plY3RzXC8xMVwvYXNzZXRzXC80ZVwvNzc0XC9lZTZmYzlkOWYzNWE1NjBkNjUzNjFkNGI0NGQ2MTNmZi0xNjIxNTIyODg4LnBuZyJ9:fastly:nVuY3PxyFqQMI6elJsMzxAGLH3IFlmiuMdacHAGRMkE?width=2400" /></a>
diff --git a/client/modules/Preview/EmbedFrame.jsx b/client/modules/Preview/EmbedFrame.jsx
@@ -252,7 +252,7 @@ function injectLocalFiles(files, htmlFile, options) {
     'PREVIEW_SCRIPTS_URL'
   )}`;
   previewScripts.setAttribute('crossorigin', '');
-  sketchDoc.body.appendChild(previewScripts);
+  sketchDoc.head.appendChild(previewScripts);
 
   const sketchDocString = `<!DOCTYPE HTML>\n${sketchDoc.documentElement.outerHTML}`;
   scriptOffs = getAllScriptOffsets(sketchDocString);
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.0",
+  "version": "2.9.1",
   "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
@@ -31,11 +31,17 @@ export function getSession(req, res) {
 }
 
 export function destroySession(req, res, next) {
-  req.logout((err) => {
+  req.session.destroy((err) => {
     if (err) {
       next(err);
       return;
     }
-    res.json({ success: true });
+    req.logout((error) => {
+      if (error) {
+        next(error);
+        return;
+      }
+      res.json({ success: true });
+    });
   });
 }

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.0",`
	`3`	`+ "version": "2.9.1",`
`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
`@@ -31,11 +31,17 @@ export function getSession(req, res) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`export function destroySession(req, res, next) {`
`34`		`- req.logout((err) => {`
	`34`	`+ req.session.destroy((err) => {`
`35`	`35`	`if (err) {`
`36`	`36`	`next(err);`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`		`- res.json({ success: true });`
	`39`	`+ req.logout((error) => {`
	`40`	`+ if (error) {`
	`41`	`+ next(error);`
	`42`	`+ return;`
	`43`	`+ }`
	`44`	`+ res.json({ success: true });`
	`45`	`+ });`
`40`	`46`	`});`
`41`	`47`	`}`