@cocreate/cli 1.14.29 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.14.30...v1.15.0) (2023-02-18)
+
+
+### Features
+
+* auto detects your chosen package manager, Currently supports npm and yarn ([c3349b3](https://github.com/CoCreate-app/CoCreate-cli/commit/c3349b3f3448ff27a1efd98e3b6d3eb14b09aced))
+
+## [1.14.30](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.14.29...v1.14.30) (2023-02-02)
+
+
+### Bug Fixes
+
+* add CoCreate-actions to repo  list ([79e576e](https://github.com/CoCreate-app/CoCreate-cli/commit/79e576ebe9484d97dd9b1e62546da8d8f496d9f9))
+
 ## [1.14.29](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.14.28...v1.14.29) (2023-02-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.14.29",
+  "version": "1.15.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",

package/repositories.js

@@ -78,13 +78,17 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-element-config',
         'repo': 'github.com/CoCreate-app/CoCreate-element-config.git'
     },
+    {
+        'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-element-prototype',
+        'repo': 'github.com/CoCreate-app/CoCreate-element-prototype.git'
+    },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-elements',
         'repo': 'github.com/CoCreate-app/CoCreate-elements.git'
     },
     {
-        'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-element-prototype',
-        'repo': 'github.com/CoCreate-app/CoCreate-element-prototype.git'
+        'path': '../CoCreate-components/CoCreate-events',
+        'repo': 'github.com/CoCreate-app/CoCreate-events.git'
     },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-fetch',
@@ -234,10 +238,10 @@ module.exports = [
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-text',
         'repo': 'github.com/CoCreate-app/CoCreate-text.git'
     },
-    {
-        'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-toggle',
-        'repo': 'github.com/CoCreate-app/CoCreate-toggle.git'
-    },
+    // {
+    //     'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-toggle',
+    //     'repo': 'github.com/CoCreate-app/CoCreate-toggle.git'
+    // },
     {
         'path': '/home/ubuntu/CoCreateServer/CoCreate-components/CoCreate-toolbar',
         'repo': 'github.com/CoCreate-app/CoCreate-toolbar.git'

package/src/commands/install.js

@@ -1,24 +1,33 @@
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
 const spawn = require('../spawn');
-const execute = require('../execute')
+
 module.exports = async function( repos, allRepos,) {
     let failed = [];
     try {
         
         let cloneFailed = await require('./clone.js')(repos)
 
-        let installFailed = await require('./yarnInstall.js')(repos)
-
         let linkFailed = await require('./link.js')( repos, allRepos)
-        failed = [...cloneFailed, ...installFailed, ...linkFailed];
-
-        let exitCode = spawn('yarn', ['start', '-w'], { cwd: '../CoCreateJS' })
+        failed = [...cloneFailed, ...linkFailed];
+        
+        let packageManager = 'npm'
+        const { error } = await exec('yarn --version');
+        if (!error)
+            packageManager = 'yarn';
+    
+            
+        let exitCode = spawn(packageManager, ['start'], { 
+            cwd: '../CoCreateJS',
+            shell: true,
+            stdio: 'inherit'
+        })
         if (exitCode !== 0) {
-            failed.push({ name: 'cocreatejs', des: `yarn start failed` })
+            failed.push({ name: 'cocreatejs', des: `${packageManager} start failed` })
         }
     } catch (err) {
         console.error(err);
         failed.push({ name: 'general', des: err.message })
-
     }
     return failed;
 }

package/src/commands/link.js

@@ -1,20 +1,17 @@
-const fs = require('fs')
-const path = require("path")
-const {
-    promisify
-} = require('util');
 const spawn = require('../spawn');
 const colors = require('colors');
 const addMeta = require('../addMeta');
 
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
 
+module.exports = async function linkPackages(repos, allrepo) {
+    let packageManager = 'npm'
+    const { error } = await exec('yarn --version');
+    if (!error)
+        packageManager = 'yarn';
 
-
-
-module.exports = async function updateYarnInstall(repos, allrepo) {
-
-    const failed = [],
-        isLinked = {};
+    const failed = [], isLinked = {};
     try {
         repos = addMeta(repos, failed)
         allrepo = addMeta(allrepo, failed)
@@ -29,41 +26,34 @@ module.exports = async function updateYarnInstall(repos, allrepo) {
     }
 
     try {
-        //   console.log(repos)
-
         for (let repo of repos) {
 
             if (!repo)
                 continue;
 
-
             let {
-                ppath,
                 packageName,
                 deps,
                 devDeps,
-                name
             } = repo;
 
             console.log(packageName, 'configuring ...')
-            await doLink(deps, repo, allrepo, failed, isLinked)
-            await doLink(devDeps, repo, allrepo, failed, isLinked)
+            await doLink(deps, repo, allrepo, failed, isLinked, packageManager)
+            await doLink(devDeps, repo, allrepo, failed, isLinked, packageManager)
         }
     }
     catch (err) {
         failed.push({ name: 'GENERAL', des: err.message })
-        console.error(err.red)
+        console.error(`${err}`.red)
     }
 
     return failed;
 }
 
 
-async function doLink(deps, repo, allrepo, failed, isLinked) {
+async function doLink(deps, repo, allrepo, failed, isLinked, packageManager) {
     for (let dep of deps) {
         let depMeta = allrepo.find(meta => meta.packageName === dep);
-        //                 console.log(depMeta)
-        // return failed;
         try {
             if (!depMeta) {
                 failed.push({
@@ -77,37 +67,41 @@ async function doLink(deps, repo, allrepo, failed, isLinked) {
 
 
             if (!isLinked[depMeta.packageName]) {
+
                 isLinked[depMeta.packageName] = true;
-                let exitCode = await spawn('yarn', ['link'], {
+                let exitCode = await spawn(packageManager, ['link'], {
                     cwd: depMeta.ppath,
-                    stdio: 'inherit',
+                    shell: true,
+                    stdio: 'inherit'
                 });
+                
                 if (exitCode !== 0) {
                     failed.push({
                         name: depMeta.name,
-                        des: `yarn link failed`
+                        des: `${packageManager} link failed`
                     })
-                    console.error(`${depMeta.name}: yarn link failed`.red)
+                    console.error(`${depMeta.name}: ${packageManager} link failed`.red)
                 }
             }
             console.log(repo.packageName, 'linking', depMeta.packageName, '...')
 
-            let exitCode = await spawn('yarn', ['link', depMeta.packageName], {
+            let exitCode = await spawn(packageManager, ['link', depMeta.packageName], {
                 cwd: repo.ppath,
-                stdio: 'inherit',
+                shell: true,
+                stdio: 'inherit'
             })
             if (exitCode !== 0) {
                 failed.push({
                     name: repo.name,
-                    des: `yarn link ${depMeta.packageName} failed`
+                    des: `${packageManager} link ${depMeta.packageName} failed`
                 });
-                console.error(`${repo.name}: yarn link ${depMeta.packageName} failed`.red)
+                console.error(`${repo.name}: ${packageManager} link ${depMeta.packageName} failed`.red)
             }
 
         }
         catch (err) {
             failed.push({ name: repo.packageName, des: err.message })
-            console.error(err.red)
+            console.error(`${err}`.red)
         }
 
     }

package/src/commands/{add.js → other/add.js}

@@ -1,8 +1,8 @@
 const fs = require('fs')
 const path = require("path")
-const spawn = require('../spawn');
+const spawn = require('../../spawn');
 const colors = require('colors');
-const addMeta = require('../addMeta');
+const addMeta = require('../../addMeta');
 
 
 module.exports = async function updateYarnLink(repos) {

package/src/commands/{symbolic.js → other/symbolic.js}

@@ -3,9 +3,9 @@ const path = require("path")
 const {
     promisify
 } = require('util');
-const spawn = require('../spawn');
+const spawn = require('../../spawn');
 const colors = require('colors');
-const addMeta = require('../addMeta');
+const addMeta = require('../../addMeta');
 
 
 

package/src/commands/{yarnInstall.js → other/yarnInstall.js}

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const path = require("path");
-const spawn = require('../spawn');
+const spawn = require('../../spawn');
 const colors = require('colors');
-const addMeta = require('../addMeta');
+const addMeta = require('../../addMeta');
 
 
 module.exports = async function updateYarnLink(repos) {

package/src/execute.js

@@ -1,11 +1,10 @@
 const colors = require('colors');
 const path = require("path");
 const fs = require("fs");
-const {
-    promisify
-} = require('util');
 const spawn = require('./spawn');
-const exec = promisify(require('child_process').exec);
+const util = require('node:util');
+const exec = util.promisify(require('node:child_process').exec);
+
 
 module.exports = async function execute(command, repos, config) {
 
@@ -44,11 +43,15 @@ module.exports = async function execute(command, repos, config) {
                 } = repo;
                 console.log(`${name}: `.green, command)
                 let exitCode;
-                if (config.hideMessage)
-                    exitCode = await exec(command, {
+                if (config.hideMessage) {
+                    const strCommand = command.join(' ');
+                    const { error } = await exec(strCommand, {
                         cwd: repo.ppath,
-                    })
-                else
+                    });
+                
+                    if (error)
+                        exitCode = 1
+                } else
                     exitCode = await spawn(command, null, {
                         cwd: repo.ppath,
                         shell: true,