lincd-cli 0.2.20 → 0.2.22

package/defaults/app-with-backend/package.json

@@ -44,7 +44,7 @@
     "@babel/register": "^7.18.9",
     "lincd": "^0.5",
     "lincd-jsonld": "^0.1.5",
-    "lincd-server": "0.1.15",
+    "lincd-server": "^0.1.19",
     "react": "^18.2",
     "react-dom": "^18.2",
     "react-error-boundary": "^3.1.3",

package/lib/cli-methods.js

@@ -1151,12 +1151,24 @@ var getLastModifiedSourceTime = function (packagePath) {
 var getLastCommitTime = function (packagePath) {
     // console.log(`git log -1 --format=%ci -- ${packagePath}`);
     // process.exit();
-    return (0, utils_1.execPromise)("git log -1 --format=%ci -- ".concat(packagePath))
-        .then(function (result) {
-        var lastCommit = new Date(result);
-        // console.log(packagePath,result,lastCommit);
-        return lastCommit;
-    })["catch"](function (_a) {
+    return (0, utils_1.execPromise)("git log -1 --format=\"%h %ci\" -- ".concat(packagePath))
+        .then(function (result) { return __awaiter(void 0, void 0, void 0, function () {
+        var commitId, date, lastCommitDate, changes;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    commitId = result.substring(0, result.indexOf(" "));
+                    date = result.substring(commitId.length + 1);
+                    lastCommitDate = new Date(date);
+                    return [4 /*yield*/, (0, utils_1.execPromise)("git show --stat --oneline ".concat(commitId, " -- ").concat(packagePath))];
+                case 1:
+                    changes = _a.sent();
+                    // log(packagePath,result,lastCommit);
+                    // log(changes);
+                    return [2 /*return*/, { date: lastCommitDate, changes: changes, commitId: commitId }];
+            }
+        });
+    }); })["catch"](function (_a) {
         var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
         debugInfo(chalk_1["default"].red('Git error: ') + error.message.toString());
         return null;
@@ -1189,7 +1201,6 @@ var publishUpdated = function (test) {
     var _this = this;
     if (test === void 0) { test = false; }
     var packages = getLocalLincdModules();
-    var browserCoreBuilt = false;
     var p = Promise.resolve('');
     var packagesLeft = packages.length;
     var results = [];
@@ -1215,7 +1226,7 @@ var publishUpdated = function (test) {
             }
             return (0, utils_1.execPromise)('npm info ' + pckg.packageName + ' --json')
                 .then(function (output) { return __awaiter(_this, void 0, void 0, function () {
-                var info, lastPublish, lastPublishDate, lastCommit, err_1, res, browserModule;
+                var info, lastPublish, lastPublishDate, lastCommitInfo, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -1239,8 +1250,8 @@ var publishUpdated = function (test) {
                             lastPublishDate = new Date(lastPublish);
                             return [4 /*yield*/, getLastCommitTime(pckg.path)];
                         case 1:
-                            lastCommit = _a.sent();
-                            if (!lastCommit) {
+                            lastCommitInfo = _a.sent();
+                            if (!lastCommitInfo) {
                                 shouldPublish = false;
                                 debugInfo('Could not determine last git commit');
                                 // return previousResult + ' ' + chalk.red(pckg.packageName + ' - could not determine last commit\n');
@@ -1249,19 +1260,17 @@ var publishUpdated = function (test) {
                             else {
                                 //NOTE: removed lastModified, because switching branches will say that the file was modified and cause everything to publish
                                 //SO: now you NEED TO commit before it picks up that you should publish
-                                shouldPublish = lastPublishDate.getTime() < lastCommit.getTime();
-                                // if (shouldPublish) {
-                                //   log(
-                                //     lastPublishDate.toDateString() +
-                                //     ' ' +
-                                //     lastPublishDate.toTimeString() +
-                                //     ' published ' +
-                                //     info.version,
-                                //   );
-                                //   log(
-                                //     lastCommit.toDateString() + ' ' + new Date(lastCommit).toTimeString() + ' source last committed',
-                                //   );
-                                // }
+                                shouldPublish = lastPublishDate.getTime() < lastCommitInfo.date.getTime();
+                                if (shouldPublish) {
+                                    log(chalk_1["default"].magenta(pckg.packageName) + ' should be published because:');
+                                    log(lastPublishDate.toDateString() +
+                                        ' ' +
+                                        lastPublishDate.toTimeString() +
+                                        ' published ' +
+                                        info.version);
+                                    log(lastCommitInfo.date.toDateString() + ' ' + new Date(lastCommitInfo.date).toTimeString() + ' source last committed:');
+                                    log(lastCommitInfo.changes);
+                                }
                             }
                             _a.label = 2;
                         case 2: return [3 /*break*/, 4];
@@ -1275,21 +1284,8 @@ var publishUpdated = function (test) {
                             return [2 /*return*/, chalk_1["default"].red(pckg.packageName + ' failed: ' + err_1.message)];
                         case 4:
                             if (shouldPublish) {
-                                res = (0, exports.publishPackage)(pckg, test, info, version);
-                                if (pckg.packageName == 'browser-core') {
-                                    browserCoreBuilt = true;
-                                }
-                                //when publishing core, also make sure to publish browser-core
-                                if (pckg.packageName == 'core' && !browserCoreBuilt) {
-                                    browserModule = packages.find(function (m) { return m.packageName == 'browser-core'; });
-                                    return [2 /*return*/, Promise.resolve(res).then(function (previousResult) {
-                                            log('# Automatically also publishing package browser-core');
-                                            return (0, exports.publishPackage)(browserModule, test);
-                                        })];
-                                }
-                                return [2 /*return*/, res];
+                                return [2 /*return*/, (0, exports.publishPackage)(pckg, test, info, version)];
                             }
-                            // return previousResult + ' ' + chalk.green(pckg.packageName + ' latest version is up to date\n');
                             return [2 /*return*/, chalk_1["default"].green(pckg.packageName + ' latest version is up to date')];
                     }
                 });
@@ -1329,9 +1325,43 @@ var publishUpdated = function (test) {
     });
 };
 exports.publishUpdated = publishUpdated;
+function getEnvJsonPath(relativeToPath) {
+    if (relativeToPath === void 0) { relativeToPath = process.cwd(); }
+    return __awaiter(this, void 0, void 0, function () {
+        var path, i, envFile;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    path = '';
+                    if (!relativeToPath.endsWith('/')) {
+                        relativeToPath += '/';
+                    }
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i <= 10)) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, get_env_vars_1.getEnvFile)({ filePath: relativeToPath + path + '.env.json' })["catch"](function (err) {
+                            return null;
+                        })];
+                case 2:
+                    envFile = _a.sent();
+                    if (envFile) {
+                        //note: we're getting the actual contents here, so we could also use that more directly?
+                        return [2 /*return*/, path + '.env.json'];
+                    }
+                    path += '../';
+                    _a.label = 3;
+                case 3:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
 var publishPackage = function (pkg, test, info, publishVersion) {
     return __awaiter(this, void 0, void 0, function () {
-        var localPackageJson, path, envCmdFile, i, envFile;
+        var localPackageJson, envJsonPath;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -1351,42 +1381,24 @@ var publishPackage = function (pkg, test, info, publishVersion) {
                         return [2 /*return*/, chalk_1["default"].blue(pkg.packageName + ' should publish')];
                     }
                     console.log(chalk_1["default"].blue('publishing ' + pkg.packageName + ' ' + publishVersion));
-                    path = './';
-                    envCmdFile = '';
-                    i = 0;
-                    _a.label = 1;
+                    return [4 /*yield*/, getEnvJsonPath(pkg.path)];
                 case 1:
-                    if (!(i <= 10)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, get_env_vars_1.getEnvFile)({ filePath: path + '.env.json' })["catch"](function (err) {
-                            return null;
+                    envJsonPath = _a.sent();
+                    return [2 /*return*/, (0, utils_1.execPromise)("cd ".concat(pkg.path, " && ").concat(envJsonPath ? "env-cmd -f ".concat(envJsonPath, " --use-shell \"") : '', "yarn version ").concat(publishVersion, " && yarn npm publish").concat(envJsonPath ? "\"" : ''), true, false, {}, true)
+                            .then(function (res) {
+                            if (res.indexOf('Aborted due to warnings') !== -1 ||
+                                res.indexOf('Could not publish') !== -1 ||
+                                res.indexOf("Couldn't publish") !== -1) {
+                                console.log(res);
+                                return chalk_1["default"].red(pkg.packageName + ' failed\n');
+                            }
+                            console.log(chalk_1["default"].green('Successfully published ' + pkg.path + ' ' + publishVersion));
+                            return chalk_1["default"].green(pkg.packageName + ' published ' + publishVersion);
+                        })["catch"](function (_a) {
+                            var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
+                            console.log(chalk_1["default"].red('Failed to publish: ' + error.message));
+                            return chalk_1["default"].red(pkg.packageName + ' failed to publish');
                         })];
-                case 2:
-                    envFile = _a.sent();
-                    if (envFile) {
-                        //note: we're getting the actual contents here, so we could also use that more directly?
-                        envCmdFile = path + '.env.json';
-                        return [3 /*break*/, 4];
-                    }
-                    path += '../';
-                    _a.label = 3;
-                case 3:
-                    i++;
-                    return [3 /*break*/, 1];
-                case 4: return [2 /*return*/, (0, utils_1.execPromise)("cd ".concat(pkg.path, " && ").concat(envCmdFile ? "env-cmd -f ".concat(envCmdFile, " --use-shell \"") : '', "yarn version ").concat(publishVersion, " && yarn npm publish").concat(envCmdFile ? "\"" : ''), true, false, {}, true)
-                        .then(function (res) {
-                        if (res.indexOf('Aborted due to warnings') !== -1 ||
-                            res.indexOf('Could not publish') !== -1 ||
-                            res.indexOf("Couldn't publish") !== -1) {
-                            console.log(res);
-                            return chalk_1["default"].red(pkg.packageName + ' failed\n');
-                        }
-                        console.log(chalk_1["default"].green('Successfully published ' + pkg.path + ' ' + publishVersion));
-                        return chalk_1["default"].green(pkg.packageName + ' published ' + publishVersion + '\n');
-                    })["catch"](function (_a) {
-                        var error = _a.error, stdout = _a.stdout, stderr = _a.stderr;
-                        console.log(chalk_1["default"].red('Failed to publish: ' + error.message));
-                        return chalk_1["default"].red(pkg.packageName + ' failed to publish\n');
-                    })];
             }
         });
     });
@@ -1395,7 +1407,7 @@ exports.publishPackage = publishPackage;
 var buildUpdated = function (back, target, target2, test) {
     if (test === void 0) { test = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var previousResult, packages, jsonldPkgUpdated, cliPkgUpdated, rebuildAllModules, packagesLeft, p;
+        var previousResult, packages, jsonldPkgUpdated, rebuildAllModules, packagesLeft, p;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -1404,18 +1416,13 @@ var buildUpdated = function (back, target, target2, test) {
                     log(test ? 'Checking which packages need to be rebuild' : 'Building updated packages');
                     packages = getLocalLincdPackageMap();
                     jsonldPkgUpdated = needsRebuilding(packages.get('lincd-jsonld'));
-                    cliPkgUpdated = needsRebuilding(packages.get('lincd-cli'));
-                    if (!(jsonldPkgUpdated || cliPkgUpdated)) return [3 /*break*/, 2];
+                    if (!jsonldPkgUpdated) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, utils_1.execPromise)('yarn build-core', false, false, {}, true)];
                 case 1:
                     _a.sent();
                     _a.label = 2;
                 case 2:
                     rebuildAllModules = false;
-                    if (cliPkgUpdated) {
-                        rebuildAllModules = true;
-                        log(chalk_1["default"].magenta('Rebuilding all packages because the build tools (lincd-cli) got updated'));
-                    }
                     packagesLeft = packages.size;
                     runOnPackagesGroupedByDependencies(packages, function (packageGroup, dependencies) {
                         // console.log('Now checking: ' + chalk.blue(packageGroup.map((i) => i.packageName)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {