Merge branch 'release-2.18.1' into release

Author: raclim

.eslintrc

@@ -29,6 +29,7 @@
         "tsx": "never"
       }
     ],
+    "import/prefer-default-export": "off",
     "react/jsx-filename-extension": [1, { "extensions": [".jsx", ".tsx"] }],
     "comma-dangle": 0,  // not sure why airbnb turned this on. gross!
     "default-param-last": 0,
@@ -41,6 +42,7 @@
     "no-restricted-exports": 1,
     "no-underscore-dangle": 0,
     "no-useless-catch": 2,
+    "no-plusplus": "off",
     "prefer-object-spread": 0,
     "max-len": [1, 120, 2, {"ignoreComments": true, "ignoreTemplateLiterals": true}],
     "max-classes-per-file": 0,
@@ -131,7 +133,9 @@
       "rules": {
         "no-use-before-define": "off",
         "import/no-extraneous-dependencies": "off",
-        "no-unused-vars": "off"
+        "no-unused-vars": "off",
+        "import/no-default-export": "warn",
+        "no-underscore-dangle": "warn",
       }
     },
     {

.prettierrc

@@ -5,7 +5,6 @@
   "insertPragma": false,
   "jsxBracketSameLine": false,
   "jsxSingleQuote": false,
-  "parser": "babel",
   "printWidth": 80,
   "proseWrap": "never",
   "requirePragma": false,

README.md

@@ -10,6 +10,14 @@ 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: 
+- [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. 

client/common/useKeyDownHandlers.js

@@ -1,6 +1,7 @@
 import { mapKeys } from 'lodash';
 import PropTypes from 'prop-types';
 import { useCallback, useEffect, useRef } from 'react';
+import { isMac } from '../utils/device';
 
 /**
  * Attaches keydown handlers to the global document.
@@ -30,8 +31,7 @@ export default function useKeyDownHandlers(keyHandlers) {
    */
   const handleEvent = useCallback((e) => {
     if (!e.key) return;
-    const isMac = navigator.userAgent.toLowerCase().indexOf('mac') !== -1;
-    const isCtrl = isMac ? e.metaKey : e.ctrlKey;
+    const isCtrl = isMac() ? e.metaKey : e.ctrlKey;
     if (e.shiftKey && isCtrl) {
       handlers.current[
         `ctrl-shift-${

client/components/SkipLink.test.tsx

@@ -2,7 +2,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import '@testing-library/jest-dom';
-import SkipLink from './SkipLink';
+import { SkipLink } from './SkipLink';
 
 jest.mock('react-i18next', () => ({
   useTranslation: () => ({

client/components/SkipLink.tsx

@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 
-type SkipLinkProps = {
-  targetId: string,
-  text: string
-};
+interface SkipLinkProps {
+  targetId: string;
+  text: string;
+}
 
-const SkipLink = ({ targetId, text }: SkipLinkProps) => {
+export const SkipLink = ({ targetId, text }: SkipLinkProps) => {
   const [focus, setFocus] = useState(false);
   const { t } = useTranslation();
   const handleFocus = () => {
@@ -30,5 +30,3 @@ const SkipLink = ({ targetId, text }: SkipLinkProps) => {
     </a>
   );
 };
-
-export default SkipLink;

client/i18n.js

@@ -3,7 +3,7 @@ import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
 
 import {
-  be,
+  bn,
   enUS,
   es,
   ja,
@@ -21,12 +21,12 @@ import {
   enIN
 } from 'date-fns/locale';
 
-import getPreferredLanguage from './utils/language-utils';
+import { getPreferredLanguage } from './utils/language-utils';
 
 const fallbackLng = ['en-US'];
 
 export const availableLanguages = [
-  'be',
+  'bn',
   'de',
   'en-US',
   'es-419',
@@ -61,7 +61,7 @@ if (
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
-    be: 'বাংলা',
+    bn: 'বাংলা',
     de: 'Deutsch',
     'en-US': 'English',
     'es-419': 'Español',
@@ -83,7 +83,7 @@ export function languageKeyToLabel(lang) {
 
 export function languageKeyToDateLocale(lang) {
   const languageMap = {
-    be,
+    bn,
     de,
     'en-US': enUS,
     'es-419': es,

client/index.jsx

@@ -9,7 +9,7 @@ import Routing from './routes';
 import ThemeProvider from './modules/App/components/ThemeProvider';
 import Loader from './modules/App/components/loader';
 import './i18n';
-import SkipLink from './components/SkipLink';
+import { SkipLink } from './components/SkipLink';
 
 require('./styles/main.scss');
 
@@ -34,6 +34,31 @@ const script = document.createElement('script');
 script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
 document.body.appendChild(script);
 
+if (window.location.href.indexOf('full') === -1) {
+  const buttonScript = document.createElement('script');
+  buttonScript.type = 'text/javascript';
+  buttonScript.defer = true;
+  buttonScript.id = 'donorbox-popup-button-installer';
+  buttonScript.src = 'https://donorbox.org/install-popup-button.js';
+
+  buttonScript.setAttribute(
+    'data-href',
+    'https://donorbox.org/back-to-school-805292'
+  );
+  buttonScript.setAttribute(
+    'data-style',
+    // eslint-disable-next-line max-len
+    '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'
+  );
+
+  document.body.appendChild(buttonScript);
+}
+
 const App = () => (
   <div>
     <Router history={browserHistory}>

client/modules/About/statics/aboutData.js

@@ -14,7 +14,7 @@ export const ContactSectionLinks = [
   { label: 'About.X', href: 'https://x.com/p5xjs' },
   {
     label: 'About.Discord',
-    href: 'https://discord.gg/SHQ8dH25r9'
+    href: 'https://discord.gg/esmGA6H6wm'
   },
   {
     label: 'About.Forum',
@@ -82,7 +82,7 @@ export const AboutSectionInfo = [
         description: 'About.LinkDescriptions.Forum'
       },
       {
-        url: 'https://discord.com/invite/SHQ8dH25r9',
+        url: 'https://discord.com/invite/esmGA6H6wm',
         title: 'About.DiscordCTA',
         description: 'About.LinkDescriptions.Discord'
       }

client/modules/IDE/actions/assets.js

@@ -1,4 +1,4 @@
-import apiClient from '../../../utils/apiClient';
+import { apiClient } from '../../../utils/apiClient';
 import * as ActionTypes from '../../../constants';
 import { startLoader, stopLoader } from '../reducers/loading';
 import { assetsActions } from '../reducers/assets';