feat: bump.js will iterate through both dependencies and devDependencies

CoCreate-app · Jun 11, 2023 · b537963 · b537963
1 parent b43a6e8
commit b537963
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -60,8 +60,8 @@
     "@cocreate/cli": "^1.29.3"
   },
   "dependencies": {
-    "@cocreate/file": "^1.2.3",
+    "@cocreate/file": "^1.2.5",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"
   }
-}
+}
diff --git a/src/commands/bump.js b/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 })
     }