diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 829c0dd656..5d768d2e5b 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -8,7 +8,6 @@ import { useSelector, useDispatch } from 'react-redux';
import classNames from 'classnames';
import { Console as ConsoleFeed } from 'console-feed';
import {
- CONSOLE_FEED_WITHOUT_ICONS,
CONSOLE_FEED_LIGHT_STYLES,
CONSOLE_FEED_DARK_STYLES,
CONSOLE_FEED_CONTRAST_STYLES
@@ -43,7 +42,7 @@ import { useDidUpdate } from '../hooks/custom-hooks';
import useHandleMessageEvent from '../hooks/useHandleMessageEvent';
import { listen } from '../../../utils/dispatcher';
-const getConsoleFeedStyle = (theme, times, fontSize) => {
+const getConsoleFeedStyle = (theme, fontSize) => {
const style = {
BASE_FONT_FAMILY: 'Inconsolata, monospace'
};
@@ -73,33 +72,30 @@ const getConsoleFeedStyle = (theme, times, fontSize) => {
};
const CONSOLE_FEED_SIZES = {
TREENODE_LINE_HEIGHT: 1.2,
- BASE_FONT_SIZE: fontSize,
- ARROW_FONT_SIZE: fontSize,
- LOG_ICON_WIDTH: fontSize,
- LOG_ICON_HEIGHT: 1.45 * fontSize
+ BASE_FONT_SIZE: `${fontSize}px`,
+ ARROW_FONT_SIZE: `${fontSize}px`,
+ LOG_ICON_WIDTH: `${fontSize}px`,
+ LOG_ICON_HEIGHT: `${1.45 * fontSize}px`
};
- if (times > 1) {
- Object.assign(style, CONSOLE_FEED_WITHOUT_ICONS);
- }
switch (theme) {
case 'light':
return Object.assign(
- CONSOLE_FEED_LIGHT_STYLES,
+ CONSOLE_FEED_LIGHT_STYLES || {},
CONSOLE_FEED_LIGHT_ICONS,
CONSOLE_FEED_SIZES,
style
);
case 'dark':
return Object.assign(
- CONSOLE_FEED_DARK_STYLES,
+ CONSOLE_FEED_DARK_STYLES || {},
CONSOLE_FEED_DARK_ICONS,
CONSOLE_FEED_SIZES,
style
);
case 'contrast':
return Object.assign(
- CONSOLE_FEED_CONTRAST_STYLES,
+ CONSOLE_FEED_CONTRAST_STYLES || {},
CONSOLE_FEED_CONTRAST_ICONS,
CONSOLE_FEED_SIZES,
style
@@ -114,7 +110,6 @@ const Console = ({ t }) => {
const isExpanded = useSelector((state) => state.ide.consoleIsExpanded);
const isPlaying = useSelector((state) => state.ide.isPlaying);
const { theme, fontSize } = useSelector((state) => state.preferences);
-
const {
collapseConsole,
expandConsole,
@@ -170,30 +165,16 @@ const Console = ({ t }) => {
-
- {consoleEvents.map((consoleEvent) => {
- const { method, times } = consoleEvent;
- return (
-
- {times > 1 && (
-
- {times}
-
- )}
-
-
- );
- })}
+
+
{isExpanded && isPlaying && (
{
diff --git a/client/styles/components/_console-feed.scss b/client/styles/components/_console-feed.scss
index 366ee54ca2..682b2e262b 100644
--- a/client/styles/components/_console-feed.scss
+++ b/client/styles/components/_console-feed.scss
@@ -27,6 +27,11 @@ $CONSOLE_FEED_LIGHT_STYLES: (
OBJECT_VALUE_NUMBER_COLOR: '#333',
OBJECT_VALUE_BOOLEAN_COLOR: '#D52889',
OBJECT_VALUE_FUNCTION_KEYWORD_COLOR: '#0B7CA9',
+ LOG_AMOUNT_BACKGROUND: '#5276B7',
+ LOG_AMOUNT_COLOR: '#FFF',
+ LOG_WARN_AMOUNT_BACKGROUND: '#996B00',
+ LOG_ERROR_AMOUNT_BACKGROUND: '#D11518',
+ LOG_DEBUG_AMOUNT_BACKGROUND: '#0071AD'
);
$CONSOLE_FEED_DARK_STYLES: (
@@ -57,7 +62,12 @@ $CONSOLE_FEED_DARK_STYLES: (
TABLE_SORT_ICON_COLOR: 'grey',
TABLE_DATA_BACKGROUND_IMAGE: 'grey',
TABLE_DATA_BACKGROUND_SIZE: 'grey',
- ARROW_COLOR: '#D9D9D9'
+ ARROW_COLOR: '#D9D9D9',
+ LOG_AMOUNT_BACKGROUND: '#5276B7',
+ LOG_AMOUNT_COLOR: '#333',
+ LOG_WARN_AMOUNT_BACKGROUND: '#996B00',
+ LOG_ERROR_AMOUNT_BACKGROUND: '#D11518',
+ LOG_DEBUG_AMOUNT_BACKGROUND: '#0071AD'
);
$CONSOLE_FEED_CONTRAST_STYLES: (
@@ -88,5 +98,10 @@ $CONSOLE_FEED_CONTRAST_STYLES: (
TABLE_SORT_ICON_COLOR: 'grey',
TABLE_DATA_BACKGROUND_IMAGE: 'grey',
TABLE_DATA_BACKGROUND_SIZE: 'grey',
- ARROW_COLOR: '#D9D9D9'
+ ARROW_COLOR: '#D9D9D9',
+ LOG_AMOUNT_BACKGROUND: '#5276B7',
+ LOG_AMOUNT_COLOR: '#333',
+ LOG_WARN_AMOUNT_BACKGROUND: '#966C08',
+ LOG_ERROR_AMOUNT_BACKGROUND: '#DD3134',
+ LOG_DEBUG_AMOUNT_BACKGROUND: '#097BB3'
);
\ No newline at end of file
diff --git a/client/styles/components/_console.scss b/client/styles/components/_console.scss
index 3874102c16..5768870655 100644
--- a/client/styles/components/_console.scss
+++ b/client/styles/components/_console.scss
@@ -43,6 +43,11 @@
flex: 1;
flex-direction: column;
overflow-y: auto;
+ & div div div:first-child {
+ height: unset;
+ line-height: unset;
+ font-size: unset;
+ }
}
.preview-console__collapse {
@@ -97,47 +102,8 @@
}
}
-.preview-console__logged-times {
-
- font-weight: bold;
- margin: #{2 / $base-font-size}rem 0 0 #{8 / $base-font-size}rem;
- border-radius: #{10 / $base-font-size}rem;
- padding: #{1 / $base-font-size}rem #{4 / $base-font-size}rem;
- z-index: 100;
- left: 0;
- position: absolute;
-
- .preview-console__message--info &, .preview-console__message--log & {
- @include themify() {
- background-color: getThemifyVariable('console-info-background-color');
- }
- }
- .preview-console__message--warn & {
- @include themify() {
- background-color: getThemifyVariable('console-warn-background-color');
- }
- }
- .preview-console__message--debug & {
- @include themify() {
- background-color: getThemifyVariable('console-debug-background-color');
- }
- }
- .preview-console__message--error & {
- @include themify() {
- background-color: getThemifyVariable('console-error-background-color');
- }
- }
-}
-
.preview-console__body {
display: flex;
flex-direction: column;
height: calc(100% - #{30 / $base-font-size}rem);
-
- .preview-console__message {
- position: relative;
- @include themify() {
- color: getThemifyVariable('console-logged-times-color');
- }
- }
}
diff --git a/package-lock.json b/package-lock.json
index 8f726bbe7b..5fc471ced2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3323,31 +3323,10 @@
"resolved": "https://registry.npmjs.org/@emmetio/codemirror-plugin/-/codemirror-plugin-1.2.1.tgz",
"integrity": "sha512-XXJO5742H6Vu6TcLnigLlS8vj7hAjbv68T/RNfTub77B6+iGGeTOr9tcMQx/1tNmi5D+f4Sh6/60su13ed6wRA=="
},
- "@emotion/babel-utils": {
- "version": "0.6.10",
- "resolved": "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz",
- "integrity": "sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==",
- "requires": {
- "@emotion/hash": "^0.6.6",
- "@emotion/memoize": "^0.6.6",
- "@emotion/serialize": "^0.9.1",
- "convert-source-map": "^1.5.1",
- "find-root": "^1.1.0",
- "source-map": "^0.7.2"
- },
- "dependencies": {
- "source-map": {
- "version": "0.7.3",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
- "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
- }
- }
- },
"@emotion/cache": {
"version": "10.0.29",
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
"integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
- "dev": true,
"requires": {
"@emotion/sheet": "0.9.4",
"@emotion/stylis": "0.8.5",
@@ -3358,14 +3337,12 @@
"@emotion/stylis": {
"version": "0.8.5",
"resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
- "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==",
- "dev": true
+ "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
},
"@emotion/utils": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
- "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
- "dev": true
+ "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
}
}
},
@@ -3373,7 +3350,6 @@
"version": "10.0.28",
"resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.28.tgz",
"integrity": "sha512-pH8UueKYO5jgg0Iq+AmCLxBsvuGtvlmiDCOuv8fGNYn3cowFpLN98L8zO56U0H1PjDIyAlXymgL3Wu7u7v6hbA==",
- "dev": true,
"requires": {
"@babel/runtime": "^7.5.5",
"@emotion/cache": "^10.0.27",
@@ -3386,20 +3362,17 @@
"@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
- "dev": true
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
},
"@emotion/memoize": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
- "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
- "dev": true
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
},
"@emotion/serialize": {
"version": "0.11.16",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
"integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
- "dev": true,
"requires": {
"@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
@@ -3411,14 +3384,12 @@
"@emotion/unitless": {
"version": "0.7.5",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
- "dev": true
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
},
"@emotion/utils": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
- "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
- "dev": true
+ "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
}
}
},
@@ -3426,7 +3397,6 @@
"version": "10.0.27",
"resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz",
"integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==",
- "dev": true,
"requires": {
"@emotion/serialize": "^0.11.15",
"@emotion/utils": "0.11.3",
@@ -3436,20 +3406,17 @@
"@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
- "dev": true
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
},
"@emotion/memoize": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
- "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
- "dev": true
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
},
"@emotion/serialize": {
"version": "0.11.16",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
"integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
- "dev": true,
"requires": {
"@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
@@ -3461,20 +3428,17 @@
"@emotion/unitless": {
"version": "0.7.5",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
- "dev": true
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
},
"@emotion/utils": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
- "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
- "dev": true
+ "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
},
"babel-plugin-emotion": {
"version": "10.0.33",
"resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz",
"integrity": "sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==",
- "dev": true,
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@emotion/hash": "0.8.0",
@@ -3490,46 +3454,15 @@
}
}
},
- "@emotion/hash": {
- "version": "0.6.6",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz",
- "integrity": "sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="
- },
- "@emotion/is-prop-valid": {
- "version": "0.6.8",
- "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz",
- "integrity": "sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA==",
- "requires": {
- "@emotion/memoize": "^0.6.6"
- }
- },
- "@emotion/memoize": {
- "version": "0.6.6",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz",
- "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="
- },
- "@emotion/serialize": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz",
- "integrity": "sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==",
- "requires": {
- "@emotion/hash": "^0.6.6",
- "@emotion/memoize": "^0.6.6",
- "@emotion/unitless": "^0.6.7",
- "@emotion/utils": "^0.8.2"
- }
- },
"@emotion/sheet": {
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz",
- "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==",
- "dev": true
+ "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA=="
},
"@emotion/styled": {
"version": "10.0.27",
"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz",
"integrity": "sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==",
- "dev": true,
"requires": {
"@emotion/styled-base": "^10.0.27",
"babel-plugin-emotion": "^10.0.27"
@@ -3538,20 +3471,17 @@
"@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
- "dev": true
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
},
"@emotion/memoize": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
- "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
- "dev": true
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
},
"@emotion/serialize": {
"version": "0.11.16",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
"integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
- "dev": true,
"requires": {
"@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
@@ -3563,20 +3493,17 @@
"@emotion/unitless": {
"version": "0.7.5",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
- "dev": true
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
},
"@emotion/utils": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
- "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
- "dev": true
+ "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
},
"babel-plugin-emotion": {
"version": "10.0.33",
"resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz",
"integrity": "sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==",
- "dev": true,
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@emotion/hash": "0.8.0",
@@ -3596,7 +3523,6 @@
"version": "10.0.31",
"resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz",
"integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==",
- "dev": true,
"requires": {
"@babel/runtime": "^7.5.5",
"@emotion/is-prop-valid": "0.8.8",
@@ -3607,14 +3533,12 @@
"@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
- "dev": true
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
},
"@emotion/is-prop-valid": {
"version": "0.8.8",
"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
- "dev": true,
"requires": {
"@emotion/memoize": "0.7.4"
}
@@ -3622,14 +3546,12 @@
"@emotion/memoize": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
- "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
- "dev": true
+ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
},
"@emotion/serialize": {
"version": "0.11.16",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
"integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
- "dev": true,
"requires": {
"@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
@@ -3641,37 +3563,19 @@
"@emotion/unitless": {
"version": "0.7.5",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
- "dev": true
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
},
"@emotion/utils": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz",
- "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==",
- "dev": true
+ "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="
}
}
},
- "@emotion/stylis": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz",
- "integrity": "sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="
- },
- "@emotion/unitless": {
- "version": "0.6.7",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz",
- "integrity": "sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="
- },
- "@emotion/utils": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz",
- "integrity": "sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="
- },
"@emotion/weak-memoize": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
- "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
- "dev": true
+ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
},
"@eslint/eslintrc": {
"version": "0.3.0",
@@ -12358,25 +12262,6 @@
"object.assign": "^4.1.0"
}
},
- "babel-plugin-emotion": {
- "version": "9.2.11",
- "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz",
- "integrity": "sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==",
- "requires": {
- "@babel/helper-module-imports": "^7.0.0",
- "@emotion/babel-utils": "^0.6.4",
- "@emotion/hash": "^0.6.2",
- "@emotion/memoize": "^0.6.1",
- "@emotion/stylis": "^0.7.0",
- "babel-plugin-macros": "^2.0.0",
- "babel-plugin-syntax-jsx": "^6.18.0",
- "convert-source-map": "^1.5.0",
- "find-root": "^1.1.0",
- "mkdirp": "^0.5.1",
- "source-map": "^0.5.7",
- "touch": "^2.0.1"
- }
- },
"babel-plugin-extract-import-names": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz",
@@ -14117,15 +14002,15 @@
"dev": true
},
"console-feed": {
- "version": "2.8.11",
- "resolved": "https://registry.npmjs.org/console-feed/-/console-feed-2.8.11.tgz",
- "integrity": "sha512-XBAM6n08Ft6kofFX3VyMazE3e0R/G5ABvp4vbwinTR+2HTQ7ZJJXXKrK2VPDQm6rkCurRw9tUI4d/N80w5+ZXA==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/console-feed/-/console-feed-3.2.0.tgz",
+ "integrity": "sha512-k1G3iFlWqsjlSc+NUW7H3IWZZTi/q+PGJBHB/yxwbkiPcZTWUjT7Tkd4nF3zeVqjPPkIChm0dL7xVdMtfCr5Cg==",
"requires": {
- "emotion": "^9.1.1",
- "emotion-theming": "^9.0.0",
+ "@emotion/core": "^10.0.10",
+ "@emotion/styled": "^10.0.12",
+ "emotion-theming": "^10.0.10",
"linkifyjs": "^2.1.6",
- "react-emotion": "^9.1.1",
- "react-inspector": "^2.2.2"
+ "react-inspector": "^5.1.0"
}
},
"consolidate": {
@@ -14737,28 +14622,6 @@
}
}
},
- "create-emotion": {
- "version": "9.2.12",
- "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz",
- "integrity": "sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==",
- "requires": {
- "@emotion/hash": "^0.6.2",
- "@emotion/memoize": "^0.6.1",
- "@emotion/stylis": "^0.7.0",
- "@emotion/unitless": "^0.6.2",
- "csstype": "^2.5.2",
- "stylis": "^3.5.0",
- "stylis-rule-sheet": "^0.0.10"
- }
- },
- "create-emotion-styled": {
- "version": "9.2.8",
- "resolved": "https://registry.npmjs.org/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz",
- "integrity": "sha512-2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg==",
- "requires": {
- "@emotion/is-prop-valid": "^0.6.1"
- }
- },
"create-hash": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -16483,21 +16346,24 @@
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
},
- "emotion": {
- "version": "9.2.12",
- "resolved": "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz",
- "integrity": "sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==",
- "requires": {
- "babel-plugin-emotion": "^9.2.11",
- "create-emotion": "^9.2.12"
- }
- },
"emotion-theming": {
- "version": "9.2.9",
- "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-9.2.9.tgz",
- "integrity": "sha512-Ncyr1WocmDDrTbuYAzklIUC5iKiGtHy3e5ymoFXcka6SuvZl/EDMawegk4wVp72Agrcm1xemab3QOHfnOkpoMA==",
+ "version": "10.0.27",
+ "resolved": "https://registry.npmjs.org/emotion-theming/-/emotion-theming-10.0.27.tgz",
+ "integrity": "sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==",
"requires": {
- "hoist-non-react-statics": "^2.3.1"
+ "@babel/runtime": "^7.5.5",
+ "@emotion/weak-memoize": "0.2.5",
+ "hoist-non-react-statics": "^3.3.0"
+ },
+ "dependencies": {
+ "hoist-non-react-statics": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+ "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+ "requires": {
+ "react-is": "^16.7.0"
+ }
+ }
}
},
"encodeurl": {
@@ -27345,14 +27211,9 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
},
"linkifyjs": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.8.tgz",
- "integrity": "sha512-j3QpiEr4UYzN5foKhrr9Sr06VI9vSlI4HisDWt+7Mq+TWDwpJ6H/LLpogYsXcyUIJLVhGblXXdUnblHsVNMPpg==",
- "requires": {
- "jquery": "^3.3.1",
- "react": "^16.4.2",
- "react-dom": "^16.4.2"
- }
+ "version": "2.1.9",
+ "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz",
+ "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug=="
},
"lint-staged": {
"version": "10.1.3",
@@ -30873,6 +30734,7 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+ "dev": true,
"requires": {
"abbrev": "1"
}
@@ -34629,15 +34491,6 @@
}
}
},
- "react-emotion": {
- "version": "9.2.12",
- "resolved": "https://registry.npmjs.org/react-emotion/-/react-emotion-9.2.12.tgz",
- "integrity": "sha512-qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw==",
- "requires": {
- "babel-plugin-emotion": "^9.2.11",
- "create-emotion-styled": "^9.2.8"
- }
- },
"react-error-overlay": {
"version": "6.0.7",
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
@@ -34791,13 +34644,13 @@
}
},
"react-inspector": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-2.3.1.tgz",
- "integrity": "sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-5.1.1.tgz",
+ "integrity": "sha512-GURDaYzoLbW8pMGXwYPDBIv6nqei4kK7LPRZ9q9HCZF54wqXz/dnylBp/kfE9XmekBhHvLDdcYeyIwSrvtOiWg==",
"requires": {
- "babel-runtime": "^6.26.0",
- "is-dom": "^1.0.9",
- "prop-types": "^15.6.1"
+ "@babel/runtime": "^7.0.0",
+ "is-dom": "^1.0.0",
+ "prop-types": "^15.0.0"
}
},
"react-is": {
@@ -38548,16 +38401,6 @@
}
}
},
- "stylis": {
- "version": "3.5.4",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
- "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
- },
- "stylis-rule-sheet": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
- "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
- },
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -39473,14 +39316,6 @@
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
},
- "touch": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz",
- "integrity": "sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==",
- "requires": {
- "nopt": "~1.0.10"
- }
- },
"tough-cookie": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
diff --git a/package.json b/package.json
index a6c43b1acd..f10c7607ea 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
"clipboard": "^1.7.1",
"codemirror": "^5.58.2",
"connect-mongo": "^1.3.2",
- "console-feed": "^2.8.11",
+ "console-feed": "^3.2.0",
"cookie-parser": "^1.4.3",
"copy-webpack-plugin": "^6.4.1",
"cors": "^2.8.5",