Fix missing yo-rc.json error (#57)

Author: ywolff

README.md

@@ -52,12 +52,12 @@ Install [Poetry](https://python-poetry.org) to manage your dependencies and tool
 
 ### Node.js
 
-Install a stable version of [Node.js](https://nodejs.org/) (v16.x.x) if you don't have one.
+Install a stable version of [Node.js](https://nodejs.org/) (v18.x.x) if you don't have one.
 The Sicarator is indeed a [Yeoman](https://yeoman.io/) generator, which is a `Node.js` module.
 
 For linux:
   ```bash
-  curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+  curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
   sudo apt-get install -y nodejs
   ```
 

generators/app/index.js

@@ -317,16 +317,6 @@ module.exports = class extends Generator {
       this.log(`${chalk.green("create folder")} ${this.answers.projectSlug}`);
       mkdirp.sync(this.answers.projectSlug);
       this.destinationRoot(this.destinationPath(this.answers.projectSlug));
-
-      // A ".yo-rc.json" file may have been created at the starting path during the prompting step
-      if (
-        this.fs.exists(this.destinationPath(path.join("..", ".yo-rc.json")))
-      ) {
-        this.fs.move(
-          this.destinationPath(path.join("..", ".yo-rc.json")),
-          this.destinationPath(".yo-rc.json")
-        );
-      }
     }
   }
 
@@ -434,23 +424,41 @@ module.exports = class extends Generator {
   }
 
   end() {
+    // The ".yo-rc.json" file may have been created at the starting path during the prompting step and has to be moved
+    // to the generated project folder. It should be moved in the `end()` step because previous steps may use the
+    // ".yo-rc.json" file in its original path.
+    if (
+      !this.fs.exists(this.destinationPath(".yo-rc.json")) &&
+      this.fs.exists(this.destinationPath(path.join("..", ".yo-rc.json")))
+    ) {
+      this.fs.move(
+        this.destinationPath(path.join("..", ".yo-rc.json")),
+        this.destinationPath(".yo-rc.json")
+      );
+    }
+
     // Initialize git repository
     this.spawnCommandSync("git", ["init"]);
 
-    // Create initial commit if there is no commit yet
+    // If there is no commit yet, add all files to Git and create initial commit
     if (
       this.spawnCommandSync("git", ["rev-parse", "--verify", "HEAD"], {
         stdio: "ignore"
       }).status !== 0
     ) {
-      this.spawnCommandSync("git", ["add", "."]);
-      this.log("Creating initial commit");
-      this.spawnCommandSync("git", [
-        "commit",
-        "--quiet",
-        "--message",
-        "Initial commit (generated by Sicarator)"
-      ]);
+      // Commit last file system changes (especially ".yo-rc.json" move) so that everything is added to Git
+      this.fs.commit([], () => {
+        this.log("Adding all generated files to Git");
+        this.spawnCommandSync("git", ["add", "."]);
+
+        this.log("Creating initial commit");
+        this.spawnCommandSync("git", [
+          "commit",
+          "--quiet",
+          "--message",
+          "Initial commit (generated by Sicarator)"
+        ]);
+      });
     }
   }
 };