Skip to content

fix(deps): Bump React Ace to v12, fix broken syntax highlighting #2905

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.

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 20 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
932bc60
Bump react-ace and ace-builds
RichDom2185 Apr 7, 2024
000c5da
Remove some unneeded imports
RichDom2185 Apr 7, 2024
394b4cb
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Apr 9, 2024
0e2eaa3
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Apr 10, 2024
f219dfa
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Apr 10, 2024
54d55cd
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Apr 13, 2024
48eb548
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Apr 13, 2024
7b91c20
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Apr 15, 2024
1d87b52
Bump ace dependencies
RichDom2185 Apr 15, 2024
2c0edd2
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Apr 21, 2024
75ab161
Merge branch 'master' into bump-deps-react-ace
chownces May 3, 2024
36a6021
Merge branch 'master' into bump-deps-react-ace
RichDom2185 May 3, 2024
52ecb08
Merge branch 'master' into bump-deps-react-ace
RichDom2185 May 6, 2024
f5b3fe0
Merge branch 'master' into bump-deps-react-ace
RichDom2185 May 6, 2024
03357c9
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Aug 17, 2024
9b79b97
Bump react-ace to v12
RichDom2185 Aug 17, 2024
642d064
Merge branch 'master' into bump-deps-react-ace
RichDom2185 Oct 28, 2024
16f4eef
Bump ace-builds version
RichDom2185 Oct 28, 2024
520ebfb
Deduplicate dependencies
RichDom2185 Oct 28, 2024
41ce699
Fix syntax highlighting
RichDom2185 Oct 28, 2024
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@szhsin/react-menu": "^4.0.0",
"@tanstack/react-table": "^8.9.3",
"@tremor/react": "^1.8.2",
"ace-builds": "^1.4.14",
"ace-builds": "^1.36.3",
"acorn": "^8.9.0",
"ag-grid-community": "^32.0.2",
"ag-grid-react": "^32.0.2",
Expand Down Expand Up @@ -68,7 +68,7 @@
"query-string": "^9.0.0",
"re-resizable": "^6.9.9",
"react": "^18.3.1",
"react-ace": "^10.1.0",
"react-ace": "^12.0.0",
"react-copy-to-clipboard": "^5.1.0",
"react-debounce-render": "^8.0.2",
"react-dom": "^18.3.1",
Expand Down
9 changes: 9 additions & 0 deletions src/commons/utils/AceHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ export const selectMode = (chapter: Chapter, variant: Variant, library: string)
ModeSelector(chapter, variant, library);
};

import 'ace-builds/src-noconflict/mode-c_cpp';
import 'ace-builds/src-noconflict/mode-html';
import 'ace-builds/src-noconflict/mode-java';
import 'ace-builds/src-noconflict/mode-javascript';
import 'ace-builds/src-noconflict/mode-python';
import 'ace-builds/src-noconflict/mode-scheme';
import 'ace-builds/src-noconflict/mode-typescript';
import 'js-slang/dist/editors/ace/theme/source';

export const getModeString = (chapter: Chapter, variant: Variant, library: string) => {
// TODO: Create our own highlighting rules for the different sublanguages
switch (chapter) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'ace-builds/webpack-resolver';

import { Button, Classes, Tab, Tabs } from '@blueprintjs/core';
import { useState } from 'react';
import { toTxtPath } from 'src/features/game/assets/TextAssets';
Expand Down
Loading
Loading