Merge pull request #6 from TurboWarp/merge-upstream

Merge upstream
TurboWarp · Dec 30, 2023 · f5ac07b · f5ac07b
2 parents c097023 + 739f0ad
commit f5ac07b
Show file tree

Hide file tree

Showing 44 changed files with 6,217 additions and 4,788 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -14,3 +14,5 @@
 /gh-pages/*
 /webpack.config.js
 /build/*
+
+/github-pages/*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,6 @@ jobs:
     - name: Install Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
     - run: npm ci
     - run: npm run test:lint
diff --git a/.npmignore b/.npmignore
@@ -1,10 +1,10 @@
 # Development files
+/.circleci
 .eslintrc
 /.editorconfig
 /.eslintignore
 /.gitattributes
 /.github
-/.travis.yml
 /.tx
 /tests
 /webpack.config.js

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -8,26 +8,23 @@
 
 Install dependencies:
 
-```
+```sh
 npm ci
 ```
 
 The playground to use for local testing is tests/vertical_playground.html.
 
 To build, run:
 
-```
+```sh
 npm run prepublish
 ```
 
-requires Python 2. scratch-gui development server must be restarted to update linked scratch-blocks.
+requires Python (2 or 3). scratch-gui development server must be restarted to update linked scratch-blocks.
 
 <!--
 #### Scratch Blocks is a library for building creative computing interfaces.
-[![Build Status](https://travis-ci.org/LLK/scratch-blocks.svg?branch=develop)](https://travis-ci.org/LLK/scratch-blocks)
-[![Dependency Status](https://david-dm.org/LLK/scratch-blocks.svg)](https://david-dm.org/LLK/scratch-blocks)
-[![devDependency Status](https://david-dm.org/LLK/scratch-blocks/dev-status.svg)](https://david-dm.org/LLK/scratch-blocks#info=devDependencies)
--->
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/LLK/scratch-blocks/tree/develop.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/LLK/scratch-blocks/tree/develop)
 
 ![](https://cloud.githubusercontent.com/assets/747641/15227351/c37c09da-1854-11e6-8dc7-9a298f2b1f01.jpg)
 

diff --git a/blocks_common/math.js b/blocks_common/math.js
@@ -51,7 +51,8 @@ Blockly.Blocks['math_number'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
@@ -75,7 +76,8 @@ Blockly.Blocks['math_integer'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
@@ -100,7 +102,8 @@ Blockly.Blocks['math_whole_number'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
@@ -124,7 +127,8 @@ Blockly.Blocks['math_positive_number'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
@@ -148,7 +152,8 @@ Blockly.Blocks['math_angle'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
diff --git a/blocks_common/note.js b/blocks_common/note.js
@@ -51,7 +51,8 @@ Blockly.Blocks['note'] = {
       "output": "Number",
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
diff --git a/blocks_common/text.js b/blocks_common/text.js
@@ -50,7 +50,8 @@ Blockly.Blocks['text'] = {
       "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
-      "colourTertiary": Blockly.Colours.textField
+      "colourTertiary": Blockly.Colours.textField,
+      "colourQuaternary": Blockly.Colours.textField
     });
   }
 };
diff --git a/blocks_horizontal/control.js b/blocks_horizontal/control.js
@@ -65,7 +65,8 @@ Blockly.Blocks['control_repeat'] = {
       "category": Blockly.Categories.control,
       "colour": Blockly.Colours.control.primary,
       "colourSecondary": Blockly.Colours.control.secondary,
-      "colourTertiary": Blockly.Colours.control.tertiary
+      "colourTertiary": Blockly.Colours.control.tertiary,
+      "colourQuaternary": Blockly.Colours.control.quaternary
     });
   }
 };
@@ -99,7 +100,8 @@ Blockly.Blocks['control_forever'] = {
       "category": Blockly.Categories.control,
       "colour": Blockly.Colours.control.primary,
       "colourSecondary": Blockly.Colours.control.secondary,
-      "colourTertiary": Blockly.Colours.control.tertiary
+      "colourTertiary": Blockly.Colours.control.tertiary,
+      "colourQuaternary": Blockly.Colours.control.quaternary
     });
   }
 };
@@ -139,7 +141,8 @@ Blockly.Blocks['control_repeat'] = {
       "category": Blockly.Categories.control,
       "colour": Blockly.Colours.control.primary,
       "colourSecondary": Blockly.Colours.control.secondary,
-      "colourTertiary": Blockly.Colours.control.tertiary
+      "colourTertiary": Blockly.Colours.control.tertiary,
+      "colourQuaternary": Blockly.Colours.control.quaternary
     });
   }
 };
@@ -167,7 +170,8 @@ Blockly.Blocks['control_stop'] = {
       "category": Blockly.Categories.control,
       "colour": Blockly.Colours.control.primary,
       "colourSecondary": Blockly.Colours.control.secondary,
-      "colourTertiary": Blockly.Colours.control.tertiary
+      "colourTertiary": Blockly.Colours.control.tertiary,
+      "colourQuaternary": Blockly.Colours.control.quaternary
     });
   }
 };
@@ -201,7 +205,8 @@ Blockly.Blocks['control_wait'] = {
       "category": Blockly.Categories.control,
       "colour": Blockly.Colours.control.primary,
       "colourSecondary": Blockly.Colours.control.secondary,
-      "colourTertiary": Blockly.Colours.control.tertiary
+      "colourTertiary": Blockly.Colours.control.tertiary,
+      "colourQuaternary": Blockly.Colours.control.quaternary
     });
   }
 };
diff --git a/blocks_horizontal/event.js b/blocks_horizontal/event.js
@@ -54,7 +54,8 @@ Blockly.Blocks['event_whenflagclicked'] = {
       "category": Blockly.Categories.event,
       "colour": Blockly.Colours.event.primary,
       "colourSecondary": Blockly.Colours.event.secondary,
-      "colourTertiary": Blockly.Colours.event.tertiary
+      "colourTertiary": Blockly.Colours.event.tertiary,
+      "colourQuaternary": Blockly.Colours.event.quaternary
     });
   }
 };
@@ -84,7 +85,8 @@ Blockly.Blocks['dropdown_whenbroadcast'] = {
     this.setOutput(true);
     this.setColour(Blockly.Colours.event.primary,
         Blockly.Colours.event.secondary,
-        Blockly.Colours.event.tertiary
+        Blockly.Colours.event.tertiary,
+        Blockly.Colours.event.quaternary
     );
   }
 };
@@ -116,7 +118,8 @@ Blockly.Blocks['event_whenbroadcastreceived'] = {
       "category": Blockly.Categories.event,
       "colour": Blockly.Colours.event.primary,
       "colourSecondary": Blockly.Colours.event.secondary,
-      "colourTertiary": Blockly.Colours.event.tertiary
+      "colourTertiary": Blockly.Colours.event.tertiary,
+      "colourQuaternary": Blockly.Colours.event.quaternary
     });
   }
 };
@@ -146,7 +149,8 @@ Blockly.Blocks['dropdown_broadcast'] = {
     this.setOutput(true);
     this.setColour(Blockly.Colours.event.primary,
         Blockly.Colours.event.secondary,
-        Blockly.Colours.event.tertiary
+        Blockly.Colours.event.tertiary,
+        Blockly.Colours.event.quaternary
     );
   }
 };
@@ -179,7 +183,8 @@ Blockly.Blocks['event_broadcast'] = {
       "category": Blockly.Categories.event,
       "colour": Blockly.Colours.event.primary,
       "colourSecondary": Blockly.Colours.event.secondary,
-      "colourTertiary": Blockly.Colours.event.tertiary
+      "colourTertiary": Blockly.Colours.event.tertiary,
+      "colourQuaternary": Blockly.Colours.event.quaternary
     });
   }
 };
diff --git a/blocks_horizontal/wedo.js b/blocks_horizontal/wedo.js
@@ -61,7 +61,8 @@ Blockly.Blocks['dropdown_wedo_setcolor'] = {
     this.setOutput(true);
     this.setColour(Blockly.Colours.looks.primary,
         Blockly.Colours.looks.secondary,
-        Blockly.Colours.looks.tertiary
+        Blockly.Colours.looks.tertiary,
+        Blockly.Colours.looks.quaternary
     );
   }
 };
@@ -94,7 +95,8 @@ Blockly.Blocks['wedo_setcolor'] = {
       "category": Blockly.Categories.looks,
       "colour": Blockly.Colours.looks.primary,
       "colourSecondary": Blockly.Colours.looks.secondary,
-      "colourTertiary": Blockly.Colours.looks.tertiary
+      "colourTertiary": Blockly.Colours.looks.tertiary,
+      "colourQuaternary": Blockly.Colours.looks.quaternary
     });
   }
 };
@@ -128,7 +130,8 @@ Blockly.Blocks['wedo_motorclockwise'] = {
       "category": Blockly.Categories.motion,
       "colour": Blockly.Colours.motion.primary,
       "colourSecondary": Blockly.Colours.motion.secondary,
-      "colourTertiary": Blockly.Colours.motion.tertiary
+      "colourTertiary": Blockly.Colours.motion.tertiary,
+      "colourQuaternary": Blockly.Colours.motion.quaternary
     });
   }
 };
@@ -162,7 +165,8 @@ Blockly.Blocks['wedo_motorcounterclockwise'] = {
       "category": Blockly.Categories.motion,
       "colour": Blockly.Colours.motion.primary,
       "colourSecondary": Blockly.Colours.motion.secondary,
-      "colourTertiary": Blockly.Colours.motion.tertiary
+      "colourTertiary": Blockly.Colours.motion.tertiary,
+      "colourQuaternary": Blockly.Colours.motion.quaternary
     });
   }
 };
@@ -186,7 +190,8 @@ Blockly.Blocks['dropdown_wedo_motorspeed'] = {
     this.setOutput(true);
     this.setColour(Blockly.Colours.motion.primary,
         Blockly.Colours.motion.secondary,
-        Blockly.Colours.motion.tertiary
+        Blockly.Colours.motion.tertiary,
+        Blockly.Colours.motion.quaternary
     );
   }
 };
@@ -219,7 +224,8 @@ Blockly.Blocks['wedo_motorspeed'] = {
       "category": Blockly.Categories.motion,
       "colour": Blockly.Colours.motion.primary,
       "colourSecondary": Blockly.Colours.motion.secondary,
-      "colourTertiary": Blockly.Colours.motion.tertiary
+      "colourTertiary": Blockly.Colours.motion.tertiary,
+      "colourQuaternary": Blockly.Colours.motion.quaternary
     });
   }
 };
@@ -250,7 +256,8 @@ Blockly.Blocks['dropdown_wedo_whentilt'] = {
     this.setOutput(true);
     this.setColour(Blockly.Colours.event.primary,
         Blockly.Colours.event.secondary,
-        Blockly.Colours.event.tertiary
+        Blockly.Colours.event.tertiary,
+        Blockly.Colours.event.quaternary
     );
   }
 };
@@ -282,7 +289,8 @@ Blockly.Blocks['wedo_whentilt'] = {
       "category": Blockly.Categories.event,
       "colour": Blockly.Colours.event.primary,
       "colourSecondary": Blockly.Colours.event.secondary,
-      "colourTertiary": Blockly.Colours.event.tertiary
+      "colourTertiary": Blockly.Colours.event.tertiary,
+      "colourQuaternary": Blockly.Colours.event.quaternary
     });
   }
 };
@@ -310,7 +318,8 @@ Blockly.Blocks['wedo_whendistanceclose'] = {
       "category": Blockly.Categories.event,
       "colour": Blockly.Colours.event.primary,
       "colourSecondary": Blockly.Colours.event.secondary,
-      "colourTertiary": Blockly.Colours.event.tertiary
+      "colourTertiary": Blockly.Colours.event.tertiary,
+      "colourQuaternary": Blockly.Colours.event.quaternary
     });
   }
 };
diff --git a/blocks_vertical/control.js b/blocks_vertical/control.js
@@ -209,7 +209,8 @@ Blockly.Blocks['control_stop'] = {
     this.setCategory(Blockly.Categories.control);
     this.setColour(Blockly.Colours.control.primary,
         Blockly.Colours.control.secondary,
-        Blockly.Colours.control.tertiary
+        Blockly.Colours.control.tertiary,
+        Blockly.Colours.control.quaternary
     );
     this.setPreviousStatement(true);
   },