Skip to content

Upgrade TS, Canvas to v3 #3115

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.

Sign up for GitHub

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 7 commits into from
Mar 31, 2025
Merged

Upgrade TS, Canvas to v3 #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7452268
Bump TS and remove canvas
RichDom2185 Mar 16, 2025
fc1d829
Fix errors post-updates
RichDom2185 Mar 16, 2025
6a3d926
Fix format
RichDom2185 Mar 16, 2025
037e3b3
Upgrade canvas to v3
RichDom2185 Mar 31, 2025
31dc1c1
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Mar 31, 2025
e6c8f20
Merge branch 'master' into richard/ts-58
sayomaki Mar 31, 2025
bc04cf7
Merge branch 'master' into richard/ts-58
RichDom2185 Mar 31, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"@types/xml2js": "^0.4.11",
"babel-jest": "^29.7.0",
"buffer": "^6.0.3",
"canvas": "^2.11.2",
"canvas": "^3.1.0",
"constants-browserify": "^1.0.0",
"coveralls": "^3.1.1",
"cross-env": "^7.0.3",
Expand All @@ -162,7 +162,7 @@
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"timers-browserify": "^2.0.12",
"typescript": "^5.5.3",
"typescript": "^5.8.2",
"typescript-eslint": "^8.1.0",
"url": "^0.11.1",
"webpack-bundle-analyzer": "^4.9.0"
Expand Down
2 changes: 1 addition & 1 deletion src/features/game/dialogue/GameDialogueGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class DialogueGenerator {
*/
public constructor(dialogueContent: DialogueObject) {
this.dialogueContent = dialogueContent;
this.currPart = dialogueContent.keys().next().value;
this.currPart = dialogueContent.keys().next().value || '';
this.currLineNum = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/styles/_achievementdashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@
color: white;
display: flex;
flex-direction: column;
height: $view-height / 3;
height: calc($view-height / 3);
justify-content: center;
margin: 1em auto;
width: $view-width;
Expand Down
Loading
Loading