Merge remote-tracking branch 'origin/develop' into UEPR-44

Author: MiroslavDionisiev

.github/workflows/signature-assistant.yml

@@ -0,0 +1,31 @@
+name: "Signature Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+permissions:
+  actions: write
+  contents: read
+  pull-requests: write
+  statuses: write
+
+jobs:
+  CLA-Assistant:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "CLA Assistant"
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # the below token should have repo scope and must be manually added by you in the repository's secrets
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.GHA_AGREEMENTS_PAT }}
+        with:
+          remote-organization-name: 'scratchfoundation'
+          remote-repository-name: 'scratch-agreements'
+          path-to-signatures: 'signatures/version1/cla.json'
+          path-to-document: 'https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md'
+          branch: 'main'
+          allowlist: semantic-release-bot,*[bot]

LICENSE

@@ -3,7 +3,7 @@
   "private": "true",
   "description": "Scratch editor mono-repository",
   "author": "Scratch Foundation",
-  "license": "BSD-3-Clause",
+  "license": "AGPL-3.0-only",
   "homepage": "https://github.com/scratchfoundation/scratch-editor#readme",
   "repository": {
     "type": "git",

package-lock.json

@@ -3,7 +3,7 @@
   "version": "4.0.15",
   "description": "Graphical User Interface for creating and running Scratch 3.0 projects",
   "author": "Massachusetts Institute of Technology",
-  "license": "BSD-3-Clause",
+  "license": "AGPL-3.0-only",
   "homepage": "https://github.com/scratchfoundation/scratch-gui#readme",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     }
   },
   "scripts": {
-    "build": "npm run clean && webpack",
+    "build": "npm run clean && BUILD_TYPE=dev webpack && BUILD_TYPE=dist webpack && BUILD_TYPE=dist-standalone webpack",
     "clean": "rimraf ./build ./dist",
     "deploy": "touch build/.nojekyll && gh-pages -t -d build -m \"[skip ci] Build for $(git log --pretty=format:%H -n1)\"",
     "prepare": "node scripts/prepare.mjs",
@@ -93,7 +93,7 @@
     "scratch-l10n": "^3.18.3",
     "scratch-paint": "^2.2.151",
     "scratch-render-fonts": "^1.0.2",
-    "scratch-storage": "^2.3.1",
+    "scratch-storage": "^3.0.1",
     "startaudiocontext": "^1.2.1",
     "style-loader": "4.0.0",
     "text-encoding": "^0.7.0",
@@ -104,8 +104,8 @@
   "peerDependencies": {
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "redux": "^3.7.2",
-    "react-redux": "^5.0.7"
+    "react-redux": "^5.0.7",
+    "redux": "^3.7.2"
   },
   "devDependencies": {
     "@babel/cli": "7.24.8",
@@ -116,9 +116,10 @@
     "@babel/plugin-transform-async-to-generator": "7.24.7",
     "@babel/preset-env": "7.25.4",
     "@babel/preset-react": "7.24.7",
+    "@types/prop-types": "^15.7.13",
+    "@types/react-modal": "^3.9.1",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
-    "@types/react-modal": "^3.9.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-loader": "9.1.3",
     "cheerio": "1.0.0-rc.3",
@@ -147,6 +148,7 @@
     "selenium-webdriver": "3.6.0",
     "semantic-release": "19.0.5",
     "stream-browserify": "3.0.0",
+    "ts-jest": "^21.2.4",
     "ts-loader": "9.5.1",
     "url-loader": "4.1.1",
     "web-audio-test-api": "0.5.2",
@@ -156,6 +158,12 @@
     "yauzl": "2.10.0"
   },
   "jest": {
+    "globals": {
+      "ts-jest": {
+        "isolatedModules": true,
+        "tsconfig": "<rootDir>/tsconfig.test.json"
+      }
+    },
     "setupFiles": [
       "raf/polyfill",
       "<rootDir>/test/helpers/enzyme-setup.js"
@@ -176,6 +184,11 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)\\??$": "<rootDir>/test/__mocks__/fileMock.js",
       "\\.(css|less)$": "<rootDir>/test/__mocks__/styleMock.js",
       "editor-msgs(\\.js)?$": "<rootDir>/test/__mocks__/editor-msgs-mock.js"
+    },
+    "moduleFileExtensions": ["ts", "js", "tsx", "jsx"],
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest",
+      "^.+\\.jsx?$": "babel-jest"
     }
   }
 }

package.json

@@ -7,7 +7,6 @@
 import fs from 'fs';
 import path from 'path';
 
-import crossFetch from 'cross-fetch';
 import yauzl from 'yauzl';
 import {fileURLToPath} from 'url';
 
@@ -79,7 +78,7 @@ const extractFirstMatchingFile = (filter, relativeDestDir, zipBuffer) => new Pro
 const downloadMicrobitHex = async () => {
     const url = 'https://downloads.scratch.mit.edu/microbit/scratch-microbit.hex.zip';
     console.info(`Downloading ${url}`);
-    const response = await crossFetch(url);
+    const response = await fetch(url);
     const zipBuffer = Buffer.from(await response.arrayBuffer());
     const relativeHexDir = path.join('static', 'microbit');
     const hexFileName = await extractFirstMatchingFile(

packages/scratch-gui/package.json

@@ -0,0 +1,149 @@
+@import "../../css/colors.css";
+
+.modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: 'transparent';
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 510;
+}
+  
+.modal-container {
+    background: white;
+    border-radius: 8px;
+    width: 1000px;
+    max-height: 90%;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    overflow-x: visible;
+    box-shadow: 0 4px 4px 0 $ui-black-transparent-10;
+}
+
+.modal-header {
+    display: flex;
+    border-radius: 8px 8px 0 0;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px;
+    background-color: $ui-green;
+}
+
+.header-title {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    font-size: 1rem;
+    line-height: 1.25rem;
+    font-weight: 700;
+    color: white; 
+}
+.debug-icon {
+    height: 22px;
+    width: 22px;
+}
+
+.hidden {
+    display: none;
+}
+  
+.close-button {
+    display: flex;
+    background: none;
+    border: none;
+    cursor: pointer;
+    width: 32px;
+    height: 32px;
+}
+
+.modal-content {
+    display: flex;
+    width: 100%;
+    flex-grow: 1;
+    overflow-y: scroll;
+}
+
+.previousIcon {
+    position: absolute;
+    cursor: pointer;
+    top: 50%;
+}
+
+.nextIcon {
+    position: absolute;
+    cursor: pointer;
+    right: -30px;
+    top: 50%;
+}
+
+.topic-list {
+    width: 30%;
+    border-right: 1px solid $ui-green;;
+}
+
+.topic-item {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    padding: 10px;
+    font-size: 1rem;
+    line-height: 1.5rem;
+    color: $ui-green;;
+    cursor: pointer;
+}
+
+.topic-item.active {
+    background-color: #D1FAEE;
+    font-weight: bold;
+}
+
+.info-container {
+    flex-direction: column;
+    width: 70%;
+    display: flex;
+    padding: 20px;
+    color: $text-primary;
+}
+
+.text-container {
+    flex: 1;
+    margin-left: 70px;
+}
+
+.title-text {
+    font-size: 24px;
+    line-height: 32px;
+    font-weight: 700;
+}
+
+.description {
+    font-size: 16px;
+    line-height: 28px;
+}
+
+.imageContainer {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 10px;
+    margin-top: 10px;
+}
+
+.topicImage {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain; /* Ensures image scales proportionally */
+}
+
+.navigation-buttons {
+    margin-top: 20px;
+}
+
+button {
+    margin: 5px;
+}