Merge branch 'develop' into fix/storage-bar-contrast

Author: NishulDhakar

README.md

@@ -15,7 +15,7 @@ Stay in touch with Processing Foundation across other platforms:
 - [Instagram](https://www.instagram.com/p5xjs)
 - [Youtube](https://www.youtube.com/@ProcessingFoundation)
 - [X](https://x.com/p5xjs)
-- [Discord](https://discord.com/invite/esmGA6H6wm)
+- [Discord](https://discord.p5js.org)
 - [Forum](https://discourse.processing.org)
 
 ## Using the p5.js Editor 🤔

SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security vulnerabilities by emailing: responsible.disclosure@processingfoundation.org
+
+## What to Expect
+- We will acknowledge your email within 72 hours
+- We will provide regular updates about our progress
+- Once the issue is confirmed and fixed, we may ask you to verify the solution
+
+## Disclosure Policy
+- Please do not disclose the vulnerability publicly until we have had a chance to address it
+- We do not offer bounties as we are a non-profit organization
+- We appreciate your efforts to responsibly disclose your findings
+
+## Scope
+
+You can use the above email to report vulnerabilities in p5.js and related repositories managed by the processing org, including the reference website.

client/jest.setup.js

@@ -5,3 +5,11 @@ import 'regenerator-runtime/runtime';
 // See: https://github.com/testing-library/jest-dom
 // eslint-disable-next-line import/no-extraneous-dependencies
 import '@testing-library/jest-dom';
+
+global.ResizeObserver = class {
+  observe() {}
+
+  unobserve() {}
+
+  disconnect() {}
+};

client/modules/About/statics/aboutData.ts

@@ -19,7 +19,7 @@ export const ContactSectionLinks: ContactSectionLink[] = [
   { label: 'About.X', href: 'https://x.com/p5xjs' },
   {
     label: 'About.Discord',
-    href: 'https://discord.gg/esmGA6H6wm'
+    href: 'https://discord.p5js.org'
   },
   {
     label: 'About.Forum',
@@ -87,7 +87,7 @@ export const AboutSectionInfo: AboutSectionInfoSection[] = [
         description: 'About.LinkDescriptions.Forum'
       },
       {
-        url: 'https://discord.com/invite/esmGA6H6wm',
+        url: 'https://discord.p5js.org',
         title: 'About.DiscordCTA',
         description: 'About.LinkDescriptions.Discord'
       }

client/modules/IDE/components/Header/Nav.jsx

@@ -321,10 +321,7 @@ const ProjectMenu = () => {
         >
           {t('Nav.Help.ReportBug')}
         </MenubarItem>
-        <MenubarItem
-          id="help-discord"
-          href="https://discord.com/invite/SHQ8dH25r9"
-        >
+        <MenubarItem id="help-discord" href="https://discord.p5js.org">
           {t('Nav.Help.ChatOnDiscord')}
         </MenubarItem>
         <MenubarItem

client/modules/IDE/components/PreviewFrame.jsx

@@ -1,18 +1,18 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { getConfig } from '../../../utils/getConfig';
 import { registerFrame } from '../../../utils/dispatcher';
 
 const Frame = styled.iframe`
-  min-height: 100%;
-  min-width: 100%;
+  display: block;
   position: ${(props) => (props.fullView ? 'relative' : 'absolute')};
   border-width: 0;
 `;
 
 function PreviewFrame({ fullView, isOverlayVisible }) {
   const iframe = useRef();
+  const [frameSize, setFrameSize] = useState(null);
   const previewUrl = getConfig('PREVIEW_URL');
   useEffect(() => {
     const unsubscribe = registerFrame(iframe.current.contentWindow, previewUrl);
@@ -21,6 +21,26 @@ function PreviewFrame({ fullView, isOverlayVisible }) {
     };
   });
 
+  useEffect(() => {
+    const parent = iframe.current?.parentElement;
+    if (!parent) {
+      return () => {};
+    }
+    const updateSize = () => {
+      const { width, height } = parent.getBoundingClientRect();
+      setFrameSize({
+        width: Math.floor(width),
+        height: Math.floor(height)
+      });
+    };
+    updateSize();
+    const observer = new ResizeObserver(updateSize);
+    observer.observe(parent);
+    return () => {
+      observer.disconnect();
+    };
+  }, []);
+
   const frameUrl = previewUrl;
   const sandboxAttributes = `allow-forms allow-modals allow-pointer-lock allow-popups 
     allow-same-origin allow-scripts allow-top-navigation-by-user-activation allow-downloads`;
@@ -45,6 +65,11 @@ function PreviewFrame({ fullView, isOverlayVisible }) {
         frameBorder="0"
         ref={iframe}
         fullView={fullView}
+        style={
+          frameSize
+            ? { width: frameSize.width, height: frameSize.height }
+            : undefined
+        }
       />
     </>
   );

client/modules/Preview/EmbedFrame.jsx

@@ -2,8 +2,7 @@ import blobUtil from 'blob-util';
 import PropTypes from 'prop-types';
 import React, { useRef, useEffect, useMemo } from 'react';
 import styled from 'styled-components';
-import loopProtect from 'loop-protect';
-import decomment from 'decomment';
+import { jsPreprocess } from './jsPreprocess';
 import { resolvePathToFile } from '../../../server/utils/filePath';
 import { getConfig } from '../../utils/getConfig';
 import {
@@ -55,47 +54,6 @@ function resolveCSSLinksInString(content, files) {
   return newContent;
 }
 
-function jsPreprocess(jsText) {
-  let newContent = jsText;
-
-  // Skip loop protection if the user explicitly opts out with // noprotect
-  if (/\/\/\s*noprotect/.test(newContent)) {
-    return newContent;
-  }
-
-  // Detect and fix multiple consecutive loops on the same line (e.g. "for(){}for(){}")
-  // which can bypass loop protection. Add semicolons between them so each loop
-  // is properly wrapped by loopProtect. See #3891.
-  // Match: for/while/do-while loops followed immediately by another loop
-  newContent = newContent.replace(
-    /((?:for|while)\s*\([^)]*\)\s*\{[^}]*\})((?:for|while)\s*\([^)]*\)\s*\{[^}]*\})/g,
-    '$1; $2'
-  );
-
-  // Always apply loop protection to prevent infinite loops from crashing
-  // the browser tab. Previously, loop protection was skipped when JSHINT
-  // found errors, but this left users vulnerable to infinite loops in
-  // syntactically imperfect code (common while typing). See #3891.
-  try {
-    newContent = decomment(newContent, {
-      ignore: /\/\/\s*noprotect/g,
-      space: true
-    });
-    newContent = loopProtect(newContent);
-  } catch (e) {
-    // If decomment or loopProtect fails (e.g. due to syntax issues),
-    // still try to apply loop protection on the original code.
-    try {
-      newContent = loopProtect(jsText);
-    } catch (err) {
-      // If loop protection can't be applied at all, return original code.
-      // The sketch will still run, but without loop protection.
-      return jsText;
-    }
-  }
-  return newContent;
-}
-
 function resolveJSLinksInString(content, files) {
   let newContent = content;
   let jsFileStrings = content.match(STRING_REGEX);