lincd-cli 0.2.24 → 0.2.26

package/defaults/app-with-backend/frontend/src/index.tsx

@@ -1,4 +1,4 @@
-import {initFrontend} from 'lincd-server/lib/utils/Frontend';
+import {initFrontend} from 'lincd-server-utils/lib/utils/Frontend';
 
 window['$RefreshReg$'] = () => {};
 window['$RefreshSig$'] = () => () => {};

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

@@ -45,6 +45,7 @@
     "lincd": "^0.5",
     "lincd-jsonld": "^0.1.5",
     "lincd-server": "^0.1.19",
+    "lincd-server-utils": "^0.1",
     "react": "^18.2",
     "react-dom": "^18.2",
     "react-error-boundary": "^3.1.3",
@@ -56,6 +57,7 @@
     "@types/react-dom": "^18.0.6",
     "env-cmd": "^10.1.0",
     "lincd-cli": "^0.2",
-    "nodemon": "^2.0.6"
+    "nodemon": "^2.0.6",
+    "pm2": "^5.3.0"
   }
 }

package/defaults/app-with-backend/pm2.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  apps: [
+    {
+      name: '${hyphen_name}',
+      script: 'yarn run server:prod',
+      time: true,
+      log_date_format: 'DD-MM-YYYY HH:mm Z',
+      out_file: "./data/out.log",
+      error_file: "./data/error.log",
+    }
+  ],
+};

package/lib/cli-methods.js

@@ -134,7 +134,7 @@ var createApp = function (name, basePath) {
                     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
                     log("Creating new LINCD application '" + name + "'");
                     //replace variables in some copied files
-                    replaceVariablesInFilesWithRoot(targetFolder, 'package.json', 'frontend/src/App.tsx', 'frontend/src/package.ts', 'frontend/src/App.scss.json', '.vscode/launch.json', 'frontend/src/components/Spinner.scss.json');
+                    replaceVariablesInFilesWithRoot(targetFolder, 'package.json', 'pm2.config.js', 'frontend/src/App.tsx', 'frontend/src/package.ts', 'frontend/src/App.scss.json', '.vscode/launch.json', 'frontend/src/components/Spinner.scss.json');
                     return [4 /*yield*/, hasYarnInstalled()];
                 case 1:
                     hasYarn = _b.sent();
@@ -183,11 +183,11 @@ function debugInfo() {
     //   console.log(gruntConfig);
     //   process.exit();
     // }
-    if (gruntConfig && gruntConfig.analyse === true) {
-        messages.forEach(function (message) {
-            console.log(chalk_1["default"].cyan('Info: ') + message);
-        });
-    }
+    // if (gruntConfig && gruntConfig.analyse === true) {
+    messages.forEach(function (message) {
+        console.log(chalk_1["default"].cyan('Info: ') + message);
+    });
+    // }
 }
 function warn() {
     var messages = [];
@@ -323,12 +323,44 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
                             })) {
                             stack.push(pkg);
                         }
-                        // else if(!done.has(package))
-                        // {
-                        // 	console.log(chalk.red(package+' not yet'))
-                        // 	console.log('UNMET DEPS: '+deps.filter(dependency => !done.has(dependency)).join(" "))
-                        // }
                     });
+                    if (stack.length <= 0 && done.size < lincdPackages.size) {
+                        console.log(chalk_1["default"].red('Only ' + done.size + ' out of ' + lincdPackages.size + ' packages have been built'));
+                        console.log('ALL remaining packages have dependencies that have not been met. This may point to ' + chalk_1["default"].red('circular dependencies.'));
+                        console.log('Already built: ' + Array.from(done).map(function (p) { return chalk_1["default"].green(p.packageName); }).join(', '));
+                        console.log(chalk_1["default"].blue('\nTo solve this issue') + ': find the circular dependencies below and fix the dependencies:\n\n');
+                        //TODO: actually find and name the packages that have circular dependencies
+                        // let circular = [];
+                        // lincdPackages.forEach((pkg) => {
+                        //   if (!done.has(pkg))
+                        //   {
+                        //     let deps = dependencies.get(pkg);
+                        //     if (deps.some(dependency => {
+                        //       //return true if this dependency (indirectly) depends on the package whos' dependency it is
+                        //       return hasDependency(dependency,pkg,dependencies)
+                        //     }))
+                        //     {
+                        //       circular.push(pkg);
+                        //     }
+                        //     process.exit();
+                        //   }
+                        // });
+                        lincdPackages.forEach(function (pkg) {
+                            var deps = dependencies.get(pkg);
+                            if (!done.has(pkg)) {
+                                console.log(chalk_1["default"].red(pkg.packageName) + ' has not been built yet. Unbuilt dependencies:\n' + deps.filter(function (dependency) {
+                                    return !Array.from(done).some(function (p) {
+                                        // console.log(p.packageName,dependency.packageName,p===dependency)
+                                        return p === dependency;
+                                    });
+                                }).map(function (p) { return chalk_1["default"].red('\t- ' + ((p === null || p === void 0 ? void 0 : p.packageName) ? p.packageName : p.toString()) + '\n'); }).join(" "));
+                                // console.log(chalk.red(pkg.packageName)+' has not been built yet. Built dependencies:\n' + deps.filter(dependency => {
+                                //   return Array.from(done).some(p => p.packageName === pkg.packageName)
+                                // }).map(p => chalk.green('\t- '+p.packageName+'\n')).join(" "))
+                                // console.log(chalk.red(pkg.packageName)+' has not been built yet. Built dependencies:\n' + deps.filter(dependency => done.has(pkg)).map(p => chalk.green('\t- '+p.packageName+'\n')).join(" "))
+                            }
+                        });
+                    }
                     //if more to be built, iterate
                     if (stack.length > 0) {
                         return [2 /*return*/, runStack(stack)];
@@ -343,6 +375,23 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
     //starts the process
     runStack(startStack);
 }
+function hasDependency(pkg, childPkg, dependencies, depth) {
+    if (depth === void 0) { depth = 1; }
+    console.log("Does " + pkg.packageName + " have dep " + childPkg.packageName + " ?");
+    var deps = dependencies.get(pkg);
+    if (deps.some(function (dependency) {
+        console.log(dependency.packageName, childPkg.packageName, dependency === childPkg);
+        if (depth === 2)
+            return false;
+        // return dependency === childPkg;
+        return dependency === childPkg || hasDependency(dependency, childPkg, dependencies, depth++);
+    })) {
+        console.log("##YES");
+        return true;
+    }
+    console.log("going up");
+    return false;
+}
 function buildAll(target, target2, target3) {
     var _this = this;
     console.log('Building all LINCD packages of this repository in order of dependencies');
@@ -1012,6 +1061,7 @@ var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, funct
                 _c.sent(); //{recursive:true} but not needed with fs-extra
                 _loop_1 = function (packageCodeName, packagePath, lincdPackagePath, isAppPackage) {
                     var errors = false;
+                    //TODO: check if this resolves, if not, skip it (for initial setup)
                     Promise.resolve().then(function () { return __importStar(require('lincd-modules/lib/scripts/package-metadata.js')); }).then(function (script) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -1222,7 +1272,7 @@ var publishUpdated = function (test) {
         p = p
             .then(function (previousResult) {
             // progressUpdate(packagesLeft-- + ' packages left. Now checking ' + pckg.packageName);
-            // log('# Checking package ' + pckg.packageName);
+            log('# Checking package ' + pckg.packageName);
             // log('# Requesting ' + 'yarn info '+pkg.packageName+' --json');
             // return execPromise('yarn info '+pkg.packageName+' --json').then((output:string) => {
             // console.log("Will be requesting npm view from this current working directory:\n"+process.cwd());
@@ -1236,13 +1286,17 @@ var publishUpdated = function (test) {
                 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')
                 .then(function (output) { return __awaiter(_this, void 0, void 0, function () {
-                var info, lastPublish, lastPublishDate, lastCommitInfo, err_1;
+                var info, lastPublish, lastPublishDate, lastCommitInfo, changedFiles, numberOfFilesChanges, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _a.trys.push([0, 3, , 4]);
+                            console.log("testing npm done");
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 4, , 5]);
                             if (output == '' || output.includes('E404')) {
                                 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');
@@ -1254,14 +1308,14 @@ var publishUpdated = function (test) {
                             else {
                                 info = JSON.parse(output);
                             }
-                            if (!info) return [3 /*break*/, 2];
+                            if (!info) return [3 /*break*/, 3];
                             lastPublish = void 0;
                             //yarn:
                             // let lastPublish = info.data.time[info.data.version];
                             lastPublish = info.time[info.version];
                             lastPublishDate = new Date(lastPublish);
                             return [4 /*yield*/, getLastCommitTime(pckg.path)];
-                        case 1:
+                        case 2:
                             lastCommitInfo = _a.sent();
                             if (!lastCommitInfo) {
                                 shouldPublish = false;
@@ -1273,6 +1327,12 @@ var publishUpdated = function (test) {
                                 //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() < lastCommitInfo.date.getTime();
+                                changedFiles = lastCommitInfo.changes.split("\n").filter(function (line) { return line.includes("|"); });
+                                numberOfFilesChanges = changedFiles.length;
+                                // console.log("CHECK "+lastCommitInfo.changes.includes("package.json")+" - "+numberOfFilesChanges)
+                                if (shouldPublish && lastCommitInfo.changes.includes("package.json") && numberOfFilesChanges === 1) {
+                                    shouldPublish = false;
+                                }
                                 if (shouldPublish) {
                                     log(chalk_1["default"].magenta(pckg.packageName) + ' should be published because:');
                                     log(lastPublishDate.toDateString() +
@@ -1284,9 +1344,9 @@ var publishUpdated = function (test) {
                                     log(lastCommitInfo.changes);
                                 }
                             }
-                            _a.label = 2;
-                        case 2: return [3 /*break*/, 4];
-                        case 3:
+                            _a.label = 3;
+                        case 3: return [3 /*break*/, 5];
+                        case 4:
                             err_1 = _a.sent();
                             // var stats = fs.statSync(path.join(packageDirectory));
                             // var files = fs.readdirSync(path.join(packageDirectory,'src'));
@@ -1294,11 +1354,11 @@ var publishUpdated = function (test) {
                             console.warn('Returned JSON from npm: ' + output);
                             // return previousResult + ' ' + chalk.red(pckg.packageName + ' failed: ' + err.message + '\n');
                             return [2 /*return*/, chalk_1["default"].red(pckg.packageName + ' failed: ' + err_1.message)];
-                        case 4:
+                        case 5:
                             if (shouldPublish) {
                                 return [2 /*return*/, (0, exports.publishPackage)(pckg, test, info, version)];
                             }
-                            return [2 /*return*/, chalk_1["default"].green(pckg.packageName + ' latest version is up to date')];
+                            return [2 /*return*/, chalk_1["default"].blue(pckg.packageName) + ' latest version is up to date'];
                     }
                 });
             }); })["catch"](function (_a) {
@@ -1404,8 +1464,8 @@ var publishPackage = function (pkg, test, info, publishVersion) {
                                 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);
+                            console.log('Successfully published ' + chalk_1["default"].green(pkg.path) + ' ' + chalk_1["default"].magenta(publishVersion));
+                            return chalk_1["default"].green(pkg.packageName) + ' published ' + chalk_1["default"].magenta(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));
@@ -1437,13 +1497,12 @@ var buildUpdated = function (back, target, target2, test) {
                     rebuildAllModules = false;
                     packagesLeft = packages.size;
                     runOnPackagesGroupedByDependencies(packages, function (packageGroup, dependencies) {
-                        // console.log('Now checking: ' + chalk.blue(packageGroup.map((i) => i.packageName)));
-                        // console.log((packagesLeft) + " packages left.");
+                        debugInfo('Now checking: ' + chalk_1["default"].blue(packageGroup.map(function (i) { return i.packageName; })));
+                        debugInfo((packagesLeft) + " packages left.");
                         packagesLeft = packagesLeft - packageGroup.length;
                         return function (pkg) { return __awaiter(_this, void 0, void 0, function () {
                             var needRebuild;
                             return __generator(this, function (_a) {
-                                debugInfo('# Checking package ' + pkg.packageName);
                                 needRebuild = needsRebuilding(pkg, true);
                                 if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                                     needRebuild = true;
@@ -1495,12 +1554,12 @@ var buildUpdated = function (back, target, target2, test) {
     });
 };
 exports.buildUpdated = buildUpdated;
-var needsRebuilding = function (pkg, logDetailsIfTrue) {
-    if (logDetailsIfTrue === void 0) { logDetailsIfTrue = false; }
+var needsRebuilding = function (pkg, log) {
+    if (log === void 0) { log = false; }
     var lastModifiedSource = getLastModifiedSourceTime(pkg.path);
     var lastModifiedBundle = getLastBuildTime(pkg.path);
     var result = lastModifiedSource.lastModifiedTime > lastModifiedBundle.lastModifiedTime;
-    if (logDetailsIfTrue) {
+    if (log) {
         debugInfo(chalk_1["default"].cyan('Last modified source: ' +
             lastModifiedSource.lastModifiedName +
             ' on ' +
@@ -1560,23 +1619,39 @@ exports.executeCommandForEachPackage = executeCommandForEachPackage;
 var addCapacitor = function (basePath) {
     if (basePath === void 0) { basePath = process.cwd(); }
     return __awaiter(this, void 0, void 0, function () {
-        var targetFolder, pack;
+        var targetFolder, envCmdPath, envCmd, pack;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     targetFolder = ensureFolderExists(basePath);
                     log('Adding capacitor');
                     fs_extra_1["default"].copySync(path_1["default"].join(__dirname, '..', 'defaults', 'app-static'), targetFolder);
+                    envCmdPath = path_1["default"].resolve(basePath, '.env-cmdrc.json');
+                    envCmd = JSON.parse(fs_extra_1["default"].readFileSync(envCmdPath, { encoding: 'utf8' }));
+                    envCmd['static-dev'] = {
+                        "NODE_ENV": "production",
+                        "SITE_ROOT": "http://localhost:4000",
+                        "DATA_ROOT": "http://localhost:4000/data",
+                        "OUTPUT_PATH": "./frontend/web/assets",
+                        "ASSET_PATH": "./assets/",
+                        "ENTRY_PATH": "./frontend/src/index-static.tsx"
+                    };
+                    fs_extra_1["default"].writeFile(envCmdPath, JSON.stringify(envCmd, null, 2));
+                    log('Edited .env-cmdrc.json');
                     pack = (0, utils_1.getPackageJSON)(basePath);
                     pack.scripts['build-static'] = 'env-cmd -e static-dev node frontend/scripts/build.js';
-                    fs_extra_1["default"].writeFile(path_1["default"].resolve(basePath, 'package.json'), JSON.stringify(pack));
-                    return [4 /*yield*/, (0, utils_1.execPromise)("yarn add -W -D @capacitor/cli", false, false, null, true)];
+                    pack.scripts['cap:android'] = 'yarn cap open android';
+                    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');
+                    return [4 /*yield*/, (0, utils_1.execPromise)("yarn add -D @capacitor/cli", true, false, null, true)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, (0, utils_1.execPromise)("yarn add -W @capacitor/android @capacitor/core @capacitor/geolocation @capacitor/ios @capacitor/push-notifications", false, false, null, true)];
+                    return [4 /*yield*/, (0, utils_1.execPromise)("yarn add @capacitor/android @capacitor/core @capacitor/geolocation @capacitor/ios @capacitor/push-notifications", false, false, null, true)];
                 case 2:
                     _a.sent();
-                    log('Done! Run `yarn build-static` to generate static bundles. Then `yarn cap add android` or `yarn cap add ios`');
+                    log("Done! Run ".concat(chalk_1["default"].magenta('yarn build-static'), " to generate static bundles. Then run ").concat(chalk_1["default"].magenta('yarn cap add android'), " and/or ").concat(chalk_1["default"].magenta('yarn cap add ios'), "')"));
+                    log("Also see the app icons in /frontend/web");
                     return [2 /*return*/];
             }
         });

package/lib/cli.js

@@ -132,7 +132,7 @@ program
     .argument('<name>', 'the name of the package. Can be a part of the name.')
     .argument('[command]', 'the lincd command you want to execute. Like dev or build')
     .argument('[args...]', 'the additional arguments of that command');
-program.command('add-capacitor').action(function () {
+program.command('enable-capacitor').action(function () {
     (0, cli_methods_1.addCapacitor)();
 });
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -59,8 +59,7 @@
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
     "lincd": "^0.5",
-    "lincd-app": "^0.1",
-    "lincd-jsonld": "^0.1.13",
+    "lincd-jsonld": "^0.1.20",
     "lincd-modules": "^0.1",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.7.5",

package/defaults/app-static/.env-cmdrc.json

@@ -1,10 +0,0 @@
-{
-  "static-dev": {
-    "NODE_ENV": "production",
-    "SITE_ROOT": "http://localhost:4000",
-    "DATA_ROOT": "https://coolbock.lincd.org/data",
-    "OUTPUT_PATH" : "./frontend/web/assets",
-    "ASSET_PATH" : "./assets/",
-    "ENTRY_PATH" : "./frontend/src/index-static.tsx"
-  }
-}