typo

cmds/pxtrequire.ts

@@ -0,0 +1,7 @@
+/// <reference path="../node_modules/pxt-core/typings/globals/node/index.d.ts"/>
+/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
+
+import * as path from "path";
+export let pxtCore = require("pxt-core");
+// require.resolve() gives path to [pxt dir]/built/pxt.js, so move up twice to get pxt root dir
+export let pxtCoreDir = path.resolve(require.resolve("pxt-core"), "..", "..");

cmds/tsconfig.json

@@ -0,0 +1,13 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "noImplicitAny": true,
+        "noImplicitReturns": true,
+        "declaration": true,
+        "outDir": "../built",
+        "module": "commonjs",
+        "rootDir": ".",
+        "newLine": "LF",
+        "sourceMap": false
+    }
+}

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v1.0.25"
+    "appref": "v"
 }

libs/core/_locales/core-jsdoc-strings.json

@@ -4,12 +4,8 @@
   "AcceleratorRange.OneG": "The accelerator measures forces up to 1 gravity",
   "AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
   "Array": "Add, remove, and replace items in lists.\n\nAdd, remove, and replace items in lists.",
-  "Array.every": "Tests whether all elements in the array pass the test implemented by the provided function.",
-  "Array.every|param|callbackfn": "A function that accepts up to two arguments. The some method calls the callbackfn function one time for each element in the array.",
   "Array.filter": "Return the elements of an array that meet the condition specified in a callback function.",
   "Array.filter|param|callbackfn": "A function that accepts up to two arguments. The filter method calls the callbackfn function one time for each element in the array.",
-  "Array.forEach": "Call a defined callback function on each element of an array.",
-  "Array.forEach|param|callbackfn": "A function that accepts up to two arguments. The forEach method calls the callbackfn function one time for each element in the array.",
   "Array.get": "Get the value at a particular index.",
   "Array.get|param|index": "the zero-based position in the list of the item, eg: 0",
   "Array.indexOf": "Return the index of the first occurrence of a value in an array.",
@@ -18,8 +14,6 @@
   "Array.insertAt": "Insert the value at a particular index, increase the array length by 1.",
   "Array.insertAt|param|index": "the zero-based position in the list to insert the value, eg: 0",
   "Array.insertAt|param|value": "to insert, eg: 0",
-  "Array.join": "joins all elements of an array into a string and returns this string.",
-  "Array.join|param|sep": "the string separator",
   "Array.length": "Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.",
   "Array.map": "Call a defined callback function on each element of an array, and return an array containing the results.",
   "Array.map|param|callbackfn": "A function that accepts up to two arguments. The map method calls the callbackfn function one time for each element in the array.",
@@ -39,8 +33,6 @@
   "Array.slice": "Return a section of an array.",
   "Array.slice|param|end": "The end of the specified portion of the array. eg: 0",
   "Array.slice|param|start": "The beginning of the specified portion of the array. eg: 0",
-  "Array.some": "Tests whether at least one element in the array passes the test implemented by the provided function.",
-  "Array.some|param|callbackfn": "A function that accepts up to two arguments. The some method calls the callbackfn function one time for each element in the array.",
   "Array.sort": "Sort the elements of an array in place and returns the array. The sort is not necessarily stable.",
   "Array.splice": "Remove elements from an array.",
   "Array.splice|param|deleteCount": "The number of elements to remove. eg: 0",
@@ -102,16 +94,6 @@
   "Math": "More complex operations with numbers.",
   "Math.abs": "Returns the absolute value of a number (the value without regard to whether it is positive or negative).\nFor example, the absolute value of -5 is the same as the absolute value of 5.",
   "Math.abs|param|x": "A numeric expression for which the absolute value is needed.",
-  "Math.ceil": "Returns the smallest number greater than or equal to its numeric argument.",
-  "Math.ceil|param|x": "A numeric expression.",
-  "Math.floor": "Returns the greatest number less than or equal to its numeric argument.",
-  "Math.floor|param|x": "A numeric expression.",
-  "Math.idiv": "Returns the value of integer signed 32 bit division of two numbers.",
-  "Math.idiv|param|x": "The first number",
-  "Math.idiv|param|y": "The second number",
-  "Math.imul": "Returns the value of integer signed 32 bit multiplication of two numbers.",
-  "Math.imul|param|x": "The first number",
-  "Math.imul|param|y": "The second number",
   "Math.max": "Returns the larger of two supplied numeric expressions.",
   "Math.min": "Returns the smaller of two supplied numeric expressions.",
   "Math.pow": "Return the value of a base expression taken to a specified power.",
@@ -120,14 +102,10 @@
   "Math.random": "Return a pseudorandom number between 0 and `limit`.",
   "Math.randomBoolean": "Generates a `true` or `false` value randomly, just like flipping a coin.",
   "Math.random|param|limit": "the upper bound of the number generated, eg: 4",
-  "Math.round": "Returns a supplied numeric expression rounded to the nearest number.",
-  "Math.round|param|x": "The value to be rounded to the nearest number.",
   "Math.sign": "Returns the sign of the x, indicating whether x is positive, negative or zero.",
   "Math.sign|param|x": "The numeric expression to test",
   "Math.sqrt": "Return the square root of a number.",
   "Math.sqrt|param|x": "A numeric expression.",
-  "Math.trunc": "Returns the number with the decimal part truncated.",
-  "Math.trunc|param|x": "A numeric expression.",
   "Number.toString": "Return a string representation of a number.",
   "String": "Combine, split, and search text strings.\n\nCombine, split, and search text strings.",
   "String.charAt": "Return the character at the specified index.",
@@ -385,7 +363,7 @@
   "music.speakerPlayTone|param|frequency": "pitch of the tone to play in Hertz (Hz)",
   "music.speakerPlayTone|param|ms": "tone duration in milliseconds (ms)",
   "music.tempo": "Returns the tempo in beats per minute. Tempo is the speed (bpm = beats per minute) at which notes play. The larger the tempo value, the faster the notes will play.",
-  "parseInt": "Convert a string to an integer.",
+  "parseInt": "Convert A string to an integer.",
   "pins": "Control currents in Pins for analog/digital signals, servos, i2c, ...",
   "pins.analogPitch": "Emits a Pulse-width modulation (PWM) signal to the current pitch pin. Use `analog set pitch pin` to define the pitch pin.",
   "pins.analogPitch|param|frequency": "frequency to modulate in Hz.",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-calliope",
-  "version": "2.0.1",
+  "version": "1.0.20",
   "description": "Calliope Mini editor for PXT",
   "keywords": [
     "JavaScript",
@@ -26,15 +26,17 @@
     "docs/*/*.md",
     "docs/*/*/*.md"
   ],
+  "main": "built/pxtrequire.js",
+  "typings": "built/pxtrequire.d.ts",
   "devDependencies": {
     "typescript": "^1.8.7",
+    "less": "^2.6.0",
     "rtlcss": "^2.1.2",
     "autoprefixer": "^6.7.6",
-    "less": "2.7.3",
-    "semantic-ui-less": "2.2.14"
+    "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.19.20"
+    "pxt-core": "0.17.4"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

pxtarget.json

@@ -1,6 +1,5 @@
 {
     "id": "calliopemini",
-    "aliases": ["calliope"],
     "name": " calliope mini",
     "nickname": "mini",
     "title": "Calliope mini - Blocks / Javascript editor",
@@ -225,24 +224,7 @@
             }
         },
         "docMenu": [],
-        "hasReferenceDocs": false,
-        "selectLanguage": true,
-                
-        "availableLocales": [
-            "en",
-            "de",
-            "el",
-            "fr",
-            "it",
-            "ko",
-            "nl",
-            "no",
-            "sv-SE",
-            "tr",
-            "zh-TW",
-            "zh-CN"
-        ]
+        "hasReferenceDocs": false
     },
     "ignoreDocsErrors": true
-
 }

targetconfig.json

@@ -8,8 +8,7 @@
         ],
         "approvedRepos": [
             "CoderDojoOlney/pxt-olney",
-            "Tinkertanker/pxt-oled-ssd1306",
-            "Seeed-Studio/pxt-grove"
+            "Tinkertanker/pxt-ssd1306-microbit"                
         ],
         "preferredRepos": [
             "Microsoft/pxt-neopixel",
@@ -20,8 +19,7 @@
             "calliope-mini/pxt-calliope-bunt",
             "calliope-mini/pxt-isl29125",
             "ubirch/pxt-ubirch",
-            "Tinkertanker/pxt-oled-ssd1306",
-            "Seeed-Studio/pxt-grove"
+            "Tinkertanker/pxt-ssd1306-microbit"                
         ]
     }
 }