Merge branch 'dev' into users/t-anmah/debugger

Author: andreamah

package-lock.json

@@ -270,7 +270,7 @@
         "mocha": "^6.1.4",
         "npm-run-all": "^4.1.3",
         "prettier": "^1.19.1",
-        "react-scripts": "3.0.1",
+        "react-scripts": "^3.4.0",
         "style-loader": "^0.21.0",
         "ts-import-plugin": "^1.5.4",
         "ts-loader": "^4.4.2",
@@ -322,4 +322,4 @@
     "extensionDependencies": [
         "ms-python.python"
     ]
-}
+}

package.json

@@ -281,50 +281,67 @@ export enum CONFIG_KEYS {
 
 export enum TelemetryEventName {
     FAILED_TO_OPEN_SIMULATOR = "SIMULATOR.FAILED_TO_OPEN",
+    DEBUGGER_INIT_SUCCESS = "DEBUGGER.INIT.SUCCESS",
+    DEBUGGER_INIT_FAIL = "DEBUGGER.INIT.FAIL",
 
     // Extension commands
-    COMMAND_DEPLOY_DEVICE = "COMMAND.DEPLOY.DEVICE",
-    COMMAND_NEW_FILE_CPX = "COMMAND.NEW.FILE.CPX",
-    COMMAND_NEW_FILE_MICROBIT = "COMMAND.NEW.FILE.MICROBIT",
-    COMMAND_OPEN_SIMULATOR = "COMMAND.OPEN.SIMULATOR",
     COMMAND_RUN_SIMULATOR_BUTTON = "COMMAND.RUN.SIMULATOR_BUTTON",
     COMMAND_RUN_PALETTE = "COMMAND.RUN.PALETTE",
-    COMMAND_RUN_EDITOR_ICON = "COMMAND.RUN.EDITOR_ICON",
-    COMMAND_SERIAL_MONITOR_CHOOSE_PORT = "COMMAND.SERIAL_MONITOR.CHOOSE_PORT",
-    COMMAND_SERIAL_MONITOR_OPEN = "COMMAND.SERIAL_MONITOR.OPEN",
-    COMMAND_SERIAL_MONITOR_BAUD_RATE = "COMMAND.SERIAL_MONITOR.BAUD_RATE",
-    COMMAND_SERIAL_MONITOR_CLOSE = "COMMAND.SERIAL_MONITOR.CLOSE",
+    COMMAND_INSTALL_EXTENSION_DEPENDENCIES = "COMMAND.INSTALL.EXTENSION.DEPENDENCIES",
+
+    CPX_COMMAND_DEPLOY_DEVICE = "CPX.COMMAND.DEPLOY.DEVICE",
+    CPX_COMMAND_NEW_FILE = "CPX.COMMAND.NEW.FILE.CPX",
+    CPX_COMMAND_OPEN_SIMULATOR = "CPX.COMMAND.OPEN.SIMULATOR",
+    CPX_COMMAND_SERIAL_MONITOR_CHOOSE_PORT = "CPX.COMMAND.SERIAL_MONITOR.CHOOSE_PORT",
+    CPX_COMMAND_SERIAL_MONITOR_OPEN = "CPX.COMMAND.SERIAL_MONITOR.OPEN",
+    CPX_COMMAND_SERIAL_MONITOR_BAUD_RATE = "CPX.COMMAND.SERIAL_MONITOR.BAUD_RATE",
+    CPX_COMMAND_SERIAL_MONITOR_CLOSE = "CPX.COMMAND.SERIAL_MONITOR.CLOSE",
+
+    MICROBIT_COMMAND_NEW_FILE = "MICROBIT.COMMAND.NEW.FILE",
+    MICROBIT_COMMAND_OPEN_SIMULATOR = "MICROBIT.COMMAND.OPEN.SIMULATOR",
 
     // Simulator interaction
-    SIMULATOR_BUTTON_A = "SIMULATOR.BUTTON.A",
-    SIMULATOR_BUTTON_B = "SIMULATOR.BUTTON.B",
-    SIMULATOR_BUTTON_AB = "SIMULATOR.BUTTON.AB",
-    SIMULATOR_SWITCH = "SIMULATOR.SWITCH",
+    CPX_SIMULATOR_BUTTON_A = "CPX.SIMULATOR.BUTTON.A",
+    CPX_SIMULATOR_BUTTON_B = "CPX.SIMULATOR.BUTTON.B",
+    CPX_SIMULATOR_BUTTON_AB = "CPX.SIMULATOR.BUTTON.AB",
+    CPX_SIMULATOR_SWITCH = "CPX.SIMULATOR.SWITCH",
+
+    MICROBIT_SIMULATOR_BUTTON_A = "MICROBIT.SIMULATOR.BUTTON.A",
+    MICROBIT_SIMULATOR_BUTTON_B = "MICROBIT.SIMULATOR.BUTTON.B",
+    MICROBIT_SIMULATOR_BUTTON_AB = "MICROBIT.SIMULATOR.BUTTON.AB",
 
     // Sensors
-    SIMULATOR_TEMPERATURE_SENSOR = "SIMULATOR.TEMPERATURE",
-    SIMULATOR_LIGHT_SENSOR = " SIMULATOR.LIGHT",
-    SIMULATOR_MOTION_SENSOR = "SIMULATOR.MOTION",
-    SIMULATOR_SHAKE = "SIMULATOR.SHAKE",
-    SIMULATOR_CAPACITIVE_TOUCH = "SIMULATOR.CAPACITIVE.TOUCH",
+    CPX_SIMULATOR_TEMPERATURE_SENSOR = "CPX.SIMULATOR.TEMPERATURE",
+    CPX_SIMULATOR_LIGHT_SENSOR = "CPX.SIMULATOR.LIGHT",
+    CPX_SIMULATOR_MOTION_SENSOR = "CPX.SIMULATOR.MOTION",
+    CPX_SIMULATOR_SHAKE = "CPX.SIMULATOR.SHAKE",
+    CPX_SIMULATOR_CAPACITIVE_TOUCH = "CPX.SIMULATOR.CAPACITIVE.TOUCH",
+
+    MICROBIT_SIMULATOR_TEMPERATURE_SENSOR = "MICROBIT.SIMULATOR.TEMPERATURE",
+    MICROBIT_SIMULATOR_LIGHT_SENSOR = "MICROBIT.SIMULATOR.LIGHT",
+    MICROBIT_SIMULATOR_MOTION_SENSOR = "MICROBIT.SIMULATOR.MOTION",
 
     // Pop-up dialog
-    CLICK_DIALOG_DONT_SHOW = "CLICK.DIALOG.DONT.SHOW",
-    CLICK_DIALOG_EXAMPLE_CODE = "CLICK.DIALOG.EXAMPLE.CODE",
-    CLICK_DIALOG_HELP_DEPLOY_TO_DEVICE = "CLICK.DIALOG.HELP.DEPLOY.TO.DEVICE",
-    CLICK_DIALOG_TUTORIALS = "CLICK.DIALOG.TUTORIALS",
+    CPX_CLICK_DIALOG_DONT_SHOW = "CPX.CLICK.DIALOG.DONT.SHOW",
+    CPX_CLICK_DIALOG_EXAMPLE_CODE = "CPX.CLICK.DIALOG.EXAMPLE.CODE",
+    CPX_CLICK_DIALOG_HELP_DEPLOY_TO_DEVICE = "CPX.CLICK.DIALOG.HELP.DEPLOY.TO.DEVICE",
+    CPX_CLICK_DIALOG_TUTORIALS = "CPX.CLICK.DIALOG.TUTORIALS",
 
-    ERROR_PYTHON_DEVICE_PROCESS = "ERROR.PYTHON.DEVICE.PROCESS",
     ERROR_PYTHON_PROCESS = "ERROR.PYTHON.PROCESS",
-    ERROR_COMMAND_NEW_FILE = "ERROR.COMMAND.NEW.FILE",
-    ERROR_DEPLOY_WITHOUT_DEVICE = "ERROR.DEPLOY.WITHOUT.DEVICE",
+    CPX_ERROR_COMMAND_NEW_FILE = "CPX.ERROR.COMMAND.NEW.FILE",
+    CPX_ERROR_DEPLOY_WITHOUT_DEVICE = "CPX.ERROR.DEPLOY.WITHOUT.DEVICE",
+    CPX_ERROR_PYTHON_DEVICE_PROCESS = "CPX.ERROR.PYTHON.DEVICE.PROCESS",
+    CPX_SUCCESS_COMMAND_DEPLOY_DEVICE = "CPX.SUCCESS.COMMAND.DEPLOY.DEVICE",
 
-    SUCCESS_COMMAND_DEPLOY_DEVICE = "SUCCESS.COMMAND.DEPLOY.DEVICE",
+    MICROBIT_ERROR_COMMAND_NEW_FILE = "MICROBIT.ERROR.COMMAND.NEW.FILE",
 
     // Performance
-    PERFORMANCE_DEPLOY_DEVICE = "PERFORMANCE.DEPLOY.DEVICE",
-    PERFORMANCE_NEW_FILE = "PERFORMANCE.NEW.FILE",
-    PERFORMANCE_OPEN_SIMULATOR = "PERFORMANCE.OPEN.SIMULATOR",
+    CPX_PERFORMANCE_DEPLOY_DEVICE = "CPX.PERFORMANCE.DEPLOY.DEVICE",
+    CPX_PERFORMANCE_NEW_FILE = "CPX.PERFORMANCE.NEW.FILE",
+    CPX_PERFORMANCE_OPEN_SIMULATOR = "CPX.PERFORMANCE.OPEN.SIMULATOR",
+
+    MICROBIT_PERFORMANCE_NEW_FILE = "MICROBIT.PERFORMANCE.NEW.FILE",
+    MICROBIT_PERFORMANCE_OPEN_SIMULATOR = "MICROBIT.PERFORMANCE.OPEN.SIMULATOR",
 }
 export const DEFAULT_DEVICE = CONSTANTS.DEVICE_NAME.CPX;