Skip to content

Commit 1d2979f

Browse files
authored
Merge branch 'master' into copilot/fix-3294
2 parents 846677b + 9101d2e commit 1d2979f

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"@types/redux-mock-store": "^1.0.3",
146146
"@types/showdown": "^2.0.1",
147147
"@types/xml2js": "^0.4.11",
148-
"@vitejs/plugin-react-swc": "^3.11.0",
148+
"@vitejs/plugin-react-swc": "^4.0.0",
149149
"@vitest/coverage-v8": "3.2.4",
150150
"@vitest/ui": "^3.2.4",
151151
"buffer": "^6.0.3",

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
239239
*/
240240
useEffect(() => {
241241
checkWorkspaceReset();
242-
if (assessment != undefined && question.type == 'voting') {
243-
dispatch(LeaderboardActions.setWorkspaceInitialRun(votingId));
244-
}
245-
}, [dispatch, assessment]);
242+
});
246243

247244
/**
248245
* Handles toggling enabling and disabling token counter depending on assessment properties
@@ -386,6 +383,8 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
386383
options.programPrependValue = votingQuestionData.prepend;
387384
if (props.fromContestLeaderboard) options.editorValue = code;
388385
options.programPostpendValue = votingQuestionData.postpend;
386+
// maybe the following dispatch can be placed in a better location
387+
dispatch(LeaderboardActions.setWorkspaceInitialRun(votingId));
389388
break;
390389
case QuestionTypes.mcq:
391390
// Do nothing

src/pages/contributors/subcomponents/ContributorsGithubApi.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ import {
44
ReposInApi
55
} from '../../../features/contributors/ContributorsTypes';
66

7-
const apiRepoDetails: string = 'https://api.github.com/orgs/source-academy/repos';
7+
const apiRepoDetails: string = 'https://api.github.com/orgs/source-academy/repos?per_page=59';
88
const ignoreRepos: string[] = ['assessments', 'tools', 'source-academy2'];
9-
const ignoreContributors: string[] = ['dependabot[bot]', 'dependabot-preview[bot]'];
9+
const ignoreContributors: string[] = [
10+
'dependabot[bot]',
11+
'dependabot-preview[bot]',
12+
'renovate[bot]'
13+
];
1014

1115
export const fetchRepos = async () => {
1216
const response = await fetch(apiRepoDetails);

yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,10 +2678,10 @@ __metadata:
26782678
languageName: node
26792679
linkType: hard
26802680

2681-
"@rolldown/pluginutils@npm:1.0.0-beta.27":
2682-
version: 1.0.0-beta.27
2683-
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.27"
2684-
checksum: 10c0/9658f235b345201d4f6bfb1f32da9754ca164f892d1cb68154fe5f53c1df42bd675ecd409836dff46884a7847d6c00bdc38af870f7c81e05bba5c2645eb4ab9c
2681+
"@rolldown/pluginutils@npm:1.0.0-beta.30":
2682+
version: 1.0.0-beta.30
2683+
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.30"
2684+
checksum: 10c0/aff8b532cb9d82d94c9a4101fa12ecb10620ad47d52dbb9135a5c65bde1ad19895b41026b821f4d607083699239a5d0010198401b6a6a54ab6a10d0015302768
26852685
languageName: node
26862686
linkType: hard
26872687

@@ -3512,7 +3512,7 @@ __metadata:
35123512
languageName: node
35133513
linkType: hard
35143514

3515-
"@swc/core@npm:^1.11.22, @swc/core@npm:^1.12.11":
3515+
"@swc/core@npm:^1.11.22, @swc/core@npm:^1.13.2":
35163516
version: 1.13.3
35173517
resolution: "@swc/core@npm:1.13.3"
35183518
dependencies:
@@ -4368,15 +4368,15 @@ __metadata:
43684368
languageName: node
43694369
linkType: hard
43704370

4371-
"@vitejs/plugin-react-swc@npm:^3.11.0":
4372-
version: 3.11.0
4373-
resolution: "@vitejs/plugin-react-swc@npm:3.11.0"
4371+
"@vitejs/plugin-react-swc@npm:^4.0.0":
4372+
version: 4.0.0
4373+
resolution: "@vitejs/plugin-react-swc@npm:4.0.0"
43744374
dependencies:
4375-
"@rolldown/pluginutils": "npm:1.0.0-beta.27"
4376-
"@swc/core": "npm:^1.12.11"
4375+
"@rolldown/pluginutils": "npm:1.0.0-beta.30"
4376+
"@swc/core": "npm:^1.13.2"
43774377
peerDependencies:
43784378
vite: ^4 || ^5 || ^6 || ^7
4379-
checksum: 10c0/0d12ee81f8c8acb74b35e7acfc45d23ecc2714ab3a0f6060e4bd900a6a739dd5a9be9c6bc842388f3c406f475f2a83e7ff3ade04ec6df9172faa1242e4faa424
4379+
checksum: 10c0/f9253956669dad67c028051a01767960b62e5ca234c20ba1ebf1fc453923c07ee730eda0fffa754b6b83fa96fd21eb2f087ad77f686252d9470fb96982e7c1b2
43804380
languageName: node
43814381
linkType: hard
43824382

@@ -7585,7 +7585,7 @@ __metadata:
75857585
"@types/redux-mock-store": "npm:^1.0.3"
75867586
"@types/showdown": "npm:^2.0.1"
75877587
"@types/xml2js": "npm:^0.4.11"
7588-
"@vitejs/plugin-react-swc": "npm:^3.11.0"
7588+
"@vitejs/plugin-react-swc": "npm:^4.0.0"
75897589
"@vitest/coverage-v8": "npm:3.2.4"
75907590
"@vitest/ui": "npm:^3.2.4"
75917591
ace-builds: "npm:^1.42.1"

0 commit comments

Comments
 (0)