Skip to content

build: update design system to v2.6.2 #1261

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

build: update design system to v2.6.2 #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4b9672a
build: update design system react to 1.7.0
maxelkins Oct 17, 2025
63dbd43
build: update design system react to 2.0.0
maxelkins Oct 17, 2025
b7d593a
build: update design system react to 2.1.0
maxelkins Oct 17, 2025
e4a59b9
build: update design system react to 2.2.0
maxelkins Oct 17, 2025
652d022
build: update design system react to 2.3.0
maxelkins Oct 17, 2025
8817520
build: update design system react to 2.4.2
maxelkins Oct 17, 2025
96507ef
build: update design system react to 2.5.0
maxelkins Oct 17, 2025
0da9ed7
build: update design system react to 2.6.2
maxelkins Oct 17, 2025
6c8987c
fix: add material symbols font to web component page
maxelkins Oct 17, 2025
67dd1e9
docs: update changelog
maxelkins Oct 29, 2025
12a87c5
refactor: change order of style imports
maxelkins Oct 29, 2025
4d3a31d
Merge branch 'main' into update-design-system
maxelkins Oct 29, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Changed

- Changed the horizontal scrollbar to show without needing to scroll to the bottom of the editor window (#1257)
- Updated Design System react to v2.6.2 (#1261)

## Added

- Material symbols font to web component preview page since the Design System depends on this (#1261)

### Fixed

Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"@hello-pangea/dnd": "^16.2.0",
"@juggle/resize-observer": "^3.3.1",
"@lezer/highlight": "^1.0.0",
"@raspberrypifoundation/design-system-core": "^1.6.0",
"@raspberrypifoundation/design-system-react": "^1.6.0",
"@raspberrypifoundation/design-system-react": "2.6.2",
"@react-three/drei": "9.114.3",
"@react-three/fiber": "^8.0.13",
"@reduxjs/toolkit": "^1.6.2",
Expand Down
3 changes: 1 addition & 2 deletions src/assets/stylesheets/ExternalStyles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@forward "@raspberrypifoundation/design-system-react/scss/design-system-core";
@use "../../../node_modules/react-tabs/style/react-tabs.css";
@use "../../../node_modules/react-toggle/style.css";
@use "../../../node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css";
@use "../../../node_modules/prismjs/plugins/line-highlight/prism-line-highlight.css";
@use "../../../node_modules/@raspberrypifoundation/design-system-core/scss/components/alert.scss";
@use "../../../node_modules/@raspberrypifoundation/design-system-core/scss/design-system-core.scss";
@use "../../../node_modules/material-symbols/sharp.scss";
@use "../../../node_modules/plotly.js/src/css/style.scss" as plotlyStyle;
5 changes: 5 additions & 0 deletions src/utils/setupTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import "@testing-library/jest-dom";
import "jest-canvas-mock";
import PyodideWorker from "../components/Editor/Runners/PythonRunner/PyodideRunner/PyodideWorker.mock.js";

// Polyfill TextEncoder/TextDecoder for Jest environment
// Required by @raspberrypifoundation/design-system-react components
import { TextEncoder, TextDecoder } from "util";
Object.assign(global, { TextDecoder, TextEncoder });

/* global globalThis */
globalThis.IS_REACT_ACT_ENVIRONMENT = true;

Expand Down
8 changes: 6 additions & 2 deletions src/web-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<title>Editor Web component</title>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Sharp:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
/>
</head>
<body>
<p id="results"></p>
Expand All @@ -52,7 +56,7 @@
"download",
"settings",
"info",
]),
])
);

// Pre-set the code attribute with an empty string.
Expand Down Expand Up @@ -89,7 +93,7 @@
runButton.appendChild(runButtonText);
runButton.onclick = (event) => {
webComp.rerunCode();
}
};
body.append(runButton);
});
</script>
Expand Down
73 changes: 16 additions & 57 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2916,28 +2916,26 @@ __metadata:
languageName: node
linkType: hard

"@raspberrypifoundation/design-system-core@npm:^1.6.0":
version: 1.6.0
resolution: "@raspberrypifoundation/design-system-core@npm:1.6.0"
"@raspberrypifoundation/design-system-core@npm:^2.4.0":
version: 2.4.0
resolution: "@raspberrypifoundation/design-system-core@npm:2.4.0"
dependencies:
classnames: ^2.3.2
checksum: 3eda17c4068e752daf070b6cbce9630b1b51997b911a4753b73f2c3726a40ec6bfba1b751380a4ad6f51e3e2e8e9cac66a7709343a7de9c5c8b074b409742a26
checksum: 8db6b71f0675849617ad18e70a35b8faa99a3cb3d4b7dbde15a250de1ca971f09ffeb0d7e4fe6d6cf1645890d6ffe0ca795967e0371e665775de9ff27e5bc4c6
languageName: node
linkType: hard

"@raspberrypifoundation/design-system-react@npm:^1.6.0":
version: 1.6.0
resolution: "@raspberrypifoundation/design-system-react@npm:1.6.0"
"@raspberrypifoundation/design-system-react@npm:2.6.2":
version: 2.6.2
resolution: "@raspberrypifoundation/design-system-react@npm:2.6.2"
dependencies:
classnames: ^2.3.2
material-symbols: ^0.14.5
prop-types: ^15.8.1
react: ^18.2.0
react-dom: ^18.2.0
react-router-dom: ^6.24.0
"@raspberrypifoundation/design-system-core": ^2.4.0
classnames: ^2.5.1
peerDependencies:
react: ^18.3.1
react-dom: ^18.3.1
react-router-dom: ^6.24.0
checksum: 6bb6341f90d3c4fa569817813de7a1a9e69a23c12ca2cf0f20d47b9d0954771e237bda27eedba93b91a0d1d81fca32e155415ddc902947630711b38583f97ac5
checksum: a2b1bf4780ec84ce369dbd456d118d68a5cd72018709fcb19558d873b883aef2505037c8d4929c04c8064108e009a57a749d7a88fa83265472c3f554e7efdb65
languageName: node
linkType: hard

Expand All @@ -2959,8 +2957,7 @@ __metadata:
"@juggle/resize-observer": ^3.3.1
"@lezer/highlight": ^1.0.0
"@pmmmwh/react-refresh-webpack-plugin": 0.4.3
"@raspberrypifoundation/design-system-core": ^1.6.0
"@raspberrypifoundation/design-system-react": ^1.6.0
"@raspberrypifoundation/design-system-react": 2.6.2
"@react-three/drei": 9.114.3
"@react-three/fiber": ^8.0.13
"@react-three/test-renderer": 8.2.1
Expand Down Expand Up @@ -3301,13 +3298,6 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.21.0":
version: 1.21.0
resolution: "@remix-run/router@npm:1.21.0"
checksum: d9477a7772053ad0ffcf03385cfb1a54e56f8a56d1f9f5062de3b1dfcbd019dd73282a00a5a72aa55c120771110982448c165c1405d64540aaef13051a8e45cc
languageName: node
linkType: hard

"@replit/codemirror-indentation-markers@npm:^6.1.0":
version: 6.5.3
resolution: "@replit/codemirror-indentation-markers@npm:6.5.3"
Expand Down Expand Up @@ -6598,7 +6588,7 @@ __metadata:
languageName: node
linkType: hard

"classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.3.2":
"classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.3.2, classnames@npm:^2.5.1":
version: 2.5.1
resolution: "classnames@npm:2.5.1"
checksum: da424a8a6f3a96a2e87d01a432ba19315503294ac7e025f9fece656db6b6a0f7b5003bb1fbb51cbb0d9624d964f1b9bb35a51c73af9b2434c7b292c42231c1e5
Expand Down Expand Up @@ -14033,13 +14023,6 @@ __metadata:
languageName: node
linkType: hard

"material-symbols@npm:^0.14.5":
version: 0.14.7
resolution: "material-symbols@npm:0.14.7"
checksum: 191dea0145eadabd3122b891b965d8568793c3f53a540186a30b459948a8a0c00938642dcca3c4fcca483b08d7480d02722c6de10caeeeae30437306a79f64b6
languageName: node
linkType: hard

"material-symbols@npm:^0.27.0":
version: 0.27.0
resolution: "material-symbols@npm:0.27.0"
Expand Down Expand Up @@ -16987,7 +16970,7 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^18.1.0, react-dom@npm:^18.2.0":
"react-dom@npm:^18.1.0":
version: 18.3.1
resolution: "react-dom@npm:18.3.1"
dependencies:
Expand Down Expand Up @@ -17186,19 +17169,6 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.24.0":
version: 6.28.0
resolution: "react-router-dom@npm:6.28.0"
dependencies:
"@remix-run/router": 1.21.0
react-router: 6.28.0
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 0cf4658a92bc66f50ec9d8518c36aa5a402bcadce71fb624ed6f900d73a29ea87ff904a4f2c42279107e75e80cc08c6192563fadcc5d4e642e6d476e38e83b21
languageName: node
linkType: hard

"react-router-dom@npm:^6.7.0":
version: 6.27.0
resolution: "react-router-dom@npm:6.27.0"
Expand All @@ -17223,17 +17193,6 @@ __metadata:
languageName: node
linkType: hard

"react-router@npm:6.28.0":
version: 6.28.0
resolution: "react-router@npm:6.28.0"
dependencies:
"@remix-run/router": 1.21.0
peerDependencies:
react: ">=16.8"
checksum: 23246ca957b5c2bc8d6f9a81fee2df2ce4fc3feca3ec27c2fd85999568fc1299a4e8273e4ab70b6f3acd43a1fb45e0c93cb01ef77e68c9f9e1f7e4f42a1419ea
languageName: node
linkType: hard

"react-shallow-renderer@npm:^16.13.1":
version: 16.15.0
resolution: "react-shallow-renderer@npm:16.15.0"
Expand Down Expand Up @@ -17316,7 +17275,7 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^18.1.0, react@npm:^18.2.0":
"react@npm:^18.1.0":
version: 18.3.1
resolution: "react@npm:18.3.1"
dependencies:
Expand Down
Loading