lincd-cli 1.2.2 → 1.2.4

package/lib/esm/cli-methods.js

@@ -14,19 +14,21 @@ import { getEnvFile } from 'env-cmd/dist/get-env-vars.js';
 import fs from 'fs-extra';
 import path, { dirname } from 'path';
 import { debugInfo, execp, execPromise, getFileImports, getFiles, getLastCommitTime, getPackageJSON, isImportOutsideOfPackage, isImportWithMissingExtension, isInvalidLINCDImport, needsRebuilding, } from './utils.js';
-import { statSync } from 'fs';
+import { spawn as spawnChild } from 'child_process';
 import { findNearestPackageJson } from 'find-nearest-package-json';
+import { statSync } from 'fs';
 import { LinkedFileStorage } from 'lincd/utils/LinkedFileStorage';
-import { spawn as spawnChild } from 'child_process';
 // import pkg from 'lincd/utils/LinkedFileStorage';
 // const { LinkedFileStorage } = pkg;
 // const config = require('lincd-server/site.webpack.config');
 import { glob } from 'glob';
 import webpack from 'webpack';
-import stagedGitFiles from 'staged-git-files';
 import ora from 'ora';
-//@ts-ignore
-let dirname__ = typeof __dirname !== 'undefined' ? __dirname : dirname(import.meta.url).replace('file:/', '');
+import stagedGitFiles from 'staged-git-files';
+let dirname__ = typeof __dirname !== 'undefined'
+    ? __dirname
+    : //@ts-ignore
+        dirname(import.meta.url).replace('file:/', '');
 var variables = {};
 export const createApp = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...args_1], void 0, function* (name, basePath = process.cwd()) {
     if (!name) {
@@ -46,7 +48,7 @@ export const createApp = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...ar
     fs.renameSync(path.join(targetFolder, 'gitignore.template'), path.join(targetFolder, '.gitignore'));
     fs.renameSync(path.join(targetFolder, 'yarnrc.yml.template'), path.join(targetFolder, '.yarnrc.yml'));
     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
-    log('Creating new LINCD application \'' + name + '\'');
+    log("Creating new LINCD application '" + name + "'");
     //replace variables in some copied files
     yield replaceVariablesInFolder(targetFolder);
     let hasYarn = yield hasYarnInstalled();
@@ -72,10 +74,15 @@ function progressUpdate(message) {
 }
 export function warn(...messages) {
     messages.forEach((message) => {
-        console.log(chalk.redBright('Warning: ') + message);
+        console.warn(chalk.redBright('Warning: ') + message);
         // console.log(chalk.red(message));
     });
 }
+export function logError(...messages) {
+    messages.forEach((message) => {
+        console.error(chalk.redBright('Error: ') + message);
+    });
+}
 export function developPackage(target, mode) {
     if (!target)
         target = 'es6';
@@ -309,9 +316,121 @@ function hasDependency(pkg, childPkg, dependencies, depth = 1) {
     console.log('going up');
     return false;
 }
+/**
+ * Finds the topmost package.json that could be an APP_ROOT
+ * Returns null if no app root is found (standalone repo case)
+ */
+function findAppRoot(startPath = process.cwd()) {
+    let currentPath = startPath;
+    let candidateRoots = [];
+    // Walk up the directory tree
+    for (let i = 0; i < 10; i++) {
+        const packageJsonPath = path.join(currentPath, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            candidateRoots.push({
+                path: currentPath,
+                hasWorkspaces: !!packageJson.workspaces,
+                isLincd: packageJson.lincd === true,
+            });
+        }
+        const parentPath = path.join(currentPath, '..');
+        // If we've reached the root or haven't moved up
+        if (parentPath === currentPath) {
+            break;
+        }
+        currentPath = parentPath;
+    }
+    // Find the topmost package.json that has workspaces
+    // Prefer non-lincd packages (app roots) over lincd packages
+    let appRoot = null;
+    for (let i = candidateRoots.length - 1; i >= 0; i--) {
+        const candidate = candidateRoots[i];
+        if (candidate.hasWorkspaces && !candidate.isLincd) {
+            appRoot = candidate.path;
+            break;
+        }
+    }
+    // If no non-lincd workspace found, use the topmost workspace
+    if (!appRoot) {
+        for (let i = candidateRoots.length - 1; i >= 0; i--) {
+            if (candidateRoots[i].hasWorkspaces) {
+                appRoot = candidateRoots[i].path;
+                break;
+            }
+        }
+    }
+    return appRoot;
+}
+/**
+ * Filters packages to only include those in the dependency tree of the app root
+ */
+function filterPackagesByDependencyTree(allPackages, appRootPath) {
+    const appPackageJson = getPackageJSON(appRootPath);
+    if (!appPackageJson) {
+        return allPackages;
+    }
+    const relevantPackages = new Map();
+    const packagesToCheck = new Set();
+    // Start with direct dependencies from app root
+    if (appPackageJson.dependencies) {
+        Object.keys(appPackageJson.dependencies).forEach((dep) => {
+            if (allPackages.has(dep)) {
+                packagesToCheck.add(dep);
+            }
+        });
+    }
+    // Recursively add dependencies
+    const processedPackages = new Set();
+    while (packagesToCheck.size > 0) {
+        const packageName = Array.from(packagesToCheck)[0];
+        packagesToCheck.delete(packageName);
+        if (processedPackages.has(packageName)) {
+            continue;
+        }
+        processedPackages.add(packageName);
+        const packageDetails = allPackages.get(packageName);
+        if (packageDetails) {
+            relevantPackages.set(packageName, packageDetails);
+            // Get this package's dependencies
+            const packageJson = getPackageJSON(packageDetails.path);
+            if (packageJson && packageJson.dependencies) {
+                Object.keys(packageJson.dependencies).forEach((dep) => {
+                    if (allPackages.has(dep) && !processedPackages.has(dep)) {
+                        packagesToCheck.add(dep);
+                    }
+                });
+            }
+        }
+    }
+    return relevantPackages;
+}
 export function buildAll(options) {
     console.log('Building all LINCD packages of this repository in order of dependencies');
     let lincdPackages = getLocalLincdPackageMap();
+    const originalPackageCount = lincdPackages.size;
+    // Check if we're in an app context and filter packages accordingly
+    const appRoot = findAppRoot();
+    if (appRoot) {
+        const appPackageJson = getPackageJSON(appRoot);
+        // Check if this is an app (not a lincd package itself) with lincd dependencies
+        const isAppWithLincdDeps = appPackageJson &&
+            appPackageJson.lincd !== true &&
+            appPackageJson.dependencies &&
+            Object.keys(appPackageJson.dependencies).some((dep) => lincdPackages.has(dep));
+        if (isAppWithLincdDeps) {
+            debugInfo(chalk.blue(`Found app root at: ${appRoot}`));
+            const filteredPackages = filterPackagesByDependencyTree(lincdPackages, appRoot);
+            console.log(chalk.magenta(`Found ${originalPackageCount} total LINCD packages, building only ${filteredPackages.size} that are relevant to this app`));
+            lincdPackages = filteredPackages;
+        }
+        else {
+            debugInfo(chalk.blue(`Building all ${originalPackageCount} packages from workspace`));
+        }
+    }
+    else {
+        debugInfo(chalk.blue(`No workspace root found, building all ${originalPackageCount} packages`));
+    }
     let startFrom;
     //by default start building
     let building = true;
@@ -385,7 +504,8 @@ export function buildAll(options) {
                 log(chalk.cyan('Building ' + pkg.packageName));
                 process.stdout.write(packagesLeft + ' packages left\r');
             }
-            return command.then(res => {
+            return command
+                .then((res) => {
                 //empty string or true is success
                 //false is success with warnings
                 //any other string is the build error text
@@ -409,7 +529,8 @@ export function buildAll(options) {
                 }
                 else {
                     if (!skipping) {
-                        log(chalk.green('Built ' + pkg.packageName) + (res === false ? chalk.redBright(' (with warnings)') : ''));
+                        log(chalk.green('Built ' + pkg.packageName) +
+                            (res === false ? chalk.redBright(' (with warnings)') : ''));
                     }
                     done.add(pkg);
                     packagesLeft--;
@@ -425,7 +546,7 @@ export function buildAll(options) {
                 }
             })
                 .catch(({ error, stdout, stderr }) => {
-                warn(chalk.red('Failed to build ' + pkg.packageName));
+                logError(chalk.red('Failed to build ' + pkg.packageName));
                 console.log(stdout);
                 process.exit(1);
                 // let dependentModules = getDependentP
@@ -608,7 +729,7 @@ const camelCase = (str) => {
     }
     return str;
 };
-export const createOntology = (prefix_1, uriBase_1, ...args_1) => __awaiter(void 0, [prefix_1, uriBase_1, ...args_1], void 0, function* (prefix, uriBase, basePath = process.cwd()) {
+export const createOntology = (prefix_1, uriBase_1, ...args_2) => __awaiter(void 0, [prefix_1, uriBase_1, ...args_2], void 0, function* (prefix, uriBase, basePath = process.cwd()) {
     if (!prefix) {
         console.warn('Please provide a suggested prefix as the first argument');
         return;
@@ -621,7 +742,7 @@ export const createOntology = (prefix_1, uriBase_1, ...args_1) => __awaiter(void
     setVariable('uri_base', uriBase);
     let { hyphenName, camelCaseName, underscoreName } = setNameVariables(prefix);
     //copy ontology accessor file
-    log('Creating files for ontology \'' + prefix + '\'');
+    log("Creating files for ontology '" + prefix + "'");
     let targetFile = path.join(targetFolder, hyphenName + '.ts');
     fs.copySync(path.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
     //copy data files
@@ -771,7 +892,7 @@ export const getScriptDir = () => {
     //   return dirname(import.meta.url).replace('file:/','');
     // }
 };
-export const createShape = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...args_1], void 0, function* (name, basePath = process.cwd()) {
+export const createShape = (name_2, ...args_3) => __awaiter(void 0, [name_2, ...args_3], void 0, function* (name, basePath = process.cwd()) {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'shapes');
     let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
@@ -789,11 +910,11 @@ export const createShape = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...
         log(`Added an import of this file from ${chalk.magenta(indexPath)}`);
     }
 });
-export const createSetComponent = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...args_1], void 0, function* (name, basePath = process.cwd()) {
+export const createSetComponent = (name_3, ...args_4) => __awaiter(void 0, [name_3, ...args_4], void 0, function* (name, basePath = process.cwd()) {
     let targetFolder = ensureFolderExists(basePath, 'src', 'components');
     let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
     //copy default shape file
-    log('Creating files for set component \'' + name + '\'');
+    log("Creating files for set component '" + name + "'");
     let targetFile = path.join(targetFolder, hyphenName + '.tsx');
     fs.copySync(path.join(getScriptDir(), '..', '..', 'defaults', 'set-component.tsx'), targetFile);
     let targetFile2 = path.join(targetFolder, hyphenName + '.scss');
@@ -803,12 +924,12 @@ export const createSetComponent = (name_1, ...args_1) => __awaiter(void 0, [name
     let indexPath = addLineToIndex(`import './components/${hyphenName}.js';`, 'components');
     log(`Created a new set component in ${chalk.magenta(targetFile.replace(basePath, ''))}`, `Created a new stylesheet in ${chalk.magenta(targetFile2.replace(basePath, ''))}`, `Added an import of this file from ${chalk.magenta(indexPath)}`);
 });
-export const createComponent = (name_1, ...args_1) => __awaiter(void 0, [name_1, ...args_1], void 0, function* (name, basePath = process.cwd()) {
+export const createComponent = (name_4, ...args_5) => __awaiter(void 0, [name_4, ...args_5], void 0, function* (name, basePath = process.cwd()) {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'components');
     let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
     //copy default shape file
-    log('Creating files for component \'' + name + '\'');
+    log("Creating files for component '" + name + "'");
     let targetFile = path.join(targetFolder, hyphenName + '.tsx');
     fs.copySync(path.join(getScriptDir(), '..', 'defaults', 'component.tsx'), targetFile);
     let targetFile2 = path.join(targetFolder, hyphenName + '.scss');
@@ -826,7 +947,7 @@ export const createComponent = (name_1, ...args_1) => __awaiter(void 0, [name_1,
 //read the source of all ts/tsx files in the src folder
 //if there is an import that imports a lincd package with /src/ in it, then warn
 //if there is an import that imports something from outside the src folder, then warn
-export const checkImports = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside the src folder
+export const checkImports = (...args_6) => __awaiter(void 0, [...args_6], void 0, function* (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside the src folder
 invalidImports = new Map()) {
     const dir = fs.readdirSync(sourceFolder);
     // Start checking each file in the source folder
@@ -885,15 +1006,17 @@ invalidImports = new Map()) {
         invalidImports.forEach((value, key) => {
             // res += '- '+chalk.blueBright(key.split('/').pop()) + ':\n';
             value.forEach(({ type, importPath }) => {
-                let message = key.split('/').pop() + ' imports from \'' + importPath + '\'';
+                let message = key.split('/').pop() + " imports from '" + importPath + "'";
                 if (type === 'outside_package') {
                     message += ' which is outside the package source root';
                 }
                 if (type === 'lincd') {
-                    message += ' which should not contain /src/ or /lib/ in the import path';
+                    message +=
+                        ' which should not contain /src/ or /lib/ in the import path';
                 }
                 if (type === 'missing_extension') {
-                    message += ' which should end with a file extension. Like .js or .scss';
+                    message +=
+                        ' which should end with a file extension. Like .js or .scss';
                 }
                 res += chalk.red(message + '\n');
             });
@@ -930,7 +1053,7 @@ export const depCheckStaged = () => __awaiter(void 0, void 0, void 0, function*
         });
     });
 });
-export const depCheck = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (packagePath = process.cwd()) {
+export const depCheck = (...args_7) => __awaiter(void 0, [...args_7], void 0, function* (packagePath = process.cwd()) {
     return new Promise((resolve, reject) => {
         depcheck(packagePath, {}, (results) => {
             if (results.missing) {
@@ -950,13 +1073,16 @@ export const depCheck = (...args_1) => __awaiter(void 0, [...args_1], void 0, fu
                 if (missingLincdPackages.length > 0) {
                     reject(chalk.red(packagePath.split('/').pop() +
                         '\n[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
-                        missingLincdPackages.map(missedKey => {
+                        missingLincdPackages
+                            .map((missedKey) => {
                             const files = results.missing[missedKey];
                             return `${missedKey} (${files.length} files: ${files.join(', ')})`;
-                        }).join(',\n- ')));
+                        })
+                            .join(',\n- ')));
                 }
                 else if (missing.length > 0) {
-                    resolve(chalk.redBright('warning: ' + packagePath.split('/').pop() +
+                    resolve(chalk.redBright('warning: ' +
+                        packagePath.split('/').pop() +
                         ' is missing dependencies:\n  - ' +
                         missing.join('\n  - ')));
                 }
@@ -1024,10 +1150,22 @@ export const runMethod = (packageName, method, options) => __awaiter(void 0, voi
     yield ensureEnvironmentLoaded();
     if (options.spawn) {
         let lincdConfig = (yield import(path.join(process.cwd(), 'lincd.config.js'))).default;
+        // Set default loadAppComponent if not provided
+        if (!lincdConfig.server) {
+            lincdConfig.server = {};
+        }
+        if (!lincdConfig.server.loadAppComponent) {
+            lincdConfig.server.loadAppComponent = () => __awaiter(void 0, void 0, void 0, function* () { return (yield import(path.join(process.cwd(), 'src', 'App'))).default; });
+        }
+        // Set default loadRoutes if not provided
+        if (!lincdConfig.server.loadRoutes) {
+            lincdConfig.server.loadRoutes = () => __awaiter(void 0, void 0, void 0, function* () { return yield import(path.join(process.cwd(), 'src', 'routes.tsx')); });
+        }
         //@ts-ignore
-        const ServerClass = (yield import('lincd-server/shapes/LincdServer')).LincdServer;
+        const ServerClass = (yield import('lincd-server/shapes/LincdServer'))
+            .LincdServer;
         yield import(path.join(process.cwd(), 'scripts', 'storage-config.js'));
-        let server = new ServerClass(Object.assign({ loadAppComponent: () => __awaiter(void 0, void 0, void 0, function* () { return (yield import(path.join(process.cwd(), 'src', 'App'))).default; }) }, lincdConfig));
+        let server = new ServerClass(lincdConfig);
         //init the server
         console.log('Initializing server...');
         server.initOnly().then(() => {
@@ -1055,7 +1193,9 @@ export const runMethod = (packageName, method, options) => __awaiter(void 0, voi
                 },
             };
             //TODO; allow sending args
-            server.callBackendMethod(packageName, method, [], request, response).then(() => {
+            server
+                .callBackendMethod(packageName, method, [], request, response)
+                .then(() => {
                 console.log('Done');
                 process.exit();
             });
@@ -1070,17 +1210,21 @@ export const runMethod = (packageName, method, options) => __awaiter(void 0, voi
             headers: {
                 'Content-Type': 'application/json',
             },
-        }).then((response) => {
+        })
+            .then((response) => {
             if (!response.ok) {
                 throw new Error('Network response was not ok');
             }
             return response.json();
-        }).then((data) => {
+        })
+            .then((data) => {
             console.log('Response data:', data);
             process.exit();
-        }).catch((error) => {
+        })
+            .catch((error) => {
             var _a;
-            if (error.code === 'ECONNREFUSED' || ((_a = error.cause) === null || _a === void 0 ? void 0 : _a.code) === 'ECONNREFUSED') {
+            if (error.code === 'ECONNREFUSED' ||
+                ((_a = error.cause) === null || _a === void 0 ? void 0 : _a.code) === 'ECONNREFUSED') {
                 console.error(chalk.red('Could not connect to the backend server. Is it running?'));
                 console.error(`Make sure you ${chalk.magenta('run "yarn start" in a separate process')} before calling this method.`);
             }
@@ -1091,9 +1235,10 @@ export const runMethod = (packageName, method, options) => __awaiter(void 0, voi
         });
     }
 });
-export const startServer = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (initOnly = false, ServerClass = null) {
+export const startServer = (...args_8) => __awaiter(void 0, [...args_8], void 0, function* (initOnly = false, ServerClass = null) {
     yield ensureEnvironmentLoaded();
-    let lincdConfig = (yield import(path.join(process.cwd(), 'lincd.config.js'))).default;
+    let lincdConfig = (yield import(path.join(process.cwd(), 'lincd.config.js')))
+        .default;
     // function scssLoadcall(source, filename) {
     //   return 'console.log("SCSS CALL: ' + filename + '");\n' + source;
     //   process.exit();
@@ -1109,16 +1254,36 @@ export const startServer = (...args_1) => __awaiter(void 0, [...args_1], void 0,
         ServerClass = (yield import('lincd-server/shapes/LincdServer')).LincdServer;
     }
     yield import(path.join(process.cwd(), 'scripts', 'storage-config.js'));
-    let appPromise;
-    if (process.env.NODE_ENV !== 'development') {
-        appPromise = (yield import(path.join(process.cwd(), 'lib', 'App.js'))).default;
-    }
-    else {
-        appPromise = (yield import(path.join(process.cwd(), 'src', 'App.js'))).default;
+    // Set default loadAppComponent if not provided
+    if (!lincdConfig.server) {
+        lincdConfig.server = {};
     }
-    let server = new ServerClass(Object.assign({ loadAppComponent: () => __awaiter(void 0, void 0, void 0, function* () {
+    if (!lincdConfig.server.loadAppComponent) {
+        let appPromise;
+        if (process.env.NODE_ENV !== 'development') {
+            appPromise = (yield import(path.join(process.cwd(), 'lib', 'App.js')))
+                .default;
+        }
+        else {
+            appPromise = (yield import(path.join(process.cwd(), 'src', 'App.tsx')))
+                .default;
+        }
+        lincdConfig.server.loadAppComponent = () => __awaiter(void 0, void 0, void 0, function* () {
             return appPromise;
-        }) }, lincdConfig));
+        });
+    }
+    // Set default loadRoutes if not provided
+    if (!lincdConfig.server.loadRoutes) {
+        lincdConfig.server.loadRoutes = () => __awaiter(void 0, void 0, void 0, function* () {
+            if (process.env.NODE_ENV !== 'development') {
+                return yield import(path.join(process.cwd(), 'lib', 'routes.js'));
+            }
+            else {
+                return yield import(path.join(process.cwd(), 'src', 'routes.tsx'));
+            }
+        });
+    }
+    let server = new ServerClass(lincdConfig);
     //Important to use slice, because when using clusers, child processes need to be able to read the same arguments
     let args = process.argv.slice(2);
     //if --initOnly is passed, only initialize the server and don't start it
@@ -1133,6 +1298,7 @@ export const buildApp = () => __awaiter(void 0, void 0, void 0, function* () {
     yield buildFrontend();
     yield buildBackend();
     console.log(chalk.magenta(`✅ ${process.env.NODE_ENV} app build finished`));
+    process.exit(0);
 });
 export const buildFrontend = () => __awaiter(void 0, void 0, void 0, function* () {
     yield ensureEnvironmentLoaded();
@@ -1174,7 +1340,8 @@ export const buildFrontend = () => __awaiter(void 0, void 0, void 0, function* (
     }).then(() => __awaiter(void 0, void 0, void 0, function* () {
         // make sure environment is not development for storage config
         // and if we want to upload to storage, we need set S3_BUCKET_ENDPOINT
-        if (process.env.NODE_ENV === 'development' || !process.env.S3_BUCKET_ENDPOINT) {
+        if (process.env.NODE_ENV === 'development' ||
+            !process.env.S3_BUCKET_ENDPOINT) {
             console.warn('Upload build to storage skip in development environment or S3_BUCKET_ENDPOINT is not set');
             return;
             // process.exit();
@@ -1211,9 +1378,11 @@ export const buildFrontend = () => __awaiter(void 0, void 0, void 0, function* (
                 // example: /Users/username/project/www/index.html -> /project/www/index.html
                 const pathname = filePath.replace(pathDir, `/${rootDirectory}`);
                 // upload file to storage
-                yield LinkedFileStorage.saveFile(pathname, fileContent).then(() => {
+                yield LinkedFileStorage.saveFile(pathname, fileContent)
+                    .then(() => {
                     clearSpinner.text = `${counter++}/${files.length}: - Published ${pathname} `;
-                }).catch(console.error);
+                })
+                    .catch(console.error);
             }));
             const urls = yield Promise.all(uploads);
             clearSpinner.succeed(`${urls.length} files uploaded to storage`);
@@ -1289,7 +1458,9 @@ export const upgradePackages = () => __awaiter(void 0, void 0, void 0, function*
     const tsConfigCJS = path.join(dirname, '../../defaults/package', 'tsconfig-cjs.json');
     const tsConfigESM = path.join(dirname, '../../defaults/package', 'tsconfig-esm.json');
     const typesFile = path.join(dirname, '../../defaults/package/src', 'types.d.ts');
-    const tsConfigTemplate = yield fs.readJson(path.join(dirname, '../../defaults/package', 'tsconfig.json')).catch(err => {
+    const tsConfigTemplate = yield fs
+        .readJson(path.join(dirname, '../../defaults/package', 'tsconfig.json'))
+        .catch((err) => {
         console.log(err);
     });
     runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
@@ -1404,7 +1575,9 @@ export const upgradePackages = () => __awaiter(void 0, void 0, void 0, function*
             //     }
             //   })
             // });
-            files.filter(f => f.match(/\.(scss\.json|css\.json)$/)).forEach(cssJsonFile => {
+            files
+                .filter((f) => f.match(/\.(scss\.json|css\.json)$/))
+                .forEach((cssJsonFile) => {
                 console.log('Removing ' + cssJsonFile);
                 fs.unlinkSync(cssJsonFile);
             });
@@ -1422,7 +1595,7 @@ export const upgradePackages = () => __awaiter(void 0, void 0, void 0, function*
     // })
     // });
 });
-export const createPackage = (name_1, uriBase_1, ...args_1) => __awaiter(void 0, [name_1, uriBase_1, ...args_1], void 0, function* (name, uriBase, basePath = process.cwd()) {
+export const createPackage = (name_5, uriBase_2, ...args_9) => __awaiter(void 0, [name_5, uriBase_2, ...args_9], void 0, function* (name, uriBase, basePath = process.cwd()) {
     if (!name) {
         console.warn('Please provide a name as the first argument');
         return;
@@ -1453,7 +1626,7 @@ export const createPackage = (name_1, uriBase_1, ...args_1) => __awaiter(void 0,
     //extra variable for clarity (will be same as 'name')
     setVariable('output_file_name', name);
     let { hyphenName, camelCaseName, underscoreName } = setNameVariables(cleanPackageName);
-    log('Creating new LINCD package \'' + name + '\'');
+    log("Creating new LINCD package '" + name + "'");
     fs.copySync(path.join(getScriptDir(), '..', '..', 'defaults', 'package'), targetFolder);
     //replace variables in some of the copied files
     yield Promise.all([
@@ -1555,7 +1728,7 @@ export const register = function (registryURL) {
         console.warn(chalk.red('Warning:') + ' not found: ' + process.cwd() + '/package.json');
     }
 };
-export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0, [target_1, target2_1, ...args_1], void 0, function* (target, target2, packagePath = process.cwd(), logResults = true) {
+export const buildPackage = (target_1, target2_1, ...args_10) => __awaiter(void 0, [target_1, target2_1, ...args_10], void 0, function* (target, target2, packagePath = process.cwd(), logResults = true) {
     let spinner;
     if (logResults) {
         //TODO: replace with listr so we can show multiple processes at once
@@ -1574,7 +1747,7 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
                 spinner.text = step.name;
                 spinner.start();
             }
-            return step.apply().then(stepResult => {
+            return step.apply().then((stepResult) => {
                 //if a build step returns a string,
                 //a warning is shown but the build is still successful with warnings
                 if (typeof stepResult === 'string') {
@@ -1623,26 +1796,29 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
         name: 'Copying files to lib folder',
         apply: () => __awaiter(void 0, void 0, void 0, function* () {
             const files = yield glob(packagePath + '/src/**/*.{json,d.ts,css,scss}');
-            return Promise.all(files.map(((file) => __awaiter(void 0, void 0, void 0, function* () {
+            return Promise.all(files.map((file) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
-                    yield fs.copy(file, packagePath + '/lib/esm/' + file.replace(packagePath + '/src/', ''));
-                    yield fs.copy(file, packagePath + '/lib/cjs/' + file.replace(packagePath + '/src/', ''));
+                    yield fs.copy(file, packagePath +
+                        '/lib/esm/' +
+                        file.replace(packagePath + '/src/', ''));
+                    yield fs.copy(file, packagePath +
+                        '/lib/cjs/' +
+                        file.replace(packagePath + '/src/', ''));
                     return true;
                 }
                 catch (err) {
                     console.warn(err);
                     return false;
                 }
-                ;
-            })))).then((allResults) => {
-                return allResults.every(r => r === true);
+            }))).then((allResults) => {
+                return allResults.every((r) => r === true);
             });
         }),
     });
     buildStep({
         name: 'Dual package support',
         apply: () => {
-            return execPromise('yarn tsconfig-to-dual-package ./tsconfig-cjs.json ./tsconfig-esm.json', false, false, { cwd: packagePath }).then(res => {
+            return execPromise('yarn tsconfig-to-dual-package ./tsconfig-cjs.json ./tsconfig-esm.json', false, false, { cwd: packagePath }).then((res) => {
                 return res === '';
             });
         },
@@ -1657,8 +1833,12 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
         name: 'Checking dependencies',
         apply: () => depCheck(packagePath),
     });
-    let success = yield buildProcess.catch(err => {
-        let msg = typeof err === 'string' || err instanceof Error ? err.toString() : (err.error && !err.error.toString().includes('Command failed:') ? err.error : err.stdout + '\n' + err.stderr);
+    let success = yield buildProcess.catch((err) => {
+        let msg = typeof err === 'string' || err instanceof Error
+            ? err.toString()
+            : err.error && !err.error.toString().includes('Command failed:')
+                ? err.error
+                : err.stdout + '\n' + err.stderr;
         if (logResults) {
             spinner.stopAndPersist({
                 symbol: chalk.red('✖'),
@@ -1676,19 +1856,23 @@ export const buildPackage = (target_1, target2_1, ...args_1) => __awaiter(void 0
         if (logResults) {
             spinner.stopAndPersist({
                 symbol: chalk.greenBright('✔'),
-                text: success === true ? 'Build successful' : 'Build successful with warnings',
+                text: success === true
+                    ? 'Build successful'
+                    : 'Build successful with warnings',
             });
         }
     }
     else {
-        spinner.stopAndPersist({
-            symbol: chalk.red('✖'),
-            text: 'Build failed',
-        });
+        if (logResults) {
+            spinner.stopAndPersist({
+                symbol: chalk.red('✖'),
+                text: 'Build failed',
+            });
+        }
     }
     return success;
 });
-export const compilePackage = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (packagePath = process.cwd()) {
+export const compilePackage = (...args_11) => __awaiter(void 0, [...args_11], void 0, function* (packagePath = process.cwd()) {
     //echo 'compiling CJS' && tsc -p tsconfig-cjs.json && echo 'compiling ESM' && tsc -p tsconfig-esm.json
     // let cjsConfig = fs.existsSync(path.join(packagePath,'tsconfig-cjs.json'));
     // let esmConfig = fs.existsSync(path.join(packagePath,'tsconfig-esm.json'));
@@ -1714,18 +1898,20 @@ export const compilePackage = (...args_1) => __awaiter(void 0, [...args_1], void
     yield compilePackageESM(packagePath);
     yield compilePackageCJS(packagePath);
 });
-export const compilePackageESM = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (packagePath = process.cwd()) {
+export const compilePackageESM = (...args_12) => __awaiter(void 0, [...args_12], void 0, function* (packagePath = process.cwd()) {
     //echo 'compiling CJS' && tsc -p tsconfig-cjs.json && echo 'compiling ESM' && tsc -p tsconfig-esm.json
     let compileCommand = `yarn exec tsc -p tsconfig-esm.json`;
-    return execPromise(compileCommand, false, false, { cwd: packagePath }).then(res => {
+    return execPromise(compileCommand, false, false, { cwd: packagePath }).then((res) => {
         return res === '';
     });
 });
-export const compilePackageCJS = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (packagePath = process.cwd()) {
+export const compilePackageCJS = (...args_13) => __awaiter(void 0, [...args_13], void 0, function* (packagePath = process.cwd()) {
     let compileCommand = `yarn exec tsc -p tsconfig-cjs.json`;
-    return execPromise(compileCommand, false, false, { cwd: packagePath }).then(res => {
+    return execPromise(compileCommand, false, false, { cwd: packagePath })
+        .then((res) => {
         return res === '';
-    }).catch(err => {
+    })
+        .catch((err) => {
         return {
             error: err.stdout,
         };
@@ -1842,7 +2028,7 @@ export var publishUpdated = function (test = false) {
             }))
                 .catch(({ error, stdout, stderr }) => {
                 if (error) {
-                    console.log(error.message);
+                    console.error(error.message);
                 }
                 if (stdout) {
                     console.log(stderr);
@@ -1920,7 +2106,7 @@ export var publishPackage = function (pkg, test, info, publishVersion) {
             .then((res) => {
             if (res.indexOf('Aborted due to warnings') !== -1 ||
                 res.indexOf('Could not publish') !== -1 ||
-                res.indexOf('Couldn\'t publish') !== -1) {
+                res.indexOf("Couldn't publish") !== -1) {
                 console.log(res);
                 return chalk.red(pkg.packageName + ' failed\n');
             }
@@ -1933,7 +2119,7 @@ export var publishPackage = function (pkg, test, info, publishVersion) {
                 chalk.magenta(publishVersion));
         })
             .catch(({ error, stdout, stderr }) => {
-            console.log(chalk.red('Failed to publish: ' + error.message));
+            logError('Failed to publish: ' + error.message);
             return chalk.red(pkg.packageName + ' failed to publish');
         });
     });
@@ -1995,42 +2181,31 @@ export var buildUpdated = function (back_1, target_1, target2_1) {
                         return chalk.blue(pkg.packageName + ' should be build');
                     }
                     log('Building ' + pkg.packageName);
-                    // return buildPackage(null,null,pkg.path)
-                    return execPromise('cd ' +
-                        pkg.path +
-                        ' && yarn build' +
-                        (target ? ' ' + target : '') +
-                        (target2 ? ' ' + target2 : ''))
+                    return buildPackage(null, null, path.join(process.cwd(), pkg.path), false)
                         .then((res) => {
-                        if (res === '') {
+                        //empty string or true is success
+                        //false is success with warnings
+                        //any other string is the build error text
+                        //undefined result means it failed
+                        if (typeof res === 'undefined') {
+                            logError('Failed to build ' + pkg.packageName);
+                            process.exit(1);
+                        }
+                        else {
                             debugInfo(chalk.green(pkg.packageName + ' successfully built'));
                             return chalk.green(pkg.packageName + ' built');
                         }
-                        else if (typeof res === 'string') {
-                            warn(chalk.red('Failed to build ' + pkg.packageName));
-                            console.log(res);
-                            process.exit(1);
-                        }
                     })
-                        .catch(({ error, stdout, stderr }) => {
-                        warn(chalk.red('Failed to build ' + pkg.packageName));
-                        console.log(stdout);
+                        .catch((err) => {
+                        logError('Failed to build ' + pkg.packageName);
+                        console.error(err);
                         process.exit(1);
-                        // let dependentModules = getDependentPackages(dependencies, pkg);
-                        // if (dependentModules.length > 0) {
-                        //   // printBuildResults(failedModules, done);
-                        //   warn(chalk.red(pkg.packageName + ' build failed'));
-                        //   warn(
-                        //     'Stopping build-updated process because ' +
-                        //       dependentModules.length +
-                        //       ' other packages depend on this package.\n',
-                        //   ); //"+dependentModules.map(d => d.packageName).join(", ")));
-                        // }
                     });
                 }
             });
-        }, (results) => {
+        }, (dependencies, results) => {
             if (results.length) {
+                log(chalk.green('Changed packages have been rebuilt'));
                 log('Summary:');
                 log(results.join('\n'));
             }
@@ -2070,16 +2245,15 @@ export var executeCommandForEachPackage = function (packages, command, filterMet
         }
         let seen = false;
         packages = packages.filter((pkg) => {
-            if (!seen &&
-                pkg.packageName.includes(startFrom)) {
+            if (!seen && pkg.packageName.includes(startFrom)) {
                 seen = true;
             }
             return seen;
         });
     }
-    log('Executing \'' +
+    log("Executing '" +
         chalk.blueBright(command) +
-        '\' on packages ' +
+        "' on packages " +
         chalk.magenta(packages.map((m) => m.packageName).join(', ')));
     var p = Promise.resolve(true);
     packages.forEach((pkg) => {
@@ -2162,11 +2336,11 @@ export var executeCommandForPackage = function (packageName, command) {
     let packageDetails = getLincdPackages().find((modDetails) => modDetails.packageName.indexOf(packageName) !== -1 ||
         modDetails.packageName.indexOf(packageName) !== -1);
     if (packageDetails) {
-        log('Executing \'cd ' +
+        log("Executing 'cd " +
             packageDetails.path +
             ' && yarn lincd' +
             (command ? ' ' + command : '') +
-            '\'');
+            "'");
         spawnChild(process.platform === 'win32' ? 'yarn.cmd' : 'yarn', // Windows quirk
         ['lincd', command || null], {
             cwd: packageDetails.path,
@@ -2174,7 +2348,7 @@ export var executeCommandForPackage = function (packageName, command) {
         });
     }
     else {
-        warn('Could not find a pkg who\'s name (partially) matched ' +
+        warn("Could not find a pkg who's name (partially) matched " +
             chalk.cyan(packageName));
     }
 };