Create Release Version (to staging)

.gitignore

@@ -8,6 +8,9 @@ out/
 !locales/**/out/  
 package.nls.*.json
 
+# virtual environment
+venv/
+
 # testing
 .vscode-test 
 

.vscode/settings.json

@@ -8,4 +8,4 @@
     },
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off"
-}
+}

gulpfile.js

@@ -1,135 +1,140 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-const gulp = require("gulp");
-
-const ts = require("gulp-typescript");
-const sourcemaps = require("gulp-sourcemaps");
-const typescript = require("typescript");
-const del = require("del");
-const es = require("event-stream");
-const vsce = require("vsce");
-const nls = require("vscode-nls-dev");
-
-const tsProject = ts.createProject("./tsconfig.json", { typescript });
-
-const inlineMap = true;
-const inlineSource = false;
-const outDest = "out";
-
-// A list of all locales supported by VSCode can be found here: https://code.visualstudio.com/docs/getstarted/locales
-const languages = [{ folderName: "en", id: "en" }];
-
-gulp.task("clean", () => {
-  return del(
-    [
-      "out/*",
-      "package.nls.*.json",
-      "../../dist/*0.0.0-UNTRACKEDVERSION.vsix"
-    ],
-    { force: true }
-  );
-});
-
-const pythonToMove = [
-  "./src/adafruit_circuitplayground/*.*",
-  "./src/*.py",
-  "./src/requirements.txt",
-];
-
-gulp.task("python-compile", () => {
-  // the base option sets the relative root for the set of files,
-  // preserving the folder structure
-  return gulp.src(pythonToMove, { base: "./src/" }).pipe(gulp.dest("out"));
-});
-
-gulp.task("internal-compile", () => {
-  return compile(false);
-});
-
-gulp.task("internal-nls-compile", () => {
-  return compile(true);
-});
-
-gulp.task("add-locales", () => {
-  return gulp
-    .src(["package.nls.json"])
-    .pipe(nls.createAdditionalLanguageFiles(languages, "locales"))
-    .pipe(gulp.dest("."));
-});
-
-gulp.task("vsce:publish", () => {
-  return vsce.publish();
-});
-
-gulp.task("vsce:package", () => {
-  return vsce.createVSIX({
-    packagePath: "../../dist/deviceSimulatorExpress-0.0.0-UNTRACKEDVERSION.vsix"
-  });
-});
-
-gulp.task(
-  "compile",
-  gulp.series("clean", "internal-compile", "python-compile", callback => {
-    callback();
-  })
-);
-
-gulp.task(
-  "build",
-  gulp.series(
-    "clean",
-    "internal-nls-compile",
-    "python-compile",
-    "add-locales",
-    callback => {
-      callback();
-    }
-  )
-);
-
-gulp.task(
-  "publish",
-  gulp.series("compile", "vsce:publish", callback => {
-    callback();
-  })
-);
-
-gulp.task(
-  "package",
-  gulp.series("compile", "vsce:package", callback => {
-    callback();
-  })
-);
-
-//---- internal
-
-function compile(buildNls) {
-  var r = tsProject
-    .src()
-    .pipe(sourcemaps.init())
-    .pipe(tsProject())
-    .js.pipe(buildNls ? nls.rewriteLocalizeCalls() : es.through())
-    .pipe(
-      buildNls
-        ? nls.createAdditionalLanguageFiles(languages, "locales", "out")
-        : es.through()
-    );
-
-  if (inlineMap && inlineSource) {
-    r = r.pipe(sourcemaps.write());
-  } else {
-    r = r.pipe(
-      sourcemaps.write("../out", {
-        // no inlined source
-        includeContent: inlineSource,
-        // Return relative source map root directories per file.
-        sourceRoot: "../src"
-      })
-    );
-  }
-
-  return r.pipe(gulp.dest(outDest));
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const gulp = require("gulp");
+
+const ts = require("gulp-typescript");
+const sourcemaps = require("gulp-sourcemaps");
+const typescript = require("typescript");
+const del = require("del");
+const es = require("event-stream");
+const vsce = require("vsce");
+const nls = require("vscode-nls-dev");
+
+const tsProject = ts.createProject("./tsconfig.json", { typescript });
+
+const inlineMap = true;
+const inlineSource = false;
+const outDest = "out";
+
+// A list of all locales supported by VSCode can be found here: https://code.visualstudio.com/docs/getstarted/locales
+const languages = [{ folderName: "en", id: "en" }];
+
+gulp.task("clean", () => {
+  return del(
+    [
+      "out/*",
+      "package.nls.*.json",
+      "../../dist/*0.0.0-UNTRACKEDVERSION.vsix",
+    ],
+    { force: true }
+  );
+});
+
+const pythonToMove = [
+  "./src/adafruit_circuitplayground/*.*",
+  "./src/microbit/*.*",
+  "./src/microbit/!(test)/**/*",
+  "./src/*.py",
+  "./src/common/*.py",
+  "./src/requirements.txt",
+  "./src/templates/*.*"
+];
+
+gulp.task("python-compile", () => {
+  // the base option sets the relative root for the set of files,
+  // preserving the folder structure
+  return gulp.src(pythonToMove, { base: "./src/" }).pipe(gulp.dest("out"));
+});
+
+gulp.task("internal-compile", () => {
+  return compile(false);
+});
+
+gulp.task("internal-nls-compile", () => {
+  return compile(true);
+});
+
+gulp.task("add-locales", () => {
+  return gulp
+    .src(["package.nls.json"])
+    .pipe(nls.createAdditionalLanguageFiles(languages, "locales"))
+    .pipe(gulp.dest("."));
+});
+
+gulp.task("vsce:publish", () => {
+  return vsce.publish();
+});
+
+gulp.task("vsce:package", () => {
+  return vsce.createVSIX({
+    packagePath:
+      "../../dist/deviceSimulatorExpress-0.0.0-UNTRACKEDVERSION.vsix",
+  });
+});
+
+gulp.task(
+  "compile",
+  gulp.series("clean", "internal-compile", "python-compile", callback => {
+    callback();
+  })
+);
+
+gulp.task(
+  "build",
+  gulp.series(
+    "clean",
+    "internal-nls-compile",
+    "python-compile",
+    "add-locales",
+    callback => {
+      callback();
+    }
+  )
+);
+
+gulp.task(
+  "publish",
+  gulp.series("compile", "vsce:publish", callback => {
+    callback();
+  })
+);
+
+gulp.task(
+  "package",
+  gulp.series("compile", "vsce:package", callback => {
+    callback();
+  })
+);
+
+//---- internal
+
+function compile(buildNls) {
+  var r = tsProject
+    .src()
+    .pipe(sourcemaps.init())
+    .pipe(tsProject())
+    .js.pipe(buildNls ? nls.rewriteLocalizeCalls() : es.through())
+    .pipe(
+      buildNls
+        ? nls.createAdditionalLanguageFiles(languages, "locales", "out")
+        : es.through()
+    );
+
+  if (inlineMap && inlineSource) {
+    r = r.pipe(sourcemaps.write());
+  } else {
+    r = r.pipe(
+      sourcemaps.write("../out", {
+        // no inlined source
+        includeContent: inlineSource,
+        // Return relative source map root directories per file.
+        sourceRoot: "../src",
+      })
+    );
+  }
+
+  return r.pipe(gulp.dest(outDest));
+}

locales/en/out/constants.i18n.json

@@ -27,7 +27,7 @@
   "info.deploySimulator": "\n[INFO] Deploying code to the simulator...\n",
   "info.deploySuccess": "\n[INFO] Code successfully deployed\n",
   "info.extensionActivated": "Congratulations, your extension Adafruit_Simulator is now active!",
-  "info.firstTimeWebview": "To reopen the simulator click on the \"Open Simulator\" button on the upper right corner of the text editor, or select the command \"Open Simulator\" from command palette.",
+  "info.firstTimeWebview": "To reopen the simulator select the command \"Open Simulator\" from command palette.",
   "info.installPythonDependencies": "Do you want us to try and install this extensions dependencies for you?",
   "error.invalidFileExtensionDebug": "The file you tried to run isn\\'t a Python file.",
   "info.newFile": "New to Python or the Circuit Playground Express? We are here to help!",
@@ -36,7 +36,7 @@
   "info.privacyStatement": "Privacy Statement",
   "info.successfulInstall": "Successfully installed Python dependencies.",
   "info.thirdPartyWebsite": "By clicking \"Agree and Proceed\" you will be redirected to adafruit.com, a third party website not managed by Microsoft. Please note that your activity on adafruit.com is subject to Adafruit's privacy policy",
-  "info.welcomeOutputTab": "Welcome to the Adafruit Simulator output tab!\n\n",
+  "info.welcomeOutputTab": "Welcome to the Device Simulator Express output tab!\n\n",
   "label.webviewPanel": "Device Simulator Express",
   "name": "Device Simulator Express",
 

locales/en/package.i18n.json

@@ -1,16 +1,19 @@
 {
-  "deviceSimulatorExpressExtension.commands.changeBaudRate": "Change Baud Rate",
-  "deviceSimulatorExpressExtension.commands.closeSerialMonitor": "Close Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.label": "Device Simulator Express",
-  "deviceSimulatorExpressExtension.commands.openSerialMonitor": "Open Serial Monitor",
-  "deviceSimulatorExpressExtension.commands.openSimulator": "Open Simulator",
-  "deviceSimulatorExpressExtension.commands.runSimulator": "Run Simulator",
-  "deviceSimulatorExpressExtension.commands.newFile": "New File",
-  "deviceSimulatorExpressExtension.commands.runDevice": "Deploy to Device",
-  "deviceSimulatorExpressExtension.commands.selectSerialPort": "Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
+  "deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
+  "deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.changeBaudRate": "[Circuit Playground Express] Change Baud Rate",
+  "deviceSimulatorExpressExtension.commands.cpx.closeSerialMonitor": "[Circuit Playground Express] Close Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSerialMonitor": "[Circuit Playground Express] Open Serial Monitor",
+  "deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
+  "deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
+  "deviceSimulatorExpressExtension.commands.cpx.selectSerialPort": "[Circuit Playground Express] Select Serial Port",
+  "deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
+  "deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
   "deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
-  "deviceSimulatorExpressExtension.configuration.properties.open": "Whether to show 'Open Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.device": "Whether to show 'Run Device' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.simulator": "Whether to show 'Run Simulator' icon in editor title menu.",
-  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger."
+  "deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
+  "deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
+  "deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files."
+  "deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new micro:bit simulator!"
 }