Skip to content

Commit 0317e0a

Browse files
authored
Merge pull request #517 from parallaxinc/develop
Release 1.5.6
2 parents a118f82 + 00ea3da commit 0317e0a

21 files changed

+1588
-864
lines changed

index.html

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
</style>
3535
</noscript>
3636
<meta name="application-name" content="BlocklyProp"/>
37+
<meta name="description" content="BlocklyProp Solo is a stand-alone Blockly implementation designed to support Parallax robots and sensor kits.">
3738
<meta name="msapplication-TileColor" content="#FFFFFF"/>
3839
<meta name="msapplication-TileImage" content="dist/images/mstile-144x144.png"/>
3940
<meta name="base" content="">

package-lock.json

+701-401
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "blocklyprop-solo",
3-
"version": "1.5.4",
3+
"version": "1.5.6",
44
"description": "A simplified implementation of Google's Blockly project configured to support Parallax robots and sensors.",
55
"main": "index.js",
66
"scripts": {
@@ -27,7 +27,7 @@
2727
},
2828
"homepage": "https://github.com/parallaxinc/solo#readme",
2929
"dependencies": {
30-
"@sentry/browser": "^5.21.0",
30+
"@sentry/browser": "^5.25.0",
3131
"ace-builds": "^1.4.8",
3232
"blockly": "^2.20190722.1",
3333
"bootbox": "^5.4.0",
@@ -47,22 +47,23 @@
4747
"@types/ace": "0.0.43",
4848
"acorn": "^7.1.1",
4949
"chai": "^4.2.0",
50-
"copy-webpack-plugin": "^5.1.1",
50+
"copy-webpack-plugin": "^6.2.0",
5151
"css-loader": "^3.4.2",
5252
"eslint": "^6.6.0",
5353
"eslint-config-google": "^0.14.0",
5454
"html-webpack-plugin": "^4.3.0",
5555
"minimist": "^1.2.5",
5656
"mocha": "^6.2.3",
5757
"node-env-webpack-plugin": "^1.1.0",
58-
"selenium-standalone": "^6.17.0",
58+
"selenium-standalone": "^6.20.0",
5959
"selenium-webdriver": "^4.0.0-alpha.7",
60+
"selfsigned": "^1.10.8",
6061
"sinon": "^7.5.0",
6162
"style-loader": "^1.1.3",
62-
"terser-webpack-plugin": "^3.0.5",
63+
"terser-webpack-plugin": "^4.2.2",
6364
"watchpack-chokidar2": "^2.0.0",
64-
"webpack": "^4.43.0",
65-
"webpack-cli": "^3.3.11",
65+
"webpack": "^4.44.2",
66+
"webpack-cli": "^3.3.12",
6667
"webpack-dev-server": "^3.11.0",
6768
"webpack-merge": "^4.2.2"
6869
},

src/modules/blockly/generators/propc.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,11 @@ Blockly.propc.finish = function(code) {
665665
}
666666

667667
if (profile.description === 'Scribbler Robot') {
668-
setups.unshift(' s3_setup();pause(100);');
668+
// setups.unshift(' s3_setup();pause(100);');
669+
setups.unshift(' ');
670+
setups.unshift(' pause(100);');
671+
setups.unshift(' s3_setup();');
672+
setups.unshift(' // Initialize the robot');
669673
}
670674

671675
// Add volatile to variable declarations in cogs

src/modules/blockly/generators/propc/aliaes.js

-137
This file was deleted.

src/modules/blockly/generators/propc/base.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -2237,8 +2237,7 @@ Blockly.Blocks.set_char_at_position = {
22372237
};
22382238

22392239
// Map deprecated block to its replacement
2240-
// Blockly.Blocks.set_char_at_position_zero =
2241-
// Blockly.Blocks.set_char_at_position;
2240+
Blockly.Blocks.set_char_at_position_zero = Blockly.Blocks.set_char_at_position;
22422241

22432242
/**
22442243
*
@@ -2274,7 +2273,7 @@ Blockly.propc.set_char_at_position = function() {
22742273
};
22752274

22762275
// Map deprecated code to its replacement
2277-
// Blockly.propc.set_char_at_position_zero = Blockly.propc.set_char_at_position;
2276+
Blockly.propc.set_char_at_position_zero = Blockly.propc.set_char_at_position;
22782277

22792278
/**
22802279
*
@@ -2318,7 +2317,7 @@ Blockly.Blocks.get_substring = {
23182317
};
23192318

23202319
// Map deprecated code to its replacement
2321-
// Blockly.Blocks.get_substring_zero = Blockly.Blocks.get_substring;
2320+
Blockly.Blocks.get_substring_zero = Blockly.Blocks.get_substring;
23222321

23232322
/**
23242323
*
@@ -2384,7 +2383,7 @@ Blockly.propc.get_substring = function() {
23842383
};
23852384

23862385
// Map deprecated code to its replacement
2387-
// Blockly.propc.get_substring_zero = Blockly.propc.get_substring;
2386+
Blockly.propc.get_substring_zero = Blockly.propc.get_substring;
23882387

23892388
/**
23902389
*

0 commit comments

Comments
 (0)