Update Deps

vicb · Sep 20, 2024 · c6e38e5 · c6e38e5
1 parent 789845e
commit c6e38e5
Show file tree

Hide file tree

Showing 16 changed files with 1,035 additions and 874 deletions.
diff --git a/apps/fetcher/project.json b/apps/fetcher/project.json
@@ -50,16 +50,20 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/fetcher/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     },
     "container": {

diff --git a/apps/fxc-front/project.json b/apps/fxc-front/project.json
@@ -59,10 +59,14 @@
       "dependsOn": ["build"]
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/fxc-front/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/apps/fxc-server/project.json b/apps/fxc-server/project.json
@@ -62,16 +62,20 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/fxc-server/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/apps/fxc-tiles/project.json b/apps/fxc-tiles/project.json
@@ -76,16 +76,21 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}", "{workspaceRoot}/coverage/apps/airspaces"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/fxc-tiles/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     },
     "container": {

diff --git a/apps/misc/project.json b/apps/misc/project.json
@@ -67,16 +67,20 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/misc/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/apps/proxy/project.json b/apps/proxy/project.json
@@ -44,16 +44,20 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/proxy/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     },
     "container": {

diff --git a/apps/run/project.json b/apps/run/project.json
@@ -50,23 +50,31 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "dependsOn": [
         {
           "projects": ["secrets"],
           "target": "build"
         }
       ],
       "options": {
-        "jestConfig": "apps/run/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     },
     "benchmark": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/run/jest-bench.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     },
     "container": {

diff --git a/libs/common-node/project.json b/libs/common-node/project.json
@@ -6,10 +6,14 @@
   "tags": [],
   "targets": {
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/common-node/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/libs/common/project.json b/libs/common/project.json
@@ -12,10 +12,14 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/common/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/libs/optimizer/project.json b/libs/optimizer/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/optimizer/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
@@ -20,17 +21,16 @@
         "assets": ["libs/optimizer/*.md"]
       }
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
-    },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/optimizer/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/libs/secrets/package.json b/libs/secrets/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "dotenv-webpack": "^8.1.0",
-    "@nx/webpack": "19.7.2"
+    "@nx/webpack": "19.8.0"
   }
 }
diff --git a/libs/vaadin-dom/project.json b/libs/vaadin-dom/project.json
@@ -6,10 +6,14 @@
   "tags": [],
   "targets": {
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/vaadin-dom/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/libs/windy-sounding/project.json b/libs/windy-sounding/project.json
@@ -78,10 +78,14 @@
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/windy-sounding/jest.config.ts"
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "coverage": true
+        }
       }
     }
   }

diff --git a/nx.json b/nx.json
@@ -71,6 +71,32 @@
         "targetName": "lint",
         "extensions": ["ts", "tsx", "js", "jsx", "html", "vue"]
       }
+    },
+    {
+      "plugin": "@nx/jest/plugin",
+      "options": {
+        "targetName": "test"
+      },
+      "include": [
+        "apps/fetcher/**/*",
+        "apps/fxc-front/**/*",
+        "apps/fxc-server/**/*",
+        "apps/fxc-tiles/**/*",
+        "apps/misc/**/*",
+        "apps/proxy/**/*",
+        "libs/common/**/*",
+        "libs/common-node/**/*",
+        "libs/optimizer/**/*",
+        "libs/vaadin-dom/**/*",
+        "libs/windy-sounding/**/*"
+      ]
+    },
+    {
+      "plugin": "@nx/jest/plugin",
+      "options": {
+        "targetName": "benchmark"
+      },
+      "include": ["apps/run/**/*"]
     }
   ]
 }