[TASK] add package-lock.json to initial commit when to use rh init cmd

Author: dmh

lib/cmd/init.js

@@ -74,9 +74,14 @@ async function initGithubRepoBasedOnTemplate (data) {
   await updateAndCommit(
     data.prompts?.githubRepoFromTmpl?.newRepoOwner || '',
     data.prompts?.githubRepoFromTmpl?.newRepoName || '',
-    ['package.json', 'theme/theme.json'],
+    ['package.json', 'package-lock.json', 'theme/theme.json'],
     {
       name: data.prompts?.githubRepoFromTmpl?.newRepoName,
+      packages: {
+        '': {
+          name: data.prompts?.githubRepoFromTmpl?.newRepoName
+        }
+      },
       label: `${data.prompts?.githubRepoFromTmpl?.newRepoLabel.charAt(0).toUpperCase()}${data.prompts?.githubRepoFromTmpl?.newRepoLabel.slice(1)}`
     }
   )
@@ -110,11 +115,15 @@ async function initLocalRepoBasedOnTemplate (data) {
     await gitAddAll({ cwd: `${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}` })
     await gitCommit('Initial commit', { cwd: `${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}` })
     const packageJson = await parseJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/package.json`)
+    const packageJsonLock = await parseJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/package-lock.json`)
     const themeJson = await parseJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/theme/theme.json`)
     packageJson.name = data.prompts?.localRepoFromTmpl?.newRepoName
+    packageJsonLock.name = data.prompts?.localRepoFromTmpl?.newRepoName
+    packageJsonLock.packages[''].name = data.prompts?.localRepoFromTmpl?.newRepoName
     themeJson.name = data.prompts?.localRepoFromTmpl?.newRepoName
     themeJson.label = `${data.prompts?.localRepoFromTmpl?.newRepoLabel.charAt(0).toUpperCase()}${data.prompts?.localRepoFromTmpl?.newRepoLabel.slice(1)}`
     await writeJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/package.json`, packageJson)
+    await writeJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/package-lock.json`, packageJsonLock)
     await writeJson(`${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}/theme/theme.json`, themeJson)
     await gitAddAll({ cwd: `${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}` })
     await gitCommit('[TASK] update package.json and theme.json with new project info', { cwd: `${data?.cwd.path}/${data.prompts?.localRepoFromTmpl?.newRepoName}` })

lib/github/commit.js

@@ -61,11 +61,31 @@ async function updateAndCommit (owner, repo, paths, changeValues) {
         }
       })
 
+      // deepMerge function
+      function deepMerge (/** @type {any} */ target, /** @type {any} */ source) {
+        Object.keys(source).forEach(key => {
+          if (source[key] && typeof source[key] === 'object') {
+            if (!target[key]) {
+              target[key] = Array.isArray(source[key]) ? [] : {}
+            }
+            deepMerge(target[key], source[key])
+          } else {
+            target[key] = source[key]
+          }
+        })
+      }
+
       // update the content of the file
       const fileData = JSON.parse(Buffer.from(oldContent, 'base64').toString('utf-8'))
       Object.keys(changeValues).forEach(key => {
-        if (fileData[key]) {
-          fileData[key] = changeValues[key]
+        if (Object.prototype.hasOwnProperty.call(fileData, key)) {
+          if (typeof fileData[key] === 'object' && typeof changeValues[key] === 'object' && !Array.isArray(fileData[key]) && !Array.isArray(changeValues[key])) {
+            // Perform a deep merge
+            deepMerge(fileData[key], changeValues[key])
+          } else {
+            // Directly update the value
+            fileData[key] = changeValues[key]
+          }
         }
       })