Clipteam · SimonShiki · May 12, 2026 · May 12, 2026 · May 12, 2026 · May 12, 2026
diff --git a/packages/audio/package.json b/packages/audio/package.json
@@ -34,6 +34,7 @@
     "@babel/core": "7.29.0",
     "@babel/eslint-parser": "7.28.6",
     "@babel/preset-env": "7.29.2",
+    "@types/node": "^25.5.2",
     "babel-eslint": "10.0.3",
     "babel-loader": "^10.1.1",
     "eslint": "^9.39.2",

diff --git a/packages/audio/src/AudioEngine.js b/packages/audio/src/AudioEngine.js
@@ -140,7 +140,7 @@ class AudioEngine {
      * Decode a sound, decompressing it into audio samples.
      * @param {object} sound - an object containing audio data and metadata for
      *     a sound
-     * @param {Buffer} sound.data - sound data loaded from scratch-storage
+     * @param {{buffer: ArrayBuffer}} sound.data - sound data loaded from scratch-storage
      * @returns {?Promise} - a promise which will resolve to the sound id and
      *     buffer if decoded
      */
@@ -217,8 +217,8 @@ class AudioEngine {
      *
      * @param {object} sound - an object containing audio data and metadata for
      *     a sound
-     * @param {Buffer} sound.data - sound data loaded from scratch-storage
-     * @returns {?Promise} - a promise which will resolve to the buffer
+     * @param {{buffer: ArrayBuffer}} sound.data - sound data loaded from scratch-storage
+     * @returns - a promise which will resolve to the buffer
      */
     decodeSoundPlayer (sound) {
         return this._decodeSound(sound)

diff --git a/packages/audio/src/SoundPlayer.js b/packages/audio/src/SoundPlayer.js
@@ -41,7 +41,7 @@ class SoundPlayer extends EventEmitter {
 
         /**
          * Output audio node.
-         * @type {AudioNode}
+         * @type {AudioBufferSourceNode}
          */
         this.outputNode = null;
 

diff --git a/packages/block/src/blocks/control.ts b/packages/block/src/blocks/control.ts
@@ -36,7 +36,7 @@ Blockly.Blocks['control_forever'] = {
       message0: Blockly.Msg.CONTROL_FOREVER,
       message1: '%1', // Statement
       message2: '%1', // Icon
-      lastDummyAlign2: 'RIGHT',
+      implicitAlign2: 'RIGHT',
       args1: [
         {
           type: 'input_statement',
@@ -69,7 +69,7 @@ Blockly.Blocks['control_repeat'] = {
       message0: Blockly.Msg.CONTROL_REPEAT,
       message1: '%1', // Statement
       message2: '%1', // Icon
-      lastDummyAlign2: 'RIGHT',
+      implicitAlign2: 'RIGHT',
       args0: [
         {
           type: 'input_value',
@@ -263,7 +263,7 @@ Blockly.Blocks['control_repeat_until'] = {
       message0: Blockly.Msg.CONTROL_REPEATUNTIL,
       message1: '%1',
       message2: '%1',
-      lastDummyAlign2: 'RIGHT',
+      implicitAlign2: 'RIGHT',
       args0: [
         {
           type: 'input_value',
@@ -302,7 +302,7 @@ Blockly.Blocks['control_while'] = {
       message0: Blockly.Msg.CONTROL_WHILE,
       message1: '%1',
       message2: '%1',
-      lastDummyAlign2: 'RIGHT',
+      implicitAlign2: 'RIGHT',
       args0: [
         {
           type: 'input_value',

diff --git a/packages/block/src/blocks/data.ts b/packages/block/src/blocks/data.ts
@@ -29,7 +29,7 @@ Blockly.Blocks['data_variable'] = {
   init: function(this: Blockly.Block) {
     this.jsonInit({
       message0: '%1',
-      lastDummyAlign0: 'CENTRE',
+      implicitAlign0: 'CENTRE',
       args0: [
         {
           type: 'field_variable_getter',
@@ -142,7 +142,7 @@ Blockly.Blocks['data_listcontents'] = {
   init: function(this: Blockly.Block) {
     this.jsonInit({
       message0: '%1',
-      lastDummyAlign0: 'CENTRE',
+      implicitAlign0: 'CENTRE',
       args0: [
         {
           type: 'field_variable_getter',

diff --git a/packages/block/src/events/block_comment_collapse.ts b/packages/block/src/events/block_comment_collapse.ts
@@ -16,7 +16,7 @@ export class BlockCommentCollapse extends BlockCommentBase {
   override type = 'block_comment_collapse';
 
   /** Whether the comment is collpased. */
-  protected newCollapsed?: boolean;
+  newCollapsed?: boolean;
 
   /**
    * @param icon The comment icon this event corresponds to.

diff --git a/packages/block/src/events/func_change.ts b/packages/block/src/events/func_change.ts
@@ -19,10 +19,10 @@ export class FuncChange extends FuncBase {
   override type = FuncChange.TYPE;
 
   /** The previous extra state of the procedure. */
-  protected oldExtraState?: ProcedureExtraState;
+  oldExtraState?: ProcedureExtraState;
 
   /** The new extra state of the procedure. */
-  protected newExtraState?: ProcedureExtraState;
+  newExtraState?: ProcedureExtraState;
 
   /**
    * @param procedure The procedure model.

diff --git a/packages/block/src/index.ts b/packages/block/src/index.ts
@@ -239,8 +239,21 @@ export type * as variableModel from './variable_model';
 export {reportValue} from './report_value';
 export {Colours} from './theme';
 export {BlockDragEnd} from './events/block_drag_end';
+export {BlockDragOutside} from './events/block_drag_outside';
+export {FuncChange} from './events/func_change';
+export {FuncCreate} from './events/func_create';
+export {FuncDelete} from './events/func_delete';
+export {BlockCommentCreate} from './events/block_comment_create';
+export {BlockCommentDelete} from './events/block_comment_delete';
+export {BlockCommentMove} from './events/block_comment_move';
+export {BlockCommentResize} from './events/block_comment_resize';
+export {BlockCommentCollapse} from './events/block_comment_collapse';
+export {BlockChange} from './events/block_change';
+export {VarCreate} from './events/var_create';
+export {VarDelete} from './events/var_delete';
 export * as Theme from './theme';
 export {glowStack} from './glow';
+export type {BlockCommentState} from './block_comment_icon';
 
 export {
   FieldAngle,

diff --git a/packages/gui/.babelrc b/packages/gui/.babelrc
@@ -9,6 +9,6 @@
     "presets": [
         ["@babel/preset-env", {"targets": {"browsers": ["last 3 versions", "Safari >= 8", "iOS >= 8"]}}],
         "@babel/preset-react",
-        "@babel/preset-typescript"
+        ["@babel/preset-typescript", {"optimizeConstEnums": true}]
     ]
 }
diff --git a/packages/gui/src/global.d.ts b/packages/gui/src/global.d.ts
@@ -0,0 +1,13 @@
+import type ScratchLinkWebSocket from '../../vm/src/util/scratch-link-websocket';
+
+type ScratchLinkSafariSocket = (new (type: 'BLE' | 'BT') => ScratchLinkWebSocket) & {
+    isSafariHelperCompatible: () => boolean;
+};
+
+declare global {
+    interface Window {
+        Scratch?: {
+            ScratchLinkSafariSocket?: ScratchLinkSafariSocket;
+        }
+    }
+}
diff --git a/packages/gui/tsconfig.json b/packages/gui/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "include": [
     "./src/**/*",
-    "./test/**/*"
+    "./test/**/*",
+    "types/**/*.d.ts"
   ],
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */

diff --git a/packages/lint-config/index.js b/packages/lint-config/index.js
@@ -32,6 +32,7 @@ module.exports = [
         rules: {
             // Most packaages uses JSDoc to generate declaration files, which has lots of undefined types.
             'jsdoc/no-undefined-types': 'warn',
+            'jsdoc/require-returns-type': 'off', /** tsc can infer return types */
             'jsdoc/reject-function-type': 'warn',
             'jsdoc/check-param-names': 'error',
             'jsdoc/check-tag-names': 'error',

diff --git a/packages/lint-config/ts.js b/packages/lint-config/ts.js
@@ -25,7 +25,7 @@ module.exports = [
             // Disable JSDoc type requirements for TypeScript (it has its own types)
             'jsdoc/require-jsdoc': 'off',
             'jsdoc/require-param-type': 'off',
-            'jsdoc/require-returns-type': 'off',
+            'jsdoc/require-property-type': 'off',
             'func-style': 'off',
 
             // Disable rules that conflict with TypeScript's type system

diff --git a/packages/render/src/RenderWebGL.js b/packages/render/src/RenderWebGL.js
@@ -381,8 +381,8 @@ class RenderWebGL extends EventEmitter {
     /**
      * Create a new SVG skin.
      * @param {!string} svgData - new SVG to use.
-     * @param {?Array<number>} rotationCenter Optional: rotation center of the skin. If not supplied, the center of the
-     * skin will be used
+     * @param {?Array<number>} [rotationCenter] Optional: rotation center of the skin. If not supplied,
+     * the center of the skin will be used
      * @returns {!int} the ID for the new skin.
      */
     createSVGSkin (svgData, rotationCenter) {
@@ -443,7 +443,8 @@ class RenderWebGL extends EventEmitter {
      * @param {!int} skinId the ID for the skin to change.
      * @param {!ImageData|HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} imgData - new contents for this skin.
      * @param {!number} bitmapResolution - the resolution scale for a bitmap costume.
-     * @param {?Array<number>} rotationCenter Optional: rotation center of the skin. If not supplied, the center of the
+     * @param {?Array<number>} [rotationCenter] Optional:
+     * rotation center of the skin. If not supplied, the center of the
      * skin will be used
      */
     updateBitmapSkin (skinId, imgData, bitmapResolution, rotationCenter) {
@@ -508,7 +509,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Create a new Drawable and add it to the scene.
      * @param {string} group Layer group to add the drawable to
-     * @returns {int | void} The ID of the new Drawable.
+     * @returns The ID of the new Drawable.
      */
     createDrawable (group) {
         if (!group || !Object.prototype.hasOwnProperty.call(this._layerGroups, group)) {
@@ -800,7 +801,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the size of a skin by ID.
      * @param {int} skinID The ID of the Skin to measure.
-     * @returns {Array<number>} Skin size, width and height.
+     * @returns {[number, number]} Skin size, width and height.
      */
     getSkinSize (skinID) {
         const skin = this._allSkins[skinID];
@@ -810,7 +811,7 @@ class RenderWebGL extends EventEmitter {
     /**
      * Get the rotation center of a skin by ID.
      * @param {int} skinID The ID of the Skin
-     * @returns {Array<number>} The rotationCenterX and rotationCenterY
+     * @returns {[number, number]} The rotationCenterX and rotationCenterY
      */
     getSkinRotationCenter (skinID) {
         const skin = this._allSkins[skinID];

diff --git a/packages/render/src/Skin.js b/packages/render/src/Skin.js
@@ -85,7 +85,7 @@ class Skin extends EventEmitter {
 
     /**
      * @abstract
-     * @returns {Array<number>} the "native" size, in texels, of this skin.
+     * @returns {[number, number]} the "native" size, in texels, of this skin.
      */
     get size () {
         return [0, 0];
@@ -106,7 +106,7 @@ class Skin extends EventEmitter {
 
     /**
      * Get the center of the current bounding box
-     * @returns {Array<number>} the center of the current bounding box
+     * @returns {[number, number]} the center of the current bounding box
      */
     calculateRotationCenter () {
         return [this.size[0] / 2, this.size[1] / 2];

diff --git a/packages/storage/src/Asset.ts b/packages/storage/src/Asset.ts
@@ -32,7 +32,7 @@ export default class Asset {
      */
     constructor (
         public assetType: IAssetType,
-        public assetId?: AssetId,
+        public assetId?: AssetId |null,
         dataFormat?: DataFormat,
         data?: AssetData,
         generateId?: boolean

diff --git a/packages/storage/src/ScratchStorage.ts b/packages/storage/src/ScratchStorage.ts
@@ -104,7 +104,7 @@ export class ScratchStorage {
      * @param assetId - The id of the asset to fetch.
      * @returns The asset, if it exists.
      */
-    get (assetId: string): Asset | null {
+    get (assetId: AssetId): Asset | null {
         return this.builtinHelper.get(assetId);
     }
 
@@ -134,8 +134,8 @@ export class ScratchStorage {
         assetType: IAssetType,
         dataFormat: DataFormat,
         data: AssetData,
-        id: AssetId,
-        generateId: boolean
+        id?: AssetId | null,
+        generateId?: boolean
     ): Asset {
         if (!dataFormat) throw new Error('Tried to create asset without a dataFormat');
         return new Asset(assetType, id, dataFormat, data, generateId);
@@ -202,7 +202,7 @@ export class ScratchStorage {
      *   If the promise is rejected, there was an error on at least one asset source. HTTP 404 does not count as an
      *   error here, but (for example) HTTP 403 does.
      */
-    load (assetType: IAssetType, assetId: AssetId, dataFormat: DataFormat): Promise<Asset | null> {
+    load (assetType: IAssetType, assetId: AssetId, dataFormat?: DataFormat): Promise<Asset | null> {
         const helpers = this._helpers.map(x => x.helper);
         const errors: unknown[] = [];
         dataFormat = dataFormat || assetType.runtimeFormat;

diff --git a/packages/vm/.babelrc b/packages/vm/.babelrc
diff --git a/packages/vm/.babelrc.js b/packages/vm/.babelrc.js
@@ -0,0 +1,20 @@
+const TESTING = process.env.NODE_ENV === 'test';
+
+const config = {
+    presets: [
+        ['@babel/preset-env', {
+            targets: {
+                browsers: ['last 3 versions', 'Safari >= 8', 'iOS >= 8']
+            }
+        }],
+        ['@babel/preset-typescript', {optimizeConstEnums: true}]
+    ]
+};
+
+if (TESTING) {
+    config.plugins = [
+        ['babel-plugin-transform-import-meta']
+    ];
+}
+
+module.exports = config;
diff --git a/packages/vm/docs/extensions.md b/packages/vm/docs/extensions.md
@@ -287,7 +287,7 @@ const TargetType = require('../../extension-support/target-type');
 const formatMessage = require('format-message');
 
 // Core, Team, and Official extension classes should be registered statically with the Extension Manager.
-// See: scratch-vm/src/extension-support/extension-manager.js
+// See: scratch-vm/src/extension-support/extension-manager.ts
 class SomeBlocks {
     constructor (runtime) {
         /**

diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/Clipteam/clipcc.git"
   },
   "exports": {
-    "types": "./dist/types/index.d.ts",
+    "types": "./dist/types/src/index.d.ts",
     "webpack": "./src/index.ts",
     "node": "./dist/node/scratch-vm.js",
     "browser": "./dist/web/scratch-vm.min.js",
@@ -66,14 +66,14 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
     "babel-loader": "^10.1.1",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "callsite": "1.0.0",
     "clipcc-audio": "workspace:~",
     "clipcc-block": "workspace:~",
     "clipcc-l10n": "workspace:~",
     "clipcc-render": "workspace:~",
     "clipcc-storage": "workspace:~",
     "clipcc-svg-renderer": "workspace:~",
-    "codingclip-worker-loader": "^3.0.10",
     "copy-webpack-plugin": "^14.0.0",
     "domhandler": "^5.0.3",
     "eslint": "^9.39.2",

diff --git a/packages/vm/src/blocks/category_prototype.ts b/packages/vm/src/blocks/category_prototype.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type BlockUtility from '../engine/block-utility';
 import type {HatMetadata, MonitorBlockInfo} from '../engine/runtime';
+import type Runtime from '../engine/runtime';
 
 export type BlockArgs = {
     [argName: string]: any;
@@ -19,3 +20,5 @@ export interface CategoryPrototype {
     getMonitored?(): Record<string, MonitorBlockInfo>;
     getOrders?(): Record<string, (string | {execute: string})[]>;
 }
+
+export type CategoryPrototypeConstructor = new (runtime: Runtime) => CategoryPrototype;