cob-cli 2.30.0 → 2.32.0

package/lib/commands/customize.js

@@ -4,7 +4,7 @@ const path = require("path");
 const { checkVersion } = require("./upgradeRepo");
 const { checkWorkingCopyCleanliness } = require("../task_lists/common_helpers");
 const axios = require("axios");
-const git = require("simple-git/promise");
+const git = require("simple-git");
 const ncp = require("ncp");
 const { Transform } = require("stream");
 const fg = require("fast-glob");
@@ -132,10 +132,10 @@ async function downloadCustomizationFiles(customizationRepo) {
 
   process.chdir(cacheDir);
   if (!fs.existsSync(path.resolve(cacheDir,customizationRepo.name))) {
-    console.log("  git  " + customizationRepo.ssh_url);
-    await git().clone(customizationRepo.ssh_url);
+    console.log("  git clone " + customizationRepo.clone_url);
+    await git().clone(customizationRepo.clone_url);
   } else {
-    console.log("  git pull " + customizationRepo.ssh_url);
+    console.log("  git pull " + customizationRepo.clone_url);
     process.chdir(customizationRepo.name);
     try {
       await git().pull();

package/lib/commands/init.js

@@ -4,7 +4,7 @@ const { newProjectTasks } = require("../task_lists/init_newProject");
 const { existingProjectTasks } = require("../task_lists/init_existingProject");
 const fs = require('fs-extra');
 const axios = require('axios');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 
 /* ******************************** MAIN LOGIC **************************************** */
 async function init(servername,args) {

package/lib/commands/test.js

@@ -1,5 +1,5 @@
 require('colors');
-const opn = require('opn');
+const opn = require('open');
 const { validateTestingConditions }  = require("../task_lists/test_validate");
 const { customUIsContinuosReload } = require("../task_lists/test_customUIsContinuosReload");
 const { otherFilesContiousReload } = require("../task_lists/test_otherFilesContiousReload");
@@ -24,7 +24,6 @@ async function test (args) {
         }
         customUIsContinuosReload(cmdEnv, args.dashboard)
         
-        console.log( "\n" + (" NOTE: Press " + "O".bold.red + " to open default browser, " + "CTRL+C".bold.red + " or " + "Q".bold.red + " to stop the tests... ").yellow.bold + "\n\n" )
         let key;
         do {
             key = await getKeypress()

package/lib/task_lists/common_enviromentHandler.js

@@ -1,7 +1,7 @@
 require('colors');
 const execa = require('execa');
 const fg = require('fast-glob');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 const fs = require('fs-extra');
 const { getCurrentBranch } = require("./common_releaseManager");
 const { SERVER_COB_CLI_DIRECTORY } = require("./common_helpers")

package/lib/task_lists/common_helpers.js

@@ -2,7 +2,7 @@ const SERVER_COB_CLI_DIRECTORY = "/opt/cob-cli/";
 
 /* **************************************************************************************** */
 async function checkWorkingCopyCleanliness(testNotDetached=true) {
-    const git = require('simple-git/promise');
+    const git = require('simple-git');
     //Check we're not detached
     if(testNotDetached) await git().revparse(["--abbrev-ref", "HEAD"]).then( currentBranch => { if(!currentBranch) throw new Error("Aborded:".red + " git head is dettached")} ) 
     await git().fetch()

package/lib/task_lists/common_releaseManager.js

@@ -1,6 +1,6 @@
 const execa = require('execa');
 const fs = require('fs-extra');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 
 const SERVER_CHANGELOG = "/opt/cob-cli/DEPLOYLOG.md";
 const LAST_SHA_FILE = "lastDeploySha"
@@ -33,7 +33,7 @@ async function registerRelease(cmdEnv) {
     }
 
     // Maintain server deploy file log
-    const user = require('whoami');
+    const user = require("os").userInfo().username;
     const date = new Date();
     const dateStr = date.toISOString().slice(0,10).replace(/-/g,".")
     const dateTimeStr = date.toISOString().slice(0,16).replace(/T/," ")

package/lib/task_lists/deploy_execute.js

@@ -1,7 +1,7 @@
 const Listr = require('listr');
 const UpdaterRenderer = require('listr-update-renderer');
 const verboseRenderer = require('listr-verbose-renderer');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 const { registerRelease } = require("./common_releaseManager");
 const { copyFiles } = require("./common_syncFiles");
 

package/lib/task_lists/deploy_validate.js

@@ -2,7 +2,7 @@ require('colors');
 const Listr = require('listr');
 const UpdaterRenderer = require('listr-update-renderer');
 const verboseRenderer = require('listr-verbose-renderer');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 const { checkWorkingCopyCleanliness, checkConnectivity } = require("./common_helpers");
 const { getCurrentBranch, getLastDeployedSha } = require("./common_releaseManager");
 const { testEquality } = require("./common_syncFiles");

package/lib/task_lists/init_existingProject.js

@@ -1,5 +1,5 @@
 const Listr = require('listr');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 
 function existingProjectTasks(repo) {
     return new Listr([

package/lib/task_lists/init_newProject.js

@@ -3,7 +3,7 @@ const Listr = require('listr');
 const fs = require('fs-extra');
 const path = require('path')
 const execa = require('execa');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 const UpdaterRenderer = require('listr-update-renderer');
 const verboseRenderer = require('listr-verbose-renderer');
 const { checkConnectivity } = require("./common_helpers");

package/lib/task_lists/test_customUIsContinuosReload.js

@@ -20,7 +20,7 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
     if(dashboardPathIsDirectory) {
         // If we have a dashboard to serve run it from local dashboard directory on 8081 with vue-cli-service
         // it will use its vue.config.js
-        console.log("\n Installing dependencies...")
+        console.log("\n PLEASE WAIT".red + ": checking dependencies...")
         await execa("npm",["install"],{cwd: dashboardPath} )
 
         commands.push( {
@@ -33,14 +33,15 @@ async function customUIsContinuosReload(cmdEnv, dashboard) {
         })
     }
 
+    console.log( "\n" + (" NOTE: Press " + "O".bold.red + " to open default browser, " + "CTRL+C".bold.red + " or " + "Q".bold.red + " to stop the tests... ").yellow.bold + "\n\n" )
+
     commands.push({
         // run wepback from cob-cli directory with webpack.config.js also from cob-cli directory
         command: [
             path.resolve(__dirname, '../../node_modules/.bin/webpack-dev-server'),
             "--config",
             path.resolve(__dirname, "../webpack/webpack.config.js"),
-            "--env.SERVER=" + "https://" + cmdEnv.server,
-            "--env.DASHBOARD=" + dashboard
+            "--mode=development"
         ].join(" "), 
         name: 'customUIs server',
         prefixColor: "blue" 

package/lib/task_lists/test_otherFilesContiousReload.js

@@ -1,7 +1,6 @@
 const fs = require('fs-extra');
 const execa = require('execa');
-const git = require('simple-git/promise');
-const user = require('whoami');
+const git = require('simple-git');
 const { SERVER_COB_CLI_DIRECTORY } = require("./common_helpers");
 const { confirmExecutionOfChanges, resolveCobPath } = require("./common_syncFiles");
 const { syncFile } = require("./test_syncFile");
@@ -124,6 +123,7 @@ async function addFileToCurrentTest(server, changedFile, changedFiles, changeTyp
             }
 
             if(!changedFiles.has(changedFile)) {
+                const user = require("os").userInfo().username;
                 execa('ssh', [server, "echo '" + changedFile + " by " + user + "' >> " + SERVER_IN_PROGRESS_TEST_FILE]);
                 changedFiles.add(changedFile);
             }

package/lib/task_lists/test_validate.js

@@ -4,7 +4,7 @@ const execa = require('execa');
 const fs = require('fs-extra');
 const UpdaterRenderer = require('listr-update-renderer');
 const verboseRenderer = require('listr-verbose-renderer');
-const git = require('simple-git/promise');
+const git = require('simple-git');
 const { checkConnectivity } = require("./common_helpers");
 const { getCurrentBranch, getLastDeployedSha } = require("./common_releaseManager");
 const { testEquality } = require("./common_syncFiles");

package/lib/webpack/webpack.config.js

@@ -1,5 +1,4 @@
 const path = require('path');
-const { env } = require('process');
 
 module.exports = env => {
   return {
@@ -7,37 +6,45 @@ module.exports = env => {
       fake_customizations2: path.resolve(__dirname,'./fake_customizations2.js')
     },
     devServer: {
-      contentBase: '.',
-      watchContentBase: true,
-      watchOptions: {
-        ignored: [
-          "**/.git/**",
-          "**/integrationm/**",
-          "**/recordm-importer/**",
-          "**/node_modules/**",
-          "**/node_modules/.cache/**",
-          "**/services/**",
-          "**/" + env.DASHBOARD + "/**"
-        ]
+      static : {
+        directory: '.',
+        watch: {
+          ignored: [
+            "**/.git/**",
+            "**/integrationm/**",
+            "**/recordm-importer/**",
+            "**/node_modules/**",
+            "**/node_modules/.cache/**",
+            "**/services/**",
+            "**/" + process.env.dash_dir + "/**"
+          ]
+        }  
       },
-      liveReload: true,
+      hot:false,
       port: 8040,
       host: "0.0.0.0",
-      stats: {
-        maxModules: 0 // Set the maximum number of modules to be shown
+      devMiddleware: {
+        stats: {
+          maxModules: 0 // Set the maximum number of modules to be shown
+        }
       },
-      before: function(app) {
-        app.get('/*', function(req, res, next) {
-          // Permite usar / ou /DASH_BOARD/ quando acedido directamente
-          if(req.url != "/") {
-            return next();
-          }
-  
-          res.redirect(`/recordm/`);
+      setupMiddlewares: (middlewares, devServer) => {
+        middlewares.push({
+          name: 'hello-world-test-one',
+          // `path` is optional
+          path: '*',
+          middleware: (req, res, next) => {
+            // Permite usar / ou /DASH_BOARD/ quando acedido directamente
+            if(req.url != "/") {
+              return next();
+            }    
+            res.redirect(`/recordm/`);
+          },
         });
+        return middlewares;
       },
       proxy: {
-        [ "**/" + env.DASHBOARD + "/**"]: {
+        [ "**/" + process.env.dash_dir + "/**"]: {
           target: "http://localhost:8041",
           secure: false
         },
@@ -47,7 +54,7 @@ module.exports = env => {
         },
         "/": {
           logLevel: "warn",
-          target: env.SERVER,
+          target: process.env.server,
           secure: false,
           ws: false,
           changeOrigin: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.30.0",
+  "version": "2.32.0",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {
@@ -16,6 +16,7 @@
     "cob-cli": "bin/cob-cli.js"
   },
   "dependencies": {
+    "@webpack-cli/serve": "^2.0.1",
     "axios": "^0.21.1",
     "colors": "^1.4.0",
     "commander": "^5.1.0",
@@ -27,11 +28,11 @@
     "listr": "^0.14.3",
     "ncp": "^2.0.0",
     "omelette": "^0.4.15-1",
-    "simple-git": "^1.132.0",
-    "webpack": "^5.49.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.2",
-    "whoami": "0.0.3",
+    "open": "^8.4.0",
+    "simple-git": "^3.15.1",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
     "xdg-basedir": "^5.1.0"
   },
   "keywords": [],