Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions devserver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"commander": "^14.0.0",
"js-slang": "^1.0.85",
"re-resizable": "^6.9.11",
"react": "^18.3.1",
"react": "^19.0.0",
"react-ace": "^14.0.0",
"react-dom": "^18.3.1",
"react-dom": "^19.0.0",
"vite": "^8.0.5",
"vite-plugin-node-polyfills": "^0.26.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitest/browser-playwright": "4.1.0",
"eslint": "^9.35.0",
"playwright": "^1.55.1",
Comment thread
RichDom2185 marked this conversation as resolved.
Expand Down
8 changes: 4 additions & 4 deletions devserver/src/components/controlBar/ControlBar.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Classes } from '@blueprintjs/core';
import classNames from 'classnames';
import React, { type JSX } from 'react';
import React from 'react';

export type ControlBarProps = {
editorButtons: Array<JSX.Element | null>;
flowButtons?: Array<JSX.Element | null>;
editingWorkspaceButtons?: Array<JSX.Element | null>;
editorButtons: Array<React.ReactElement | null>;
flowButtons?: Array<React.ReactElement | null>;
editingWorkspaceButtons?: Array<React.ReactElement | null>;
};

const ControlBar: React.FC<ControlBarProps> = (props) => {
Expand Down
3 changes: 1 addition & 2 deletions devserver/src/components/repl/Repl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const Output: React.FC<OutputProps> = (props: OutputProps) => {
};

export type ReplProps = {
// replButtons: Array<JSX.Element | null>;
output: InterpreterOutput | null;
hidden?: boolean;
inputHidden?: boolean;
Expand All @@ -80,7 +79,7 @@ const Repl: React.FC<ReplProps> = (props: ReplProps) => (
<div className="repl-output-parent">
{props.output === null
? <Card />
: <Output output={props.output}/>}
: <Output output={props.output} />}
{/* {cards.length > 0 ? cards : (<Card />)} */}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion devserver/src/components/sideContent/SideContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const renderTab = (
return <Tab key={tab.id} {...tabProps} />;
}

const tabPanel: React.JSX.Element = <div className="side-content-text">{tab.body}</div>;
const tabPanel: React.ReactElement = <div className="side-content-text">{tab.body}</div>;

return <Tab key={tab.id} {...tabProps} panel={tabPanel} />;
};
Expand Down
4 changes: 2 additions & 2 deletions devserver/src/components/sideContent/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ export type SideContentTab = {
id: string;
label: string;
iconName: IconName;
body: React.JSX.Element;
body: React.ReactElement;
};

export type ModuleSideContent = {
label: string;
iconName: IconName;
toSpawn?: (context: DebuggerContext) => boolean;
body: (context: DebuggerContext) => React.JSX.Element;
body: (context: DebuggerContext) => React.ReactElement;
};

export type RawTab = (provider: ReturnType<typeof requireProvider>, react: typeof React) => Promise<{ default: ModuleSideContent }>;
2 changes: 1 addition & 1 deletion devserver/src/components/utils/Hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { type RefObject } from 'react';

export const useDimensions = (ref: RefObject<HTMLElement>): [width: number, height: number] => {
export const useDimensions = (ref: RefObject<HTMLElement | null>): [width: number, height: number] => {
const [width, setWidth] = React.useState<number>(0);
const [height, setHeight] = React.useState<number>(0);

Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/2-bundle/3-editing.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This adds the dependency to `devDependencies` instead.
> specified in the root repository `package.json`:
>
> ```sh
> yarn add react@^18.3.1
> yarn add react@^19.0.0
> ```
>
> You can also use the command `yarn constraints` to check if you have incorrectly specified the version of a dependency. You can view all
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/3-tabs/1-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The Frontend expects each tab's entry point to provide a default export of an ob
```ts
interface ModuleSideContent {
toSpawn: ((context: DebuggerContext) => boolean) | undefined;
body: (context: DebuggerContext) => JSX.Element;
body: (context: DebuggerContext) => React.ReactElement;
label: string;
iconName: string;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/3-tabs/3-editing.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This adds the dependency to `devDependencies` instead.
> specified in the root repository `package.json`:
>
> ```sh
> yarn add react@^18.3.1
> yarn add react@^19.0.0
> ```
>
> You can also use the command `yarn constraints` to check if you have incorrectly specified the version of a dependency. You can view all
Expand Down
2 changes: 1 addition & 1 deletion docs/src/repotools/5-yarn.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ As part of ensuring consistency, everything in this repository has been designed
Tabs, for example, should all be using the same versions of `react` and `react-dom`: the one in use by the frontend. If a dependency is specified in the root `package.json`, then the constraints file
requires that all child workspaces use the version of that dependency.

For example, the root package specifies `react@^18.3.1` as a dependency, so all workspaces that require React must also use that version spec.
For example, the root package specifies `react@^19.0.0` as a dependency, so all workspaces that require React must also use that version spec.

This validation is not carried out across child workspaces, however. Two different bundles could use two different versions of the same package. This should not cause an issue **unless** the bundles are somehow dependent on each other.

Expand Down
8 changes: 4 additions & 4 deletions lib/modules-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "module",
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitejs/plugin-react": "^6.0.1",
"@vitest/browser-playwright": "4.1.0",
"eslint": "^9.35.0",
Expand Down Expand Up @@ -35,8 +35,8 @@
"@blueprintjs/icons": "^6.0.0",
"es-toolkit": "^1.44.0",
"js-slang": "^1.0.85",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
Comment thread
RichDom2185 marked this conversation as resolved.
"react-dom": "^19.0.0"
Comment thread
RichDom2185 marked this conversation as resolved.
},
"scripts-info": {
Comment thread
RichDom2185 marked this conversation as resolved.
"docs": "Build the documentation for documentation server using Typedoc"
Expand Down
2 changes: 1 addition & 1 deletion lib/modules-lib/src/tabs/MultiItemDisplay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { clamp } from 'es-toolkit';
import { useState } from 'react';

export interface MultiItemDisplayProps {
elements: JSX.Element[];
elements: React.ReactElement[];
onStepChange?: (newIndex: number, oldIndex: number) => void;
};

Expand Down
2 changes: 1 addition & 1 deletion lib/modules-lib/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ export interface ModuleSideContent {
* This function will be called to render the module tab in the side contents
* on Source Academy frontend.
*/
body: (context: DebuggerContext) => JSX.Element;
body: (context: DebuggerContext) => React.ReactElement;
};
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"@sourceacademy/vitest-reporter": "workspace:^",
"@stylistic/eslint-plugin": "^5.10.0",
"@types/node": "^24.0.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitest/coverage-v8": "4.1.0",
"@vitest/eslint-plugin": "^1.6.14",
"@yarnpkg/types": "^4.0.1",
Comment thread
RichDom2185 marked this conversation as resolved.
Comment thread
RichDom2185 marked this conversation as resolved.
Comment thread
RichDom2185 marked this conversation as resolved.
Comment thread
RichDom2185 marked this conversation as resolved.
Expand All @@ -77,8 +77,8 @@
"husky": "^9.1.7",
"jsdom": "^29.0.0",
"jsonc-eslint-parser": "^3.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"typescript": "^6.0.2",
"typescript-eslint": "^8.58.0",
"vitest": "4.1.0",
Expand All @@ -89,8 +89,8 @@
"@blueprintjs/icons": "^6.0.0",
"es-toolkit": "^1.44.0",
"js-slang": "^1.0.85",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devEngines": {
"packageManager": {
Expand Down
8 changes: 4 additions & 4 deletions src/archive/bundles/ar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
},
"dependencies": {
"os": "^0.1.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"saar": "^1.0.4",
"uniqid": "^5.4.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "^5.8.2"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/archive/tabs/AugmentedReality/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"@blueprintjs/icons": "^6.0.0",
"@sourceacademy/bundle-ar": "workspace:^",
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"saar": "^1.0.4"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1"
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0"
},
"scripts": {
"build": "buildtools build tab .",
Comment thread
RichDom2185 marked this conversation as resolved.
Comment thread
RichDom2185 marked this conversation as resolved.
Expand Down
6 changes: 3 additions & 3 deletions src/bundles/pix_n_flix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"private": true,
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react": "^19.0.0",
"@vitest/browser-playwright": "4.1.0",
"playwright": "^1.55.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"typescript": "^6.0.2",
"vitest": "4.1.0",
"vitest-browser-react": "^2.1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/bundles/unity_academy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"dependencies": {
"@blueprintjs/core": "^6.0.0",
"@blueprintjs/icons": "^6.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "^6.0.2"
},
"type": "module",
Expand Down
8 changes: 4 additions & 4 deletions src/tabs/ArcadeTwod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@blueprintjs/icons": "^6.0.0",
"@sourceacademy/modules-lib": "workspace:^",
"phaser": "^3.54.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "^6.0.2"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/tabs/CopyGc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"@blueprintjs/core": "^6.0.0",
"@sourceacademy/bundle-copy_gc": "workspace:^",
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "^6.0.2"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/tabs/Csg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@blueprintjs/icons": "^6.0.0",
"@sourceacademy/bundle-csg": "workspace:^",
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"typescript": "^6.0.2"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/tabs/Csg/src/canvas_holder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class CanvasHolder extends React.Component<
CanvasHolderProps,
CanvasHolderState
> {
private readonly canvasReference: React.RefObject<HTMLCanvasElement> = React.createRef();
private readonly canvasReference: React.RefObject<HTMLCanvasElement | null> = React.createRef();

private statefulRenderer: StatefulRenderer | null = null;

Expand Down
8 changes: 4 additions & 4 deletions src/tabs/Curve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@blueprintjs/icons": "^6.0.0",
"@sourceacademy/bundle-curve": "workspace:^",
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@vitest/browser-playwright": "4.1.0",
"@vitest/coverage-v8": "4.1.0",
"playwright": "^1.55.1",
Expand Down
6 changes: 3 additions & 3 deletions src/tabs/Game/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"private": true,
"dependencies": {
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react": "^19.0.0",
"typescript": "^6.0.2"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/tabs/MarkSweep/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"dependencies": {
"@blueprintjs/core": "^6.0.0",
"@sourceacademy/modules-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/react": "^18.3.1",
"@types/react": "^19.0.0",
"typescript": "^6.0.2"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/tabs/Nbody/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"@sourceacademy/modules-lib": "workspace:^",
"nbody": "^0.2.0",
"plotly.js-dist": "^2.17.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"three": "^0.183.0"
},
"devDependencies": {
"@sourceacademy/modules-buildtools": "workspace:^",
"@types/plotly.js": "^2.35.4",
"@types/react": "^18.3.1",
"@types/react": "^19.0.0",
"@types/three": "^0.183.0",
"typescript": "^6.0.2"
},
Expand Down
Loading
Loading