Merge pull request #2020 from processing/chore/webpack-v5

Chore/webpack v5

Author: catarak

.babelrc

@@ -87,6 +87,7 @@
     "@babel/plugin-proposal-nullish-coalescing-operator",
     "@babel/plugin-proposal-do-expressions",
     "@babel/plugin-proposal-function-bind",
-    ["@babel/plugin-proposal-private-methods", { "loose": true }]
+    ["@babel/plugin-proposal-private-methods", { "loose": true }],
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
   ]
 }

client/modules/IDE/components/Console.jsx

@@ -37,13 +37,6 @@ import { useDidUpdate } from '../hooks/custom-hooks';
 import useHandleMessageEvent from '../hooks/useHandleMessageEvent';
 import { listen } from '../../../utils/dispatcher';
 
-const CONSOLE_FEED_WITHOUT_ICONS = {
-  LOG_WARN_ICON: 'none',
-  LOG_ERROR_ICON: 'none',
-  LOG_DEBUG_ICON: 'none',
-  LOG_INFO_ICON: 'none'
-};
-
 const CONSOLE_FEED_LIGHT_STYLES = {
   BASE_BACKGROUND_COLOR: '',
   LOG_ERROR_BACKGROUND: 'hsl(0, 100%, 97%)',

client/modules/IDE/components/ShareModal.jsx

@@ -2,13 +2,13 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { withTranslation } from 'react-i18next';
 import CopyableInput from './CopyableInput';
-import getConfig from '../../../utils/getConfig';
+// import getConfig from '../../../utils/getConfig';
 
 class ShareModal extends React.PureComponent {
   render() {
     const { projectId, ownerUsername, projectName } = this.props;
     const hostname = window.location.origin;
-    const previewUrl = getConfig('PREVIEW_URL');
+    // const previewUrl = getConfig('PREVIEW_URL');
     return (
       <div className="share-modal">
         <h3 className="share-modal__project-name">{projectName}</h3>

client/modules/Preview/filesReducer.js

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import objectID from 'bson-objectid';
 import blobUtil from 'blob-util';
-import mime from 'mime-types';
+import mime from 'mime';
 import { PLAINTEXT_FILE_REGEX } from '../../../server/utils/fileUtils';
 
 const defaultSketch = `function setup() {
@@ -112,7 +112,9 @@ export function createBlobUrl(file) {
     blobUtil.revokeObjectURL(file.blobUrl);
   }
 
-  const mimeType = mime.lookup(file.name);
+  const mimeType = mime.getType(file.name) || 'text/plain';
+  console.log(mimeType);
+
   const fileBlob = blobUtil.createBlob([file.content], { type: mimeType });
   const blobURL = blobUtil.createObjectURL(fileBlob);
   return blobURL;

client/styles/abstracts/_variables.scss

@@ -96,8 +96,8 @@ $themes: (
     error-color: $p5js-pink,
     table-row-stripe-color: $medium-light,
     table-row-stripe-color-alternate: $medium-light,
-    codefold-icon-open: url(../images/triangle-arrow-down.svg?byUrl),
-    codefold-icon-closed: url(../images/triangle-arrow-right.svg?byUrl),
+    codefold-icon-open: url("../images/triangle-arrow-down.svg?byUrl"),
+    codefold-icon-closed: url("../images/triangle-arrow-right.svg?byUrl"),
 
     primary-button-color: $lightest,
     primary-button-background-color: $p5js-pink,
@@ -178,8 +178,8 @@ $themes: (
     error-color: $p5js-pink,
     table-row-stripe-color: $dark,
     table-row-stripe-color-alternate: $darker,
-    codefold-icon-open: url(../images/triangle-arrow-down-white.svg?byUrl),
-    codefold-icon-closed: url(../images/triangle-arrow-right-white.svg?byUrl),
+    codefold-icon-open: url("../images/triangle-arrow-down-white.svg?byUrl"),
+    codefold-icon-closed: url("../images/triangle-arrow-right-white.svg?byUrl"),
 
     primary-button-color: $lightest,
     primary-button-background-color: $p5js-pink,
@@ -258,8 +258,8 @@ $themes: (
     error-color: $p5-contrast-pink,
     table-row-stripe-color: $dark,
     table-row-stripe-color-alternate: $darker,
-    codefold-icon-open: url(../images/triangle-arrow-down-white.svg?byUrl),
-    codefold-icon-closed: url(../images/triangle-arrow-right-white.svg?byUrl),
+    codefold-icon-open: url("../images/triangle-arrow-down-white.svg?byUrl"),
+    codefold-icon-closed: url("../images/triangle-arrow-right-white.svg?byUrl"),
 
     primary-button-color: $lightest,
     primary-button-background-color: $p5js-pink,

docker-compose-development.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   mongo:
-    image: mongo:3.6
+    image: mongo:4.4
     volumes:
       - dbdata:/data/db
   app:

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   mongo:
-    image: mongo:3.6
+    image: mongo:4.4
     volumes:
       - dbdata:/data/db
   app: