Merge branch 'develop' into fix-404-page-style

Author: vansh-commits

.eslintrc

@@ -135,7 +135,7 @@
         "import/no-extraneous-dependencies": "off",
         "no-unused-vars": "off",
         "import/no-default-export": "warn",
-        "no-underscore-dangle": "warn",
+        "no-underscore-dangle": "off",
         "react/require-default-props": "off",
         "no-shadow": "off",
         "@typescript-eslint/no-shadow": "error"

.github/workflows/test.yml

@@ -7,13 +7,12 @@ jobs:
     name: Test and lint code base
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: '18.20.x'
-    - run: npm install
-    - run: npm run test
-    - run: npm run lint
-
-
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '18.20.x'
+      - run: npm install
+      - run: npm run test
+      - run: npm run typecheck
+      - run: npm run lint

.storybook/preview.js

@@ -2,14 +2,14 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router';
 
-import configureStore from '../client/store';
+import { setupStore } from '../client/store';
 import '../client/i18n-test';
-import '../client/styles/storybook.css'
+import '../client/styles/storybook.css';
 import { withThemeProvider, themeToolbarItem } from './decorator-theme';
 
 const initialState = window.__INITIAL_STATE__;
 
-const store = configureStore(initialState);
+const store = setupStore(initialState);
 
 export const decorators = [
   (Story) => (

README.md

@@ -10,45 +10,36 @@ We are a community of, and in solidarity with, people from every gender identity
 
 Learn more about [our community](https://p5js.org/community/) and read our [Community Statement and Code of Conduct](./.github/CODE_OF_CONDUCT.md). You can directly support our work with p5.js by [donating to the Processing Foundation](https://processingfoundation.org/support).
 
-Stay in touch with Processing Foundation across other platforms: 
+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)
 - [Forum](https://discourse.processing.org)
 
-
 ## Using the p5.js Editor 🤔
 
-Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn more about sketching with p5.js on the [Get Started](https://p5js.org/tutorials/get-started/) and find everything you can do in the [Reference](https://p5js.org/reference/). You can also look at [examples](https://editor.p5js.org/p5/sketches) and remix them in the p5.js Editor. 
+Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn more about sketching with p5.js on the [Get Started](https://p5js.org/tutorials/get-started/) and find everything you can do in the [Reference](https://p5js.org/reference/). You can also look at [examples](https://editor.p5js.org/p5/sketches) and remix them in the p5.js Editor.
 
-For more information on usage guidelines for the p5.js Editor, check out the [p5.js Editor Terms of Use](https://editor.p5js.org/terms-of-use). To gain better insight into how we handle user data and data privacy, refer to the [p5.js Editor Privacy Policy](https://editor.p5js.org/privacy-policy). 
+For more information on usage guidelines for the p5.js Editor, check out the [p5.js Editor Terms of Use](https://editor.p5js.org/terms-of-use). To gain better insight into how we handle user data and data privacy, refer to the [p5.js Editor Privacy Policy](https://editor.p5js.org/privacy-policy).
 
 ## Contributing 📖 🐛 🎨
 
-The p5.js Editor is a collaborative project created by many individuals, mostly volunteers, and you are invited to help. All types of involvement are welcome. To get started with contributing to the p5.js Editor, we recommend exploring the following resources in order: 
+The p5.js Editor is a collaborative project created by many individuals, mostly volunteers, and you are invited to help. All types of involvement are welcome. To get started with contributing to the p5.js Editor, we recommend exploring the following resources in order:
 
 1. [p5.js Community Statement and Code of Conduct](https://editor.p5js.org/code-of-conduct) - Read our Community Statement and Code of Conduct to understand the values that guide our community and how to participate respectfully and constructively.
 
 2. [Contributor Docs](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/README.md) - For a deeper look at how to get involved with the p5.js Editor, check out our Contributor Docs for more in-depth details about contributing to different areas of the project, including code, bug fixes, documentation, discussion, and more.
 
 3. [All Contributors list on the p5.js repository](https://github.com/processing/p5.js?tab=readme-ov-file#contributors) - Explore the All Contributors list to see the wide range of contributions by our amazing community!
 
-> **TypeScript Migration:** 
-> As of July 2025, we are working on migrating the repo to TypeScript as part of the **[p5.js Web Editor pr05 Grant](https://github.com/processing/pr05-grant/wiki/2025-pr05-Program-Page)**.  
-> This migration will occur in two phases:
-> 1. **Grant Work (July – October 31, 2025)** – Setting up TypeScript configuration, tooling, and starting partial migration. Contributions will be **closed** during this period.
-> 2. **Open Contribution (After October 31, 2025)** – TypeScript migration tasks will **open** to all contributors, with guidelines and tutorials available.  
+> **TypeScript Migration:** We have initiated migrating the repo to Typescript as part of the **[p5.js Web Editor pr05 Grant](https://github.com/processing/pr05-grant/wiki/2025-pr05-Program-Page)**, and the repo is now open to migration contributions.
 >
-> For full details, see [TypeScript Migration Plan](./contributor_docs/typescript-migration.md).
+> Please see [Typescript Migration](contributor_docs/typescript_migration.md) for migration guidelines. Please see [2025 pr05 Typescript Migration Project](contributor_docs/pr05_2025_typescript_migration/index.md) for details and technical decisions for the migration project.
 
 ## Acknowledgements 🙏
 
-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. 
+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 />
-<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>
+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>

client/custom.d.ts

@@ -4,5 +4,18 @@ declare module '*.svg' {
   const ReactComponent: React.FunctionComponent<
     React.SVGProps<SVGSVGElement> & { title?: string }
   >;
+  // eslint-disable-next-line import/no-default-export
   export default ReactComponent;
 }
+
+// Extend window for Redux DevTools
+interface Window {
+  __REDUX_DEVTOOLS_EXTENSION__?: () => any;
+}
+
+// Extend NodeModule for hot reloading
+interface NodeModule {
+  hot?: {
+    accept(path?: string, callback?: () => void): void;
+  };
+}

client/i18n.js

@@ -70,7 +70,7 @@ export function languageKeyToLabel(lang) {
     it: 'Italiano',
     ja: '日本語',
     ko: '한국어',
-    'pt-BR': 'Português',
+    'pt-BR': 'Português do Brasil',
     sv: 'Svenska',
     'uk-UA': 'Українська',
     'zh-CN': '简体中文',

client/index.integration.test.jsx

@@ -4,13 +4,13 @@ import React from 'react';
 import Routing from './routes';
 
 import { reduxRender, act, waitFor, screen, within } from './test-utils';
-import configureStore from './store';
+import { setupStore } from './store';
 import * as Actions from './modules/User/actions';
 import { userResponse } from './testData/testServerResponses';
 
 // setup for the app
 const initialState = window.__INITIAL_STATE__;
-const store = configureStore(initialState);
+const store = setupStore(initialState);
 
 // need to mock this file or it'll throw ERRCONNECTED
 jest.mock('./i18n');

client/index.jsx

@@ -1,11 +1,11 @@
-import React, { Suspense } from 'react';
+import React, { Suspense, useEffect } from 'react';
 import { render } from 'react-dom';
-import { Provider } from 'react-redux';
+import { Provider, useSelector } from 'react-redux';
 import { Router } from 'react-router-dom';
 
 import { useTranslation } from 'react-i18next';
 import browserHistory from './browserHistory';
-import configureStore from './store';
+import { setupStore } from './store';
 import Routing from './routes';
 import ThemeProvider from './modules/App/components/ThemeProvider';
 import Loader from './modules/App/components/loader';
@@ -19,9 +19,14 @@ require('./images/p5js-square-logo.png');
 
 const initialState = window.__INITIAL_STATE__;
 
-const store = configureStore(initialState);
+const store = setupStore(initialState);
+
+const DONATE_LOGO_IMAGE_URL = 'https://donorbox.org/images/white_logo.svg';
+
+const showDonateCampaign = false;
 
 if (
+  showDonateCampaign &&
   window.location.href.indexOf('full') === -1 &&
   window.location.href.indexOf('embed') === -1
 ) {
@@ -56,30 +61,30 @@ if (
     'background: #f1678e; color: #fff; text-decoration: none; font-family: Verdana, sans-serif; display: flex; gap: 8px; width: fit-content; font-size: 16px; border-radius: 0 0 5px 5px; line-height: 24px; position: fixed; top: 50%; transform-origin: center; z-index: 9999; overflow: hidden; padding: 8px 22px 8px 18px; right: 20px; left: auto; transform: translate(50%, -50%) rotate(90deg)'
   );
   buttonScript.setAttribute('data-button-cta', 'Donate');
-  buttonScript.setAttribute(
-    'data-img-src',
-    'https://donorbox.org/images/white_logo.svg'
-  );
+  buttonScript.setAttribute('data-img-src', DONATE_LOGO_IMAGE_URL);
 
   document.body.appendChild(buttonScript);
 }
 
 const App = () => {
   const { t } = useTranslation();
+  const language = useSelector((state) => state.preferences.language);
 
-  setTimeout(() => {
-    const donateButton = document.getElementsByClassName(
-      'dbox-donation-button'
-    )[0];
+  useEffect(() => {
+    setTimeout(() => {
+      const donateButton = document.getElementsByClassName(
+        'dbox-donation-button'
+      )[0];
 
-    if (donateButton) {
-      const donateLogoImage = document.createElement('img');
-      donateLogoImage.src = 'https://donorbox.org/images/white_logo.svg';
+      if (donateButton) {
+        const donateLogoImage = document.createElement('img');
+        donateLogoImage.src = DONATE_LOGO_IMAGE_URL;
 
-      donateButton.text = t('About.Donate');
-      donateButton.prepend(donateLogoImage);
-    }
-  }, 0);
+        donateButton.text = t('About.Donate');
+        donateButton.prepend(donateLogoImage);
+      }
+    }, 500);
+  }, [language]);
 
   return (
     <div>
@@ -91,13 +96,19 @@ const App = () => {
   );
 };
 
-render(
-  <Provider store={store}>
-    <ThemeProvider>
-      <Suspense fallback={<Loader />}>
-        <App />
-      </Suspense>
-    </ThemeProvider>
-  </Provider>,
-  document.getElementById('root')
-);
+// This prevents crashes in test environments (like Jest) where document.getElementById('root') may return null.
+const rootEl = document.getElementById('root');
+if (rootEl) {
+  render(
+    <Provider store={store}>
+      <ThemeProvider>
+        <Suspense fallback={<Loader />}>
+          <App />
+        </Suspense>
+      </ThemeProvider>
+    </Provider>,
+    rootEl
+  );
+}
+
+export default store;

client/modules/About/pages/About.jsx

@@ -95,7 +95,7 @@ const About = () => {
         ))}
 
         <Contact>
-          <h2>{t('Contact')}</h2>
+          <h2>{t('About.Contact')}</h2>
           <div>
             <ContactTitle>{t('About.Email')}</ContactTitle>
             <ContactHandles>