fix: correctly define quality:format so it can be cached

tablecheck · Feb 6, 2024 · 791d58f · 791d58f
1 parent 0f1bea0
commit 791d58f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 61 deletions.
diff --git a/packages/audit/project.json b/packages/audit/project.json
@@ -9,14 +9,11 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/audit/**/*.ts"]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/audit/**/*.ts"],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     }
   },

diff --git a/packages/commitlint-config/project.json b/packages/commitlint-config/project.json
@@ -9,13 +9,11 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/commitlint-config/index.js"]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "options": {
-        "lintFilePatterns": ["packages/commitlint-config/index.js"],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     }
   },

diff --git a/packages/eslint-config/project.json b/packages/eslint-config/project.json
@@ -29,13 +29,11 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/eslint-config/**/*.ts"]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "options": {
-        "lintFilePatterns": ["packages/eslint-config/**/*.ts"],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     }
   },

diff --git a/packages/eslint-plugin/project.json b/packages/eslint-plugin/project.json
@@ -9,14 +9,11 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/eslint-plugin/**/*.ts"]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/eslint-plugin/**/*.ts"],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     },
     "quality:docs": {

diff --git a/packages/nx/project.json b/packages/nx/project.json
@@ -17,22 +17,11 @@
           "packages/nx/generators.json",
           "packages/nx/migrations.json"
         ]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/nx/src/*.ts",
-          "packages/nx/src/*/*.ts",
-          "packages/nx/src/*/*/*.ts",
-          "packages/nx/executors.json",
-          "packages/nx/package.json",
-          "packages/nx/generators.json",
-          "packages/nx/migrations.json"
-        ],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     }
   },

diff --git a/packages/nx/src/generators/quality/projectConfig.ts b/packages/nx/src/generators/quality/projectConfig.ts
@@ -27,12 +27,12 @@ export function updateProjectConfig(tree: Tree, projectName: string) {
           ),
       ),
     },
-  };
-  const lintFormatTarget = merge({}, lintTarget, {
-    options: {
-      fix: true,
+    configurations: {
+      format: {
+        fix: true,
+      },
     },
-  });
+  };
   try {
     const projectConfig = readProjectConfiguration(tree, projectName);
     updateProjectConfiguration(
@@ -41,7 +41,6 @@ export function updateProjectConfig(tree: Tree, projectName: string) {
       merge(projectConfig, {
         targets: {
           quality: lintTarget,
-          'quality:format': lintFormatTarget,
         },
       }),
     );
@@ -55,7 +54,6 @@ export function updateProjectConfig(tree: Tree, projectName: string) {
       sourceRoot: 'src',
       targets: {
         quality: lintTarget,
-        'quality:format': lintFormatTarget,
       },
     });
   }

diff --git a/packages/semantic-release-config/project.json b/packages/semantic-release-config/project.json
@@ -9,14 +9,11 @@
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["packages/semantic-release-config/index.js"]
-      }
-    },
-    "quality:format": {
-      "executor": "@tablecheck/nx:quality",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/semantic-release-config/index.js"],
-        "fix": true
+      },
+      "configurations": {
+        "format": {
+          "fix": true
+        }
       }
     }
   },