Skip to content

Commit 76ee585

Browse files
committed
Merge branch 'ReplNotificationDisplayer' of github.com:jayjay19630/source-academy-frontend into ReplNotificationDisplayer
2 parents d17398b + 8cde9b1 commit 76ee585

File tree

53 files changed

+2316
-3395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2316
-3395
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"prepare": "husky"
2727
},
2828
"dependencies": {
29-
"@blueprintjs/core": "^4.20.1",
30-
"@blueprintjs/datetime": "^4.4.37",
31-
"@blueprintjs/icons": "^4.16.0",
32-
"@blueprintjs/popover2": "^1.14.11",
33-
"@blueprintjs/select": "^4.9.24",
29+
"@blueprintjs/core": "^5.7.0",
30+
"@blueprintjs/datetime2": "^2.2.7",
31+
"@blueprintjs/icons": "^5.5.0",
32+
"@blueprintjs/popover2": "^2.0.0",
33+
"@blueprintjs/select": "^5.0.0",
3434
"@octokit/rest": "^20.0.0",
3535
"@sentry/browser": "^7.57.0",
3636
"@sourceacademy/sharedb-ace": "^2.0.2",
@@ -129,10 +129,10 @@
129129
"constants-browserify": "^1.0.0",
130130
"coveralls": "^3.1.1",
131131
"cross-env": "^7.0.3",
132-
"eslint-plugin-simple-import-sort": "^10.0.0",
132+
"eslint-plugin-simple-import-sort": "^12.0.0",
133133
"https-browserify": "^1.0.0",
134134
"husky": "^9.0.0",
135-
"npm-run-all2": "^5.0.0",
135+
"npm-run-all2": "^6.0.0",
136136
"os-browserify": "^0.3.0",
137137
"path-browserify": "^1.0.1",
138138
"prettier": "~3.0.0",

src/commons/__tests__/__snapshots__/ContentDisplay.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exports[`ContentDisplay page renders correctly 1`] = `
88
className="col-md-10 col-xs-11 contentdisplay-content-parent"
99
>
1010
<div
11-
className="bp4-card bp4-elevation-3 contentdisplay-content"
11+
className="contentdisplay-content bp5-card bp5-elevation-3"
1212
>
1313
<div>
1414
Test Content

src/commons/__tests__/__snapshots__/Markdown.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Markdown page renders correctly 1`] = `
44
<div
5-
className="md bp4-running-text"
5+
className="md bp5-running-text"
66
dangerouslySetInnerHTML={
77
Object {
88
"__html": "<p>Welcome to the Source Academy playground!</p>

src/commons/application/ApplicationTypes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ export const sourceLanguages: SALanguage[] = sourceSubLanguages.map(sublang => {
242242

243243
// Enable Subst Visualizer only for default Source 1 & 2
244244
supportedFeatures.substVisualizer =
245-
chapter <= Chapter.SOURCE_2 && (variant === Variant.DEFAULT || variant === Variant.NATIVE);
245+
chapter <= Chapter.SOURCE_2 &&
246+
(variant === Variant.DEFAULT || variant === Variant.NATIVE || variant === Variant.TYPED);
246247

247248
// Enable Env Visualizer for Source Chapter 3 and above
248249
supportedFeatures.envVisualizer =

src/commons/application/__tests__/ApplicationTypes.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('available Source language configurations', () => {
2525
const expectedSourceConfigs = [
2626
// Source 1
2727
{ chapter: Chapter.SOURCE_1, variant: Variant.DEFAULT, supports: { substVisualizer: true } },
28-
{ chapter: Chapter.SOURCE_1, variant: Variant.TYPED },
28+
{ chapter: Chapter.SOURCE_1, variant: Variant.TYPED, supports: { substVisualizer: true } },
2929
{ chapter: Chapter.SOURCE_1, variant: Variant.WASM },
3030
{ chapter: Chapter.SOURCE_1, variant: Variant.LAZY },
3131
{ chapter: Chapter.SOURCE_1, variant: Variant.NATIVE, supports: { substVisualizer: true } },
@@ -35,7 +35,11 @@ describe('available Source language configurations', () => {
3535
variant: Variant.DEFAULT,
3636
supports: { dataVisualizer: true, substVisualizer: true }
3737
},
38-
{ chapter: Chapter.SOURCE_2, variant: Variant.TYPED, supports: { dataVisualizer: true } },
38+
{
39+
chapter: Chapter.SOURCE_2,
40+
variant: Variant.TYPED,
41+
supports: { dataVisualizer: true, substVisualizer: true }
42+
},
3943
{ chapter: Chapter.SOURCE_2, variant: Variant.LAZY, supports: { dataVisualizer: true } },
4044
{
4145
chapter: Chapter.SOURCE_2,

src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Array [
8888
"envVisualizer": false,
8989
"multiFile": false,
9090
"repl": true,
91-
"substVisualizer": false,
91+
"substVisualizer": true,
9292
},
9393
"variant": "typed",
9494
},
@@ -153,7 +153,7 @@ Array [
153153
"envVisualizer": false,
154154
"multiFile": true,
155155
"repl": true,
156-
"substVisualizer": false,
156+
"substVisualizer": true,
157157
},
158158
"variant": "typed",
159159
},

src/commons/application/types/SessionTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export type SessionState = {
104104
readonly enableAchievements?: boolean;
105105
readonly enableSourcecast?: boolean;
106106
readonly enableStories?: boolean;
107-
readonly sourceChapter?: number;
107+
readonly sourceChapter?: Chapter;
108108
readonly sourceVariant?: Variant;
109109
readonly moduleHelpText?: string;
110110
readonly assetsPrefix?: string;

0 commit comments

Comments
 (0)