lucid-package 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.26",
+    "version": "0.0.28",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/editorextension.js

@@ -9,6 +9,7 @@ const express = require("express");
 const child_process = require("child_process");
 const shapelibrary_1 = require("./shapelibrary");
 const packagemanifest_1 = require("./packagemanifest");
+const path = require("path");
 const WebPackCLI = require('webpack-cli');
 function linkInternalTestingSDK() {
     if (!oldFs.existsSync('node_modules/lucid-extension-sdk')) {
@@ -16,8 +17,9 @@ function linkInternalTestingSDK() {
         const rootSearch = 'lucid/main/extensibility/';
         const pos = cwd.indexOf(rootSearch);
         const sdkPath = cwd.substr(0, pos + rootSearch.length) + 'lucid-extension-sdk';
+        const relativePath = path.relative(cwd, sdkPath);
         console.log('Using symlink for dependency on SDK for internal testing');
-        console.log(child_process.execSync(`ln -s ${sdkPath} node_modules/lucid-extension-sdk`).toString());
+        console.log(child_process.execSync(`npm install --silent --save ${relativePath}`).toString());
     }
 }
 function installDependenciesIfNeeded(isInternalTesting) {
@@ -138,6 +140,9 @@ async function debugEditorExtension(extensionNames, quiet = false) {
                 const credentials = JSON.parse((await fs.readFile(`${name}.credentials.local`)).toString());
                 res.send(JSON.stringify(Object.assign(Object.assign({}, provider), credentials)));
             }
+            else {
+                res.sendStatus(404);
+            }
         }
         else {
             res.sendStatus(404);

package/src/index.js

@@ -72,7 +72,7 @@ class LucidSuiteExtensionCLI {
         createShapeLibrary.add_argument('name');
         const parsed = parser.parse_args(args);
         //For internal development, creating and operating on a "test" package via bazel
-        const isInternalTesting = !!parsed['chdir'];
+        let isInternalTesting = !!parsed['chdir'];
         if (isInternalTesting) {
             if (parsed['project']) {
                 process.chdir(parsed['chdir'] + '/' + parsed['project']);
@@ -84,6 +84,11 @@ class LucidSuiteExtensionCLI {
         else if (parsed['project']) {
             process.chdir(parsed['project']);
         }
+        //If we've spawned a child process recursively calling a new lucid-package target,
+        //then we're still testing as long as it's originally triggered by Bazel.
+        if (process.env['BAZEL_TARGET']) {
+            isInternalTesting = true;
+        }
         switch (parsed['command']) {
             case 'create':
                 (0, package_1.createEmptyPackage)(parsed['name']);