lucid-package 0.0.85 → 0.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.85",
+    "version": "0.0.87",
     "description": "",
     "main": "index.js",
     "bin": {
@@ -12,7 +12,9 @@
     "devDependencies": {
         "@types/argparse": "^2.0.10",
         "@types/express": "^4.17.13",
-        "@types/node": "^16.11.11"
+        "@types/node": "^16.11.11",
+        "prettier": "file:../../cake/node_modules/prettier",
+        "prettier-plugin-organize-imports": "file:../../cake/node_modules/prettier-plugin-organize-imports"
     },
     "publishConfig": {
         "access": "public"

package/src/dataconnector.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDataConnector = void 0;
+const path = require("path");
 const filesystemutil_1 = require("./filesystemutil");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
-const path = require("path");
 async function createDataConnector(name, isInternalTesting, skipSDKDependency) {
     console.log('Creating data connector in dataconnectors/' + name);
     const source = path.join(__dirname, '..', 'templates', 'dataconnector');

package/src/editorextension.js

@@ -44,7 +44,7 @@ async function createEditorExtension(name, isInternalTesting, skipSDKDependency)
 }
 exports.createEditorExtension = createEditorExtension;
 async function buildEditorExtension(name, isInternalTesting, quiet = false) {
-    const extensionCodePath = path.join('editorextensions', (await getExtensionCodeDirectoryName(name)));
+    const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
     (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting);
     const cli = new WebPackCLI();
@@ -52,7 +52,7 @@ async function buildEditorExtension(name, isInternalTesting, quiet = false) {
 }
 exports.buildEditorExtension = buildEditorExtension;
 async function updateExtensionSDK(name) {
-    const extensionCodePath = path.join('editorextensions', (await getExtensionCodeDirectoryName(name)));
+    const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
     console.log('Installing latest SDK in extension ' + name);
     console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install lucid-extension-sdk@latest').toString());
@@ -64,7 +64,7 @@ exports.updateExtensionSDK = updateExtensionSDK;
  * @param quiet If true, will only show errors in output
  */
 async function watchEditorExtension(name, isInternalTesting, quiet = false) {
-    const extensionCodePath = path.join('editorextensions', (await getExtensionCodeDirectoryName(name)));
+    const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
     (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting);
     const cli = new WebPackCLI();
@@ -186,7 +186,8 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
     }
     app.use('/resources', express.static('public'));
     const listen = () => {
-        const server = app.listen(port, 'localhost', () => {
+        const server = app
+            .listen(port, 'localhost', () => {
             console.log('Listening at http://localhost:' + port + '/extension.js');
             // Watch for any editor extension changes, and inform watchers that they need to refresh them.
             const wss = new ws.Server({ server, path: '/editorExtensions/changes' });
@@ -208,7 +209,8 @@ async function debugEditorExtension(extensionNames, quiet = false, pickAnyPort =
                 }, 100);
             });
             (0, shapelibrary_1.debugShapeLibraries)(undefined, pickAnyPort);
-        }).on('error', (err) => {
+        })
+            .on('error', (err) => {
             if (err.code === 'EADDRINUSE') {
                 if (pickAnyPort && port < 15000) {
                     port++;

package/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
 const argparse_1 = require("argparse");
+const path = require("path");
 const dataconnector_1 = require("./dataconnector");
 const editorextension_1 = require("./editorextension");
 const package_1 = require("./package");
@@ -144,6 +144,7 @@ class LucidSuiteExtensionCLI {
                     switch (parsed['command']) {
                         case 'bundle':
                             await (0, package_1.writePackage)(parsed['quiet'], parsed['env']);
+                            break;
                         case 'update-sdk':
                             await (0, package_1.updateAllExtensionSDK)();
                             break;

package/src/installationutil.js

@@ -8,25 +8,14 @@ function installDependenciesIfNeeded(isInternalTesting, skipSDKDependency = fals
     if (!oldFs.existsSync('node_modules')) {
         console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --silent').toString());
     }
-    if (!oldFs.existsSync(path.join('node_modules', 'lucid-extension-sdk')) && !skipSDKDependency) {
-        if (isInternalTesting) {
-            linkInternalTestingSDK();
-        }
-        else {
-            console.log('Adding dependency on SDK');
-            console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --save lucid-extension-sdk').toString());
-        }
+    const sdkDir = path.join('node_modules', 'lucid-extension-sdk');
+    if (isInternalTesting) {
+        //Delete any lucid-extension-sdk directory; let it come from //extensibility/packages/node_modules/lucid-extension-sdk
+        oldFs.rmSync(sdkDir, { recursive: true, force: true });
     }
-}
-exports.installDependenciesIfNeeded = installDependenciesIfNeeded;
-function linkInternalTestingSDK() {
-    if (!oldFs.existsSync(path.join('node_modules', 'lucid-extension-sdk'))) {
-        const cwd = process.cwd();
-        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((0, shellutil_1.execSyncLoggingOutputOnError)(`npm install --silent --save ${relativePath}`).toString());
+    else if (!oldFs.existsSync(sdkDir) && !skipSDKDependency) {
+        console.log('Adding dependency on SDK');
+        console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --save lucid-extension-sdk').toString());
     }
 }
+exports.installDependenciesIfNeeded = installDependenciesIfNeeded;

package/src/package.js

@@ -4,8 +4,8 @@ exports.writePackage = exports.updateAllExtensionSDK = exports.modifyManifest =
 const fsOld = require("fs");
 const fs = require("fs/promises");
 const JSZip = require("jszip");
-const path = require("path");
 const lucid_extension_sdk_1 = require("lucid-extension-sdk");
+const path = require("path");
 const editorextension_1 = require("./editorextension");
 const filesystemutil_1 = require("./filesystemutil");
 const packagemanifest_1 = require("./packagemanifest");

package/src/packagemanifest.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readManifest = exports.SettingType = void 0;
 const fs = require("fs");
 const fsPromises = require("fs/promises");
-const path = require("path");
 const lucid_extension_sdk_1 = require("lucid-extension-sdk");
+const path = require("path");
 const supportedproduct_1 = require("./supportedproduct");
 var SettingType;
 (function (SettingType) {