From d91580c5618c55f17a5c3c7ab535f9a697651755 Mon Sep 17 00:00:00 2001 From: raclim <43053081+raclim@users.noreply.github.com> Date: Tue, 11 Jul 2023 11:15:23 -0400 Subject: [PATCH 1/2] uninstall console-feed, install its mirror --- package-lock.json | 129 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d8027e0a9..51bd8ce078 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@babel/core": "^7.14.6", "@babel/register": "^7.14.5", "@emmetio/codemirror-plugin": "^1.2.4", + "@nicksrandall/console-feed": "^3.5.0", "@redux-devtools/core": "^3.11.0", "@redux-devtools/dock-monitor": "^2.1.0", "@redux-devtools/log-monitor": "^3.1.0", @@ -28,7 +29,6 @@ "codemirror": "^5.62.0", "codemirror-colorpicker": "^1.9.72", "connect-mongo": "^1.3.2", - "console-feed": "^3.2.0", "cookie-parser": "^1.4.5", "copy-webpack-plugin": "^10.2.4", "cors": "^2.8.5", @@ -5344,6 +5344,31 @@ "strict-event-emitter": "^0.2.0" } }, + "node_modules/@nicksrandall/console-feed": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@nicksrandall/console-feed/-/console-feed-3.5.0.tgz", + "integrity": "sha512-Fv5NtxQ3QC/e2sI/FJ1DI23XvjrWcvTlY8E/QjUkK0x+khxdSiP01ml3gdtX//TUkn51e2REvshKAfNRYhPa8A==", + "dependencies": { + "@emotion/core": "^10.0.10", + "@emotion/styled": "^10.0.12", + "emotion-theming": "^10.0.10", + "linkifyjs": "^2.1.6", + "react-inspector": "^5.1.0" + }, + "peerDependencies": { + "react": "^15.x || ^16.x || ^17.x || ^18.x" + } + }, + "node_modules/@nicksrandall/console-feed/node_modules/linkifyjs": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz", + "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==", + "peerDependencies": { + "jquery": ">= 1.11.0", + "react": ">= 0.14.0", + "react-dom": ">= 0.14.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -11439,21 +11464,6 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, - "node_modules/console-feed": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/console-feed/-/console-feed-3.3.0.tgz", - "integrity": "sha512-GS0EtpiLyAZGEYBtTih+uI3s3NDmOsfkgpNGhr7UWeM5BzDT+dKgit2nEMFwDb2w7NaT95774/cwAztA1BxrHQ==", - "dependencies": { - "@emotion/core": "^10.0.10", - "@emotion/styled": "^10.0.12", - "emotion-theming": "^10.0.10", - "linkifyjs": "^2.1.6", - "react-inspector": "^5.1.0" - }, - "peerDependencies": { - "react": "^15.x || ^16.x || ^17.x" - } - }, "node_modules/consolidate": { "version": "0.15.1", "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", @@ -17476,9 +17486,12 @@ } }, "node_modules/is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", + "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/is-plain-obj": { "version": "2.1.0", @@ -17608,7 +17621,7 @@ "node_modules/is-window": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz", - "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=" + "integrity": "sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==" }, "node_modules/isarray": { "version": "1.0.0", @@ -22590,10 +22603,10 @@ } }, "node_modules/jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", - "optional": true + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==", + "peer": true }, "node_modules/js-base64": { "version": "2.6.4", @@ -23252,16 +23265,6 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, - "node_modules/linkifyjs": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.8.tgz", - "integrity": "sha512-j3QpiEr4UYzN5foKhrr9Sr06VI9vSlI4HisDWt+7Mq+TWDwpJ6H/LLpogYsXcyUIJLVhGblXXdUnblHsVNMPpg==", - "optionalDependencies": { - "jquery": "^3.3.1", - "react": "^16.4.2", - "react-dom": "^16.4.2" - } - }, "node_modules/lint-staged": { "version": "10.5.4", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz", @@ -37384,6 +37387,26 @@ "strict-event-emitter": "^0.2.0" } }, + "@nicksrandall/console-feed": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@nicksrandall/console-feed/-/console-feed-3.5.0.tgz", + "integrity": "sha512-Fv5NtxQ3QC/e2sI/FJ1DI23XvjrWcvTlY8E/QjUkK0x+khxdSiP01ml3gdtX//TUkn51e2REvshKAfNRYhPa8A==", + "requires": { + "@emotion/core": "^10.0.10", + "@emotion/styled": "^10.0.12", + "emotion-theming": "^10.0.10", + "linkifyjs": "^2.1.6", + "react-inspector": "^5.1.0" + }, + "dependencies": { + "linkifyjs": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.9.tgz", + "integrity": "sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==", + "requires": {} + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -42102,18 +42125,6 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, - "console-feed": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/console-feed/-/console-feed-3.3.0.tgz", - "integrity": "sha512-GS0EtpiLyAZGEYBtTih+uI3s3NDmOsfkgpNGhr7UWeM5BzDT+dKgit2nEMFwDb2w7NaT95774/cwAztA1BxrHQ==", - "requires": { - "@emotion/core": "^10.0.10", - "@emotion/styled": "^10.0.12", - "emotion-theming": "^10.0.10", - "linkifyjs": "^2.1.6", - "react-inspector": "^5.1.0" - } - }, "consolidate": { "version": "0.15.1", "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", @@ -46521,9 +46532,9 @@ "dev": true }, "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", + "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==" }, "is-plain-obj": { "version": "2.1.0", @@ -46613,7 +46624,7 @@ "is-window": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz", - "integrity": "sha1-LIlspT25feRdPDMTOmXYyfVjSA0=" + "integrity": "sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==" }, "isarray": { "version": "1.0.0", @@ -50485,10 +50496,10 @@ "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==" }, "jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==", - "optional": true + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==", + "peer": true }, "js-base64": { "version": "2.6.4", @@ -50984,16 +50995,6 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "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" - } - }, "lint-staged": { "version": "10.5.4", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz", diff --git a/package.json b/package.json index 4ee252c68c..a8cabc350c 100644 --- a/package.json +++ b/package.json @@ -148,6 +148,7 @@ "@babel/core": "^7.14.6", "@babel/register": "^7.14.5", "@emmetio/codemirror-plugin": "^1.2.4", + "@nicksrandall/console-feed": "^3.5.0", "@redux-devtools/core": "^3.11.0", "@redux-devtools/dock-monitor": "^2.1.0", "@redux-devtools/log-monitor": "^3.1.0", @@ -163,7 +164,6 @@ "codemirror": "^5.62.0", "codemirror-colorpicker": "^1.9.72", "connect-mongo": "^1.3.2", - "console-feed": "^3.2.0", "cookie-parser": "^1.4.5", "copy-webpack-plugin": "^10.2.4", "cors": "^2.8.5", From ce4479046a96ae54329bc338c7ea70770b5fc9a2 Mon Sep 17 00:00:00 2001 From: raclim <43053081+raclim@users.noreply.github.com> Date: Tue, 11 Jul 2023 11:15:44 -0400 Subject: [PATCH 2/2] update imports to point to the mirror --- client/modules/IDE/components/Console.jsx | 2 +- client/modules/IDE/components/ConsoleInput.jsx | 2 +- client/modules/IDE/hooks/useHandleMessageEvent.js | 2 +- client/utils/previewEntry.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx index f4f8f32396..81455bd22e 100644 --- a/client/modules/IDE/components/Console.jsx +++ b/client/modules/IDE/components/Console.jsx @@ -5,7 +5,7 @@ import { bindActionCreators } from 'redux'; import { useSelector, useDispatch } from 'react-redux'; import classNames from 'classnames'; -import { Console as ConsoleFeed } from 'console-feed'; +import { Console as ConsoleFeed } from '@nicksrandall/console-feed'; import warnLightUrl from '../../../images/console-warn-light.svg?byUrl'; import warnDarkUrl from '../../../images/console-warn-dark.svg?byUrl'; import warnContrastUrl from '../../../images/console-warn-contrast.svg?byUrl'; diff --git a/client/modules/IDE/components/ConsoleInput.jsx b/client/modules/IDE/components/ConsoleInput.jsx index 759ccdd10d..dd01acd0bd 100644 --- a/client/modules/IDE/components/ConsoleInput.jsx +++ b/client/modules/IDE/components/ConsoleInput.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import CodeMirror from 'codemirror'; -import { Encode } from 'console-feed'; +import { Encode } from '@nicksrandall/console-feed'; import RightArrowIcon from '../../../images/right-arrow.svg'; import { dispatchMessage, MessageTypes } from '../../../utils/dispatcher'; diff --git a/client/modules/IDE/hooks/useHandleMessageEvent.js b/client/modules/IDE/hooks/useHandleMessageEvent.js index 68852c6c19..22685b9239 100644 --- a/client/modules/IDE/hooks/useHandleMessageEvent.js +++ b/client/modules/IDE/hooks/useHandleMessageEvent.js @@ -1,5 +1,5 @@ import { useDispatch } from 'react-redux'; -import { Decode } from 'console-feed'; +import { Decode } from '@nicksrandall/console-feed'; import { dispatchConsoleEvent } from '../actions/console'; import { stopSketch, expandConsole } from '../actions/ide'; diff --git a/client/utils/previewEntry.js b/client/utils/previewEntry.js index 2dfa2a239b..c40590a6a3 100644 --- a/client/utils/previewEntry.js +++ b/client/utils/previewEntry.js @@ -1,5 +1,5 @@ import loopProtect from 'loop-protect'; -import { Hook, Decode, Encode } from 'console-feed'; +import { Hook, Decode, Encode } from '@nicksrandall/console-feed'; import StackTrace from 'stacktrace-js'; import evaluateExpression from './evaluateExpression';