Simplify nx task graph (#1333)

* Remove dead dependency: `^pipeline` * Rename `genfile` -> `gen-file` * Remove `build-webpack` dependency on `^build` * Remove `serve` dependency on `webpack` * Add `serve` dependencies * update serve target --------- Co-authored-by: frzyc <[email protected]>
frzyc · Nov 12, 2023 · 8bf0b9c · 8bf0b9c
1 parent 5333ea4
commit 8bf0b9c
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 20 deletions.
diff --git a/apps/frontend/project.json b/apps/frontend/project.json
@@ -86,7 +86,7 @@
           "hmr": false
         }
       },
-      "dependsOn": ["build-webpack"]
+      "dependsOn": ["^gen-file"]
     },
     "lint": {},
     "test": {}

diff --git a/apps/gi-frontend/project.json b/apps/gi-frontend/project.json
@@ -21,7 +21,8 @@
           "buildTarget": "gi-frontend:build-vite:production",
           "hmr": false
         }
-      }
+      },
+      "dependsOn": ["^gen-file"]
     },
     "preview": {
       "executor": "@nx/vite:preview-server",

diff --git a/apps/sr-frontend/project.json b/apps/sr-frontend/project.json
@@ -22,7 +22,8 @@
           "buildTarget": "sr-frontend:build-vite:production",
           "hmr": false
         }
-      }
+      },
+      "dependsOn": ["^gen-file"]
     },
     "preview": {
       "executor": "@nx/vite:preview-server",

diff --git a/libs/dm/project.json b/libs/dm/project.json
@@ -15,7 +15,7 @@
         }
       ]
     },
-    "genfile": {},
+    "gen-file": {},
     "build": {},
     "build-ts": {
       "options": {

diff --git a/libs/gi-assets/project.json b/libs/gi-assets/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "tags": [],
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/gi-assets:gen-assets",
       "outputs": ["{workspaceRoot}/${projectRoot}/src/gen/**/*"]
     },

diff --git a/libs/gi-dm-localization/project.json b/libs/gi-dm-localization/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "libs/gi-dm-localization/src",
   "projectType": "application",
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/gi-dm-localization:gen-locale",
       "outputs": ["{projectRoot}/assets/locales"]
     },

diff --git a/libs/gi-localization/project.json b/libs/gi-localization/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "libs/gi-localization/src",
   "projectType": "library",
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/gi-localization:gen-locale",
       "outputs": [
         "{projectRoot}/Translated",

diff --git a/libs/gi-stats/project.json b/libs/gi-stats/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "libs/gi-stats/src",
   "projectType": "library",
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/gi-stats:gen-stats",
       "outputs": [
         "{projectRoot}/Data/**/*",

diff --git a/libs/silly-wisher-names/project.json b/libs/silly-wisher-names/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "libs/silly-wisher-names/src",
   "projectType": "library",
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/silly-wisher-names:gen-assets",
       "outputs": ["{projectRoot}/assets/locales", "{projectRoot}/Translated"]
     },

diff --git a/libs/sr-assets/project.json b/libs/sr-assets/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "tags": [],
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/sr-assets:gen-assets",
       "outputs": ["{workspaceRoot}/${projectRoot}/src/gen/**/*"]
     },

diff --git a/libs/sr-dm/project.json b/libs/sr-dm/project.json
@@ -15,7 +15,7 @@
         }
       ]
     },
-    "genfile": {},
+    "gen-file": {},
     "build": {},
     "build-ts": {
       "options": {

diff --git a/libs/sr-stats/project.json b/libs/sr-stats/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "libs/sr-stats/src",
   "projectType": "library",
   "targets": {
-    "genfile": {
+    "gen-file": {
       "executor": "@genshin-optimizer/sr-stats:gen-stats",
       "outputs": [
         "{projectRoot}/Data/**/*",

diff --git a/nx.json b/nx.json
@@ -7,7 +7,7 @@
       "options": {
         "cacheableOperations": [
           "load-dm",
-          "genfile",
+          "gen-file",
           "build",
           "build-webpack",
           "build-vite",
@@ -24,9 +24,9 @@
       "executor": "@genshin-optimizer/plugin:sync-repo",
       "outputs": ["{workspaceRoot}/{options.outputPath}.hash"]
     },
-    "genfile": {
+    "gen-file": {
       "executor": "nx:noop",
-      "dependsOn": ["load-dm", "^genfile"],
+      "dependsOn": ["load-dm", "^gen-file"],
       "inputs": ["production", "^production"]
     },
     "build": {
@@ -35,7 +35,7 @@
       "inputs": ["production", "^production"]
     },
     "build-webpack": {
-      "dependsOn": ["genfile", "^genfile", "^build", "^pipeline"],
+      "dependsOn": ["gen-file", "^gen-file"],
       "inputs": ["production", "^production"]
     },
     "build-vite": {
@@ -53,7 +53,7 @@
           "mode": "production"
         }
       },
-      "dependsOn": ["genfile", "^genfile", "^build", "^pipeline"],
+      "dependsOn": ["gen-file", "^gen-file", "^build"],
       "inputs": ["production", "^production"]
     },
     "build-ts": {
@@ -64,7 +64,7 @@
         "main": "{projectRoot}/src/index.ts",
         "tsConfig": "{projectRoot}/tsconfig.lib.json"
       },
-      "dependsOn": ["genfile", "^genfile", "^build", "^pipeline"],
+      "dependsOn": ["gen-file", "^gen-file", "^build"],
       "inputs": ["production", "^production"]
     },
     "e2e": {
@@ -78,7 +78,7 @@
         "fix": true
       },
       "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-      "dependsOn": ["genfile", "^genfile", "^pipeline"]
+      "dependsOn": ["gen-file", "^gen-file"]
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -89,7 +89,7 @@
         "reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}",
         "passWithNoTests": true
       },
-      "dependsOn": ["genfile", "^genfile", "^pipeline"],
+      "dependsOn": ["gen-file", "^gen-file"],
       "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
     },
     "publish": {