2.1.41

bump pxt
2.1.40
2020-01-17 20:58:59 -08:00 · 2020-01-17 20:58:51 -08:00 · 2020-01-16 20:39:18 -08:00 · 2020-01-16 20:39:08 -08:00 · 2020-01-14 17:33:00 -08:00 · 2020-01-14 16:19:14 -08:00
1582 changed files with 82865 additions and 34781 deletions
--- a/.clang-format
+++ b/.clang-format
@ -0,0 +1,6 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+UseTab: Never
+ColumnLimit: 100
+AllowShortFunctionsOnASingleLine: Inline
+SortIncludes: false
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+Add screenshots to help explain your problem. You can copy paste the screenshot in the github report. The .gif screen recording is very useful as well. 
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/lock.yml
+++ b/.github/lock.yml
@ -0,0 +1,75 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+
+
+# Number of days of inactivity before a closed issue or pull request is locked
+
+daysUntilLock: 365
+
+
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+
+skipCreatedBefore: false
+
+
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+
+exemptLabels: []
+
+
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+
+lockLabel: false
+
+
+
+# Comment to post before locking. Set to `false` to disable
+
+lockComment: >
+
+  This thread has been automatically locked since there has not been
+
+  any recent activity after it was closed. Please open a new issue for
+
+  related bugs.
+
+
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+
+setLockReason: true
+
+
+
+# Limit to only `issues` or `pulls`
+
+# only: issues
+
+
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+
+# issues:
+
+#   exemptLabels:
+
+#     - help-wanted
+
+#   lockLabel: outdated
+
+
+
+# pulls:
+
+#   daysUntilLock: 30
+
+
+
+# Repository to extend settings from
+
+# _extends: repo
--- a/.github/workflows/pxt-buildpr.yml
+++ b/.github/workflows/pxt-buildpr.yml
@ -0,0 +1,31 @@
+name: pxt-buildpr
+
+on: [pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x]
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: npm install
+        run: |
+          sudo apt-get install xvfb
+          sudo npm install -g pxt
+          npm install
+      - name: pxt ci
+        run: |
+          pxt ci
+        env:
+          CHROME_BIN: chromium-browser
+          DISPLAY: :99.0
+          CI: true
--- a/.github/workflows/pxt-buildtarget.yml
+++ b/.github/workflows/pxt-buildtarget.yml
@ -0,0 +1,39 @@
+name: pxt-buildtarget
+
+on:
+  push:
+    branches: 
+      - master
+  create:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x]
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: npm install
+        run: |
+          sudo apt-get install xvfb
+          sudo npm install -g pxt
+          npm install
+      - name: pxt ci
+        run: |
+          pxt ci
+        env:
+          CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
+          PXT_ACCESS_TOKEN: ${{ secrets.PXT_ACCESS_TOKEN }}
+          PXT_RELEASE_REPO: ${{ secrets.PXT_RELEASE_REPO }}
+          NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+          CHROME_BIN: chromium-browser
+          DISPLAY: :99.0
+          CI: true
--- a/.gitignore
+++ b/.gitignore
@ -15,7 +15,10 @@ clients/win10/app/bld
 clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
-clients/electron/projects
+electron-out
+hexcache
+build
+crowdinstats.csv

 *.user
 *.sw?
@ -24,3 +27,10 @@ clients/electron/projects
 *.db
 *.suo
 *.log
+
+.DS_Store
+.idea
+*.iml
+.vscode/.BROWSE.VC.DB-shm
+.vscode/.BROWSE.VC.DB-wal
+package-lock.json
--- a/.travis.yml
+++ b/.travis.yml
@ -1,14 +1,24 @@
 language: node_js
+os: linux
+dist: trusty
 node_js:
-  - "5.7.0"
+  - "8.9.4"
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 script:
-  - "node node_modules/pxt-core/built/pxt.js travis"  
-  - "node node_modules/pxt-core/built/pxt.js testdir tests"
-  - "node node_modules/pxt-core/built/pxt.js uploaddoc"
+  - "node node_modules/pxt-core/built/pxt.js travis"
+# - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js run)"
+# - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js run)"
+# - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js test)"
+# - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js test)"
+# - "node node_modules/pxt-core/built/pxt.js testdir tests"
+#  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv http://az851932.vo.msecnd.net/files/td-converter-tests-v1.json)"
 sudo: false
 notifications:
  email:
-    - kindscript@microsoft.com
+    - touchdevelop-build@microsoft.com
 cache:
  directories:
    - node_modules
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,46 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceRoot}/../pxt/built/pxt.js",
+            "stopOnEntry": false,
+            "args": ["serve"],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": null,
+            "runtimeExecutable": null,
+            "runtimeArgs": [
+                "--nolazy"
+            ],
+            "env": {
+                "NODE_ENV": "development"
+            },
+            "console": "internalConsole",
+            "sourceMaps": false,
+            "outDir": null
+        },
+        {
+            "name": "Attach",
+            "type": "node",
+            "request": "attach",
+            "port": 5858,
+            "address": "localhost",
+            "restart": false,
+            "sourceMaps": false,
+            "outDir": null,
+            "localRoot": "${workspaceRoot}",
+            "remoteRoot": null
+        },
+        {
+            "name": "Attach to Process",
+            "type": "node",
+            "request": "attach",
+            "processId": "${command.PickProcess}",
+            "port": 5858,
+            "sourceMaps": false,
+            "outDir": null
+        }
+    ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,6 +1,6 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "file.autoSave": "afterDelay",   
+    "files.autoSave": "afterDelay",
    "files.watcherExclude": {
        "**/.git/objects/**": true,
        "**/built/**": true,
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,26 @@
+# Contributing Code
+
+PXT accepts bug fix pull requests. For a bug fix PR to be accepted, it must first have a tracking issue that has been marked approved. Your PR should link to the bug you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
+
+PXT also accepts new feature pull requests. For a feature-level PR to be accepted, it first needs to have design discussion. Design discussion can take one of two forms a) a feature request in the issue tracker that has been marked as approved or b) the PR must be accompanied by a full design spec and this spec is later approved in the open design discussion. Features are evaluated against their complexity, impact on other features, roadmap alignment, and maintainability.
+
+These two blogs posts on contributing code to open source projects are a good reference: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik.
+
+## Security
+
+If you believe you have found a security issue in PXT, please share it with us privately following the guidance at the Microsoft [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094). Reporting it via this channel helps minimize risk to projects built with PXT.
+
+## Legal
+
+You will need to complete a Contributor License Agreement (CLA) before your pull request can be accepted. This agreement testifies that you are granting us permission to use the source code you are submitting, and that this work is being submitted under appropriate license that we can use it.
+
+You can complete the CLA by going through the steps at https://cla.microsoft.com. Once we have received the signed CLA, we'll review the request. You will only need to do this once.
+
+## Housekeeping
+
+Your pull request should:
+* Include a description of what your change intends to do
+* Be a child commit of a reasonably recent commit in the master branch
+* Pass all unit tests
+* Have a clear commit message
+* Include adequate tests
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,25 @@
+PXT - Programming Experience Toolkit
+
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,9 +1,13 @@
-# Calliope target for PXT
+# Calliope target for Microsoft MakeCode

-This target allow to program a [Calliope](http://calliope.cc/) using 
-PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
+This editor is hosted at https://makecode.calliope.cc.

-[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)
+* Got a question? Try the forum at https://forum.calliope.cc/
+
+### BUILD COMMENTS
+
+- build libs/core/dal.d.ts new requires some meddling, as the `#define` parser does not parse `#ifdef` and thus
+has some conflicts with double defines constants

 ![](http://calliope.cc/content/1-ueber-mini/mini_board.png)

@ -15,7 +19,7 @@ The local server allows to run the editor and the documentation from your comput

 The following commands are a 1-time setup after synching the repo on your machine.

-* if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
+* See requirements for [pxt](https://github.com/Microsoft/pxt)
 * [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
 ```
 git clone https://github.com/microsoft/pxt-calliope
--- a/THIRD-PARTY-NOTICES.txt
+++ b/THIRD-PARTY-NOTICES.txt
@ -0,0 +1,229 @@
+/*!----------------- PXT ThirdPartyNotices -------------------------------------------------------
+
+PXT uses third party material from the projects listed below.
+The original copyright notice and the license under which Microsoft
+received such third party material are set forth below. Microsoft
+reserves all other rights not expressly granted, whether by
+implication, estoppel or otherwise.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           abchatra@microsoft.com
+
+---------------------------------------------
+Third Party Code Components
+---------------------------------------------
+
+Some code derived (as noted) from
+
+https://github.com/bbcmicrobit/micropython
+
+The MIT License (MIT)
+
+Copyright (c) 2013-2016 The MicroPython-on-micro:bit Developers, as listed
+in the accompanying AUTHORS file
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+----------------- google/blockly -------------------
+
+Sounds under sim/public/blockly/media from Google Blockly.
+
+
+Copyright 2013 Google Inc
+
+                                 Apache License
+                           Version 2.0, January 2011
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+---------------------------------------------
--- a/calliope.code-workspace
+++ b/calliope.code-workspace
@ -0,0 +1,13 @@
+{
+	"folders": [
+		{
+			"path": "../pxt"
+		},
+		{
+			"path": "../pxt-common-packages"
+		},
+		{
+			"path": "."
+		}
+	]
+}
--- a/clients/chrome/README.md
+++ b/clients/chrome/README.md
@ -1,26 +0,0 @@
-# microbit-chrome
-Prototype chrome addon that exposes the micro:bit's serial output to webpages. 
-* watch the [demo video](https://vimeo.com/146207766)
-
-# Installation
-See [developer.chrome.com](https://developer.chrome.com/extensions/getstarted#unpacked)
-for instructions on how to install the local version into your chrome browser.
-
-# Requirements
-* Chrome 48 or later.
-
-# Sample page
-The `demo.html` webpage goes along with the
-https://github.com/Microsoft/microbit-touchdevelop/blob/master/examples/tcs34725.cpp
-program. Run `http-server` from this directory, then visit
-http://localhost:8080/demo.html
-(keep in mind that pages served from `file://` cannot open ports).
-
-# Building
-
-Open a command prompt and run the following commands.
-
-````
-npm install
-typings update
-````
--- a/clients/chrome/background.js
+++ b/clients/chrome/background.js
@ -1,68 +0,0 @@
-///<reference path='typings/browser.d.ts'/>
-var connections = [];
-// A list of "ports", i.e. connected clients (such as web pages). Multiple web
-// pages can connect to our service: they all receive the same data.
-var ports = [];
-function byPath(path) {
-    return connections.filter(function (x) { return x.path == path; });
-}
-function byId(id) {
-    return connections.filter(function (x) { return x.id == id; });
-}
-function onReceive(data, id) {
-    if (ports.length == 0)
-        return;
-    var view = new DataView(data);
-    var decoder = new TextDecoder("utf-8");
-    var decodedString = decoder.decode(view);
-    ports.forEach(function (port) { return port.postMessage({
-        type: "serial",
-        data: decodedString,
-        id: id
-    }); });
-}
-function findNewDevices() {
-    chrome.serial.getDevices(function (serialPorts) {
-        serialPorts.forEach(function (serialPort) {
-            if (byPath(serialPort.path).length == 0 &&
-                serialPort.displayName == "mbed Serial Port") {
-                chrome.serial.connect(serialPort.path, { bitrate: 115200 }, function (info) {
-                    // In case the [connect] operation takes more than five seconds...
-                    if (info && byPath(serialPort.path).length == 0)
-                        connections.push({
-                            id: info.connectionId,
-                            path: serialPort.path
-                        });
-                });
-            }
-        });
-    });
-}
-function main() {
-    // Register new clients in the [ports] global variable.
-    chrome.runtime.onConnectExternal.addListener(function (port) {
-        if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
-            ports.push(port);
-            port.onDisconnect.addListener(function () {
-                ports = ports.filter(function (x) { return x != port; });
-            });
-        }
-    });
-    // When receiving data for one of the connections that we're tracking, forward
-    // it to all connected clients.
-    chrome.serial.onReceive.addListener(function (info) {
-        if (byId(info.connectionId).length > 0)
-            onReceive(info.data, info.connectionId);
-    });
-    // When it looks like we've been disconnected, drop the corresponding
-    // connection object from the [connections] global variable.
-    chrome.serial.onReceiveError.addListener(function (info) {
-        if (info.error == "system_error" || info.error == "disconnected" || info.error == "device_lost")
-            connections = connections.filter(function (x) { return x.id != info.connectionId; });
-    });
-    // Probe serial connections at regular intervals. In case we find an mbed port
-    // we haven't yet connected to, connect to it.
-    setInterval(findNewDevices, 5000);
-    findNewDevices();
-}
-document.addEventListener("DOMContentLoaded", main);
--- a/clients/chrome/background.ts
+++ b/clients/chrome/background.ts
@ -1,92 +0,0 @@
-// A list of: {
-//   id: number;
-//   path: string;
-// } where [id] is the [connectionId] (internal to Chrome) and [path] is the
-// OS' name for the device (e.g. "COM4").
-interface Connection {
-  id: string;
-  path: string;
-}
-let connections: Connection[] = [];
-
-// A list of "ports", i.e. connected clients (such as web pages). Multiple web
-// pages can connect to our service: they all receive the same data.
-let ports = [];
-
-interface Message {
-  type: string;
-  data: string;
-  id: string;
-}
-
-function byPath(path: string): Connection[] {
-  return connections.filter((x) => x.path == path);
-}
-
-function byId(id: string): Connection[] {
-  return connections.filter((x) => x.id == id);
-}
-
-function onReceive(data, id: string) {
-  if (ports.length == 0) return;
-
-  let view = new DataView(data);
-  let decoder = new TextDecoder("utf-8");
-  let decodedString = decoder.decode(view);
-  ports.forEach(port => port.postMessage(<Message>{
-    type: "serial",
-    data: decodedString,
-    id: id,
-  }));
-}
-
-function findNewDevices() {
-  chrome.serial.getDevices(function (serialPorts) {
-    serialPorts.forEach(function (serialPort) {
-      if (byPath(serialPort.path).length == 0 &&
-        serialPort.displayName == "mbed Serial Port") {
-        chrome.serial.connect(serialPort.path, { bitrate: 115200 }, function (info) {
-          // In case the [connect] operation takes more than five seconds...
-          if (info && byPath(serialPort.path).length == 0)
-            connections.push({
-              id: info.connectionId,
-              path: serialPort.path
-            });
-        });
-      }
-    });
-  });
-}
-
-function main() {
-  // Register new clients in the [ports] global variable.
-  chrome.runtime.onConnectExternal.addListener(function (port) {
-    if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
-      ports.push(port);
-      port.onDisconnect.addListener(function () {
-        ports = ports.filter(function (x) { return x != port });
-      });
-    }
-  });
-
-  // When receiving data for one of the connections that we're tracking, forward
-  // it to all connected clients.
-  chrome.serial.onReceive.addListener(function (info) {
-    if (byId(info.connectionId).length > 0)
-      onReceive(info.data, info.connectionId);
-  });
-
-  // When it looks like we've been disconnected, drop the corresponding
-  // connection object from the [connections] global variable.
-  chrome.serial.onReceiveError.addListener(function (info) {
-    if (info.error == "system_error" || info.error == "disconnected" || info.error == "device_lost")
-      connections = connections.filter((x) => x.id != info.connectionId);
-  });
-
-  // Probe serial connections at regular intervals. In case we find an mbed port
-  // we haven't yet connected to, connect to it.
-  setInterval(findNewDevices, 5000);
-  findNewDevices();
-}
-
-document.addEventListener("DOMContentLoaded", main);
--- a/clients/chrome/logo128.png
+++ b/clients/chrome/logo128.png
--- a/clients/chrome/logo48.png
+++ b/clients/chrome/logo48.png
--- a/clients/chrome/manifest.json
+++ b/clients/chrome/manifest.json
@ -1,30 +0,0 @@
-{
-  "app": {
-    "background": {
-      "scripts": [ "background.js" ]
-    }
-  },
-
-  "manifest_version": 2,
-  "name": "code the micro:bit",
-  "version": "0.6.0",
-  "author": "Microsoft Corporation",
-  "short_name": "code the micro:bit",
-
-  "description": "Extension for https://codethemicrobit.com.",
-  "homepage_url": "https://codethemicrobit.com",
-  "offline_enabled": "true",
-  "icons": {
-    "48": "logo48.png",
-    "128": "logo128.png"
-  },
-
-  "permissions": [
-    "serial",
-    "usb"
-  ],
-
-  "externally_connectable": {
-    "matches": [ "*://localhost/*", "https://codethemicrobit.com/*", "https://*.codethemicrobit.com/*" ]
-  }
-}
--- a/clients/chrome/screenshot.png
+++ b/clients/chrome/screenshot.png
--- a/clients/chrome/tsconfig.json
+++ b/clients/chrome/tsconfig.json
@ -1,7 +0,0 @@
-{
-    "compiler-options": {
-        "target": "ES5",
-        "module": "amd",
-        "sourceMap": false
-    }
- }
--- a/clients/electron/.gitignore
+++ b/clients/electron/.gitignore
@ -1,2 +0,0 @@
-node_modules
-projects
--- a/clients/electron/README.md
+++ b/clients/electron/README.md
@ -1,5 +0,0 @@
-# PXT micro:bit Electron app
-
-A very basic wrapper around the web app. To install, copy the contents of this
-directory to somewhere outside the main `pxt-microbit` repository. Then run `npm
-install && npm start`.
--- a/clients/electron/index.html
+++ b/clients/electron/index.html
@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>code the micro:bit</title>
-  </head>
-  <body>
-    <webview id="webview" style="position:absolute; left:0; top:0; right:0; bottom:0"/>
-    <script>
-      const webview = document.getElementById("webview")
-      const url = `http://localhost:3232/${window.location.hash}`
-      webview.src = url
-    </script>
-  </body>
-</html>
--- a/clients/electron/main.js
+++ b/clients/electron/main.js
@ -1,39 +0,0 @@
-const {app, BrowserWindow, Menu} = require('electron')
-const pxt = require('pxt-core')
-const path = require('path')
-
-let win
-
-const cliPath = path.join(process.cwd(), "node_modules/pxt-microbit") 
-
-function startServerAndCreateWindow() {
-  pxt.mainCli(cliPath, ["serve", "-no-browser"])
-  createWindow()
-}
-
-function createWindow () {
-  win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    title: "code the micro:bit"
-  })
-  Menu.setApplicationMenu(null)
-  win.loadURL(`file://${__dirname}/index.html#local_token=${pxt.globalConfig.localToken}`)
-  win.on('closed', () => {
-    win = null
-  })
-}
-
-app.on('ready', startServerAndCreateWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (win === null) {
-    createWindow()
-  }
-})
--- a/clients/electron/package.json
+++ b/clients/electron/package.json
@ -1,14 +0,0 @@
-{
-  "name"    : "code-the-microbit",
-  "version" : "1.0.0",
-  "description": "Blocks / Javascript editor",
-  "author": "Microsoft",
-  "main"    : "main.js",
-  "scripts": {
-      "start": "node_modules/.bin/electron ."
-  },
-  "devDependencies": {
-      "electron": "*",
-      "pxt-microbit": "*"
-  }
-}
--- a/clients/macuploader/Graphics/appicon.sketch
+++ b/clients/macuploader/Graphics/appicon.sketch
--- a/clients/macuploader/Graphics/export.png
+++ b/clients/macuploader/Graphics/export.png
--- a/clients/macuploader/Graphics/menubar.sketch
+++ b/clients/macuploader/Graphics/menubar.sketch
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -124,7 +124,7 @@
 }

 - (void)launchEditor:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://makecode.microbit.org/"]];
 }

@end
--- a/clients/macuploader/README.md
+++ b/clients/macuploader/README.md
@ -1,12 +1,12 @@
-# micro:bit uploader for OS X
+# @boardname@ uploader for OS X

 ![](Microbit Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png)

 This project is a clone of the [Windows
-uploader](https://codethemicrobit.com/uploader), but for OS X. Once launched,
+uploader](https://makecode.microbit.org/uploader), but for OS X. Once launched,
 the app runs in your menu bar and will automatically deploy any HEX files to
-your `micro:bit`. Like the Windows version, it is compatible with any browser
-that can run [codethemicrobit.com](http://codethemicrobit.com).
+your `@boardname@`. Like the Windows version, it is compatible with any browser
+that can run @homeurl@.

 ## Install the built version

--- a/clients/win10/app.sln
+++ b/clients/win10/app.sln
@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "m.pxt.io", "app\m.pxt.io.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle
+++ b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle
--- a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer
+++ b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer
--- a/clients/win10/app/BundleArtifacts/neutral.txt
+++ b/clients/win10/app/BundleArtifacts/neutral.txt
@ -1 +0,0 @@
-MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx
--- a/clients/win10/app/codethemicrobitapp.sln
+++ b/clients/win10/app/codethemicrobitapp.sln
@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codethemicrobitapp", "codethemicrobitapp.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/clients/win10/app/images/LockScreenLogo.scale-200.png
+++ b/clients/win10/app/images/LockScreenLogo.scale-200.png
--- a/clients/win10/app/images/SplashScreen.scale-200.png
+++ b/clients/win10/app/images/SplashScreen.scale-200.png
--- a/clients/win10/app/images/Square150x150Logo.scale-200.png
+++ b/clients/win10/app/images/Square150x150Logo.scale-200.png
--- a/clients/win10/app/images/Square44x44Logo.scale-200.png
+++ b/clients/win10/app/images/Square44x44Logo.scale-200.png
--- a/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/clients/win10/app/images/StoreLogo.png
+++ b/clients/win10/app/images/StoreLogo.png
--- a/clients/win10/app/images/Wide310x150Logo.scale-200.png
+++ b/clients/win10/app/images/Wide310x150Logo.scale-200.png
--- a/clients/win10/app/msapp-error.css
+++ b/clients/win10/app/msapp-error.css
@ -1,17 +0,0 @@
-body {
-  margin: 10px;
-} 
-
-.tip {
-  font-size: 90%;
-  padding-left: 20px;
-}
-
-.paramName {
-  font-size: 100%;
-  color: black;
-} 
-
-.paramValue {
-  color: black;
-}
--- a/clients/win10/app/msapp-error.html
+++ b/clients/win10/app/msapp-error.html
@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Navigation Error</title>
-  <link href="msapp-error.css" rel="stylesheet" type="text/css"/>
-  <script src="msapp-error.js" type="text/javascript"></script>
-</head>
-<body>
-  <h1>Navigation Error</h1>
-  <div id="failureUrl" class="param"> 
-    <span>-</span><span class="paramName">failureUrl</span><span>=</span> 
-    <span id="failureUrlValue" class="paramValue"></span> 
-    <span class="tip">(indicates the url where the error occurred)</span><br/> 
-  </div><br/> 
-  <div id="httpStatus" class="param"> 
-    <span>-</span><span class="paramName">httpStatus</span><span>=</span> 
-    <span id="httpStatusValue" class="paramValue"></span> 
-    <span class="tip">(available when the error has an http status code)</span><br/> 
-  </div><br/> 
-  <div id="failureName"> 
-    <span>-</span><span class="paramName">failureName</span><span>=</span> 
-    <span id="failureNameValue" class="paramValue"></span> 
-    <span class="tip">(available only when the error does not have a http status code)</span><br/> 
-  </div> 
-</body>
-</html>
--- a/clients/win10/app/msapp-error.js
+++ b/clients/win10/app/msapp-error.js
@ -1,22 +0,0 @@
-(function () { 
-  var validParameterNames = [ "httpStatus", "failureName", "failureUrl" ]; 
-  
-  function parseQueryParameters() { 
-    var query = location.search.slice(1); 
-    return query.split("&").reduce(function (queryParameters, rawPair) {
-                                   var pair = rawPair.split("=").map(decodeURIComponent);
-                                   queryParameters[pair[0]] = pair[1];
-                                   return queryParameters;
-    }, {});
-  }
- 
-  function initialize() {
-    var queryParameters = parseQueryParameters();
-    validParameterNames.forEach(function (parameterName) {
-                               var parameterValue = queryParameters[parameterName] || "N/A"; 
-                               document.getElementById(parameterName + "Value").textContent = parameterValue;
-    });
-  }
-  
-  document.addEventListener("DOMContentLoaded", initialize);
-}());
--- a/clients/win10/app/package.appxmanifest
+++ b/clients/win10/app/package.appxmanifest
@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.5.0" Publisher="CN=jhalleux" />
-  <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>codethemicrobit</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>images\storelogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" StartPage="https://codethemicrobit.com">
-      <uap:ApplicationContentUriRules>
-        <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codethemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-      </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="code the micro:bit" Description="A code editor for the BBC micro:bit with Blocks or Javascript." BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="code the micro:bit">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="images\splashscreen.png" />
-      </uap:VisualElements>
-      <Extensions>
-        <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="microbithex">
-            <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
-            <uap:SupportedFileTypes>
-              <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <uap:Capability Name="removableStorage" />
-    <DeviceCapability Name="bluetooth" />
-    <DeviceCapability Name="serialcommunication">
-      <Device Id="any">
-        <Function Type="name:serialPort" />
-      </Device>
-    </DeviceCapability>
-  </Capabilities>
-</Package>
--- a/clients/win10/app/pxtwinapp_TemporaryKey.pfx
+++ b/clients/win10/app/pxtwinapp_TemporaryKey.pfx
--- a/clients/win10/store/desktopblocks1366x768.png
+++ b/clients/win10/store/desktopblocks1366x768.png
--- a/clients/win10/store/desktopjavascript1366x768.png
+++ b/clients/win10/store/desktopjavascript1366x768.png
--- a/clients/win10/store/mobileblocks480x800.png
+++ b/clients/win10/store/mobileblocks480x800.png
--- a/clients/winuploader/Microbit.Uploader/MainForm.cs
+++ b/clients/winuploader/Microbit.Uploader/MainForm.cs
@ -32,7 +32,7 @@ namespace Microsoft.MicroBit
        private void openEditor()
        {
            // lanch editor
-            try { Process.Start("https://codethemicrobit.com#uploader"); } catch (Exception) { }
+            try { Process.Start("https://makecode.microbit.org#uploader"); } catch (Exception) { }
        }

        private void initializeFileWatch()
@ -236,7 +236,7 @@ namespace Microsoft.MicroBit
        {
            try
            {
-                Process.Start("https://codethemicrobit.com/uploader");
+                Process.Start("https://makecode.microbit.org/uploader");
            }
            catch (IOException) { }
        }
--- a/cmds/cmds.ts
+++ b/cmds/cmds.ts
@ -1,59 +0,0 @@
-/// <reference path="../node_modules/pxt-core/built/pxt.d.ts"/>
-
-import * as fs from "fs";
-import * as path from "path";
-import * as child_process from "child_process";
-
-let writeFileAsync: any = Promise.promisify(fs.writeFile)
-let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
-let readDirAsync = Promise.promisify(fs.readdir)
-
-
-export function deployCoreAsync(res: ts.pxtc.CompileResult) {
-    return getBitDrivesAsync()
-        .then(drives => {
-            if (drives.length == 0) {
-                let msg = "cannot find any drives to deploy to";
-                console.log(msg);
-                return Promise.reject(new Error(msg));
-            }
-
-            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
-
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
-}
-
-function getBitDrivesAsync(): Promise<string[]> {
-    if (process.platform == "win32") {
-        const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
-        return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
-            .then(buf => {
-                let res: string[] = []
-                buf.toString("utf8").split(/\n/).forEach(ln => {
-                    let m = rx.exec(ln)
-                    if (m) {
-                        res.push(m[1] + "/")
-                    }
-                })
-                return res
-            })
-    }
-    else if (process.platform == "darwin") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        return readDirAsync("/Volumes")
-            .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
-    } else if (process.platform == "linux") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        const user = process.env["USER"]
-        return readDirAsync(`/media/${user}`)
-            .then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
-    } else {
-        return Promise.resolve([])
-    }
-}
--- a/docfiles/appmeta.html
+++ b/docfiles/appmeta.html
@ -1,16 +0,0 @@
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:site" content="@codethemicrobit" />
-    <meta name="twitter:title" content="code the micro:bit" />
-    <meta name="twitter:description" content="Blocks+JavaScript for programming your micro:bit" />
-    <meta name="twitter:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
-
-    <meta property="og:title" content="micro:bit editor" />
-    <meta property="og:description" content="Blocks+JavaScript for programming your micro:bit" />
-    <meta property="og:site_name" content="code the micro:bit" />
-    <meta property="og:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
-    <!--
-    Canonical URL needs to wait until main release is updated.
-    <meta property="og:url" content="https://codethemicrobit.com" />
-    <meta property="og:type" content="website" />
-    <meta property="fb:app_id" content="" />
-    -->
--- a/docfiles/apptracking.html
+++ b/docfiles/apptracking.html
@ -1,6 +0,0 @@
-<script type="text/javascript">
-    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
-    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
-    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
-</script>
--- a/docfiles/indexhead.html
+++ b/docfiles/indexhead.html
@ -0,0 +1,29 @@
+<meta name="msvalidate.01" content="C458ADC671C51F222A0F655F66596649" />
+<meta property="og:title" content="Microsoft MakeCode" />
+<meta property="og:site_name" content="Microsoft MakeCode" />
+<meta property="og:url" content="https://www.makecode.com">
+<meta property="og:type" content="website" />
+<meta property="og:description" content="Microsoft MakeCode is a free, open-source Block and JavaScript learn-to-code editor that promotes a more inclusive approach to computing education." />
+<meta property="og:image" content="/static/logo/logo-card.png">
+<meta property="fb:app_id" content=""/>
+
+<meta name="msapplication-config" content="/static/logo/favicons/browserconfig.xml">
+<meta name="msapplication-TileImage" content="/static/logo/favicons/mstile-310x310.png">
+<meta name="msapplication-TileColor" content="#b4009e">
+<meta name="application-name" content="MakeCode">
+<link rel="shortcut icon" sizes="16x16 24x24 32x32 48x48" href="/static/logo/favicons/favicon.ico">
+<link rel="icon" type="image/png" sizes="32x32" href="/static/logo/favicons/favicon-32x32.png">
+<link rel="apple-touch-icon" sizes="180x180" href="/static/logo/favicons/apple-touch-icon.png">
+
+<meta name="twitter:card" content="summary"/>
+<meta name="twitter:title" content="Microsoft MakeCode">
+<meta name="twitter:description" content="Microsoft MakeCode is a free, open-source Block and JavaScript learn-to-code editor that promotes a more inclusive approach to computing education.">
+<meta name="twitter:site" content="@MSMakeCode">
+<meta name="twitter:creator" content="@MSMakeCode">
+<meta name="twitter:image" content="/static/logo/logo-card.png"/>
+<link rel="stylesheet" href="/doccdn/semantic.css" />
+<link rel="stylesheet" href="/docfiles/index.css" />
+
+<script src="/doccdn/jquery.js"></script>
+<script src="/static/semantic/semantic.min.js"></script>
+<script src="/docfiles/index.js"></script>
--- a/docfiles/meta.html
+++ b/docfiles/meta.html
@ -1,21 +0,0 @@
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:site" content="@codethemicrobit" />
-<meta name="twitter:title" content="@name@" />
-<meta name="twitter:description" content="@description@" />
-<meta name="twitter:image" content="@cardLogo@" />
-
-<meta property="og:title" content="@name@" />
-<meta property="og:site_name" content="code the micro:bit" />
-<meta property="og:description" content="@description@" />
-<meta property="og:image" content="@cardLogo@" />
-<!--
-    <meta property="og:type" content="website" />
-    <meta property="fb:app_id" content="" />
-    -->
-
-<link rel="apple-touch-icon" href="@appLogo@">
-<link rel="icon" type="image/png" href="@appLogo@">
-<link rel="mask-icon" href="https://az851932.vo.msecnd.net/pub/zwxazere/safari-pinned-tab.svg" color="#000000">
-<link rel="shortcut icon" href="@appLogo@">
-<meta name="theme-color" content="@accentColor@">
-
--- a/docfiles/target.css
+++ b/docfiles/target.css
@ -1,5 +0,0 @@
-#root .avatar .avatar-image {
-    background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
-    background-size: contain;
-    background-repeat: no-repeat;
-}
--- a/docfiles/tracking.html
+++ b/docfiles/tracking.html
@ -1,6 +0,0 @@
-<script type="text/javascript">
-    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
-    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
-    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (typeof pxtConfig !== "undefined") mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
-</script>
--- a/docs/_locales/pl/_theme.json
+++ b/docs/_locales/pl/_theme.json
@ -1,22 +0,0 @@
-{
-    "name": "koduj z micro:bit",
-    "title": "koduj z micro:bit",
-    "docMenu": [
-        {
-            "name": "O nas",
-            "path": "/about"
-        },
-        {
-            "name": "Lekcje",
-            "path": "/lessons"
-        },
-        {
-            "name": "Instrukcja obsługi",
-            "path": "/reference"
-        },
-        {
-            "name": "Urządzenie",
-            "path": "/device"
-        }
-    ]
-}
--- a/docs/_locales/pl/docs.md
+++ b/docs/_locales/pl/docs.md
@ -1,7 +0,0 @@
-# Dokumentacja
-
-Witamy na stronach dokumentacji!
-
-* Przeglądnij [instrukcje obsługi](/reference)
-* Dowiedz się więcej o [urządzeniu](/device)
-* Wystartuj z [lekcjami](/lessons)
--- a/docs/about.md
+++ b/docs/about.md
@ -1,91 +0,0 @@
-![](/static/mb/device/pano.jpg)
-
-# About
-
-### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
-
-The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
-The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
-
-The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
-Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
-
-* [Read the docs](/docs)
-
-## [Hardware: The Device](/device)
-
-The BBC micro:bit is packaged with sensors, radio and other goodies. Learn about the [hardware components](/device) of the micro:bit to make the most of it!
-
-## Programming: [Blocks](/blocks) or [JavaScript](/javascript)
-
-You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [micro:bit APIs](/reference):
-
-```block
-input.onButtonPressed(Button.A, () => {
-    basic.showString("Hi!");
-})
-```
-```typescript
-input.onButtonPressed(Button.A, () => {
-    basic.showString("Hi!");
-})
-```
-
-The editor work in [most modern browsers](/browsers), work [offline](/offline) once loaded and do not require any installation. 
-
-## [Compile and Flash: Your Program!](/device/usb)
-
-When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
-
-Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
-program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
-
-## Simulator: Test Your Code
-
-You can run your code using the micro:bit simulator, all within the confines of a web browser. 
-The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
-
-```sim
-basic.forever(() => {
-  basic.showString("Hi!");
-})
-input.onButtonPressed(Button.A, () => {
-    led.stopAnimation();
-    basic.showLeds(`
-. . . . .
-. # . # .
-. . . . .
-# . . . #
-. # # # .`);
-});
-input.onButtonPressed(Button.B, () => {
-    led.stopAnimation();
-    basic.showLeds(`
-. # . # .
-# . # . #
-# . . . #
-. # . # .
-. . # . .`);
-});
-```
-
-## C++ Runtime
-
-The [C++ micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
-as well as a set of helper functions (such as displaying a number/image/string on the LED screen). 
-
-The [micro:bit library](/reference) mirrors the functions of the C++ library. 
-When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.
-
-## [Command Line Tools](/cli)
-
-Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
-
-## [Packages](/packages)
-
-Create, edit and distribute your own blocks and JavaScript using [packages](/packages). Packages are hosted on GitHub and may be written
-using C++, JavaScript and/or ARM thumb.
-
-## [Open Source](/open-source)
-
-The code for the micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!
--- a/docs/beta-ref.json
+++ b/docs/beta-ref.json
@ -0,0 +1,3 @@
+{
+    "appref": "v"
+}
--- a/docs/blocks.md
+++ b/docs/blocks.md
@ -1,14 +0,0 @@
-# Blocks language
-
-### @description Langugage constructs for the Block editor.
-
-```namespaces
-for (let i = 0;i<5;++i) {}
-if (true){}
-let x = 0;
-Math.random(5);
-```
-
-## See Also
-
-[logic](/blocks/logic), [loops](/blocks/loops), [math](/blocks/math), [variables](/blocks/variables)
--- a/docs/blocks/logic.md
+++ b/docs/blocks/logic.md
@ -1,9 +0,0 @@
-# Logic
-
-```cards
-if(true) {}
-true;
-true && false;
-!true;
-1 != 0;
-```
--- a/docs/blocks/logic/boolean.md
+++ b/docs/blocks/logic/boolean.md
@ -1,102 +0,0 @@
-# Boolean
-
-true or false.
-
-A Boolean has one of two possible values: `true`; `false`.  Boolean (logical) operators (*and*, *or*, *not*) take Boolean inputs and yields a Boolean value. Comparison operators on other types ([numbers](/reference/types/number), [strings](/reference/types/string) yields a Boolean value.
-
-The following blocks represent the true and false Boolean values, which can be plugged in anywhere a Boolean value is expected:
-
-```blocks
-true;
-false;
-```
-
-The next three blocks represent the three Boolean (logic) operators:
-
-```blocks
-true && false;
-true || false;
-!true;
-```
-
-The next six blocks represent comparison operators that yield a Boolean value. Most comparisons you will do involve [numbers](/reference/types/number):
-
-```blocks
-42 == 0;
-42 != 0;
-42 < 0;
-42 > 0;
-42 <= 0;
-42 >= 0;
-```
-
-Boolean values and operators are often used with an [if](/blocks/logic/if) or [while](/blocks/loops/while) statement to determine which code will execute next. For example:
-
-### Functions that return a Boolean
-
-Some functions return a Boolean value, which you can store in a Boolean variable. For example, the following code gets the on/off state of `point (1, 2)` and stores this in the Boolean variable named `on`. Then the code clears the screen if `on` is `true`:
-
-### Boolean operators
-
-Boolean operators take Boolean inputs and evaluate to a Boolean output:
-
-### Conjunction: `A and B`
-
-`A and B` evaluates to `true` if-and-only-if both A and B are true:
-
-```blocks
-false && false == false;
-false && true == false;
-true && false == false;
-true && true == true;
-```
-
-### Disjunction: `A or B`
-
-`A or B` evaluates to `true` if-and-only-if either A is true or B is true:
-
-```blocks
-false || false == false;
-false || true == true;
-true || false == true;
-true || true == true;
-```
-
-### Negation: `not A`
-
-`not A` evaluates to the opposite (negation) of A:
-
-```blocks
-!false == true;
-!true == false;
-```
-
-### Example
-
-This example turns on LED `3 , 3`, if LEDs `1 , 1` and `2 , 2` are both on:
-
-```blocks
-if (led.point(1,1) && led.point(2,2)) {
-   led.plot(3,3)
-}
-```
-
-### Comparisons of numbers and strings
-
-When you compare two Numbers, you get a Boolean value, such as the comparison `x < 5` in the code below:
-
-```blocks
-let x = Math.random(5)
-if(x < 5) {
-   basic.showString("low");
-} else { 
-   basic.showString("high");
-} 
-```
-
-See the documentation on [Numbers](/reference/types/number) for more information on comparing two Numbers. You can also [compare strings](/reference/types/string-functions) using the `equals` function.
-
-### See also
-
-[if](/blocks/logic/if), [while](/blocks/loops/while), [number](/reference/types/number)
-
--- a/docs/blocks/logic/if.md
+++ b/docs/blocks/logic/if.md
@ -1,28 +0,0 @@
-# If
-
-### @parent blocks/language
- 
-
-Conditionally run code depending on whether a [Boolean](/blocks/logic/boolean) condition is true or false.
-
-```blocks
-if(true) {
-}
-```
-
-Click on the dark blue gear icon (see above) to add an *else* or *if* to the current block.
-
-### Example: adjusting screen brightness
-
-```blocks
-if(input.lightLevel()<100){
-    led.setBrightness(255);
-}
-```
-
-If the [light level](/reference/input/light-level) is `< 100`, this code sets the brightness to `255`:
-
-### See also
-
-[while loop](/blocks/loops/while), [for](/blocks/loops/for), [boolean](/blocks/logic/boolean)
-
--- a/docs/blocks/loops.md
+++ b/docs/blocks/loops.md
@ -1,7 +0,0 @@
-# Loops
-
-```cards
-for(let i = 0;i<5;i++) {}
-while(true) {}
-basic.forever(() => {});
-```
--- a/docs/blocks/loops/for.md
+++ b/docs/blocks/loops/for.md
@ -1,20 +0,0 @@
-# For
-
-### @parent blocks/language
- 
-Run part of the program the number of times you say.
-
-### Example: Count to 4
-
-This program will show the numbers 0, 1, 2, 3, and 4 one after another on the LED screen.
-
-```blocks
-for(let i = 0; i < 5; ++i) {
-basic.showNumber(i)
-}
-```
-
-### See also
-
-[repeat](/blocks/loops/repeat), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
-
--- a/docs/blocks/loops/repeat.md
+++ b/docs/blocks/loops/repeat.md
@ -1,12 +0,0 @@
-# Repeat
-
-Run part of the program the number of times you say.
-
-### Block Editor
-
-![](/static/mb/blocks/contents-0.png)
-
-### See also
-
-[for](/blocks/loops/for), [while](/blocks/loops/while), [if](/blocks/logic/if), [show number](/reference/basic/show-number)
-
--- a/docs/blocks/loops/while.md
+++ b/docs/blocks/loops/while.md
@ -1,29 +0,0 @@
-# While
-
-Repeat code while a [Boolean](/blocks/logic/boolean) `condition` is true.
-
-```blocks
-while(true) {
-}
-```
-
-The while loop has a *condition* that evaluates to a [Boolean](/blocks/logic/boolean) value. After the `do` keyword, add the code that you want to run while the `condition` is `true`. The while loop concludes with `end while`.
-
-The condition is tested before any code runs. Which means that if the condition is false, the code inside the loop doesn't execute.
-
-### Example: diagonal line
-
-The following example uses a while loop to make a diagonal line on the LED screen (points `0, 0`, `1, 1`, `2, 2`, `3, 3`, `4, 4`).
-
-```blocks
-let index = 4;
-while(index >= 0) {
-    led.plot(index, index);
-    index--;
-}
-```
-
-### See also
-
-[on button pressed](/reference/input/on-button-pressed), [for](/blocks/loops/for), [if](/blocks/logic/if), [forever](/reference/basic/forever)
-
--- a/docs/blocks/math.md
+++ b/docs/blocks/math.md
@ -1,36 +0,0 @@
-# Math
-
-### [Numeric](/reference/types/number) values: 0, 1, 2, ...
-
-```block
-0;
-1;
-2;
-```
-
-### Arithmetic binary operation (+, -, *, /)
-
-```block
-0+1;
-0-1;
-1*2;
-3/4;
-```
-
-### Absolute value
-
-```block
-Math.abs(-5);
-```
-
-### Minimum/maximum of two values
-
-```block
-Math.min(0, 1);
-```
-
-### Random value
-
-```block
-Math.random(5);
-```
--- a/docs/blocks/variables.md
+++ b/docs/blocks/variables.md
@ -1,21 +0,0 @@
-# Variables
-
-[Assign](/blocks/variables/assign) (set) a variable's value
-
-```blocks
-let x = 0;
-```
-
-Get a variable's value
-
-```blocks
-let x = 0;
-x;
-```
-
-[Change](/blocks/variables/change-var) a variable's value
-
-```blocks
-let x = 0;
-x+=1;
-```
--- a/docs/blocks/variables/assign.md
+++ b/docs/blocks/variables/assign.md
@ -1,36 +0,0 @@
-# Assignment Operator
-
-Use an equals sign to make a [variable](/blocks/variables/var) store the [number](/reference/types/number) 
-or [string](/reference/types/string) you say.
-
-When you use the equals sign to store something in a variable, the equals sign is called
-an *assignment operator*, and what you store is called a *value*.
-
-### Storing numbers in variables
-
-This program makes the variable `item` equal `5` and then shows it on the [LED screen](/device/screen).
-
-````blocks
-let item = 5
-basic.showNumber(item)
-````
-
-### Storing strings in variables
-
-This program makes the variable `name` equal `Joe` and then shows it on the [LED screen](/device/screen).
-
-````blocks
-let name = "Joe"
-basic.showString(name);
-````
-
-### Notes
-
-You can use the assignment operator with variables of 
-every [type](/reference/types). A *type* is which kind of thing
-a variable can store, like a number or string.
-
-### See also
-
-[variable](/blocks/variables/var), [types](/reference/types)
-
--- a/docs/blocks/variables/change-var.md
+++ b/docs/blocks/variables/change-var.md
@ -1,40 +0,0 @@
-# Change Value
-
-Set the value for local and global variables.
-
-### @parent blocks/change-value
-
-Change the value of a variable
-
-```blocks
-let x = 0
-x += 1
-```
-
-### Declare a variable
-
-Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Like this:
-
-```blocks
-let x = 0
-x += 1
-```
-
-### Example
-
-Use the assignment operator to set the value of a [variable](/blocks/variables/var). Change the value of a variable from 0 to 1 using the change item block. Then display the new value of the variable on the LED screen. Like this:
-
-```blocks
-let x = 0;
-x += 1;
-basic.showNumber(x);
-```
-
-### Notes
-
-* You can use the assignment operator with variables of each of the supported [types](/reference/types).
-
-### See also
-
-[variable](/blocks/variables/var), [types](/reference/types)
-
--- a/docs/blocks/variables/var.md
+++ b/docs/blocks/variables/var.md
@ -1,87 +0,0 @@
-# Local Variables
-
-How to define and use local variables.
-
-### @parent language
-
-A variable is a place where you can store and retrieve data. Variables have a name, a [type](/reference/types), and value:
-
-* *name* is how you'll refer to the variable
-* *type* refers to the kind of data a variable can store
-* *value* refers to what's stored in the variable
-
-### Var statement
-
-Use the Block Editor variable statement to create a variable 
-and the [assignment operator](/blocks/variables/assign) 
-to store something in the variable.
-
-For example, this code stores the number `2` in the `x` variable:
-
-```blocks
-let x = 2;
-```
-Here's how to define a variable in the Block Editor:
-
-1. Click `variables`.
-
-2. Change the default variable name if you like.
-
-3. Drag a block type on the right-side of the [assignment operator](/blocks/variables/assign) and click the down arrow to change the variable name.
-
-A variable is created for the number returned by the [brightness](/reference/led/brightness) function.
-
-```blocks
-let b = led.brightness();
-```
-
-### Using variables
-
-Once you've defined a variable, just use the variable's name whenever you need what's stored in the variable. For example, the following code shows the value stored in `counter` on the LED screen:
-
-```blocks
-let counter = 1;
-basic.showNumber(counter);
-```
-
-To change the contents of a variable use the assignment operator. The following code sets `counter` to 1 and then increments `counter` by 10:
-
-```blocks
-let counter = 1;
-counter = counter + 10;
-basic.showNumber(counter);
-```
-
-### Why use variables?
-
-If you want to remember and modify data, you'll need a variable. 
-A counter is a great example:
-
-```blocks
-let counter = 0;
-input.onButtonPressed(Button.A, () => { 
-  counter = counter + 1;
-  basic.showNumber(counter);
-});
-```
-
-### Local variables
-
-Local variables exist only within the function or block of code where they're defined. For example:
-
-```blocks
-// x does NOT exist here.
-if (led.brightness() > 128) {
-  // x exists here
-  let x = 0;
-}
-```
-
-#### Notes
-
-* You can use the default variable names if you'd like, however, it's best to use descriptive variable names. To change a variable name in the editor, select the down arrow next to the variable and then click "new variable".
-
-### See also
-
-[types](/reference/types), [assignment operator](/blocks/variables/assign)
-
--- a/docs/browsers.md
+++ b/docs/browsers.md
@ -1,104 +0,0 @@
-# Unsupported configuration
-
-[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
-your browser or operating system. The following configurations are supported:
-
-## Windows
-
-You need one of these browsers running on Windows 7, Windows 8, Windows 8.1, or
-Windows 10:
-
-* Internet Explorer 11
-* Microsoft Edge
-* Google Chrome
-* Mozilla Firefox
-
-## Mac
-
-You need one of these browsers running on OS X 10.9 Mavericks, OS X 10.10
-Yosemite, OS X 10.11 El Capitan, or macOS 10.12 Sierra:
-
-* Safari
-* Google Chrome
-* Mozilla Firefox
-
-## Linux
-
-If you're using a Raspberry Pi, please see [the documentation
-here](/raspberry-pi).
-
-You need to be running a Linux distribution recent enough to run the most recent
-version of one of the following:
-
-* Google Chrome, or Chromium
-* Mozilla Firefox, Iceweasel, or Seamonkey
-
-## How to check your OS or browser
-
-### Windows
-
-* Click on the Start menu
-* Type 'System'
-* Click on the app called 'System'
-* The version of Windows you are using will be displayed:
-
-![](/static/configurations/windows-version.png)
-
-### Mac
-
-* Click on the Apple icon in the top left
-* Click on 'About this Mac'
-* This window will be displayed:
-
-![](/static/configurations/osx-version.png)
-
-### Internet Explorer
-
-* Click on the Settings icon in the top right
-* Click 'About Internet Explorer'
-* This window will be displayed:
-
-![](/static/configurations/ie-version.png)
-
-### Edge
-
-Edge automatically updates, so you should always be using the latest version
-
-* Click on the menu icon in the top right (three dots)
-* Scroll to the bottom
-* Information similar to the following will be displayed:
-
-![](/static/configurations/edge-version.png)
-
-### Google Chrome
-
-Google Chrome automatically updates, so you should always be using the latest version
-
-* Click on the menu icon in the top right (three dots)
-* Click Help, and About Google Chrome
-* Information similar to the following will be displayed:
-
-![](/static/configurations/chrome-version.png)
-
-### Firefox
-
-Firefox automatically updates, so you should always be using the latest version
-
-* Click on the menu icon in the top right (three horizontal lines)
-* Click the question mark icon (help button)
-* Click 'About Firefox'
-
-![](/static/configurations/firefox-version.png)
-
-### Safari
-
-Safari updates when your operating system updates, so if you are using the
-latest version of OS X then you'll be using the latest version of Safari.
-
-* Click on the Safari menu in the top left
-* Click 'About Safari'
-
-![](/static/configurations/safari-version.png)
-
-IT administrators should check which browser versions are supported
-[here](/browsers/technical).
--- a/docs/browsers/linux.md
+++ b/docs/browsers/linux.md
@ -1,16 +0,0 @@
-# Recommended browser for Linux
-
-As you are using Linux, it is recommended that you use [Mozilla
-Firefox][firefox] or [Google Chrome][chrome].
-
-Please see [here][technical] for technical information on which browsers are
-supported, or [here][versions] to check which version you are using.
-
-[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
-[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
-[firefox]: https://www.mozilla.org/en-US/firefox/new/
-[chrome]: https://www.google.com/chrome/
-[opera]: https://www.opera.com
-[safari]: http://www.apple.com/safari/
-[technical]: /browsers/technical
-[versions]: /browsers
--- a/docs/browsers/mac.md
+++ b/docs/browsers/mac.md
@ -1,16 +0,0 @@
-# Recommended browser for Mac
-
-As you are using a Mac, it is recommended that you use [Safari][]. Alternatively,
-[Google Chrome][chrome] and [Mozilla Firefox][firefox] are also supported.
-
-Please see [here][technical] for technical information on which browsers are
-supported, or [here][versions] to check which version you are using.
-
-[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
-[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
-[firefox]: https://www.mozilla.org/en-US/firefox/new/
-[chrome]: https://www.google.com/chrome/
-[opera]: https://www.opera.com
-[safari]: http://www.apple.com/safari/
-[technical]: /browsers/technical
-[versions]: /browsers
--- a/docs/browsers/technical.md
+++ b/docs/browsers/technical.md
@ -1,36 +0,0 @@
-# Technical information about browser support
-
-[codethemicrobit.com][] requires that you use a recent version of a modern
-browser, such as Microsoft Edge, Google Chrome, Mozilla Firefox, Safari, Opera,
-or IE11.  This is because the editor uses modern web technologies such as [web
-workers][] to enable compiling [TypeScript][] in the browser, or the using the
-same [Monaco][] editor that powers [Visual Studio Code][].
-
-[codethemicrobit.com]: https://codethemicrobit.com
-[web workers]: http://www.w3.org/TR/workers/
-[typescript]: http://www.typescriptlang.org
-[monaco]: https://microsoft.github.io/monaco-editor/
-[visual studio code]: http://code.visualstudio.com
-
-Most modern browsers automatically update themselves, but in some environments
-such as schools these automatic updates are disabled for security. **We
-strongly recommend that you use the most recent version of any of these
-browsers**, but if you can't then you must use at least:
-
-| Browser           | Minimum version | Release date   | Windows     | Mac        |
-| ----------------- | --------------- | -------------- | ----------- | ---------- |
-| Edge              | 12              | March 2015     | Windows 10+ | N/A        |
-| Internet Explorer | 11              | October 2013   | Windows 7+  | N/A        |
-| Mozilla Firefox   | 31 ESR          | July 2014      | Windows XP+ | OS X 10.6+ |
-| Google Chrome     | 38              | October 2014   | Windows XP+ | OS X 10.6+ |
-| Safari            | 9               | September 2015 | N/A         | OS X 10.9+ |
-| Opera             | 21              | May 2014       | Windows 7+  | OS X 10.9+ |
-
-
-Please see our information for which browsers are recommended for [Windows][],
-[Mac][], [Linux][], or [Raspberry Pi][].
-
-[Windows]: /browsers/windows
-[Mac]: /browsers/mac
-[Linux]: /browsers/linux
-[Raspberry Pi]: /raspberry-pi
--- a/docs/browsers/windows.md
+++ b/docs/browsers/windows.md
@ -1,18 +0,0 @@
-# Recommended browser for Windows
-
-We recommend [Microsoft Edge][edge] if you are running Windows 10, but users on
-Windows 7 or higher can use [Internet Explorer 11][ie] or recent versions of
-[Mozilla Firefox][firefox], [Google Chrome][chrome], or [Opera][opera].
-
-
-Please see [here][technical] for technical information on which browsers are
-supported, or [here][versions] to check which version you are using.
-
-[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
-[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
-[firefox]: https://www.mozilla.org/en-US/firefox/new/
-[chrome]: https://www.google.com/chrome/
-[opera]: https://www.opera.com
-[safari]: http://www.apple.com/safari/
-[technical]: /browsers/technical
-[versions]: /browsers
--- a/docs/calliope/examples.md
+++ b/docs/calliope/examples.md
@ -0,0 +1,17 @@
+# Projects
+
+Here are some cool tutorials to get you started with your @boardname@!
+
+## Basic
+
+```codecard
+[
+{
+  "name": "Radio Bridge",
+  "description": "Send radio messages to editor",
+  "url": "/projects/radio-bridge",
+  "imageUrl": "/static/mb/projects/radio-bridge.png",
+  "cardType": "example"
+}
+]
+```
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx`