setup(all): refactor nx lint targets to accept --fix

daotl · Dec 15, 2023 · cf8b495 · cf8b495
1 parent 186e713
commit cf8b495
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 99 deletions.
diff --git a/apps/desktop/project.json b/apps/desktop/project.json
@@ -6,16 +6,12 @@
     "build": {
       "executor": "nx:run-commands",
       "options": {
-        "cwd": "./apps/desktop",
-        "command": "mkdir -p dist && echo 'app' > dist/index.js"
-      }
-    },
-    "eslint": {
-      "options": {
+        "command": "mkdir -p dist && echo 'app' > dist/index.js",
         "cwd": "./apps/desktop"
       }
     },
-    "eslint:fix": {
+    "lint": {},
+    "eslint": {
       "options": {
         "cwd": "./apps/desktop"
       }
@@ -25,17 +21,6 @@
         "cwd": "./apps/desktop"
       }
     },
-    "stylelint:fix": {
-      "options": {
-        "cwd": "./apps/desktop"
-      }
-    },
-    "lint": {
-      "executor": "nx:noop"
-    },
-    "lint:fix": {
-      "executor": "nx:noop"
-    },
     "container": {
       "executor": "@nx-tools/nx-container:build",
       "options": {

diff --git a/apps/web/project.json b/apps/web/project.json
@@ -6,16 +6,13 @@
     "build": {
       "executor": "nx:run-commands",
       "options": {
-        "cwd": "./apps/web",
-        "command": "mkdir -p dist && echo 'app' > dist/index.js"
-      }
-    },
-    "eslint": {
-      "options": {
+        "command": "mkdir -p dist && echo 'app' > dist/index.js",
         "cwd": "./apps/web"
       }
     },
-    "eslint:fix": {
+
+    "lint": {},
+    "eslint": {
       "options": {
         "cwd": "./apps/web"
       }
@@ -25,17 +22,7 @@
         "cwd": "./apps/web"
       }
     },
-    "stylelint:fix": {
-      "options": {
-        "cwd": "./apps/web"
-      }
-    },
-    "lint": {
-      "executor": "nx:noop"
-    },
-    "lint:fix": {
-      "executor": "nx:noop"
-    },
+
     "container": {
       "executor": "@nx-tools/nx-container:build",
       "options": {

diff --git a/k8s/package.json b/k8s/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@fgweb/k8s",
   "main": "src/index.ts",
-  "scripts": {
-    "lint": "biome check .",
-    "lint:fix": "biome check --apply ."
-  },
   "dependencies": {
     "@pulumi/kubernetes": "^4.5.4",
     "@pulumi/kubernetesx": "^0.1.6",

diff --git a/k8s/project.json b/k8s/project.json
@@ -0,0 +1,13 @@
+{
+  "name": "k8s",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "k8s/src",
+  "targets": {
+    "lint": {
+      "options": {
+        "command": "[ {args.fix} = 'true' ] && biome check . || biome check --apply .",
+        "cwd": "k8s"
+      }
+    }
+  }
+}
diff --git a/nx.js b/nx.js
@@ -24,13 +24,14 @@ const config = {
   targetDefaults: {
     build: {
       dependsOn: ['^build'],
+      cache: true,
       inputs: ['default'],
       // outputs,
-      cache: true,
     },
 
     test: {
       dependsOn: ['build'],
+      cache: true,
       inputs: [
         '{projectRoot}/src/**/*.js',
         '{projectRoot}/src/**/*.jsx',
@@ -42,53 +43,42 @@ const config = {
         '{projectRoot}/test/**/*.tsx',
         '{projectRoot}/src/**/*.vue',
       ],
-      cache: true,
     },
 
     dev: {
       cache: false,
     },
 
-    eslint: {
+    lint: {
+      dependsOn: [
+        // To pass "--fix"
+        { project: 'self', target: 'eslint', params: 'forward' },
+        { project: 'self', target: 'stylelint', params: 'forward' },
+      ],
+      cache: true,
+      inputs: [...inputsIgnore],
+      // Can't use "nx:noop" for it doesn't allow passing args
+      // executor: 'nx:noop',
       executor: 'nx:run-commands',
       options: {
-        command: 'echo eslint ',
+        command: 'echo lint done, args:',
       },
     },
-
-    'eslint:fix': {
+    eslint: {
+      cache: true,
       executor: 'nx:run-commands',
       options: {
-        command: 'echo eslint:fix',
+        command: 'FIX={args.fix}; echo eslint --fix=${FIX:-false}',
       },
     },
-
     stylelint: {
+      cache: true,
       executor: 'nx:run-commands',
       options: {
-        command: 'echo stylelint',
-      },
-    },
-
-    'stylelint:fix': {
-      executor: 'nx:run-commands',
-      options: {
-        command: 'echo stylelint:fix',
+        command: 'FIX={args.fix}; echo stylelint --fix=${FIX:-false}',
       },
     },
 
-    lint: {
-      dependsOn: ['eslint', 'stylelint'],
-      inputs: [...inputsIgnore],
-      cache: true,
-    },
-
-    'lint:fix': {
-      dependsOn: ['eslint:fix', 'stylelint:fix'],
-      inputs: [...inputsIgnore],
-      cache: true,
-    },
-
     container: {
       dependsOn: ['build'],
       cache: true,

diff --git a/nx.json b/nx.json
@@ -19,15 +19,16 @@
       "dependsOn": [
         "^build"
       ],
+      "cache": true,
       "inputs": [
         "default"
-      ],
-      "cache": true
+      ]
     },
     "test": {
       "dependsOn": [
         "build"
       ],
+      "cache": true,
       "inputs": [
         "{projectRoot}/src/**/*.js",
         "{projectRoot}/src/**/*.jsx",
@@ -38,52 +39,45 @@
         "{projectRoot}/test/**/*.ts",
         "{projectRoot}/test/**/*.tsx",
         "{projectRoot}/src/**/*.vue"
-      ],
-      "cache": true
+      ]
     },
     "dev": {
       "cache": false
     },
-    "eslint": {
+    "lint": {
+      "dependsOn": [
+        {
+          "project": "self",
+          "target": "eslint",
+          "params": "forward"
+        },
+        {
+          "project": "self",
+          "target": "stylelint",
+          "params": "forward"
+        }
+      ],
+      "cache": true,
+      "inputs": [],
       "executor": "nx:run-commands",
       "options": {
-        "command": "echo eslint "
+        "command": "echo lint done, args:"
       }
     },
-    "eslint:fix": {
+    "eslint": {
+      "cache": true,
       "executor": "nx:run-commands",
       "options": {
-        "command": "echo eslint:fix"
+        "command": "FIX={args.fix}; echo eslint --fix=${FIX:-false}"
       }
     },
     "stylelint": {
+      "cache": true,
       "executor": "nx:run-commands",
       "options": {
-        "command": "echo stylelint"
-      }
-    },
-    "stylelint:fix": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "echo stylelint:fix"
+        "command": "FIX={args.fix}; echo stylelint --fix=${FIX:-false}"
       }
     },
-    "lint": {
-      "dependsOn": [
-        "eslint",
-        "stylelint"
-      ],
-      "inputs": [],
-      "cache": true
-    },
-    "lint:fix": {
-      "dependsOn": [
-        "eslint:fix",
-        "stylelint:fix"
-      ],
-      "inputs": [],
-      "cache": true
-    },
     "container": {
       "dependsOn": [
         "build"