@cocreate/cli 1.32.1 → 1.33.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.33.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.32.2...v1.33.0) (2023-06-11)
+
+
+### Features
+
+* bump.js will iterate through both dependencies and devDependencies ([b537963](https://github.com/CoCreate-app/CoCreate-cli/commit/b537963fb11b6e5f8c505b02f609d6879f87ecb7))
+
+## [1.32.2](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.32.1...v1.32.2) (2023-06-11)
+
+
+### Bug Fixes
+
+* renamed db to storage ([fa41daf](https://github.com/CoCreate-app/CoCreate-cli/commit/fa41daf2344f2c8768bfd2db10c58ce4bad403be))
+* renamed hosts to host. the value can be a string or an array of strings ([932f60b](https://github.com/CoCreate-app/CoCreate-cli/commit/932f60bdd7890da296b9d4d5ea92c9c7aeb9398c))
+
 ## [1.32.1](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.32.0...v1.32.1) (2023-06-10)
 
 

package/CoCreate.config.js

@@ -10,7 +10,7 @@ module.exports = {
                 "name": "index.html",
                 "path": "/docs/cli/index.html",
                 "src": "{{./docs/index.html}}",
-                "hosts": [
+                "host": [
                     "*",
                     "general.cocreate.app"
                 ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.32.1",
+  "version": "1.33.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",
@@ -60,7 +60,7 @@
     "@cocreate/cli": "^1.29.3"
   },
   "dependencies": {
-    "@cocreate/file": "^1.2.3",
+    "@cocreate/file": "^1.2.5",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"
   }

package/src/commands/bump.js

@@ -8,13 +8,16 @@ let pathList, nameList, item = {}, failed = [];
 
 module.exports = async function bump(repos, args) {
     pathList = repos.map(o => o.absolutePath)
-    if (repos.length === 1) {
+    if (repos.length <= 1) {
         let packageJsonPath = path.resolve(process.cwd(), './package.json');
 
         if (fs.existsSync(packageJsonPath)) {
-            let object = require(packageJsonPath)
-            if (object.dependencies) {
-                for (let key of Object.keys(object.dependencies)) {
+            let json = require(packageJsonPath)
+            if (json) {
+                let dependencies = json.dependencies || {}
+                let devDependencies = json.devDependencies || {}
+                let object = { ...dependencies, ...devDependencies }
+                for (let key of Object.keys(object)) {
                     if (key.startsWith("@cocreate/")) {
                         const version = await exec(`npm view ${key} version`);
                         item[key] = `^${version.stdout}`.trim()
@@ -30,7 +33,7 @@ module.exports = async function bump(repos, args) {
 
     } else {
         nameList = pathList.map(fn => path.basename(fn).toLowerCase());
-
+        console.log('namelist', nameList)
         for (let [index, name] of nameList.entries()) {
             getVersions(pathList[index] + '/package.json', `@${name}`)
         }
@@ -62,22 +65,25 @@ function bumpVersion(filePath, name) {
     let object = require(filePath)
     if (object) {
         let newObject = { ...object }
-
-        if (!object.dependencies)
-            return console.log(name, 'not updated')
-        else {
-            for (const name of Object.keys(object.dependencies)) {
-                if (item[name]) {
-                    newObject.dependencies[name] = item[name]
-                }
+        let dependencies = object.dependencies || {}
+        let devDependencies = object.devDependencies || {}
+        for (const name of Object.keys(dependencies)) {
+            if (item[name]) {
+                newObject.dependencies[name] = item[name]
             }
+        }
 
-            if (fs.existsSync(filePath)) {
-                fs.unlinkSync(filePath)
+        for (const name of Object.keys(devDependencies)) {
+            if (item[name]) {
+                newObject.devDependencies[name] = item[name]
             }
+        }
 
-            fs.writeFileSync(filePath, JSON.stringify(object, null, 2))
+        if (fs.existsSync(filePath)) {
+            fs.unlinkSync(filePath)
         }
+
+        fs.writeFileSync(filePath, JSON.stringify(object, null, 2))
     } else {
         failed.push({ name: 'bump version', des: 'path doesn\'t exist:' + filePath })
     }

package/src/commands/config.js

@@ -71,14 +71,21 @@ module.exports = async function CoCreateConfig(items, processEnv = true, updateG
 
                 if (process.env[key]) {
                     config[key] = process.env[key];
-                } else if (localConfig[key]) {
-                    config[key] = localConfig[key];
-                } else if (globalConfig[key]) {
-                    config[key] = globalConfig[key];
-                } else if (prompt || prompt === '') {
-                    config[key] = await promptForInput(prompt || `${key}: `);
-                    if (processEnv) process.env[key] = config[key];
-                    if (updateGlobal) update = true;
+                } else {
+                    if (localConfig[key]) {
+                        config[key] = localConfig[key];
+                    } else if (globalConfig[key]) {
+                        config[key] = globalConfig[key];
+                    } else if (prompt || prompt === '') {
+                        config[key] = await promptForInput(prompt || `${key}: `);
+                        if (updateGlobal) update = true;
+                    }
+                    if (processEnv) {
+                        if (typeof config[key] === 'object')
+                            process.env[key] = JSON.stringify(config[key]);
+                        else
+                            process.env[key] = config[key];
+                    }
                 }
             }
         }

package/src/commands/fs/config.js

@@ -39,7 +39,7 @@ function update(MdPath) {
                 "name": "index.html",
                 "path": "/docs/${name}/index.html",
                 "src": "{{./docs/index.html}}",
-                "hosts": [
+                "host": [
                     "general.cocreate.app"
                 ],
                 "directory": "/docs/${name}",
@@ -56,7 +56,7 @@ function update(MdPath) {
 
     if (!document_id.length)
         console.log("Document_id Undefined: ", MdPath);
-    if (document_id.length != 24 && document_id.length != 0 )
+    if (document_id.length != 24 && document_id.length != 0)
         console.log("Document_id not valid! please check your config: ", MdPath);
     else {
         console.log(MdPath, " -> document_id : ", document_id);

package/src/commands/symlink.js

@@ -40,6 +40,18 @@ async function createSymlink(repo) {
         let dest = path.resolve(dpath, 'node_modules');
         if (dest) {
             if (fs.existsSync(dest)) {
+
+                if (!cwdNodeModulesPath.includes('/CoCreateJS')) {
+                    let isSymlink = await isSymlinkDirectory(dest)
+                    if (isSymlink) {
+                        const targetPath = await getSymlinkTargetPath(dest);
+                        if (targetPath.includes('/CoCreateJS')) {
+                            console.warn('symlink already exists with CoCreateJS')
+                            return
+                        }
+                    }
+                }
+
                 fs.rm(dest, { recursive: true, force: true }, function (err) {
                     if (err) {
                         failed.push({ name: 'symlink', des: 'with response:' + response, err })
@@ -111,3 +123,23 @@ async function install(repo, repos) {
     }
 
 }
+
+async function isSymlinkDirectory(path) {
+    try {
+        const stats = await fs.promises.lstat(path);
+        return stats.isSymbolicLink();
+    } catch (err) {
+        throw err;
+    }
+}
+
+async function getSymlinkTargetPath(symlinkPath) {
+    try {
+        const target = await fs.promises.readlink(symlinkPath);
+        const targetPath = fs.realpathSync(target);
+        return targetPath;
+    } catch (err) {
+        throw err;
+    }
+}
+