Skip to content

Commit bde6efd

Browse files
authored
fix(deps): Bump React Ace to v12, fix broken syntax highlighting (#2905)
* Bump react-ace and ace-builds * Remove some unneeded imports * Bump ace dependencies * Bump react-ace to v12 * Bump ace-builds version * Deduplicate dependencies * Fix syntax highlighting
1 parent c7bdcb3 commit bde6efd

File tree

4 files changed

+44
-193
lines changed

4 files changed

+44
-193
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@szhsin/react-menu": "^4.0.0",
4141
"@tanstack/react-table": "^8.9.3",
4242
"@tremor/react": "^1.8.2",
43-
"ace-builds": "^1.4.14",
43+
"ace-builds": "^1.36.3",
4444
"acorn": "^8.9.0",
4545
"ag-grid-community": "^32.0.2",
4646
"ag-grid-react": "^32.0.2",
@@ -68,7 +68,7 @@
6868
"query-string": "^9.0.0",
6969
"re-resizable": "^6.9.9",
7070
"react": "^18.3.1",
71-
"react-ace": "^10.1.0",
71+
"react-ace": "^12.0.0",
7272
"react-copy-to-clipboard": "^5.1.0",
7373
"react-debounce-render": "^8.0.2",
7474
"react-dom": "^18.3.1",

src/commons/utils/AceHelper.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ export const selectMode = (chapter: Chapter, variant: Variant, library: string)
3131
ModeSelector(chapter, variant, library);
3232
};
3333

34+
import 'ace-builds/src-noconflict/mode-c_cpp';
35+
import 'ace-builds/src-noconflict/mode-html';
36+
import 'ace-builds/src-noconflict/mode-java';
37+
import 'ace-builds/src-noconflict/mode-javascript';
38+
import 'ace-builds/src-noconflict/mode-python';
39+
import 'ace-builds/src-noconflict/mode-scheme';
40+
import 'ace-builds/src-noconflict/mode-typescript';
41+
import 'js-slang/dist/editors/ace/theme/source';
42+
3443
export const getModeString = (chapter: Chapter, variant: Variant, library: string) => {
3544
// TODO: Create our own highlighting rules for the different sublanguages
3645
switch (chapter) {

src/pages/academy/gameSimulator/subcomponents/chapterSimulator/ChapterSimulatorTextLoader.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'ace-builds/webpack-resolver';
2-
31
import { Button, Classes, Tab, Tabs } from '@blueprintjs/core';
42
import { useState } from 'react';
53
import { toTxtPath } from 'src/features/game/assets/TextAssets';

0 commit comments

Comments
 (0)