lincd-cli 0.2.32 → 0.2.34

package/lib/plugins/declaration-plugin.js

@@ -1,13 +1,12 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="colors.d.ts" />
-var colors = require("colors");
-var path = require("path");
-var webpack = require('webpack');
-var Compilation = webpack.Compilation;
-var DeclarationPlugin = /** @class */ (function () {
-    function DeclarationPlugin(options) {
-        if (options === void 0) { options = {}; }
+const colors = require("colors");
+const path = require("path");
+const webpack = require('webpack');
+const { Compilation } = webpack;
+class DeclarationPlugin {
+    constructor(options = {}) {
         this.logMessages = true;
         this.exportRoot = '/lib';
         this.options = options;
@@ -26,43 +25,42 @@ var DeclarationPlugin = /** @class */ (function () {
     //     (compilation, callback) => {
     //
     //     }
-    DeclarationPlugin.prototype.apply = function (compiler) {
-        var _this = this;
+    apply(compiler) {
         this.debug('applying ');
         //when the compiler is ready to emit files
         // compiler.plugin('emit', (compilation,callback) =>
-        compiler.hooks.compilation.tap('DeclarationPlugin', function (compilation) {
+        compiler.hooks.compilation.tap('DeclarationPlugin', (compilation) => {
             //NOTE: even though the stage comes from the processAssets hook and not the afterProcessAssets hook
             // somehow this only works WITH the stage defined
             compilation.hooks.afterProcessAssets.tap({
                 stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
                 name: 'DeclarationPlugin'
-            }, function () {
+            }, () => {
                 // this.debug('indexing and removing declaration assets');
                 //collect all generated declaration files
                 //and remove them from the assets that will be emitted
                 //NOTE: at some point we decided to overwrite declaration files between emits because sometimes only one new declaration file is emitted
                 //this may cause issues when you remove a file during the continuous building process, but better than the other way around for now
-                if (!_this.declarationFiles) {
-                    _this.declarationFiles = {};
+                if (!this.declarationFiles) {
+                    this.declarationFiles = {};
                 }
-                compilation.getAssets().forEach(function (asset, key) {
+                compilation.getAssets().forEach((asset, key) => {
                     // this.debug('key '+key.toString())
                     // this.debug('value '+Object.getOwnPropertyNames(asset).join(", "))
                     // this.debug('asset: ' + asset.name);
                     if (asset.name.indexOf('.d.ts') !== -1) {
-                        if (_this.declarationFiles[asset.name]) {
-                            _this.debug('overwriting ' + asset.name);
+                        if (this.declarationFiles[asset.name]) {
+                            this.debug('overwriting ' + asset.name);
                         }
-                        _this.declarationFiles[asset.name] = asset;
-                        _this.debug('indexed and removed asset: ' + colors.green(asset.name));
+                        this.declarationFiles[asset.name] = asset;
+                        this.debug('indexed and removed asset: ' + colors.green(asset.name));
                         compilation.deleteAsset(asset.name);
                     }
                 });
-                if (Object.keys(_this.declarationFiles).length == 0) {
-                    _this.debug('Didn\'t build .d.ts file because no declaration assets were emitted during build process.'.yellow);
-                    _this.debug('This is likely because webpack is using cache.'.yellow);
-                    _this.debug('In watch mode, declaration assets will be emitted once you change a ts(x) source file'.yellow);
+                if (Object.keys(this.declarationFiles).length == 0) {
+                    this.debug('Didn\'t build .d.ts file because no declaration assets were emitted during build process.'.yellow);
+                    this.debug('This is likely because webpack is using cache.'.yellow);
+                    this.debug('In watch mode, declaration assets will be emitted once you change a ts(x) source file'.yellow);
                     // this.log('Make sure to run '.yellow + 'tsc'.blue + ' before running webpack'.yellow);
                     // this.log(
                     //   'Make sure to test for '.yellow +
@@ -74,7 +72,7 @@ var DeclarationPlugin = /** @class */ (function () {
                     return;
                 }
                 //combine them into one declaration file
-                var combinedDeclaration = _this.generateCombinedDeclaration(_this.declarationFiles); //moduleConfig
+                var combinedDeclaration = this.generateCombinedDeclaration(this.declarationFiles); //moduleConfig
                 //and insert that back into the assets
                 // compilation.assets[this.options.out] = {
                 //   source: function() {
@@ -85,7 +83,7 @@ var DeclarationPlugin = /** @class */ (function () {
                 //   },
                 // };
                 // As suggested by @JonWallsten here: https://github.com/TypeStrong/ts-loader/pull/1251#issuecomment-800032753
-                compilation.emitAsset(_this.options.out, new webpack.sources.RawSource(combinedDeclaration));
+                compilation.emitAsset(this.options.out, new webpack.sources.RawSource(combinedDeclaration));
                 //get meta data from module exports
                 /*var metaRdfJson = this.generateMetaRdfJson(compilation,moduleConfig);
                   //and insert that back into the assets as [module_name].meta.json
@@ -100,26 +98,18 @@ var DeclarationPlugin = /** @class */ (function () {
                 //}
             });
         });
-    };
-    DeclarationPlugin.prototype.debug = function () {
-        var msgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            msgs[_i] = arguments[_i];
-        }
+    }
+    debug(...msgs) {
         msgs.unshift('declarations:');
         if (this.logMessages) {
             console.log.apply(null, msgs);
         }
-    };
-    DeclarationPlugin.prototype.log = function () {
-        var msgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            msgs[_i] = arguments[_i];
-        }
+    }
+    log(...msgs) {
         msgs.unshift('declarations:');
         console.log.apply(null, msgs);
-    };
-    DeclarationPlugin.prototype.generateCombinedDeclaration = function (declarationFiles) {
+    }
+    generateCombinedDeclaration(declarationFiles) {
         this.debug('generating combined declaration');
         var declarations = '';
         //this.debug("daCore: using config ",moduleConfig);
@@ -153,8 +143,8 @@ var DeclarationPlugin = /** @class */ (function () {
                         if ((importPath.substr(0, 2) == './' || importPath.substr(0, 3) == '../') && !importMap[importPath]) {
                             //we will replace it with the local npm module later, calc and save the absolute path for now
                             //we parse from builds, because now TS-LOADER gives paths relative to its output folder
-                            var parsed = path.parse('./builds/' + declarationFileName);
-                            var fileDirectory = parsed.dir;
+                            let parsed = path.parse('./builds/' + declarationFileName);
+                            let fileDirectory = parsed.dir;
                             var absoluteImportPath = path.resolve(fileDirectory, importPath);
                             // this.debug('declarationfilename '+declarationFileName);
                             // this.debug('filedir '+fileDirectory);
@@ -169,7 +159,7 @@ var DeclarationPlugin = /** @class */ (function () {
                 excludeLine = excludeLine || /import ["'][a-z0-9A-Z_\-.\/\\]+["']/.test(line);
                 //if defined, check for excluded references
                 if (!excludeLine && this.excludedReferences && line.indexOf('<reference') !== -1) {
-                    excludeLine = this.excludedReferences.some(function (reference) { return line.indexOf(reference) !== -1; });
+                    excludeLine = this.excludedReferences.some((reference) => line.indexOf(reference) !== -1);
                 }
                 if (excludeLine) {
                     this.debug('Excluding line ' + i + ': ' + line);
@@ -184,32 +174,31 @@ var DeclarationPlugin = /** @class */ (function () {
                 }
             }
             //TS Loader now uses paths relative to output dir. so here we remove a single ../ from the path (which is in there because /builds is the output dir and /lib is the relative path of the file)
-            var fixedDeclarationPath = declarationFileName.replace(/\\/g, '/').replace('../', '').replace('.d.ts', '');
+            let fixedDeclarationPath = declarationFileName.replace(/\\/g, '/').replace('../', '').replace('.d.ts', '');
             var moduleDeclaration = npmModuleName + '/' + fixedDeclarationPath;
             //this.debug('basePath:'+basePath);
             declarations += "declare module '" + moduleDeclaration + "' {\n\t" + lines.join('\n\t') + '\n}\n\n';
             this.debug('Defining module ' + colors.yellow(moduleDeclaration) + ' from ' + colors.blue(declarationFileName));
         }
         for (var relativeImportPath in importMap) {
-            var absoluteImportPath_1 = importMap[relativeImportPath];
-            var npmImportModule = npmModuleName + '/' + absoluteImportPath_1.substr(basePath.length).replace('.d.ts', '').replace(/\\/g, '/');
+            let absoluteImportPath = importMap[relativeImportPath];
+            let npmImportModule = npmModuleName + '/' + absoluteImportPath.substr(basePath.length).replace('.d.ts', '').replace(/\\/g, '/');
             this.debug('Replacing ' + colors.blue(relativeImportPath) + ' with ' + colors.yellow(npmImportModule));
             //wrap in quotes to omit problems with replacing partials and having to fix order of replacements
             declarations = declarations.replace(new RegExp('(\'|")' + relativeImportPath + '(\'|")', 'g'), '"' + npmImportModule + '"');
         }
-        var indexModulePath = this.modulePackageInfo.name + this.exportRoot + '/index';
+        let indexModulePath = this.modulePackageInfo.name + this.exportRoot + '/index';
         this.debug('Replacing index ' + colors.yellow(indexModulePath) + ' with ' + colors.yellow(this.modulePackageInfo.name));
         declarations = declarations.replace("'" + indexModulePath + "'", "'" + this.modulePackageInfo.name + "'");
         //replace alias
         if (this.options.alias) {
-            for (var aliasKey in this.options.alias) {
+            for (let aliasKey in this.options.alias) {
                 //declarations = declarations.replace(aliasKey,this.options.alias[aliasKey]);
                 this.debug('Replacing alias ' + aliasKey + ' with ' + this.options.alias[aliasKey]);
                 declarations = declarations.replace(new RegExp(aliasKey, 'g'), this.options.alias[aliasKey]);
             }
         }
         return declarations;
-    };
-    return DeclarationPlugin;
-}());
-exports["default"] = DeclarationPlugin;
+    }
+}
+exports.default = DeclarationPlugin;

package/lib/plugins/externalise-modules.js

@@ -1,23 +1,7 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="colors.d.ts" />
-var colors = require("colors");
+const colors = require("colors");
 var exportRoot = '/lib';
 var libraryName = 'lincd';
 var lincdModules = new Map();
@@ -29,31 +13,22 @@ var includedLincdModules = new Set();
 //it basically turns every import from a lincd module into a lookup for that class/object in the global lincd object
 //See also: https://webpack.js.org/configuration/externals/
 var externaliseModules = function (config, es5) {
-    function debug() {
-        var msgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            msgs[_i] = arguments[_i];
-        }
+    function debug(...msgs) {
         msgs.unshift('externals: ');
         if (config && config.debug) {
             console.log.apply(null, msgs);
         }
     }
-    function log() {
-        var msgs = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            msgs[_i] = arguments[_i];
-        }
+    function log(...msgs) {
         msgs.unshift('externals: ');
         console.log.apply(null, msgs);
     }
     // let externalKeys: string[] = config.externals ? Object.keys(config.externals) : [];
     //return the function that is handed to webpack in the 'externals' option.
     //it determines for each request what is external and what is not
-    return function (_a, callback) {
+    return function ({ context, request, contextInfo }, callback) {
         // debug('checking '+request);
         // debug('imported by '+contextInfo.issuer);
-        var context = _a.context, request = _a.request, contextInfo = _a.contextInfo;
         if (config.externals && config.externals[request]) {
             if (!excludedExternals.has(request)) {
                 excludedExternals.add(request);
@@ -110,7 +85,7 @@ var externaliseModules = function (config, es5) {
         // --> match[0] = @dacore/some-mod
         // --> match[1] = @dacore
         // --> match[2] = some-mod
-        var _b = __read(request.match(/(@[\w\-]+\/)?([\w\-]+)/), 3), packageName = _b[0], scope = _b[1], cleanPackageName = _b[2];
+        let [packageName, scope, cleanPackageName] = request.match(/(@[\w\-]+\/)?([\w\-]+)/);
         //if this module is listed as internal module in the config (or if we internalize all modules with '*')
         if (config && config.internals && (config.internals.indexOf(packageName) !== -1 || config.internals === '*')) {
             //then don't exclude and don't continue this function
@@ -122,7 +97,7 @@ var externaliseModules = function (config, es5) {
             return callback();
         }
         //check if this module is a lincd module
-        var isLincd = isLincdModule(debug, packageName);
+        let isLincd = isLincdModule(debug, packageName);
         if (isLincd) {
             if (!includedLincdModules.has(packageName)) {
                 includedLincdModules.add(packageName);
@@ -139,11 +114,11 @@ var externaliseModules = function (config, es5) {
             return callback();
         }
         //remove export root path (for example with lincd/lib/models: the module has lib/ as root, so to get to the exported path lincd.models we need to remove it)
-        var cleanRequest = request.replace(exportRoot, '');
-        var targetVariable;
+        let cleanRequest = request.replace(exportRoot, '');
+        let targetVariable;
         //expects a flat export / global tree with all the modules classes
         //replace - by _ and remove es5, because both es6 and es5 modules will be listed under the bare module name in the global treemap
-        var firstSlash = cleanRequest.indexOf('/');
+        let firstSlash = cleanRequest.indexOf('/');
         //if importing {x} from "lincd" (so directly from library without any paths)
         if (firstSlash === -1 && cleanRequest == libraryName) {
             //then we refer straight to the global object
@@ -190,8 +165,8 @@ var externaliseModules = function (config, es5) {
 function isLincdModule(debug, packageName) {
     if (!lincdModules.has(packageName)) {
         // debug(colors.green('checking ' + moduleName + '/package.json'));
-        var isLincdModule_1;
-        var modulePackage = void 0;
+        let isLincdModule;
+        let modulePackage;
         try {
             modulePackage = require(packageName + '/package.json');
         }
@@ -199,9 +174,9 @@ function isLincdModule(debug, packageName) {
             debug(colors.red(packageName + '/package.json' + ' does not exist'));
             // return callback();
         }
-        isLincdModule_1 = modulePackage && modulePackage.lincd && true;
-        lincdModules.set(packageName, isLincdModule_1);
+        isLincdModule = modulePackage && modulePackage.lincd && true;
+        lincdModules.set(packageName, isLincdModule);
     }
     return lincdModules.get(packageName);
 }
-exports["default"] = externaliseModules;
+exports.default = externaliseModules;

package/lib/plugins/watch-run.js

@@ -4,15 +4,13 @@
  * triggered webpack re-compilation/re-build
  */
 'use strict';
-exports.__esModule = true;
-var WatchRunPlugin = /** @class */ (function () {
-    function WatchRunPlugin() {
-    }
-    WatchRunPlugin.prototype.apply = function (compiler) {
-        compiler.hooks.watchRun.tap('WatchRun', function (comp) {
-            var changedTimes = comp.watchFileSystem.watcher.mtimes;
-            var changedFiles = Object.keys(changedTimes)
-                .map(function (file) { return "\n  ".concat(file); })
+Object.defineProperty(exports, "__esModule", { value: true });
+class WatchRunPlugin {
+    apply(compiler) {
+        compiler.hooks.watchRun.tap('WatchRun', (comp) => {
+            const changedTimes = comp.watchFileSystem.watcher.mtimes;
+            const changedFiles = Object.keys(changedTimes)
+                .map((file) => `\n  ${file}`)
                 .join('');
             if (changedFiles.length) {
                 console.log('====================================');
@@ -20,9 +18,8 @@ var WatchRunPlugin = /** @class */ (function () {
                 console.log('====================================');
             }
         });
-    };
-    return WatchRunPlugin;
-}());
+    }
+}
 /*class WebpackWatchRunPlugin {
     constructor(options?) {
         if (typeof options !== "object") options = {};
@@ -44,4 +41,4 @@ var WatchRunPlugin = /** @class */ (function () {
             });
     }
 }*/
-exports["default"] = WatchRunPlugin;
+exports.default = WatchRunPlugin;

package/lib/utils.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -33,56 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLinkedTailwindColors = exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getModulePackageJSON = exports.getLINCDDependencies = exports.getPackageJSON = void 0;
-var fs = __importStar(require("fs"));
-var path = __importStar(require("path"));
-var chalk_1 = __importDefault(require("chalk"));
-var child_process_1 = require("child_process");
-var _a = require('find-nearest-package-json'), findNearestPackageJson = _a.findNearestPackageJson, findNearestPackageJsonSync = _a.findNearestPackageJsonSync;
-var getPackageJSON = function (root, error) {
-    if (root === void 0) { root = process.cwd(); }
-    if (error === void 0) { error = true; }
-    var packagePath = path.join(root, 'package.json');
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const child_process_1 = require("child_process");
+const { findNearestPackageJson, findNearestPackageJsonSync } = require('find-nearest-package-json');
+var getPackageJSON = function (root = process.cwd(), error = true) {
+    let packagePath = path.join(root, 'package.json');
     if (fs.existsSync(packagePath)) {
         return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
     }
@@ -101,43 +52,62 @@ exports.getPackageJSON = getPackageJSON;
  * Returns an array of lincd packages, with each entry containing an array with the package name and the local path to the package
  * @param packageJson
  */
-var getLINCDDependencies = function (packageJson, checkedPackages) {
-    var e_1, _a;
-    if (checkedPackages === void 0) { checkedPackages = new Set(); }
+var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
+    var _a;
     if (!packageJson) {
         packageJson = (0, exports.getPackageJSON)();
     }
-    var dependencies = __assign(__assign({}, packageJson.dependencies), packageJson.devDependencies);
-    var lincdPackagePaths = [];
-    try {
-        for (var _b = __values(Object.keys(dependencies)), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var dependency = _c.value;
-            try {
-                if (!checkedPackages.has(dependency)) {
-                    checkedPackages.add(dependency);
-                    var _d = __read((0, exports.getModulePackageJSON)(dependency), 2), modulePackageJson = _d[0], modulePath = _d[1];
-                    if (modulePackageJson === null || modulePackageJson === void 0 ? void 0 : modulePackageJson.lincd) {
-                        lincdPackagePaths.push([modulePackageJson.name, modulePath]);
-                        //also check if this package has any dependencies that are lincd packages
-                        lincdPackagePaths = lincdPackagePaths.concat((0, exports.getLINCDDependencies)(modulePackageJson, checkedPackages));
-                    }
-                    if (!modulePackageJson) {
-                        //this seems to only happen with yarn workspaces for some grunt related dependencies of lincd-cli
-                        // console.log(`could not find package.json of ${dependency}`);
-                    }
+    let dependencies = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
+    let lincdPackagePaths = [];
+    let firstTime = checkedPackages.size === 0;
+    for (var dependency of Object.keys(dependencies)) {
+        try {
+            if (!checkedPackages.has(dependency)) {
+                let [modulePackageJson, modulePath] = (0, exports.getModulePackageJSON)(dependency);
+                checkedPackages.add(dependency);
+                if (modulePackageJson === null || modulePackageJson === void 0 ? void 0 : modulePackageJson.lincd) {
+                    lincdPackagePaths.push([modulePackageJson.name, modulePath, [...Object.keys(Object.assign(Object.assign({}, modulePackageJson.dependencies), modulePackageJson.devDependencies))]]);
+                    //also check if this package has any dependencies that are lincd packages
+                    lincdPackagePaths = lincdPackagePaths.concat((0, exports.getLINCDDependencies)(modulePackageJson, checkedPackages));
+                }
+                if (!modulePackageJson) {
+                    //this seems to only happen with yarn workspaces for some grunt related dependencies of lincd-cli
+                    // console.log(`could not find package.json of ${dependency}`);
                 }
             }
-            catch (err) {
-                console.log("could not check if ".concat(dependency, " is a lincd package: ").concat(err));
-            }
+        }
+        catch (err) {
+            console.log(`could not check if ${dependency} is a lincd package: ${err}`);
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
+    if (firstTime) {
+        let dependencyMap = new Map();
+        let lincdPackageNames = new Set(lincdPackagePaths.map(([packageName, modulePath, pkgDependencies]) => packageName));
+        //remove lincd-cli from the list of lincd packages
+        lincdPackageNames.delete('lincd-cli');
+        lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies]) => {
+            dependencyMap.set(packageName, new Set(pkgDependencies.filter(dependency => lincdPackageNames.has(dependency))));
+        });
+        //remove lincd-modules from the dependencies of lincd-cli (it's not a hard dependency, and it messes things up)
+        (_a = dependencyMap.get('lincd-cli')) === null || _a === void 0 ? void 0 : _a.delete('lincd-modules');
+        //add the nested dependencies for each lincd package
+        for (let [packageName, pkgDependencies] of dependencyMap) {
+            pkgDependencies.forEach((dependency) => {
+                if (dependencyMap.has(dependency)) {
+                    dependencyMap.get(dependency).forEach((nestedDependency) => {
+                        pkgDependencies.add(nestedDependency);
+                    });
+                }
+            });
         }
-        finally { if (e_1) throw e_1.error; }
+        //sort the lincd packages by least dependent first
+        lincdPackagePaths.sort(([packageNameA, modulePathA, pkgDependenciesA], [packageNameB, modulePathB, pkgDependenciesB]) => {
+            //if package A depends on package B, then package B should come first
+            if (dependencyMap.get(packageNameA).has(packageNameB)) {
+                return 1;
+            }
+            return -1;
+        });
     }
     return lincdPackagePaths;
 };
@@ -163,10 +133,8 @@ var getModulePackageJSON = function (module_name, work_dir) {
     return [package_json, module_dir];
 };
 exports.getModulePackageJSON = getModulePackageJSON;
-var getGruntConfig = function (root, error) {
-    if (root === void 0) { root = process.cwd(); }
-    if (error === void 0) { error = true; }
-    var gruntFile = path.join(root, 'Gruntfile.js');
+var getGruntConfig = function (root = process.cwd(), error = true) {
+    let gruntFile = path.join(root, 'Gruntfile.js');
     if (fs.existsSync(gruntFile)) {
         return require(gruntFile)();
     }
@@ -178,14 +146,11 @@ var getGruntConfig = function (root, error) {
     }
 };
 exports.getGruntConfig = getGruntConfig;
-function execp(cmd, log, allowError, options) {
-    if (log === void 0) { log = false; }
-    if (allowError === void 0) { allowError = false; }
-    if (options === void 0) { options = {}; }
+function execp(cmd, log = false, allowError = false, options = {}) {
     // opts || (opts = {});
     if (log)
-        console.log(chalk_1["default"].cyan(cmd));
-    return new Promise(function (resolve, reject) {
+        console.log(chalk_1.default.cyan(cmd));
+    return new Promise((resolve, reject) => {
         var child = (0, child_process_1.exec)(cmd, options);
         child.stdout.pipe(process.stdout);
         child.stderr.pipe(process.stderr);
@@ -233,17 +198,14 @@ function execp(cmd, log, allowError, options) {
     });
 }
 exports.execp = execp;
-function execPromise(command, log, allowError, options, pipeOutput) {
-    if (log === void 0) { log = false; }
-    if (allowError === void 0) { allowError = false; }
-    if (pipeOutput === void 0) { pipeOutput = false; }
+function execPromise(command, log = false, allowError = false, options, pipeOutput = false) {
     return new Promise(function (resolve, reject) {
         if (log)
-            console.log(chalk_1["default"].cyan(command));
-        var child = (0, child_process_1.exec)(command, options, function (error, stdout, stderr) {
+            console.log(chalk_1.default.cyan(command));
+        let child = (0, child_process_1.exec)(command, options, (error, stdout, stderr) => {
             if (error) {
                 if (!allowError) {
-                    reject({ error: error, stdout: stdout, stderr: stderr });
+                    reject({ error, stdout, stderr });
                     return;
                 }
                 else if (log) {
@@ -251,7 +213,7 @@ function execPromise(command, log, allowError, options, pipeOutput) {
                 }
             }
             //TODO: getting a typescript error for 'trim()', this worked before, is it still used? do we log anywhere?
-            var result = stdout['trim']();
+            let result = stdout['trim']();
             if (log) {
                 // console.log(chalk"RESOLVING "+command);
                 console.log(result);
@@ -271,8 +233,8 @@ exports.execPromise = execPromise;
 function generateScopedName(moduleName, name, filename, css) {
     // console.log(moduleName,name,filename,css);
     var file = path.basename(filename, '.scss');
-    var nearestPackageJson = findNearestPackageJsonSync(filename);
-    var packageName = nearestPackageJson ? nearestPackageJson.data.name : moduleName;
+    let nearestPackageJson = findNearestPackageJsonSync(filename);
+    let packageName = nearestPackageJson ? nearestPackageJson.data.name : moduleName;
     return packageName.replace(/[^a-zA-Z0-9_]+/g, '_') + '_' + file + '_' + name;
     // process.exit();
     // var path = require('path');
@@ -303,33 +265,21 @@ function generateScopedName(moduleName, name, filename, css) {
     return moduleName + '_' + file + '_' + name;
 }
 exports.generateScopedName = generateScopedName;
-function log() {
-    var messages = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        messages[_i] = arguments[_i];
-    }
-    messages.forEach(function (message) {
-        console.log(chalk_1["default"].cyan(message));
+function log(...messages) {
+    messages.forEach((message) => {
+        console.log(chalk_1.default.cyan(message));
     });
 }
 exports.log = log;
-function debug(config) {
-    var messages = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        messages[_i - 1] = arguments[_i];
-    }
+function debug(config, ...messages) {
     if (config.debug) {
-        log.apply(void 0, __spreadArray([], __read(messages), false));
+        log(...messages);
     }
 }
 exports.debug = debug;
-function warn() {
-    var messages = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        messages[_i] = arguments[_i];
-    }
-    messages.forEach(function (message) {
-        console.log(chalk_1["default"].red(message));
+function warn(...messages) {
+    messages.forEach((message) => {
+        console.log(chalk_1.default.red(message));
     });
 }
 exports.warn = warn;
@@ -342,7 +292,7 @@ exports.flatten = flatten;
 function getLinkedTailwindColors() {
     return {
         'primary-color': 'var(--primary-color)',
-        'font-color': 'var(--font-color)'
+        'font-color': 'var(--font-color)',
     };
 }
 exports.getLinkedTailwindColors = getLinkedTailwindColors;