scratch-blocks 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -20,10 +20,11 @@
   },
   "scripts": {
     "build": "webpack --mode production",
+    "format": "prettier --write . && eslint --fix",
     "prepare": "husky || true",
     "start": "webpack serve --open --mode development",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "test:lint": "eslint ."
+    "test:lint": "eslint && prettier --check ."
   },
   "dependencies": {
     "@blockly/continuous-toolbox": "^7.0.8",
@@ -33,8 +34,10 @@
   "devDependencies": {
     "@commitlint/cli": "17.8.1",
     "@commitlint/config-conventional": "17.8.1",
-    "eslint": "4.19.1",
+    "eslint": "^9.39.3",
+    "eslint-config-scratch": "^13.0.0",
     "husky": "9.1.7",
+    "prettier": "3.8.1",
     "scratch-semantic-release-config": "4.0.1",
     "semantic-release": "22.0.12",
     "source-map-loader": "4.0.2",

package/prettier.config.mjs

@@ -0,0 +1,3 @@
+import { prettierConfigScratch } from 'eslint-config-scratch'
+
+export default prettierConfigScratch.recommended

package/release.config.js

@@ -3,20 +3,20 @@ module.exports = {
   extends: 'scratch-semantic-release-config',
   branches: [
     {
-      name: 'develop'
+      name: 'develop',
       // default channel
     },
     {
       name: 'alpha',
-      prerelease: true
+      prerelease: true,
     },
     {
       name: 'beta',
-      prerelease: true
+      prerelease: true,
     },
     {
       name: 'spork',
-      prerelease: true
-    }
-  ]
-};
+      prerelease: true,
+    },
+  ],
+}

package/renovate.json5

@@ -1,15 +1,13 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
 
-  "extends": [
-    "github>scratchfoundation/scratch-renovate-config:js-lib-bundled"
-  ],
+  extends: ['github>scratchfoundation/scratch-renovate-config:js-lib-bundled'],
 
-  "packageRules": [
+  packageRules: [
     // Closure compiler & library releases are always "major" so separating them leads to PR SPAM
     {
-      "matchPackageNames": ["google-closure-compiler", "google-closure-library"],
-      "separateMultipleMajor": false
-    }
-  ]
+      matchPackageNames: ['google-closure-compiler', 'google-closure-library'],
+      separateMultipleMajor: false,
+    },
+  ],
 }

package/src/block_reporting.ts

@@ -1,33 +1,30 @@
-import * as Blockly from "blockly/core";
-import { Colours } from "./colours";
+import * as Blockly from 'blockly/core'
+import { Colours } from './colours'
 
 export function reportValue(id: string, value: string) {
   const block = (Blockly.getMainWorkspace().getBlockById(id) ||
     (Blockly.getMainWorkspace() as Blockly.WorkspaceSvg)
       .getFlyout()
       ?.getWorkspace()
-      ?.getBlockById(id)) as Blockly.BlockSvg;
+      ?.getBlockById(id)) as Blockly.BlockSvg
   if (!block) {
-    throw "Tried to report value on block that does not exist.";
+    throw new Error('Tried to report value on block that does not exist.')
   }
 
-  let field;
+  let field
   for (const input of block.inputList) {
     for (const f of input.fieldRow) {
-      field = f;
-      break;
+      field = f
+      break
     }
   }
-  if (!field) return;
+  if (!field) return
 
-  const contentDiv = Blockly.DropDownDiv.getContentDiv();
-  const valueReportBox = document.createElement("div");
-  valueReportBox.setAttribute("class", "valueReportBox");
-  valueReportBox.innerText = value;
-  contentDiv.appendChild(valueReportBox);
-  Blockly.DropDownDiv.setColour(
-    Colours.valueReportBackground,
-    Colours.valueReportBorder
-  );
-  Blockly.DropDownDiv.showPositionedByBlock(field, block);
+  const contentDiv = Blockly.DropDownDiv.getContentDiv()
+  const valueReportBox = document.createElement('div')
+  valueReportBox.setAttribute('class', 'valueReportBox')
+  valueReportBox.innerText = value
+  contentDiv.appendChild(valueReportBox)
+  Blockly.DropDownDiv.setColour(Colours.valueReportBackground, Colours.valueReportBorder)
+  Blockly.DropDownDiv.showPositionedByBlock(field, block)
 }

package/src/blocks/colour.ts

@@ -1,5 +1,4 @@
 /**
- * @license
  * Visual Blocks Editor
  *
  * Copyright 2012 Google Inc.
@@ -17,40 +16,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * @fileoverview Colour blocks for Blockly.
+ * @file Colour blocks for Blockly.
  * @author fraser@google.com (Neil Fraser)
  */
-import * as Blockly from "blockly/core";
-import * as Constants from "../constants";
+import * as Blockly from 'blockly/core'
+import * as Constants from '../constants'
 
 /**
  * Pick a random colour.
- *
  * @returns #RRGGBB for random colour.
  */
 function randomColour(): string {
-  const num = Math.floor(Math.random() * Math.pow(2, 24));
-  return "#" + ("00000" + num.toString(16)).substr(-6);
+  const num = Math.floor(Math.random() * Math.pow(2, 24))
+  return '#' + ('00000' + num.toString(16)).substr(-6)
 }
 
-Blockly.Blocks["colour_picker"] = {
+Blockly.Blocks.colour_picker = {
   /**
    * Block for colour picker.
    */
   init: function (this: Blockly.Block) {
     this.jsonInit({
-      message0: "%1",
+      message0: '%1',
       args0: [
         {
-          type: "field_colour_slider",
-          name: "COLOUR",
+          type: 'field_colour_slider',
+          name: 'COLOUR',
           colour: randomColour(),
         },
       ],
       outputShape: Constants.OUTPUT_SHAPE_ROUND,
-      output: "Colour",
-    });
+      output: 'Colour',
+    })
   },
-};
+}