Skip to content

Chore/webpack v5 #2020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 27, 2022
Merged

Chore/webpack v5 #2020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef6393b
Update MongoDB version in docker-compose files
catarak Apr 25, 2022
3ec0a58
Update webpack, update dependent modules, get dev and prod builds wor…
catarak Apr 25, 2022
1a8cfdd
Move from mime-types package to mime package
catarak Apr 25, 2022
a2ed1b7
Update decomment
catarak Apr 25, 2022
01ef44f
Update node-sass to latest
catarak Apr 26, 2022
82c8690
Update async to latest, try to diagnose SCSS resource query issue
catarak Apr 27, 2022
c052370
Downgrade css-loader to v5.2.7
catarak Apr 27, 2022
ac21e1a
Move copy-webpack-plugin to dependencies from devDependencies
catarak Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }]
]
}
7 changes: 0 additions & 7 deletions client/modules/IDE/components/Console.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%)',
Expand Down
4 changes: 2 additions & 2 deletions client/modules/IDE/components/ShareModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions client/modules/Preview/filesReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions client/styles/abstracts/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'
services:
mongo:
image: mongo:3.6
image: mongo:4.4
volumes:
- dbdata:/data/db
app:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'
services:
mongo:
image: mongo:3.6
image: mongo:4.4
volumes:
- dbdata:/data/db
app:
Expand Down
Loading