reduxjs/redux-devtools
1
1
Fork 0
mirror of https://github.com/reduxjs/redux-devtools.git synced 2025-06-15 02:23:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(trace): restore usage of @babel/code-frames (#813)

Browse Source 
* Restore usage of @babel/code-frame

* Use resolutions
This commit is contained in:
Nathan Bierema 2021-08-29 18:32:44 +00:00 committed by GitHub
parent 451e1adfd0
commit b32b08552e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -71,5 +71,8 @@
"packages/redux-devtools/examples/counter", "packages/redux-devtools/examples/counter",
"packages/redux-devtools/examples/todomvc", "packages/redux-devtools/examples/todomvc",
"packages/redux-devtools-slider-monitor/examples/todomvc" "packages/redux-devtools-slider-monitor/examples/todomvc"
] ],
"resolutions": {
"@babel/highlight/chalk": "Methuselah96/chalk#head=v2-without-process"
}
} }

39
packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/containers/StackFrameCodeBlock.tsx
View File

@ -12,7 +12,7 @@ import { absolutifyCaret } from '../utils/dom/absolutifyCaret';
import { ScriptLine } from '../utils/stack-frame'; import { ScriptLine } from '../utils/stack-frame';
import generateAnsiHTML from '../utils/generateAnsiHTML'; import generateAnsiHTML from '../utils/generateAnsiHTML';
// import { codeFrameColumns } from '@babel/code-frame'; import { codeFrameColumns } from '@babel/code-frame';
import { nicinabox as theme } from 'redux-devtools-themes'; import { nicinabox as theme } from 'redux-devtools-themes';
interface StackFrameCodeBlockPropsType { interface StackFrameCodeBlockPropsType {
@ -48,25 +48,24 @@ function StackFrameCodeBlock(props: StackFrameCodeBlockPropsType) {
} }
sourceCode[line - 1] = text; sourceCode[line - 1] = text;
}); });
// const ansiHighlight = codeFrameColumns( const ansiHighlight = codeFrameColumns(
// sourceCode.join('\n'), sourceCode.join('\n'),
// { {
// start: { start: {
// line: lineNum, line: lineNum,
// column: column:
// columnNum == null columnNum == null
// ? 0 ? 0
// : columnNum - (isFinite(whiteSpace) ? whiteSpace : 0), : columnNum - (isFinite(whiteSpace) ? whiteSpace : 0),
// }, },
// }, },
// { {
// forceColor: true, forceColor: true,
// linesAbove: contextSize, linesAbove: contextSize,
// linesBelow: contextSize, linesBelow: contextSize,
// } }
// ); );
// const htmlHighlight = generateAnsiHTML(ansiHighlight); const htmlHighlight = generateAnsiHTML(ansiHighlight);
const htmlHighlight = generateAnsiHTML(sourceCode.join('\n'));
const code = document.createElement('code'); const code = document.createElement('code');
code.innerHTML = htmlHighlight; code.innerHTML = htmlHighlight;
absolutifyCaret(code); absolutifyCaret(code);

11
yarn.lock
View File

@ -11008,6 +11008,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"chalk@Methuselah96/chalk#head=v2-without-process":
version: 2.4.2
resolution: "chalk@https://github.com/Methuselah96/chalk.git#commit=3dd077ca367b80efec4b522cc300d68b4974499e"
dependencies:
ansi-styles: ^3.2.1
escape-string-regexp: ^1.0.5
supports-color: ^5.3.0
checksum: dbe195f24bc04b95494b966dd357d9389c57092b548138f9d49b8e7d4a3c9d6f81e181fb52afbebf12ab8abec7e2ae04cd409c83cdcc275bc1f72bb82f4c954c
languageName: node
linkType: hard
"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": "chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
version: 2.4.2 version: 2.4.2
resolution: "chalk@npm:2.4.2" resolution: "chalk@npm:2.4.2"