pxt-core 8.6.3 → 8.6.4

package/built/web/serviceworker.js

@@ -1 +1 @@
-var DisconnectResponse;function initWebappServiceWorker(){const e="@relprefix@".replace("---","").replace(/^\//,""),o=-1===e.indexOf("/"),t="makecode;"+e+";@pxtRelId@",n=["@targetUrl@/"+e,"@simUrl@","/blb/semantic.js","/blb/main.js","/blb/pxtapp.js","/blb/typescript.js","/blb/marked/marked.min.js","/blb/highlight.js/highlight.pack.js","/blb/jquery.js","/blb/pxtlib.js","/blb/pxtcompiler.js","/blb/pxtpy.js","/blb/pxtblockly.js","/blb/pxteditor.js","/blb/pxtsim.js","/blb/pxtembed.js","/blb/pxtworker.js","/blb/pxtweb.js","/blb/blockly.css","/blb/semantic.css","/blb/rtlsemantic.css","/cdn/blockly/media/sprites.png","/cdn/blockly/media/click.mp3","/cdn/blockly/media/disconnect.wav","/cdn/blockly/media/delete.mp3","/blb/vs/loader.js","/blb/vs/base/worker/workerMain.js","/blb/vs/basic-languages/bat/bat.js","/blb/vs/basic-languages/cpp/cpp.js","/blb/vs/basic-languages/python/python.js","/blb/vs/basic-languages/markdown/markdown.js","/blb/vs/editor/editor.main.css","/blb/vs/editor/editor.main.js","/blb/vs/editor/editor.main.nls.js","/blb/vs/language/json/jsonMode.js","/blb/vs/language/json/jsonWorker.js","/blb/smoothie/smoothie_compressed.js","/blb/images/Bars_black.gif","/blb/gifjs/gif.js","/blb/ai.0.js","/blb/target.js","@targetFieldEditorsJs@","@targetEditorJs@","@defaultLocaleStrings@","@targetUrl@@monacoworkerjs@","@targetUrl@@workerjs@"],i=a("@cachedHexFilesEncoded@"),s=a("@targetImagesEncoded@"),c=r(n.concat(s).map((e=>e.trim())).filter((e=>!!e&&0!==e.indexOf("@"))));let l=!1;function r(e){const o=[];for(const t of e)-1===o.indexOf(t)&&o.push(t);return o}function a(e){const o=String.fromCharCode(64)+"cdnUrl"+String.fromCharCode(64);return r(e.split(";").map((e=>decodeURIComponent(e).replace(o,"@cdnUrl@").trim())))}self.addEventListener("install",(e=>{o?(l=!0,console.log("Installing service worker..."),e.waitUntil(caches.open(t).then((e=>(console.log("Opened cache"),console.log("Caching:\n"+c.join("\n")),e.addAll(c).then((()=>e))))).then((e=>e.addAll(i).catch((e=>{console.log("Failed to cache hexfiles")})))).then((()=>self.skipWaiting())))):console.log("Skipping service worker install for unnamed endpoint")})),self.addEventListener("activate",(n=>{o?(console.log("Activating service worker..."),n.waitUntil(caches.keys().then((o=>{const n=o.filter((o=>{const n=function(e){const o=e.split(";");return 3!==o.length?null:o[1]}(o);return null===n||n===e&&o!==t}));return Promise.all(n.map((e=>caches.delete(e))))})).then((()=>l?(l=!1,function(){const o=self;return o.clients.claim().then((()=>o.clients.matchAll())).then((o=>{o.forEach((o=>o.postMessage({type:"serviceworker",state:"activated",ref:e})))}))}()):Promise.resolve())))):console.log("Skipping service worker activate for unnamed endpoint")})),self.addEventListener("fetch",(e=>{e.respondWith(caches.match(e.request).then((o=>o||fetch(e.request))))}))}function initWebUSB(){let e,o,t,n,i=0,s="idle";async function c(e){(await self.clients.matchAll()).forEach((o=>o.postMessage(e)))}function l(){let o;const n=new Promise((o=>{console.log("Waiting for disconnect "+e),t=o,c({type:"serviceworker",action:"packet-io-lock-disconnect",lock:e})})),i=new Promise((t=>{o=setTimeout((()=>{console.log("Timed-out disconnect request "+e),t(DisconnectResponse.TimedOut)}),5e3)}));return Promise.race([n,i]).then((e=>(clearTimeout(o),t=void 0,e)))}function r(e){return new Promise((o=>{setTimeout(o,e)}))}self.addEventListener("message",(async a=>{const d=a.data;if("serviceworkerclient"===(null==d?void 0:d.type))if("request-packet-io-lock"===d.action){if(e||(e=await function(){if(e)return Promise.resolve(e);let o;const t=new Promise((e=>{console.log("check for existing lock"),n=e,c({type:"serviceworker",action:"packet-io-status"})})),i=new Promise((e=>{o=setTimeout((()=>{console.log("Timed-out check for existing lock"),e(void 0)}),1e3)}));return Promise.race([t,i]).then((e=>(clearTimeout(o),n=void 0,e)))}()),"granting"===s)return void await c({type:"serviceworker",action:"packet-io-lock-granted",granted:!1,lock:d.lock});console.log("Received lock request "+d.lock);const t=Date.now()-i;if(o=d.lock,t<4e3&&(s="waiting",console.log("Waiting to grant lock request "+d.lock),await r(4e3-t)),o!==d.lock)return console.log("Rejecting old lock request "+d.lock),void await c({type:"serviceworker",action:"packet-io-lock-granted",granted:!1,lock:d.lock});if(s="granting",e){let e;do{console.log("Sending disconnect request "+d.lock),e=await l(),e===DisconnectResponse.Waiting&&(console.log("Waiting on disconnect request "+d.lock),await r(1e3))}while(e===DisconnectResponse.Waiting)}console.log("Granted lock request "+d.lock),e=d.lock,await c({type:"serviceworker",action:"packet-io-lock-granted",granted:!0,lock:d.lock}),i=Date.now(),s="idle"}else"release-packet-io-lock"===d.action?(console.log("Received disconnect for "+e),e=void 0,t&&t(DisconnectResponse.Disconnected)):"packet-io-lock-disconnect"===d.action?(console.log("Received disconnect response for "+e),d.didDisconnect&&(e=void 0),t&&t(d.didDisconnect?DisconnectResponse.Disconnected:DisconnectResponse.Waiting)):"packet-io-supported"===d.action?await c({type:"serviceworker",action:"packet-io-supported",supported:!0}):"packet-io-status"===d.action&&d.hasLock&&n&&n(d.lock)}))}!function(e){e[e.Disconnected=0]="Disconnected",e[e.Waiting=1]="Waiting",e[e.TimedOut=2]="TimedOut"}(DisconnectResponse||(DisconnectResponse={})),initWebappServiceWorker(),initWebUSB();
+var DisconnectResponse;function initWebappServiceWorker(){const e="@relprefix@".replace("---","").replace(/^\//,""),o=-1===e.indexOf("/"),t="makecode;"+e+";@pxtRelId@",i=["@targetUrl@/"+e,"@simUrl@","/blb/semantic.js","/blb/main.js","/blb/pxtapp.js","/blb/typescript.js","/blb/marked/marked.min.js","/blb/highlight.js/highlight.pack.js","/blb/jquery.js","/blb/pxtlib.js","/blb/pxtcompiler.js","/blb/pxtpy.js","/blb/pxtblockly.js","/blb/pxteditor.js","/blb/pxtsim.js","/blb/pxtembed.js","/blb/pxtworker.js","/blb/pxtweb.js","/blb/blockly.css","/blb/semantic.css","/blb/rtlsemantic.css","/cdn/blockly/media/sprites.png","/cdn/blockly/media/click.mp3","/cdn/blockly/media/disconnect.wav","/cdn/blockly/media/delete.mp3","/blb/vs/loader.js","/blb/vs/base/worker/workerMain.js","/blb/vs/basic-languages/bat/bat.js","/blb/vs/basic-languages/cpp/cpp.js","/blb/vs/basic-languages/python/python.js","/blb/vs/basic-languages/markdown/markdown.js","/blb/vs/editor/editor.main.css","/blb/vs/editor/editor.main.js","/blb/vs/editor/editor.main.nls.js","/blb/vs/language/json/jsonMode.js","/blb/vs/language/json/jsonWorker.js","/blb/smoothie/smoothie_compressed.js","/blb/images/Bars_black.gif","/blb/gifjs/gif.js","/blb/ai.0.js","/blb/target.js","/blb/music-editor/apple.png","/blb/music-editor/burger.png","/blb/music-editor/cake.png","/blb/music-editor/car.png","/blb/music-editor/cat.png","/blb/music-editor/cherry.png","/blb/music-editor/clam.png","/blb/music-editor/computer.png","/blb/music-editor/crab.png","/blb/music-editor/dog.png","/blb/music-editor/duck.png","/blb/music-editor/egg.png","/blb/music-editor/explosion.png","/blb/music-editor/fish.png","/blb/music-editor/ice-cream.png","/blb/music-editor/lemon.png","/blb/music-editor/snake.png","/blb/music-editor/star.png","/blb/music-editor/strawberry.png","/blb/music-editor/taco.png","/blb/music-editor/bass-clef.svg","/blb/music-editor/treble-clef.svg","@targetFieldEditorsJs@","@targetEditorJs@","@defaultLocaleStrings@","@targetUrl@@monacoworkerjs@","@targetUrl@@workerjs@"],n=a("@cachedHexFilesEncoded@"),c=a("@targetImagesEncoded@"),s=r(i.concat(c).map((e=>e.trim())).filter((e=>!!e&&0!==e.indexOf("@"))));let l=!1;function r(e){const o=[];for(const t of e)-1===o.indexOf(t)&&o.push(t);return o}function a(e){const o=String.fromCharCode(64)+"cdnUrl"+String.fromCharCode(64);return r(e.split(";").map((e=>decodeURIComponent(e).replace(o,"@cdnUrl@").trim())))}self.addEventListener("install",(e=>{o?(l=!0,console.log("Installing service worker..."),e.waitUntil(caches.open(t).then((e=>(console.log("Opened cache"),console.log("Caching:\n"+s.join("\n")),e.addAll(s).then((()=>e))))).then((e=>e.addAll(n).catch((e=>{console.log("Failed to cache hexfiles")})))).then((()=>self.skipWaiting())))):console.log("Skipping service worker install for unnamed endpoint")})),self.addEventListener("activate",(i=>{o?(console.log("Activating service worker..."),i.waitUntil(caches.keys().then((o=>{const i=o.filter((o=>{const i=function(e){const o=e.split(";");return 3!==o.length?null:o[1]}(o);return null===i||i===e&&o!==t}));return Promise.all(i.map((e=>caches.delete(e))))})).then((()=>l?(l=!1,function(){const o=self;return o.clients.claim().then((()=>o.clients.matchAll())).then((o=>{o.forEach((o=>o.postMessage({type:"serviceworker",state:"activated",ref:e})))}))}()):Promise.resolve())))):console.log("Skipping service worker activate for unnamed endpoint")})),self.addEventListener("fetch",(e=>{e.respondWith(caches.match(e.request).then((o=>o||fetch(e.request))))}))}function initWebUSB(){let e,o,t,i,n=0,c="idle";async function s(e){(await self.clients.matchAll()).forEach((o=>o.postMessage(e)))}function l(){let o;const i=new Promise((o=>{console.log("Waiting for disconnect "+e),t=o,s({type:"serviceworker",action:"packet-io-lock-disconnect",lock:e})})),n=new Promise((t=>{o=setTimeout((()=>{console.log("Timed-out disconnect request "+e),t(DisconnectResponse.TimedOut)}),5e3)}));return Promise.race([i,n]).then((e=>(clearTimeout(o),t=void 0,e)))}function r(e){return new Promise((o=>{setTimeout(o,e)}))}self.addEventListener("message",(async a=>{const b=a.data;if("serviceworkerclient"===(null==b?void 0:b.type))if("request-packet-io-lock"===b.action){if(e||(e=await function(){if(e)return Promise.resolve(e);let o;const t=new Promise((e=>{console.log("check for existing lock"),i=e,s({type:"serviceworker",action:"packet-io-status"})})),n=new Promise((e=>{o=setTimeout((()=>{console.log("Timed-out check for existing lock"),e(void 0)}),1e3)}));return Promise.race([t,n]).then((e=>(clearTimeout(o),i=void 0,e)))}()),"granting"===c)return void await s({type:"serviceworker",action:"packet-io-lock-granted",granted:!1,lock:b.lock});console.log("Received lock request "+b.lock);const t=Date.now()-n;if(o=b.lock,t<4e3&&(c="waiting",console.log("Waiting to grant lock request "+b.lock),await r(4e3-t)),o!==b.lock)return console.log("Rejecting old lock request "+b.lock),void await s({type:"serviceworker",action:"packet-io-lock-granted",granted:!1,lock:b.lock});if(c="granting",e){let e;do{console.log("Sending disconnect request "+b.lock),e=await l(),e===DisconnectResponse.Waiting&&(console.log("Waiting on disconnect request "+b.lock),await r(1e3))}while(e===DisconnectResponse.Waiting)}console.log("Granted lock request "+b.lock),e=b.lock,await s({type:"serviceworker",action:"packet-io-lock-granted",granted:!0,lock:b.lock}),n=Date.now(),c="idle"}else"release-packet-io-lock"===b.action?(console.log("Received disconnect for "+e),e=void 0,t&&t(DisconnectResponse.Disconnected)):"packet-io-lock-disconnect"===b.action?(console.log("Received disconnect response for "+e),b.didDisconnect&&(e=void 0),t&&t(b.didDisconnect?DisconnectResponse.Disconnected:DisconnectResponse.Waiting)):"packet-io-supported"===b.action?await s({type:"serviceworker",action:"packet-io-supported",supported:!0}):"packet-io-status"===b.action&&b.hasLock&&i&&i(b.lock)}))}!function(e){e[e.Disconnected=0]="Disconnected",e[e.Waiting=1]="Waiting",e[e.TimedOut=2]="TimedOut"}(DisconnectResponse||(DisconnectResponse={})),initWebappServiceWorker(),initWebUSB();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "8.6.3",
+  "version": "8.6.4",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",

package/react-common/components/palette/ColorPickerField.tsx

@@ -45,7 +45,7 @@ export const ColorPickerField = (props: ColorPickerFieldProps) => {
             <input className="color-input" type="color" value={currentColor || color} onBlur={onBlur} onChange={onColorPickerChanged} />
             <Input initialValue={currentColor || color.toUpperCase()} onChange={onTextInputChanged} />
         </div>
-        <Button className="circle-button" title={lf("Move color up")} leftIcon="fas fa-arrow-up" onClick={() => onMoveColor(true)} />
-        <Button className="circle-button" title={lf("Move color down")} leftIcon="fas fa-arrow-down" onClick={() => onMoveColor(false)} />
+        <Button className="circle-button" title={lf("Move color up")} leftIcon="fas fa-arrow-up" onClick={() => onMoveColor(true)} disabled={index === 1}/>
+        <Button className="circle-button" title={lf("Move color down")} leftIcon="fas fa-arrow-down" onClick={() => onMoveColor(false)} disabled={index === 15}/>
     </div>
 }

package/react-common/styles/palette/ColorPickerField.less

@@ -3,6 +3,9 @@
     grid-template-columns: 0.5fr 8fr 1fr 1fr;
     align-items: center;
     padding: 0.1rem 0rem;
+    i.fas {
+        margin: 0;
+    }
 }
 
 .common-color-inputs {

package/webapp/public/index.html

@@ -107,7 +107,29 @@
             "rtlblockly.css": "/blb/rtlblockly.css",
             "gifjs/gif.js": "/blb/gifjs/gif.js",
             "qrcode/qrcode.min.js": "/blb/qrcode/qrcode.min.js",
-            "zip.js/zip.min.js": "/blb/zip.js/zip.min.js"
+            "zip.js/zip.min.js": "/blb/zip.js/zip.min.js",
+            "music-editor/apple.png": "/blb/music-editor/apple.png",
+            "music-editor/burger.png": "/blb/music-editor/burger.png",
+            "music-editor/cake.png": "/blb/music-editor/cake.png",
+            "music-editor/car.png": "/blb/music-editor/car.png",
+            "music-editor/cat.png": "/blb/music-editor/cat.png",
+            "music-editor/cherry.png": "/blb/music-editor/cherry.png",
+            "music-editor/clam.png": "/blb/music-editor/clam.png",
+            "music-editor/computer.png": "/blb/music-editor/computer.png",
+            "music-editor/crab.png": "/blb/music-editor/crab.png",
+            "music-editor/dog.png": "/blb/music-editor/dog.png",
+            "music-editor/duck.png": "/blb/music-editor/duck.png",
+            "music-editor/egg.png": "/blb/music-editor/egg.png",
+            "music-editor/explosion.png": "/blb/music-editor/explosion.png",
+            "music-editor/fish.png": "/blb/music-editor/fish.png",
+            "music-editor/ice-cream.png": "/blb/music-editor/ice-cream.png",
+            "music-editor/lemon.png": "/blb/music-editor/lemon.png",
+            "music-editor/snake.png": "/blb/music-editor/snake.png",
+            "music-editor/star.png": "/blb/music-editor/star.png",
+            "music-editor/strawberry.png": "/blb/music-editor/strawberry.png",
+            "music-editor/taco.png": "/blb/music-editor/taco.png",
+            "music-editor/bass-clef.svg": "/blb/music-editor/bass-clef.svg",
+            "music-editor/treble-clef.svg": "/blb/music-editor/treble-clef.svg",
         }
     </script>
 </body>

package/webapp/public/music-editor/bass-clef.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="112mm" height="132mm" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd" viewBox="0 0 8268 11692" id="svg2">
+  <defs id="defs4">
+    <style type="text/css" id="style6">
+      .str0{stroke:#131516;stroke-width:42}.fil0{fill:none}
+    </style>
+  </defs>
+  <g id="Layer 1" transform="matrix(4.58848 0 0 4.57504 -4898.431 -28736.72)">
+    <path d="M1239 8245c158-107 276-188 352-244 76-55 156-124 238-206s151-175 207-278c44-76 82-164 113-264 31-99 47-195 50-286 0-85-11-166-34-242-22-77-60-140-114-191-54-50-124-75-211-75-84 0-163 17-237 50-73 34-125 88-154 164 0 7-4 16-10 29 2 16 10 28 25 37s28 13 40 13c6 0 23-3 49-9 27-6 49-10 67-10 53 0 100 19 143 56 42 37 63 82 63 135 0 38-11 74-32 107s-50 60-87 79c-37 20-78 29-122 29-80 0-148-24-204-73-55-50-83-113-83-192 0-101 31-188 92-262 62-74 140-129 236-166 95-38 191-56 289-56 107 0 209 27 304 82 96 54 171 129 227 222 56 94 85 194 85 302 0 192-64 370-192 535s-286 308-475 430c-126 83-330 195-611 336l-14-52zm1389-1547c0-36 13-66 39-90 25-25 56-37 93-37 32 0 62 14 89 41 27 26 40 57 40 91 0 36-14 67-40 92-28 24-59 36-94 36-37 0-67-12-91-39-24-26-36-57-36-94zm0 524c0-36 13-67 37-91 25-25 56-37 95-37 32 0 61 13 89 40 26 27 40 56 40 88 0 39-13 70-38 95-26 25-56 38-91 38-39 0-70-13-95-37-24-24-37-56-37-96z" id="path19" style="fill:#131516;stroke:#131516;stroke-width:3"/>
+  </g>
+</svg>

package/webapp/public/music-editor/treble-clef.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="110mm" height="216mm" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd" viewBox="0 0 8268 11692" id="svg2"><defs id="defs4"><style type="text/css" id="style6">.str1{stroke:#131516;stroke-width:42}.fil1{fill:none}</style></defs><g id="Layer 1" transform="matrix(3.81735 0 0 3.8081 -3380.452 -23251.63)"><path d="M2002 7851c-61 17-116 55-167 113-51 59-76 124-76 194 0 44 15 94 44 147 29 54 73 93 130 118 19 4 28 14 28 28 0 5-7 10-24 14-91-23-166-72-224-145-58-74-88-158-90-254 3-103 34-199 93-287 60-89 137-152 231-189l-69-355c-154 128-279 261-376 401-97 139-147 290-151 453 2 73 17 144 45 212 28 69 70 131 126 188 113 113 260 172 439 178 61-4 126-15 196-33l-155-783zm72-10 156 769c154-62 231-197 231-403-9-69-29-131-63-186-33-56-77-100-133-132s-119-48-191-48zm-205-1040c33-20 71-55 112-104 41-48 81-105 119-169 39-65 70-131 93-198 23-66 34-129 34-187 0-25-2-50-7-72-4-36-15-64-34-83-19-18-43-28-73-28-60 0-114 37-162 111-37 64-68 140-90 226-23 87-36 173-38 260 5 99 21 180 46 244zm-63 58c-45-162-70-327-75-495 1-108 12-209 33-303 20-94 49-175 87-245 37-70 80-123 128-159 43-32 74-49 91-49 13 0 24 5 34 14s23 24 39 44c119 169 179 373 179 611 0 113-15 223-45 333-29 109-72 213-129 310-58 98-126 183-205 256l81 394c44-5 74-9 91-9 76 0 144 16 207 48s117 75 161 130c44 54 78 116 102 186 23 70 36 143 36 219 0 118-31 226-93 323s-155 168-280 214c8 49 22 120 43 211 20 92 35 165 45 219s14 106 14 157c0 79-19 149-57 211-39 62-91 110-157 144-65 34-137 51-215 51-110 0-206-31-288-92-82-62-126-145-130-251 3-47 14-91 34-133s47-76 82-102c34-27 75-41 122-44 39 0 76 11 111 32 34 22 62 51 83 88 20 37 31 78 31 122 0 59-20 109-60 150s-91 62-152 62h-23c39 60 103 91 192 91 45 0 91-10 137-28 47-19 86-44 119-76s55-66 64-102c17-41 25-98 25-169 0-48-5-96-14-144-9-47-23-110-42-188-19-77-33-137-41-178-60 15-122 23-187 23-109 0-212-22-309-67s-182-107-256-187c-73-80-130-170-171-272-40-101-61-207-62-317 4-102 23-200 59-292 36-93 82-181 139-263s116-157 177-224c62-66 143-151 245-254z" id="path9" style="fill:#131516;stroke:#131516;stroke-width:3"/></g></svg>