lincd-cli 1.1.11 → 1.2.1

package/lib/{cli-methods.js → cjs/cli-methods.js}

@@ -1,24 +1,66 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.removeOldFiles = exports.register = exports.createPackage = exports.buildApp = exports.startServer = exports.ensureEnvironmentLoaded = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
+exports.removeOldFiles = exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.compilePackageCJS = exports.compilePackageESM = exports.compilePackage = exports.buildPackage = exports.register = exports.createPackage = exports.upgradePackages = exports.buildApp = exports.startServer = exports.ensureEnvironmentLoaded = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.getScriptDir = exports.setNameVariables = exports.createOntology = exports.createApp = void 0;
+exports.warn = warn;
+exports.developPackage = developPackage;
+exports.buildAll = buildAll;
+exports.getLincdPackages = getLincdPackages;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const depcheck_1 = __importDefault(require("depcheck"));
-const get_env_vars_1 = require("env-cmd/dist/get-env-vars");
+const get_env_vars_js_1 = require("env-cmd/dist/get-env-vars.js");
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("./utils");
+const path_1 = __importStar(require("path"));
+const utils_js_1 = require("./utils.js");
 const fs_1 = require("fs");
 const find_nearest_package_json_1 = require("find-nearest-package-json");
+const LinkedFileStorage_1 = require("lincd/utils/LinkedFileStorage");
+// import pkg from 'lincd/utils/LinkedFileStorage';
+// const { LinkedFileStorage } = pkg;
 // const config = require('lincd-server/site.webpack.config');
-var glob = require('glob');
+const glob_1 = require("glob");
+const webpack_1 = __importDefault(require("webpack"));
+const staged_git_files_1 = __importDefault(require("staged-git-files"));
+const ora_1 = __importDefault(require("ora"));
+//@ts-ignore
+let dirname__ = typeof __dirname !== 'undefined' ? __dirname : (0, path_1.dirname)(import.meta.url).replace('file:/', '');
 var variables = {};
-var open = require('open');
-var stagedGitFiles = require('staged-git-files');
-const webpack = require('webpack');
 const createApp = async (name, basePath = process.cwd()) => {
     if (!name) {
         console.warn('Please provide a name as the first argument');
@@ -28,7 +70,7 @@ const createApp = async (name, basePath = process.cwd()) => {
     if (!fs_extra_1.default.existsSync(targetFolder)) {
         fs_extra_1.default.mkdirSync(targetFolder);
     }
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-with-backend'), targetFolder);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'app-with-backend'), targetFolder);
     //make sure the data folder exists (even though its empty).. copying empty folders does not work with fs.copySync
     fs_extra_1.default.mkdirSync(path_1.default.join(targetFolder, 'data'), { recursive: true });
     fs_extra_1.default.mkdirSync(path_1.default.join(targetFolder, 'data/uploads/resized'), {
@@ -37,21 +79,21 @@ const createApp = async (name, basePath = process.cwd()) => {
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'gitignore.template'), path_1.default.join(targetFolder, '.gitignore'));
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'yarnrc.yml.template'), path_1.default.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
     await replaceVariablesInFolder(targetFolder);
     let hasYarn = await hasYarnInstalled();
     let installCommand = hasYarn
         ? 'export NODE_OPTIONS="--no-network-family-autoselection" && yarn install'
         : 'npm install';
-    await (0, utils_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
+    await (0, utils_js_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
         console.warn('Could not install dependencies or start application');
     });
     log(`Your LINCD App is ready at ${chalk_1.default.blueBright(targetFolder)}`, `To start, run\n${chalk_1.default.blueBright(`cd ${hyphenName}`)} and then ${chalk_1.default.blueBright((hasYarn ? 'yarn' : 'npm') + ' start')}`);
 };
 exports.createApp = createApp;
 function logHelp() {
-    (0, utils_1.execp)('yarn exec lincd help');
+    (0, utils_js_1.execp)('yarn exec lincd help');
 }
 function log(...messages) {
     messages.forEach((message) => {
@@ -64,11 +106,10 @@ function progressUpdate(message) {
 }
 function warn(...messages) {
     messages.forEach((message) => {
-        console.log(chalk_1.default.magenta('Warning: ') + message);
+        console.log(chalk_1.default.redBright('Warning: ') + message);
         // console.log(chalk.red(message));
     });
 }
-exports.warn = warn;
 function developPackage(target, mode) {
     if (!target)
         target = 'es6';
@@ -94,7 +135,6 @@ function developPackage(target, mode) {
         console.warn('unknown build target. Use es5 or es6');
     }
 }
-exports.developPackage = developPackage;
 function checkWorkspaces(rootPath, workspaces, res) {
     // console.log('checking workspaces at '+rootPath+": "+workspaces.toString());
     if (workspaces.packages) {
@@ -140,7 +180,7 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
     //get dependencies of each package
     let leastDependentPackage;
     lincdPackages.forEach((pkg) => {
-        var pack = (0, utils_1.getPackageJSON)(pkg.path);
+        var pack = (0, utils_js_1.getPackageJSON)(pkg.path);
         if (pack) {
             //get lincd related dependencies and get the actual package details from the package map by removing '@dacore/' from the package name
             let packageDependencies = Object.keys(pack.dependencies)
@@ -165,9 +205,17 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
     let startStack = [leastDependentPackage];
     const runPackage = (runFunction, pck) => {
         return runFunction(pck)
-            .catch(({ error, stdout, stderr }) => {
-            warn('Uncaught exception whilst running parallel function on ' +
-                pck.packageName, error.message);
+            .catch((errorObj) => {
+            if (errorObj.error) {
+                let { error, stdout, stderr } = errorObj;
+                warn('Uncaught exception whilst running parallel function on ' +
+                    pck.packageName, (error === null || error === void 0 ? void 0 : error.message) ? error.message : error === null || error === void 0 ? void 0 : error.toString());
+            }
+            else {
+                warn('Uncaught exception whilst running parallel function on ' +
+                    pck.packageName, errorObj === null || errorObj === void 0 ? void 0 : errorObj.toString());
+                process.exit();
+            }
             // warn(chalk.red(pck.packageName+' failed:'));
             // console.log(stdout);
         })
@@ -336,10 +384,10 @@ function buildAll(options) {
     // let packagesLeft = lincdPackages.size - done.size;
     runOnPackagesGroupedByDependencies(lincdPackages, (packageGroup, dependencies) => {
         if (done.size > 0) {
-            (0, utils_1.debugInfo)(chalk_1.default.magenta('\n-------\nThese packages are next, since all their dependencies have now been build:'));
+            (0, utils_js_1.debugInfo)(chalk_1.default.magenta('\n-------\nThese packages are next, since all their dependencies have now been build:'));
             // log(stack);
         }
-        (0, utils_1.debugInfo)('Now building: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
+        (0, utils_js_1.debugInfo)('Now building: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
         return async (pkg) => {
             let command;
             let skipping = false;
@@ -358,50 +406,119 @@ function buildAll(options) {
             }
             //unless told otherwise, build the package
             if (!command) {
-                command = (0, utils_1.execPromise)('cd ' + pkg.path + ' && yarn exec lincd build', 
-                // (target ? ' ' + target : '') +
-                // (target2 ? ' ' + target2 : ''),
-                false, false, {}, false);
+                command = (0, exports.buildPackage)(null, null, path_1.default.join(process.cwd(), pkg.path), false);
+                // command = execPromise(
+                //   'cd ' + pkg.path + ' && yarn exec lincd build',
+                //   // (target ? ' ' + target : '') +
+                //   // (target2 ? ' ' + target2 : ''),
+                //   false,
+                //   false,
+                //   {},
+                //   false,
+                // );
                 log(chalk_1.default.cyan('Building ' + pkg.packageName));
                 process.stdout.write(packagesLeft + ' packages left\r');
             }
-            return command
-                .catch(({ error, stdout, stderr }) => {
-                //this prints out the webpack output, including the build errors
-                warn('Failed to build ' + pkg.packageName);
-                console.log(stdout);
-                failedModules.push(pkg.packageName);
-                let dependentModules = getDependentPackages(dependencies, pkg);
-                if (dependentModules.length > 0) {
-                    printBuildResults(failedModules, done);
-                    console.log(chalk_1.default.magenta('Stopping build process because an error occurred whilst building ' +
-                        pkg.packageName +
-                        ', which ' +
-                        dependentModules.length +
-                        ' other packages depend on.')); //"+dependentModules.map(d => d.packageName).join(", ")));
-                    console.log(chalk_1.default.cyanBright('tip ') +
-                        'Run ' +
-                        chalk_1.default.green(`lincd build-all --from=${pkg.packageName}`) +
-                        ' to build only the remaining packages'); //"+dependentModules.map(d => d.packageName).join(", ")));
-                    process.exit(1);
-                }
-            })
-                .then((res) => {
-                if (!skipping) {
-                    log(chalk_1.default.green('Built ' + pkg.packageName));
-                }
-                done.add(pkg);
-                packagesLeft--;
-                // log(chalk.magenta(packagesLeft + ' packages left'));
-                process.stdout.write(packagesLeft + ' packages left\r');
-                if (packagesLeft == 0) {
-                    printBuildResults(failedModules, done);
-                    if (failedModules.length > 0) {
+            return command.then(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 (res !== '' && res !== true && res !== false) {
+                if (typeof res === 'undefined') {
+                    failedModules.push(pkg.packageName);
+                    let dependentModules = getDependentPackages(dependencies, pkg);
+                    if (dependentModules.length > 0) {
+                        printBuildResults(failedModules, done);
+                        console.log('Stopping build process because an error occurred whilst building ' +
+                            pkg.packageName +
+                            ', which ' +
+                            dependentModules.length +
+                            ' other packages depend on.'); //"+dependentModules.map(d => d.packageName).join(", ")));
+                        log('Run ' +
+                            chalk_1.default.greenBright(`lincd build-all --from=${pkg.packageName}`) +
+                            ' to build only the remaining packages'); //"+dependentModules.map(d => d.packageName).join(", ")));
                         process.exit(1);
                     }
                 }
-                return res;
+                else {
+                    if (!skipping) {
+                        log(chalk_1.default.green('Built ' + pkg.packageName) + (res === false ? chalk_1.default.redBright(' (with warnings)') : ''));
+                    }
+                    done.add(pkg);
+                    packagesLeft--;
+                    // log(chalk.magenta(packagesLeft + ' packages left'));
+                    process.stdout.write(packagesLeft + ' packages left\r');
+                    if (packagesLeft == 0) {
+                        printBuildResults(failedModules, done);
+                        if (failedModules.length > 0) {
+                            process.exit(1);
+                        }
+                    }
+                    return res;
+                }
+            })
+                .catch(({ error, stdout, stderr }) => {
+                warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
+                console.log(stdout);
+                process.exit(1);
+                // let dependentModules = getDependentP
             });
+            //undefined result means it failed
+            /*if (typeof res === 'undefined')
+            {
+              // .catch(({ error,stdout,stderr }) => {
+              //this prints out the webpack output, including the build errors
+              // warn('Failed to build ' + pkg.packageName);
+              // console.log(stdout);
+              failedModules.push(pkg.packageName);
+              let dependentModules = getDependentPackages(dependencies,pkg);
+              if (dependentModules.length > 0)
+              {
+                printBuildResults(failedModules,done);
+                console.log(
+                  'Stopping build process because an error occurred whilst building ' +
+                  pkg.packageName +
+                  ', which ' +
+                  dependentModules.length +
+                  ' other packages depend on.',
+                ); //"+dependentModules.map(d => d.packageName).join(", ")));
+                log(
+                  'Run ' +
+                  chalk.greenBright(`lincd build-all --from=${pkg.packageName}`) +
+                  ' to build only the remaining packages',
+                ); //"+dependentModules.map(d => d.packageName).join(", ")));
+                process.exit(1);
+              }
+            }
+            else //true is successful build, false is successful but with warnings
+            {
+              //successful build
+              // })
+              //   .then((res) => {
+              if (!skipping)
+              {
+                log(chalk.green('Built ' + pkg.packageName)+(res === false ? chalk.redBright(' (with warnings)') : ''));
+              }
+              done.add(pkg);
+    
+              packagesLeft--;
+              // log(chalk.magenta(packagesLeft + ' packages left'));
+              process.stdout.write(packagesLeft + ' packages left\r');
+              if (packagesLeft == 0)
+              {
+                printBuildResults(failedModules,done);
+                if (failedModules.length > 0)
+                {
+                  process.exit(1);
+                }
+              }
+    
+              return res;
+            }*/
+            // }).catch(err => {
+            //   console.log(err);
+            // })
         };
     }, (dependencies) => {
         //if no more packages to build but we never started building...
@@ -443,7 +560,6 @@ function buildAll(options) {
         }
     }, sync);
 }
-exports.buildAll = buildAll;
 function getDependentPackages(dependencies, pkg) {
     let dependentModules = [];
     dependencies.forEach((dModuleDependencies, dModule) => {
@@ -473,11 +589,11 @@ function getLocalLincdModules(rootPath = './') {
     });
 }
 function getLincdPackages(rootPath = process.cwd()) {
-    let pack = (0, utils_1.getPackageJSON)();
+    let pack = (0, utils_js_1.getPackageJSON)();
     if (!pack || !pack.workspaces) {
         for (let i = 0; i <= 3; i++) {
             rootPath = path_1.default.join(process.cwd(), ...Array(i).fill('..'));
-            pack = (0, utils_1.getPackageJSON)(rootPath);
+            pack = (0, utils_js_1.getPackageJSON)(rootPath);
             if (pack && pack.workspaces) {
                 // log('Found workspace at '+packagePath);
                 break;
@@ -494,7 +610,6 @@ function getLincdPackages(rootPath = process.cwd()) {
     checkWorkspaces(rootPath, pack.workspaces, res);
     return res;
 }
-exports.getLincdPackages = getLincdPackages;
 function setVariable(name, replacement) {
     //prepare name for regexp
     name = name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
@@ -540,28 +655,28 @@ const createOntology = async (prefix, uriBase, basePath = process.cwd()) => {
     setVariable('uri_base', uriBase);
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(prefix);
     //copy ontology accessor file
-    log("Creating files for ontology '" + prefix + "'");
+    log('Creating files for ontology \'' + prefix + '\'');
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
     //copy data files
     let targetDataFile = path_1.default.join(targetFolder, '..', 'data', hyphenName + '.json');
     let targetDataFile2 = path_1.default.join(targetFolder, '..', 'data', hyphenName + '.json.d.ts');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json'), targetDataFile);
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json.d.ts'), targetDataFile2);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json'), targetDataFile);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json.d.ts'), targetDataFile2);
     await replaceVariablesInFiles(targetFile, targetDataFile, targetDataFile2);
     log(`Prepared a new ontology data files in ${chalk_1.default.magenta(targetDataFile.replace(basePath, ''))}`, `And an ontology accessor file in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`);
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
         //then also add an import to index
-        let indexPath = addLineToIndex(`import './ontologies/${hyphenName}';`, 'ontologies');
+        let indexPath = addLineToIndex(`import './ontologies/${hyphenName}.js';`, 'ontologies');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
 exports.createOntology = createOntology;
-const addLineToIndex = function (line, insertMatchString) {
+const addLineToIndex = function (line, insertMatchString, root = process.cwd(), insertAtStart = false) {
     //import ontology in index
     let indexPath = ['index.ts', 'index.tsx']
-        .map((f) => path_1.default.join('src', f))
+        .map((f) => path_1.default.join(root, 'src', f))
         .find((indexFileName) => {
         return fs_extra_1.default.existsSync(indexFileName);
     });
@@ -570,8 +685,9 @@ const addLineToIndex = function (line, insertMatchString) {
         let lines = indexContents.split(/\n/g);
         let newContents;
         for (var key in lines) {
+            //if the match string is found
             if (lines[key].indexOf(insertMatchString) !== -1) {
-                //remove lines after this line and insert new line in its place
+                //add the new line after this line
                 lines[key] += `\n${line}`;
                 newContents = lines.join('\n');
                 // log("Found at "+key,lines,newContents);
@@ -579,7 +695,12 @@ const addLineToIndex = function (line, insertMatchString) {
             }
         }
         if (!newContents) {
-            newContents = indexContents + `\n${line}`;
+            if (insertAtStart) {
+                newContents = `${line}\n${indexContents}`;
+            }
+            else {
+                newContents = `${indexContents}\n${line}`;
+            }
             // log("Added at end",newContents);
         }
         fs_extra_1.default.writeFileSync(indexPath, newContents);
@@ -593,13 +714,13 @@ const replaceVariablesInFiles = function (...files) {
 };
 const replaceVariablesInFolder = function (folder) {
     //get all files in folder, including files that start with a dot
-    glob(folder + '/**/*', { dot: true, nodir: true }, function (err, files) {
+    glob_1.glob(folder + '/**/*', { dot: true, nodir: true }, async function (err, files) {
         if (err) {
             console.log('Error', err);
         }
         else {
             // console.log(files);
-            return Promise.all(files.map((file) => {
+            await Promise.all(files.map((file) => {
                 return replaceVariablesInFile(file);
             }));
         }
@@ -609,7 +730,7 @@ const replaceVariablesInFilesWithRoot = function (root, ...files) {
     return replaceVariablesInFiles(...files.map((f) => path_1.default.join(root, f)));
 };
 const hasYarnInstalled = async function () {
-    let version = (await (0, utils_1.execPromise)('yarn --version').catch((err) => {
+    let version = (await (0, utils_js_1.execPromise)('yarn --version').catch((err) => {
         console.log('yarn probably not working');
         return '';
     }));
@@ -665,6 +786,24 @@ function getSourceFolder(basePath = process.cwd()) {
         return path_1.default.join(basePath, 'src');
     }
 }
+/**
+ * get __dirname for either ESM/CJS
+ */
+const getScriptDir = () => {
+    return dirname__;
+    // // @ts-ignore
+    // if (typeof __dirname !== 'undefined')
+    // {
+    //   // @ts-ignore
+    //   return __dirname;
+    // }
+    // else
+    // {
+    //   // @ts-ignore
+    //   return dirname(import.meta.url).replace('file:/','');
+    // }
+};
+exports.getScriptDir = getScriptDir;
 const createShape = async (name, basePath = process.cwd()) => {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'shapes');
@@ -672,14 +811,14 @@ const createShape = async (name, basePath = process.cwd()) => {
     //copy default shape file
     // log("Creating files for shape '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'shape.ts'), targetFile);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'shape.ts'), targetFile);
     //replace variables in some of the copied files
     await replaceVariablesInFiles(targetFile);
     log(`Created a new shape class template in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`);
     //if this is NOT a lincd app (but a lincd package)
     let indexPath;
     if (!sourceFolder.includes('frontend')) {
-        indexPath = addLineToIndex(`import './shapes/${hyphenName}';`, 'shapes');
+        indexPath = addLineToIndex(`import './shapes/${hyphenName}.js';`, 'shapes');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
@@ -688,14 +827,14 @@ const createSetComponent = async (name, basePath = process.cwd()) => {
     let targetFolder = ensureFolderExists(basePath, 'src', 'components');
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
-    log("Creating files for set component '" + name + "'");
+    log('Creating files for set component \'' + name + '\'');
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'set-component.tsx'), targetFile);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'set-component.tsx'), targetFile);
     let targetFile2 = path_1.default.join(targetFolder, hyphenName + '.scss');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'component.scss'), targetFile2);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'component.scss'), targetFile2);
     //replace variables in some of the copied files
     await replaceVariablesInFiles(targetFile, targetFile2);
-    let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
+    let indexPath = addLineToIndex(`import './components/${hyphenName}.js';`, 'components');
     log(`Created a new set component in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`, `Created a new stylesheet in ${chalk_1.default.magenta(targetFile2.replace(basePath, ''))}`, `Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
 };
 exports.createSetComponent = createSetComponent;
@@ -704,26 +843,26 @@ const createComponent = async (name, basePath = process.cwd()) => {
     let targetFolder = ensureFolderExists(sourceFolder, 'components');
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
-    log("Creating files for component '" + name + "'");
+    log('Creating files for component \'' + name + '\'');
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'component.tsx'), targetFile);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', 'defaults', 'component.tsx'), targetFile);
     let targetFile2 = path_1.default.join(targetFolder, hyphenName + '.scss');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'component.scss'), targetFile2);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', 'defaults', 'component.scss'), targetFile2);
     //replace variables in some of the copied files
     await replaceVariablesInFiles(targetFile, targetFile2);
     log(`Created a new component template in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`, `Created component stylesheet template in ${chalk_1.default.magenta(targetFile2.replace(basePath, ''))}`);
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
         //then also add an import to index
-        let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
+        let indexPath = addLineToIndex(`import './components/${hyphenName}.js';`, 'components');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
 exports.createComponent = createComponent;
 //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 outside of the src folder, then warn
-const checkImports = async (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside of the src folder
+//if there is an import that imports something from outside the src folder, then warn
+const checkImports = async (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside the src folder
 invalidImports = new Map()) => {
     const dir = fs_extra_1.default.readdirSync(sourceFolder);
     // Start checking each file in the source folder
@@ -733,45 +872,81 @@ invalidImports = new Map()) => {
         // INFO: For future use - if this part fails, it could be due to user permissions
         //  i.e. the program not having access to check the file metadata
         if (!filename.match(/\.tsx?$/)) {
-            if ((0, fs_1.statSync)(filename).isDirectory()) {
-                await (0, exports.checkImports)(filename, depth + 1, invalidImports);
+            try {
+                if ((0, fs_1.statSync)(filename).isDirectory()) {
+                    await (0, exports.checkImports)(filename, depth + 1, invalidImports);
+                }
+                else {
+                    // Ignore all files that aren't one of the following:
+                    // - .ts
+                    // - .tsx
+                    continue;
+                }
+            }
+            catch (e) {
+                console.log(e);
             }
-            // Ignore all files that aren't one of the following:
-            // - .ts
-            // - .tsx
-            continue;
         }
-        const allImports = await (0, utils_1.getFileImports)(filename);
-        const lincdImports = allImports.filter((i) => i.includes('lincd') || i.includes('..'));
-        lincdImports.forEach((i) => {
-            if (!(0, utils_1.isValidLINCDImport)(i, depth)) {
-                if (!invalidImports.has(filename)) {
-                    invalidImports.set(filename, []);
-                }
-                invalidImports.get(filename).push(i);
+        const allImports = await (0, utils_js_1.getFileImports)(filename);
+        if (!invalidImports.has(filename)) {
+            invalidImports.set(filename, []);
+        }
+        allImports.forEach((i) => {
+            if ((0, utils_js_1.isImportOutsideOfPackage)(i, depth)) {
+                invalidImports.get(filename).push({
+                    type: 'outside_package',
+                    importPath: i
+                });
+            }
+            if ((0, utils_js_1.isInvalidLINCDImport)(i, depth)) {
+                invalidImports.get(filename).push({
+                    type: 'lincd',
+                    importPath: i
+                });
+            }
+            if ((0, utils_js_1.isImportWithMissingExtension)(i)) {
+                invalidImports.get(filename).push({
+                    type: 'missing_extension',
+                    importPath: i
+                });
             }
         });
     }
+    let res = '';
+    //check if invalidImports has any
+    let flat = [...invalidImports.values()].flat();
     // All recursion must have finished, display any errors
-    if (depth === 0 && invalidImports.size > 0) {
-        console.warn(chalk_1.default.red('\n' + 'Invalid imports found.  See fixes below:'));
-        console.warn(chalk_1.default.red(" - For relative imports, ensure you don't import outside of the /src/ folder"));
-        console.warn(chalk_1.default.red(' - For lincd imports, access the /lib/ folder instead of /src/'));
+    if (depth === 0 && flat.length > 0) {
+        res += chalk_1.default.red('Invalid imports found.\n');
         invalidImports.forEach((value, key) => {
-            console.info(chalk_1.default.red('\nFound in file ') + chalk_1.default.blue(key) + chalk_1.default.red(':'));
-            value.forEach((i) => console.warn(chalk_1.default.red("- '" + i + "'")));
+            // res += '- '+chalk.blueBright(key.split('/').pop()) + ':\n';
+            value.forEach(({ type, 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';
+                }
+                if (type === 'missing_extension') {
+                    message += ' which should end with a file extension. Like .js or .scss';
+                }
+                res += chalk_1.default.red(message + '\n');
+            });
         });
-        process.exit(1);
+        throw res;
+        // process.exit(1);
     }
     else if (depth === 0 && invalidImports.size === 0) {
-        console.info('All imports OK');
-        process.exit(0);
+        // console.info('All imports OK');
+        // process.exit(0);
+        return true;
     }
 };
 exports.checkImports = checkImports;
 const depCheckStaged = async () => {
     console.log('Checking dependencies of staged files');
-    stagedGitFiles(async function (err, results) {
+    (0, staged_git_files_1.default)(async function (err, results) {
         const packages = new Set();
         await Promise.all(results.map(async (file) => {
             // console.log('STAGED: ', file.filename);
@@ -791,50 +966,54 @@ const depCheckStaged = async () => {
     });
 };
 exports.depCheckStaged = depCheckStaged;
-const depCheck = async (path = process.cwd()) => {
-    (0, depcheck_1.default)(path, {}, (results) => {
-        if (results.missing) {
-            let lincdPackages = getLocalLincdModules();
-            let missing = Object.keys(results.missing);
-            //filter out missing types, if it builds we're not too concerned about that at the moment?
-            //especially things like @types/react, @types/react-dom, @types/node (they are added elsewhere?)
-            // missing = missing.filter(m => m.indexOf('@types/') === 0);
-            //currently react is not an explicit dependency, but we should add it as a peer dependency
-            missing.splice(missing.indexOf('react'), 1);
-            let missingLincdPackages = missing.filter((missingDep) => {
-                return lincdPackages.some((lincdPackage) => {
-                    return lincdPackage.packageName === missingDep;
+const depCheck = async (packagePath = process.cwd()) => {
+    return new Promise((resolve, reject) => {
+        (0, depcheck_1.default)(packagePath, {}, (results) => {
+            if (results.missing) {
+                let lincdPackages = getLocalLincdModules();
+                let missing = Object.keys(results.missing);
+                //filter out missing types, if it builds we're not too concerned about that at the moment?
+                //especially things like @types/react, @types/react-dom, @types/node (they are added elsewhere?)
+                // missing = missing.filter(m => m.indexOf('@types/') === 0);
+                //currently react is not an explicit dependency, but we should add it as a peer dependency
+                missing.splice(missing.indexOf('react'), 1);
+                let missingLincdPackages = missing.filter((missingDep) => {
+                    return lincdPackages.some((lincdPackage) => {
+                        return lincdPackage.packageName === missingDep;
+                    });
                 });
-            });
-            //currently just missing LINCD packages cause a hard failure exit code
-            if (missingLincdPackages.length > 0) {
-                console.warn(chalk_1.default.red(path +
-                    '\n[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
-                    missingLincdPackages.join(',\n- ')));
-                process.exit(1);
-            }
-            else if (missing.length > 0) {
-                console.warn(chalk_1.default.magenta(path +
-                    '\nMissing dependencies (for now a warning, soon an error):\n\t' +
-                    missing.join(',\n\t')));
+                //currently just missing LINCD packages cause a hard failure exit code
+                if (missingLincdPackages.length > 0) {
+                    reject(chalk_1.default.red(packagePath.split('/').pop() +
+                        '\n[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
+                        missingLincdPackages.join(',\n- ')));
+                }
+                else if (missing.length > 0) {
+                    resolve(chalk_1.default.redBright('warning: ' + packagePath.split('/').pop() +
+                        ' is missing dependencies:\n  - ' +
+                        missing.join('\n  - ')));
+                }
+                else {
+                    resolve(true);
+                }
             }
-        }
-        // if(Object.keys(results.invalidFiles).length > 0) {
-        //   console.warn(chalk.red("Invalid files:\n")+Object.keys(results.invalidFiles).join(",\n"));
-        // }
-        // if(Object.keys(results.invalidDirs).length > 0) {
-        //   console.warn(chalk.red("Invalid dirs:\n")+results.invalidDirs.toString());
-        // }
-        // if(results.unused) {
-        //   console.warn("Unused dependencies: "+results.missing.join(", "));
-        // }
+            // if(Object.keys(results.invalidFiles).length > 0) {
+            //   console.warn(chalk.red("Invalid files:\n")+Object.keys(results.invalidFiles).join(",\n"));
+            // }
+            // if(Object.keys(results.invalidDirs).length > 0) {
+            //   console.warn(chalk.red("Invalid dirs:\n")+results.invalidDirs.toString());
+            // }
+            // if(results.unused) {
+            //   console.warn("Unused dependencies: "+results.missing.join(", "));
+            // }
+        });
     });
 };
 exports.depCheck = depCheck;
 const ensureEnvironmentLoaded = async () => {
     if (!process.env.NODE_ENV) {
         //load env-cmd for development environment
-        let { GetEnvVars } = require('env-cmd');
+        let { GetEnvVars } = await Promise.resolve().then(() => __importStar(require('env-cmd')));
         let envCmdrcPath = path_1.default.join(process.cwd(), '.env-cmdrc.json');
         if (!fs_extra_1.default.existsSync(envCmdrcPath)) {
             console.warn('No .env-cmdrc.json found in this folder. Are you running this command from the root of a LINCD app?');
@@ -878,13 +1057,24 @@ const ensureEnvironmentLoaded = async () => {
 exports.ensureEnvironmentLoaded = ensureEnvironmentLoaded;
 const startServer = async (initOnly = false, ServerClass = null) => {
     await (0, exports.ensureEnvironmentLoaded)();
-    let lincdConfig = require(path_1.default.join(process.cwd(), 'lincd.config'));
+    let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s)))).default;
+    // function scssLoadcall(source, filename) {
+    //   return 'console.log("SCSS CALL: ' + filename + '");\n' + source;
+    //   process.exit();
+    // }
+    // hook.hook('.scss', scssLoadcall);
+    // hook.hook('.css', scssLoadcall);
+    // import.meta.
+    // // hook.hook('*.css', scssLoadcall);
+    // // hook.hook('Body.module.css', scssLoadcall);
+    // hook.hook('.module.css', scssLoadcall);
     if (!ServerClass) {
-        ServerClass = require('lincd-server/lib/shapes/LincdServer').LincdServer;
+        //@ts-ignore
+        ServerClass = (await Promise.resolve().then(() => __importStar(require('lincd-server/shapes/LincdServer')))).LincdServer;
     }
-    require(path_1.default.join(process.cwd(), 'scripts', 'storage-config'));
+    await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
     let server = new ServerClass({
-        loadAppComponent: () => require(path_1.default.join(process.cwd(), 'src', 'App')).default,
+        loadAppComponent: async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default,
         ...lincdConfig,
     });
     //Important to use slice, because when using clusers, child processes need to be able to read the same arguments
@@ -900,15 +1090,12 @@ const startServer = async (initOnly = false, ServerClass = null) => {
 exports.startServer = startServer;
 const buildApp = async () => {
     await (0, exports.ensureEnvironmentLoaded)();
-    const webpackAppConfig = require('./config-webpack-app').webpackAppConfig;
+    const webpackAppConfig = await (await Promise.resolve().then(() => __importStar(require('./config-webpack-app.js')))).getWebpackAppConfig();
     console.log(chalk_1.default.magenta(`Building ${process.env.NODE_ENV} app bundles`));
     return new Promise((resolve, reject) => {
-        webpack(webpackAppConfig, async (err, stats) => {
+        (0, webpack_1.default)(webpackAppConfig, async (err, stats) => {
             if (err) {
                 console.error(err.stack || err);
-                if (err.details) {
-                    console.error(err.details);
-                }
                 process.exit(1);
             }
             const info = stats.toJson();
@@ -922,10 +1109,9 @@ const buildApp = async () => {
                 console.log(stats.toString({
                     chunks: false,
                     assets: true,
-                    entryPoints: false,
+                    entrypoints: false,
                     modules: false,
                     moduleAssets: false,
-                    moduleChunks: false,
                     colors: true,
                 }));
                 console.log('App build process finished');
@@ -939,9 +1125,190 @@ const buildApp = async () => {
             }
             // process.exit();
         });
+    }).then(async () => {
+        // 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) {
+            console.warn('Upload build to storage skip in development environment or S3_BUCKET_ENDPOINT is not set');
+            process.exit();
+        }
+        if (process.env.APP_ENV) {
+            console.warn('Not uploading to CDN for app builds');
+            process.exit();
+        }
+        // load the storage config
+        const storageConfig = await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
+        // check if LincdFileStorage has a default FileStore
+        // if yes: copy all the files in the build folder over with LincdFileStorage
+        if (LinkedFileStorage_1.LinkedFileStorage.getDefaultStore()) {
+            // get public directory
+            const rootDirectory = 'public';
+            const pathDir = path_1.default.join(process.cwd(), rootDirectory);
+            if (!fs_extra_1.default.existsSync(pathDir)) {
+                console.warn('No public directory found. Please create a public directory in the root of your project');
+                return;
+            }
+            // get all files in the web directory and then upload them to the storage
+            const files = await (0, utils_js_1.getFiles)(pathDir);
+            const uploads = files.map(async (filePath) => {
+                // read file content
+                const fileContent = await fs_extra_1.default.promises.readFile(filePath);
+                // replace pathDir with rootDirectory in filePath to get pathname
+                // example: /Users/username/project/www/index.html -> /project/www/index.html
+                const pathname = filePath.replace(pathDir, `/${rootDirectory}`);
+                // upload file to storage
+                return await LinkedFileStorage_1.LinkedFileStorage.saveFile(pathname, fileContent);
+            });
+            const urls = await Promise.all(uploads);
+            console.log(`${urls.length} files uploaded to storage`);
+            process.exit();
+        }
     });
 };
 exports.buildApp = buildApp;
+const upgradePackages = async () => {
+    await (0, exports.ensureEnvironmentLoaded)();
+    // let packages = getLincdPackages();
+    // let packages = getLocalLincdModules();
+    let packages = getLocalLincdPackageMap();
+    let dirname = (0, exports.getScriptDir)();
+    const tsConfigCJS = path_1.default.join(dirname, '../../defaults/package', 'tsconfig-cjs.json');
+    const tsConfigESM = path_1.default.join(dirname, '../../defaults/package', 'tsconfig-esm.json');
+    const typesFile = path_1.default.join(dirname, '../../defaults/package/src', 'types.d.ts');
+    const tsConfigTemplate = await fs_extra_1.default.readJson(path_1.default.join(dirname, '../../defaults/package', 'tsconfig.json')).catch(err => {
+        console.log(err);
+    });
+    runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
+        // packageGroup.forEach((pkg) => {
+        //   console.log(' Upgrading ' + pkg.packageName);
+        console.log('-----');
+        return async (pkg) => {
+            if (pkg.packageName === 'lincd')
+                return;
+            // await execPromise(`cd ${pkg.path} && yarn upgrade`);
+            console.log('Upgrading ' + pkg.packageName);
+            //
+            // //create a new file src/tsconfig-cjs.json
+            // //copy the contents of tsconfig.json into it
+            // if (!fs.existsSync(path.join(pkg.path,'tsconfig-cjs.json')))
+            // {
+            //   await fs.copy(tsConfigCJS,path.join(pkg.path,'tsconfig-cjs.json'));
+            //   await fs.copy(tsConfigESM,path.join(pkg.path,'tsconfig-esm.json'));
+            //   console.log('Copied new tsconfig to ' + pkg.packageName);
+            // }
+            //
+            // //read tsconfig
+            // await fs.readJson(path.join(pkg.path,'tsconfig.json')).then((tsconfig) => {
+            //   let oldCompilerOpts = tsconfig.compilerOptions;
+            //   tsconfig.compilerOptions = tsConfigTemplate.compilerOptions;
+            //   tsconfig.compilerOptions.types = oldCompilerOpts.types;
+            //   tsconfig.compilerOptions.plugins = [{"name": "typescript-plugin-css-modules"}];
+            //
+            //   console.log('Upgraded tsconfig for ' + pkg.packageName);
+            //   return fs.writeJson(path.join(pkg.path,'tsconfig.json'),tsconfig,{spaces: 2});
+            // });
+            // //import types at the beginning of index.ts
+            // addLineToIndex(`import './types';`,null,pkg.path,true);
+            // //copy over the types file
+            // await fs.copy(typesFile,path.join(pkg.path,'src','types.d.ts'));
+            // await fs.readJson(path.join(pkg.path,'package.json')).then((packageJson) => {
+            //   let version = packageJson.version;
+            //   let nextVersion;
+            //   if (version.split('.').shift() === '0')
+            //   {
+            //     nextVersion = getNextMajorVersion(version);
+            //   }
+            //   else
+            //   {
+            //     nextVersion = getNextMinorVersion(version);
+            //   }
+            //   console.log('Upgraded version for ' + pkg.packageName + ' to ' + nextVersion);
+            //
+            //   packageJson.version = nextVersion;
+            //   packageJson.devDependencies['tsconfig-to-dual-package'] = '^1.2.0';
+            //   packageJson.devDependencies['typescript-plugin-css-modules'] = '^5.1.0';
+            //
+            //   packageJson.main = 'lib/cjs/index.js';
+            //   packageJson.module = 'lib/esm/index.js';
+            //   packageJson.exports = {
+            //     '.': {
+            //       'types': './lib/esm/index.d.ts',
+            //       'import': './lib/esm/index.js',
+            //       'require': './lib/cjs/index.js',
+            //     },
+            //     './*': {
+            //       'types': './lib/esm/*.d.ts',
+            //       'import': './lib/esm/*.js',
+            //       'require': './lib/cjs/*.js',
+            //     },
+            //   };
+            //   packageJson.typesVersions = {
+            //     '*': {
+            //       '*': [
+            //         'lib/esm/*',
+            //       ],
+            //     },
+            //   };
+            //
+            //   return fs.writeJson(path.join(pkg.path,'package.json'),packageJson,{ spaces: 2 });
+            // });
+            //change .css files and .scss files to .module.css and .module.scss
+            let files = await (0, utils_js_1.getFiles)(path_1.default.join(pkg.path, 'src'));
+            // let tsFiles = files.filter(f => f.match(/\.(ts|tsx)$/));
+            // let cssFiles = files.filter(f => f.match(/\.(css|scss)$/)).filter(f => !f.match(/\.module\.(css|scss)$/));
+            // cssFiles.forEach(cssFile => {
+            //   let cssFileName = path.basename(cssFile);
+            //   let newFile = cssFileName.replace(/\.s?css$/,'.module$&');
+            //   let newFilePath = cssFile.replace(/\.s?css$/,'.module$&');
+            //   let jsonFile = cssFileName.replace(/\.s?css$/,'$&.json');
+            //   fs.renameSync(cssFile,newFilePath);
+            //   console.log('Renaming ' + cssFileName + ' to ' + newFilePath);
+            //   //find other files that import this file and update them
+            //   tsFiles.forEach(tsFile => {
+            //     //read contents of f2
+            //     let contents = fs.readFileSync(tsFile,'utf8');
+            //     //if it imports f
+            //     if (contents.indexOf(cssFileName) !== -1)
+            //     {
+            //       //find the whole line that imports f
+            //       let line = contents.split('\n').find(l => l.indexOf(cssFileName) !== -1);
+            //       // console.log("OLD: "+line);
+            //       let jsonLine = contents.split('\n').find(l => l.indexOf(jsonFile) !== -1);
+            //       // console.log("JSON: "+jsonLine);
+            //       //if not commented out
+            //       if(line.indexOf('//') === -1) {
+            //         let previousImportPath = line.match(/['"](.*)['"]/)[1];
+            //         let newImportPath = previousImportPath.replace(cssFileName,newFile);
+            //         let newContents = contents.replace(line,`import style from '${newImportPath}';`)
+            //           .replace(jsonLine+'\n','');
+            //         // console.log("\n");
+            //         fs.writeFileSync(tsFile,newContents);
+            //         console.log('Updated imports in ' + tsFile);
+            //         // fs.writeFileSync
+            //         // fs.writeFileSync(i,fs.readFileSync(i,'utf8').replace(f,newFile));
+            //       }
+            //     }
+            //   })
+            // });
+            files.filter(f => f.match(/\.(scss\.json|css\.json)$/)).forEach(cssJsonFile => {
+                console.log('Removing ' + cssJsonFile);
+                fs_extra_1.default.unlinkSync(cssJsonFile);
+            });
+        };
+        // });
+    }, () => {
+        console.log('Finished upgrading packages');
+    });
+    // packages.forEach((pkg,key) => {
+    //   console.log(key+' Upgrading ' + pkg.packageName);
+    // execPromise(`cd ${pkg.path} && yarn upgrade`).then(() => {
+    //   console.log('Upgraded ' + pkg.packageName);
+    // }).catch(err => {
+    //   console.warn(err);
+    // })
+    // });
+};
+exports.upgradePackages = upgradePackages;
 const createPackage = async (name, uriBase, basePath = process.cwd()) => {
     if (!name) {
         console.warn('Please provide a name as the first argument');
@@ -973,8 +1340,8 @@ const createPackage = async (name, uriBase, basePath = process.cwd()) => {
     //extra variable for clarity (will be same as 'name')
     setVariable('output_file_name', name);
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(cleanPackageName);
-    log("Creating new LINCD package '" + name + "'");
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package'), targetFolder);
+    log('Creating new LINCD package \'' + name + '\'');
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'package'), targetFolder);
     //replace variables in some of the copied files
     await Promise.all([
         'src/index.ts',
@@ -1001,14 +1368,14 @@ const createPackage = async (name, uriBase, basePath = process.cwd()) => {
         console.log('rename ', path_1.default.join(targetFolder, f), path_1.default.join(targetFolder, ...newParts, newName));
         fs_extra_1.default.renameSync(path_1.default.join(targetFolder, f), path_1.default.join(targetFolder, ...newParts, newName));
     });
-    let version = (await (0, utils_1.execPromise)('yarn --version').catch((err) => {
+    let version = (await (0, utils_js_1.execPromise)('yarn --version').catch((err) => {
         console.log('yarn probably not working');
         return '';
     }));
     let installCommand = version.toString().match(/[0-9]+/)
         ? 'yarn install'
         : 'npm install';
-    await (0, utils_1.execp)(`cd ${targetFolder} && ${installCommand} && npm exec lincd build`, true).catch((err) => {
+    await (0, utils_js_1.execp)(`cd ${targetFolder} && ${installCommand} && npm exec lincd build`, true).catch((err) => {
         console.warn('Could not install dependencies');
     });
     log(`Prepared a new LINCD package in ${chalk_1.default.magenta(targetFolder)}`, `Run ${chalk_1.default.blueBright('yarn build')} from this directory to build once`, `Or ${chalk_1.default.blueBright('yarn dev')} to continuously rebuild on file changes`);
@@ -1030,43 +1397,6 @@ var buildFailed = function (output) {
     return (output.indexOf('Aborted due to warnings') !== -1 &&
         output.indexOf('Command failed') !== -1);
 };
-/*program.command('shapes').action(async () => {
-    //we've imported require-extensions from npm so that we can use this
-    //we want to avoid nodejs tripping up over @import commands in css files
-    require.extensions['.scss'] = function (sourcecode, filename) {
-        return {};
-    };
-    require.extensions['.css'] = function (sourcecode, filename) {
-        return {};
-    };
-
-    if (fs.existsSync(process.cwd() + '/package.json')) {
-        var pack = JSON.parse(
-            fs.readFileSync(process.cwd() + '/package.json', 'utf8'),
-        );
-        let packageName = pack.name;
-
-        //just making sure the library is loaded in correct order because circular references are currently happening when importing BlankNode before NamedNode for example
-        // require('lincd');
-        //TODO: replace with actual index file from package.json, or tsconfig
-        let indexExports = require(process.cwd() + '/lib/index.js');
-        if(indexExports.packageExports)
-        {
-            let shapeJSONLD = await getShapesJSONLD(indexExports.packageExports);
-            console.log(indexExports.packageExports);
-            console.log(shapeJSONLD);
-            console.log(chalk.bold(chalk.green(packageName+'/dist/shapes.json')));
-            return fs.writeFile(path.join('dist', 'shapes.json'), shapeJSONLD);
-        }
-        else
-        {
-            console.warn("Invalid LINCD package. Index file should export a packageExports object. See examples.")
-        }
-
-    } else {
-        console.warn('Not a project');
-    }
-});*/
 const register = function (registryURL) {
     if (fs_extra_1.default.existsSync(process.cwd() + '/package.json')) {
         var pack = JSON.parse(fs_extra_1.default.readFileSync(process.cwd() + '/package.json', 'utf8'));
@@ -1114,104 +1444,186 @@ const register = function (registryURL) {
     }
 };
 exports.register = register;
-/**
- * Function to remove files older than 10 seconds from the 'lib' folder.
- * @param {string} packagePath - The path to the package directory.
- */
-const removeOldFiles = async (packagePath) => {
-    const libPath = path_1.default.join(packagePath, 'lib');
-    try {
-        // Read all files in the 'lib' folder asynchronously
-        const files = await fs_extra_1.default.readdir(libPath);
-        // Iterate through each file
-        for (const file of files) {
-            const filePath = path_1.default.join(libPath, file);
-            //check if the file is a directory
-            const stats = await fs_extra_1.default.stat(filePath);
-            let isDir = stats.isDirectory();
-            if (isDir) {
-                continue;
-            }
-            // Check if the file exists before attempting to delete it
-            if (await fs_extra_1.default.pathExists(filePath)) {
-                const stats = await fs_extra_1.default.stat(filePath);
-                const currentTime = new Date().getTime();
-                const lastModifiedTime = stats.mtime.getTime();
-                // Check if the difference between the current time and last modified time is greater than 10 seconds
-                if (currentTime - lastModifiedTime > 120000) {
-                    // Attempt to delete the file
-                    await fs_extra_1.default.remove(filePath);
-                    console.log(`Removed: ${filePath}`);
-                }
-            }
-            else {
-                console.warn(`File ${filePath} does not exist.`);
-            }
-        }
+const buildPackage = async (target, target2, packagePath = process.cwd(), logResults = true) => {
+    let spinner;
+    if (logResults) {
+        //TODO: replace with listr so we can show multiple processes at once
+        spinner = (0, ora_1.default)({
+            discardStdin: true,
+            text: 'Compiling ESM',
+        }).start();
     }
-    catch (error) {
-        console.error(`Error removing files: ${error.message}`);
-    }
-};
-exports.removeOldFiles = removeOldFiles;
-const buildPackage = (target, target2, packagePath = process.cwd(), logResults = true) => {
-    if (target == 'production' || target == 'es5' || target == 'es6' || !target) {
-        if (!fs_extra_1.default.existsSync(path_1.default.join(packagePath, 'Gruntfile.js'))) {
-            console.warn(`No Gruntfile found at ${packagePath}\\Gruntfile.js. Cannot build.`);
-            return;
-        }
-        var nodeEnv = '';
-        if (target == 'production') {
-            if (!(target2 == 'es5' || target2 == 'es6' || typeof target2 == 'undefined')) {
-                console.warn('unknown second build target. Use es5 or es6', target2);
-                return;
+    let buildProcess = Promise.resolve(true);
+    let buildStep = (step) => {
+        buildProcess = buildProcess.then((previousResult) => {
+            if (!previousResult) {
+                return false;
             }
-            var isWindows = /^win/.test(process.platform);
-            if (isWindows) {
-                nodeEnv = 'SET NODE_ENV=production&& ';
-            }
-            else {
-                nodeEnv = "NODE_ENV='production' ";
+            if (logResults) {
+                spinner.text = step.name;
+                spinner.start();
             }
+            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') {
+                    // spinner.text = step.name + ' - ' + stepResult;
+                    if (logResults) {
+                        spinner.warn(step.name + ' - ' + stepResult);
+                        spinner.stop();
+                    }
+                    //can still continue
+                    return true;
+                }
+                else if (stepResult === true || typeof stepResult === 'undefined') {
+                    if (logResults) {
+                        spinner.succeed();
+                    }
+                    return previousResult && true;
+                }
+                else if (typeof stepResult === 'object' && stepResult.error) {
+                    if (logResults) {
+                        spinner.fail(step.name + ' - ' + stepResult.error);
+                        spinner.stop();
+                    }
+                    //failed and should stop
+                    return false;
+                }
+            });
+        });
+    };
+    buildStep({
+        name: 'Compiling ESM',
+        apply: async () => {
+            return (0, exports.compilePackageESM)(packagePath);
+        },
+    });
+    buildStep({
+        name: 'Compiling CJS',
+        apply: async () => {
+            return (0, exports.compilePackageCJS)(packagePath);
+        },
+    });
+    buildStep({
+        name: 'Copying files to lib folder',
+        apply: async () => {
+            const files = await (0, glob_1.glob)(packagePath + '/src/**/*.{json,d.ts,css,scss}');
+            return Promise.all(files.map((async (file) => {
+                try {
+                    await fs_extra_1.default.copy(file, packagePath + '/lib/esm/' + file.replace(packagePath + '/src/', ''));
+                    await fs_extra_1.default.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);
+            });
+        },
+    });
+    buildStep({
+        name: 'Dual package support',
+        apply: () => {
+            return (0, utils_js_1.execPromise)('yarn tsconfig-to-dual-package ./tsconfig-cjs.json ./tsconfig-esm.json', false, false, { cwd: packagePath }).then(res => {
+                return res === '';
+            });
+        },
+    });
+    buildStep({
+        name: 'Removing old files from lib folder',
+        apply: async () => {
+            return (0, exports.removeOldFiles)(packagePath);
+        },
+    });
+    buildStep({
+        name: 'Checking imports',
+        apply: () => (0, exports.checkImports)(packagePath),
+    });
+    buildStep({
+        name: 'Checking dependencies',
+        apply: () => (0, exports.depCheck)(packagePath),
+    });
+    let success = await 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_1.default.red('✖'),
+                // text: 'Build failed',
+            });
         }
-        if (!target) {
-            target = 'es6';
+        else {
+            console.log(chalk_1.default.red(packagePath.split('/').pop(), ' - Build failed:'));
+            console.log(err);
+        }
+        console.log(msg);
+    });
+    //will be undefined if there was an error
+    if (typeof success !== 'undefined' && success !== false) {
+        if (logResults) {
+            spinner.stopAndPersist({
+                symbol: chalk_1.default.greenBright('✔'),
+                text: success === true ? 'Build successful' : 'Build successful with warnings',
+            });
         }
-        log('building once: ' +
-            nodeEnv +
-            'grunt build' +
-            (target ? '-' + target : '') +
-            (target2 ? '-' + target2 : '') +
-            ' --color');
-        let method = logResults ? utils_1.execp : utils_1.execPromise;
-        //NOTE: we moved SCSS:JSON out of webpack and grunt, into this file
-        //this is the beginning of a transition away from grunt
-        //but for the time being it's perhaps a bit strange that we
-        // let x = postcss([
-        //   postcssModules({
-        //     generateScopedName,
-        //   }),
-        // ]);
-        //execute the command to build the method, and provide the current work directory as option
-        return method(nodeEnv +
-            'grunt build' +
-            (target ? '-' + target : '') +
-            (target2 ? '-' + target2 : '') +
-            ' --color', false, false, { cwd: packagePath })
-            .then(() => {
-            // Once the build is complete, remove old files
-            return (0, exports.removeOldFiles)(packagePath);
-        })
-            .catch((err) => {
-            console.error('Error building package:', err);
-            process.exit(1);
-        });
     }
     else {
-        console.warn('unknown build target. Use es5, es6, or production.');
+        spinner.stopAndPersist({
+            symbol: chalk_1.default.red('✖'),
+            text: 'Build failed',
+        });
     }
+    return success;
 };
 exports.buildPackage = buildPackage;
+const compilePackage = async (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'));
+    // let compileCJS = `yarn exec tsc -p tsconfig-cjs.json`;
+    // let compileESM = `yarn exec tsc -p tsconfig-esm.json`;
+    // let compileCommand;
+    // if (cjsConfig && esmConfig)
+    // {
+    //   compileCommand = `${compileCJS} && ${compileESM}`;
+    // }
+    // else if (cjsConfig)
+    // {
+    //   compileCommand = compileCJS;
+    // }
+    // else if (esmConfig)
+    // {
+    //   compileCommand = compileESM;
+    // }
+    // else
+    // {
+    //   compileCommand = `yarn exec tsc`;
+    // }
+    await (0, exports.compilePackageESM)(packagePath);
+    await (0, exports.compilePackageCJS)(packagePath);
+};
+exports.compilePackage = compilePackage;
+const compilePackageESM = async (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 (0, utils_js_1.execPromise)(compileCommand, false, false, { cwd: packagePath }).then(res => {
+        return res === '';
+    });
+};
+exports.compilePackageESM = compilePackageESM;
+const compilePackageCJS = async (packagePath = process.cwd()) => {
+    let compileCommand = `yarn exec tsc -p tsconfig-cjs.json`;
+    return (0, utils_js_1.execPromise)(compileCommand, false, false, { cwd: packagePath }).then(res => {
+        return res === '';
+    }).catch(err => {
+        return {
+            error: err.stdout
+        };
+    });
+};
+exports.compilePackageCJS = compilePackageCJS;
 var publishUpdated = function (test = false) {
     let packages = getLocalLincdModules();
     var p = Promise.resolve('');
@@ -1229,22 +1641,22 @@ var publishUpdated = function (test = false) {
             // console.log("Will be requesting npm view from this current working directory:\n"+process.cwd());
             // return execPromise('npm view '+pkg.packageName+' --json').then((output:string) => {
             let shouldPublish;
-            var pack = (0, utils_1.getPackageJSON)(pckg.path);
+            var pack = (0, utils_js_1.getPackageJSON)(pckg.path);
             let version = getNextVersion(pack.version);
             if (pack.private) {
                 shouldPublish = false;
-                (0, utils_1.debugInfo)(chalk_1.default.blue('--> is private, skipping'));
+                (0, utils_js_1.debugInfo)(chalk_1.default.blue('--> is private, skipping'));
                 return chalk_1.default.gray(pckg.packageName + ' is private');
                 // return previousResult + ' ' + chalk.gray(pckg.packageName + ' is private\n');
             }
             console.log('testing npm');
-            return (0, utils_1.execPromise)('npm info ' + pckg.packageName + ' --json')
+            return (0, utils_js_1.execPromise)('npm info ' + pckg.packageName + ' --json')
                 .then(async (output) => {
                 console.log('testing npm done');
                 var info;
                 try {
                     if (output == '' || output.includes('E404')) {
-                        (0, utils_1.debugInfo)('Empty or 404 response from `npm info`. This package was probably not published before');
+                        (0, utils_js_1.debugInfo)('Empty or 404 response from `npm info`. This package was probably not published before');
                         // throw new Error('Empty response from `yarn info`. This pkg was probably not published before');
                         // return;
                         shouldPublish = true;
@@ -1267,10 +1679,10 @@ var publishUpdated = function (test = false) {
                         // }
                         let lastPublishDate = new Date(lastPublish);
                         // let {lastModifiedTime, lastModifiedName, lastModified} = getLastModifiedSourceTime(pkg.path);
-                        let lastCommitInfo = await (0, utils_1.getLastCommitTime)(pckg.path);
+                        let lastCommitInfo = await (0, utils_js_1.getLastCommitTime)(pckg.path);
                         if (!lastCommitInfo) {
                             shouldPublish = false;
-                            (0, utils_1.debugInfo)('Could not determine last git commit');
+                            (0, utils_js_1.debugInfo)('Could not determine last git commit');
                             // return previousResult + ' ' + chalk.red(pckg.packageName + ' - could not determine last commit\n');
                             return chalk_1.default.red(pckg.packageName + ' - could not determine last commit');
                         }
@@ -1364,7 +1776,7 @@ async function getEnvJsonPath(relativeToPath = process.cwd()) {
     }
     // let path = './';
     for (let i = 0; i <= 10; i++) {
-        let envFile = await (0, get_env_vars_1.getEnvFile)({
+        let envFile = await (0, get_env_vars_js_1.getEnvFile)({
             filePath: relativeToPath + path + '.env.json',
         }).catch((err) => {
             return null;
@@ -1378,7 +1790,7 @@ async function getEnvJsonPath(relativeToPath = process.cwd()) {
 }
 var publishPackage = async function (pkg, test, info, publishVersion) {
     if (!pkg) {
-        let localPackageJson = (0, utils_1.getPackageJSON)();
+        let localPackageJson = (0, utils_js_1.getPackageJSON)();
         pkg = {
             path: process.cwd(),
             packageName: localPackageJson.name,
@@ -1388,18 +1800,18 @@ var publishPackage = async function (pkg, test, info, publishVersion) {
         publishVersion = info ? getNextVersion(info.version) : 'patch';
     }
     if (test) {
-        (0, utils_1.debugInfo)('should publish ' + pkg.packageName + ' ' + publishVersion);
+        (0, utils_js_1.debugInfo)('should publish ' + pkg.packageName + ' ' + publishVersion);
         //when testing what needs to be published
         return chalk_1.default.blue(pkg.packageName + ' should publish');
     }
     console.log(chalk_1.default.blue('publishing ' + pkg.packageName + ' ' + publishVersion));
     //looking for an .env.json file in our workspace, which may store our NPM AUTH key
     let envJsonPath = await getEnvJsonPath(pkg.path);
-    return (0, utils_1.execPromise)(`cd ${pkg.path} && ${envJsonPath ? `env-cmd -f ${envJsonPath} --use-shell "` : ''}yarn version ${publishVersion} && yarn npm publish${envJsonPath ? `"` : ''}`, true, false, {}, true)
+    return (0, utils_js_1.execPromise)(`cd ${pkg.path} && ${envJsonPath ? `env-cmd -f ${envJsonPath} --use-shell "` : ''}yarn version ${publishVersion} && yarn npm publish${envJsonPath ? `"` : ''}`, true, false, {}, true)
         .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_1.default.red(pkg.packageName + ' failed\n');
         }
@@ -1428,12 +1840,12 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
     // let packages = getLocalLincdModules();
     let packages = getLocalLincdPackageMap();
     // console.log(packages);
-    let jsonldPkgUpdated = await (0, utils_1.needsRebuilding)(packages.get('lincd-jsonld'), useGitForLastModified);
+    let jsonldPkgUpdated = await (0, utils_js_1.needsRebuilding)(packages.get('lincd-jsonld'), useGitForLastModified);
     // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
     //if either cli or jsonldPkg needs to be rebuilt
     // if (jsonldPkgUpdated || cliPkgUpdated) {
     if (jsonldPkgUpdated) {
-        await (0, utils_1.execPromise)('yarn exec tsc && echo "compiled lincd-jsonld"', false, false, {
+        await (0, utils_js_1.execPromise)('yarn exec tsc && echo "compiled lincd-jsonld"', false, false, {
             cwd: packages.get('lincd-jsonld').path,
         }, true);
         // await execPromise('yarn build-core', false, false, {}, true);
@@ -1445,12 +1857,12 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
     // }
     let packagesLeft = packages.size;
     runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
-        (0, utils_1.debugInfo)('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
-        (0, utils_1.debugInfo)(packagesLeft + ' packages left.');
+        (0, utils_js_1.debugInfo)('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
+        (0, utils_js_1.debugInfo)(packagesLeft + ' packages left.');
         packagesLeft = packagesLeft - packageGroup.length;
         return async (pkg) => {
             // debugInfo('# Checking package ' + pkg.packageName);
-            let needRebuild = await (0, utils_1.needsRebuilding)(pkg, useGitForLastModified);
+            let needRebuild = await (0, utils_js_1.needsRebuilding)(pkg, useGitForLastModified);
             if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                 needRebuild = true;
             }
@@ -1458,18 +1870,26 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
                 //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
                 // log(packageName+' modified since last commit on '+now.toString());
                 if (test) {
-                    (0, utils_1.debugInfo)('Need to build ' + pkg.packageName);
+                    (0, utils_js_1.debugInfo)('Need to build ' + pkg.packageName);
                     return chalk_1.default.blue(pkg.packageName + ' should be build');
                 }
                 log('Building ' + pkg.packageName);
-                return (0, utils_1.execPromise)('cd ' +
+                // return buildPackage(null,null,pkg.path)
+                return (0, utils_js_1.execPromise)('cd ' +
                     pkg.path +
                     ' && yarn build' +
                     (target ? ' ' + target : '') +
                     (target2 ? ' ' + target2 : ''))
                     .then((res) => {
-                    (0, utils_1.debugInfo)(chalk_1.default.green(pkg.packageName + ' successfully built'));
-                    return chalk_1.default.green(pkg.packageName + ' built');
+                    if (res === '') {
+                        (0, utils_js_1.debugInfo)(chalk_1.default.green(pkg.packageName + ' successfully built'));
+                        return chalk_1.default.green(pkg.packageName + ' built');
+                    }
+                    else if (typeof res === 'string') {
+                        warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
+                        // console.log(res);
+                        process.exit(1);
+                    }
                 })
                     .catch(({ error, stdout, stderr }) => {
                     warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
@@ -1501,9 +1921,11 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
 };
 exports.buildUpdated = buildUpdated;
 const printBuildResults = function (failed, done) {
-    log('Successfully built: ' +
-        chalk_1.default.green([...done].map((m) => m.packageName).join(', ')) +
-        '\n');
+    if (done.size > 0 || done.length > 0) {
+        log('Successfully built: ' +
+            chalk_1.default.green([...done].map((m) => m.packageName).join(', ')) +
+            '\n');
+    }
     if (failed.length > 0) {
         warn('Failed to build: ' + chalk_1.default.red(failed.join(', ')) + '\n');
     }
@@ -1528,21 +1950,21 @@ var executeCommandForEachPackage = function (packages, command, filterMethod, fi
         let seen = false;
         packages = packages.filter((pkg) => {
             if (!seen &&
-                (pkg.packageName == startFrom || pkg.packageName == startFrom)) {
+                pkg.packageName.includes(startFrom)) {
                 seen = true;
             }
             return seen;
         });
     }
-    log("Executing '" +
+    log('Executing \'' +
         chalk_1.default.blueBright(command) +
-        "' on packages " +
+        '\' on packages ' +
         chalk_1.default.magenta(packages.map((m) => m.packageName).join(', ')));
     var p = Promise.resolve(true);
     packages.forEach((pkg) => {
         p = p.then(() => {
             log('# Package ' + chalk_1.default.magenta(pkg.packageName));
-            return (0, utils_1.execp)('cd ' + pkg.path + ' && ' + command);
+            return (0, utils_js_1.execp)('cd ' + pkg.path + ' && ' + command);
         });
     });
     return p;
@@ -1564,8 +1986,8 @@ exports.addLinesToFile = addLinesToFile;
 var addCapacitor = async function (basePath = process.cwd()) {
     let targetFolder = ensureFolderExists(basePath);
     log('Adding capacitor');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-static'), targetFolder);
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'capacitor', 'scripts'), path_1.default.join(targetFolder, 'scripts'));
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'app-static'), targetFolder);
+    fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'capacitor', 'scripts'), path_1.default.join(targetFolder, 'scripts'));
     //update .env-cmdrc.json file
     let envCmdPath = path_1.default.resolve(basePath, '.env-cmdrc.json');
     let envCmd = JSON.parse(fs_extra_1.default.readFileSync(envCmdPath, { encoding: 'utf8' }));
@@ -1587,7 +2009,7 @@ var addCapacitor = async function (basePath = process.cwd()) {
     log('Edited .env-cmdrc.json');
     gitIgnore('android/app/build', 'android/**/capacitor.build.gradle', 'ios/App/App/public');
     //update package.json scripts
-    let pack = (0, utils_1.getPackageJSON)(basePath);
+    let pack = (0, utils_js_1.getPackageJSON)(basePath);
     pack.scripts['build-staging'] =
         'env-cmd -e _main, staging node scripts/build.js';
     pack.scripts['fix-app'] = 'node scripts/fix-namespace.js';
@@ -1602,8 +2024,8 @@ var addCapacitor = async function (basePath = process.cwd()) {
     pack.scripts['cap:sync'] = 'yarn cap sync';
     fs_extra_1.default.writeFile(path_1.default.resolve(basePath, 'package.json'), JSON.stringify(pack, null, 2));
     log('Added new run script to package.json');
-    await (0, utils_1.execPromise)(`yarn add -D @capacitor/cli`, true, false, null, true);
-    await (0, utils_1.execPromise)(`yarn add @capacitor/android @capacitor/core @capacitor/app @capacitor/ios`, false, false, null, true);
+    await (0, utils_js_1.execPromise)(`yarn add -D @capacitor/cli`, true, false, null, true);
+    await (0, utils_js_1.execPromise)(`yarn add @capacitor/android @capacitor/core @capacitor/app @capacitor/ios`, false, false, null, true);
     // TODO: Do we need to add `npx cap init`? If yes, we should not copy capacitor config.ts yet
     // await execPromise(`npx cap init`, true, false, null, true);
     // got error:
@@ -1620,20 +2042,55 @@ 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 exec lincd' +
             (command ? ' ' + command : '') +
-            "'");
-        return (0, utils_1.execp)('cd ' +
+            '\'');
+        //TODO : replace with spawn("path to executable", ["params"], {stdio: "inherit"});
+        // maybe make spawnPromise that returns a promise
+        return (0, utils_js_1.execp)('cd ' +
             packageDetails.path +
             ' && yarn exec lincd' +
             (command ? ' ' + 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_1.default.cyan(packageName));
     }
 };
 exports.executeCommandForPackage = executeCommandForPackage;
+/**
+ * Function to remove files older than 10 seconds from the 'lib' folder.
+ * @param {string} packagePath - The path to the package directory.
+ */
+const removeOldFiles = async (packagePath) => {
+    const libPath = path_1.default.join(packagePath, 'lib');
+    try {
+        // Read all files in the 'lib' folder asynchronously
+        const files = await (0, glob_1.glob)(packagePath + '/lib/**/*.*');
+        // Iterate through each file
+        for (const file of files) {
+            // const filePath = path.join(libPath, file);
+            // Check if the file exists before attempting to delete it
+            // if (await fs.pathExists(filePath)) {
+            const stats = await fs_extra_1.default.stat(file);
+            const currentTime = new Date().getTime();
+            const lastModifiedTime = stats.mtime.getTime();
+            // Check if the difference between the current time and last modified time is greater than 120 seconds
+            if (currentTime - lastModifiedTime > 120000) {
+                // Attempt to delete the file
+                await fs_extra_1.default.unlink(file);
+                // console.log(`Removed: ${file}`);
+            }
+            // }
+        }
+        return true;
+    }
+    catch (error) {
+        console.error(`Error removing files: ${error.message}`);
+        return false;
+    }
+};
+exports.removeOldFiles = removeOldFiles;
 //# sourceMappingURL=cli-methods.js.map