fixup! feat(ng-dev/format): add staged-re command

angular · Feb 14, 2022 · 4bd3efd · 4bd3efd
1 parent 4d7cd4f
commit 4bd3efd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/github-actions/commit-message-based-labels/main.js b/github-actions/commit-message-based-labels/main.js
@@ -49451,8 +49451,8 @@ var require_git_client = __commonJS({
       allStagedFiles() {
         return gitOutputAsArray(this.runGraceful(["diff", "--name-only", "--diff-filter=ACM", "--staged"]));
       }
-      stageFiles(files) {
-        return gitOutputAsArray(this.runGraceful(["add", files.join(" ")]));
+      stageFiles(files, options = {}) {
+        return this.runGraceful(["add", ...files], options);
       }
       allFiles() {
         return gitOutputAsArray(this.runGraceful(["ls-files"]));

diff --git a/github-actions/slash-commands/main.js b/github-actions/slash-commands/main.js
@@ -55125,8 +55125,8 @@ var require_git_client = __commonJS({
       allStagedFiles() {
         return gitOutputAsArray(this.runGraceful(["diff", "--name-only", "--diff-filter=ACM", "--staged"]));
       }
-      stageFiles(files) {
-        return gitOutputAsArray(this.runGraceful(["add", files.join(" ")]));
+      stageFiles(files, options = {}) {
+        return this.runGraceful(["add", ...files], options);
       }
       allFiles() {
         return gitOutputAsArray(this.runGraceful(["ls-files"]));

diff --git a/ng-dev/format/cli.ts b/ng-dev/format/cli.ts
@@ -46,17 +46,12 @@ export function buildFormatParser(localYargs: yargs.Argv) {
     .command(
       'staged',
       'Run the formatter on all staged files',
-      (args) =>
-        args.options('add', {
-          type: 'boolean',
-          description: 'Add the potentially formatted files back to the staging area',
-          conflicts: 'check',
-        }),
-      async ({check, add}) => {
+      (args) => args,
+      async ({check}) => {
         const executionCmd = check ? checkFiles : formatFiles;
         const allStagedFiles = GitClient.get().allStagedFiles();
         process.exitCode = await executionCmd(allStagedFiles);
-        if (!check && add && process.exitCode === 0) {
+        if (!check && process.exitCode === 0) {
           GitClient.get().stageFiles(allStagedFiles);
         }
       },

diff --git a/ng-dev/utils/git/git-client.ts b/ng-dev/utils/git/git-client.ts
@@ -198,8 +198,8 @@ export class GitClient {
   }
 
   /** Adds the provided files to the staging area. */
-  stageFiles(files: string[]) {
-    return gitOutputAsArray(this.runGraceful(['add', files.join(' ')]));
+  stageFiles(files: string[], options: GitCommandRunOptions = {}): SpawnSyncReturns<string> {
+    return this.runGraceful(['add', ...files], options);
   }
 
   /** Retrieve a list of all files tracked in the repository. */

diff --git a/tools/local-actions/changelog/main.js b/tools/local-actions/changelog/main.js
@@ -46552,8 +46552,8 @@ var require_git_client = __commonJS({
       allStagedFiles() {
         return gitOutputAsArray(this.runGraceful(["diff", "--name-only", "--diff-filter=ACM", "--staged"]));
       }
-      stageFiles(files) {
-        return gitOutputAsArray(this.runGraceful(["add", files.join(" ")]));
+      stageFiles(files, options = {}) {
+        return this.runGraceful(["add", ...files], options);
       }
       allFiles() {
         return gitOutputAsArray(this.runGraceful(["ls-files"]));