Merge pull request #436 from UN-OCHA/HPC-9272

HPC-9272: Upgrade to Nx 18
UN-OCHA · Apr 16, 2024 · 9768527 · 9768527
2 parents 831733c + 46ddea7
commit 9768527
Show file tree

Hide file tree

Showing 18 changed files with 2,026 additions and 1,314 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,4 +38,6 @@ testem.log
 .DS_Store
 Thumbs.db
 
-.env.json
+.env.json
+
+/.nx/cache
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,5 @@
 
 /dist
 /coverage
+
+/.nx/cache
diff --git a/apps/hpc-cdm-e2e/project.json b/apps/hpc-cdm-e2e/project.json
@@ -18,13 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "apps/hpc-cdm-e2e/src/**/*.ts",
-          "apps/hpc-cdm-e2e/src/**/*.js"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     }
   },

diff --git a/apps/hpc-cdm/project.json b/apps/hpc-cdm/project.json
@@ -73,28 +73,13 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "apps/hpc-cdm/**/*.js",
-          "apps/hpc-cdm/**/*.jsx",
-          "apps/hpc-cdm/**/*.ts",
-          "apps/hpc-cdm/**/*.tsx",
-          "apps/hpc-cdm/src/app/components/enketo-form/enketo-core.d.ts",
-          "apps/hpc-cdm/**/*.spec.ts",
-          "apps/hpc-cdm/**/*.spec.tsx",
-          "apps/hpc-cdm/**/*.spec.js",
-          "apps/hpc-cdm/**/*.spec.jsx",
-          "apps/hpc-cdm/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "apps/hpc-cdm/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/hpc-cdm/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/apps/hpc-cdm"]
     }

diff --git a/apps/hpc-cdm/tsconfig.app.json b/apps/hpc-cdm/tsconfig.app.json
@@ -2,7 +2,11 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node"]
+    "types": [
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
   },
   "exclude": [
     "**/*.spec.ts",

diff --git a/apps/hpc-cdm/tsconfig.spec.json b/apps/hpc-cdm/tsconfig.spec.json
@@ -3,7 +3,12 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": [
+      "jest",
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
   },
   "include": [
     "**/*.spec.ts",

diff --git a/apps/hpc-ftsadmin-e2e/project.json b/apps/hpc-ftsadmin-e2e/project.json
@@ -17,11 +17,8 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/hpc-ftsadmin-e2e/**/*.{js,ts}"]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/hpc-ftsadmin/project.json b/apps/hpc-ftsadmin/project.json
@@ -78,18 +78,14 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/hpc-ftsadmin/**/*.{ts,tsx,js,jsx}"]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/hpc-ftsadmin"],
       "options": {
-        "jestConfig": "apps/hpc-ftsadmin/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/hpc-ftsadmin/jest.config.ts"
       }
     }
   },

diff --git a/apps/hpc-ftsadmin/tsconfig.app.json b/apps/hpc-ftsadmin/tsconfig.app.json
@@ -2,7 +2,11 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["node"]
+    "types": [
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
   },
   "exclude": [
     "**/*.spec.ts",

diff --git a/apps/hpc-ftsadmin/tsconfig.spec.json b/apps/hpc-ftsadmin/tsconfig.spec.json
@@ -3,7 +3,12 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": [
+      "jest",
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
   },
   "include": [
     "**/*.spec.ts",

diff --git a/libs/hpc-core/project.json b/libs/hpc-core/project.json
@@ -6,24 +6,13 @@
   "generators": {},
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/hpc-core/**/*.ts",
-          "libs/hpc-core/**/*.spec.ts",
-          "libs/hpc-core/**/*.spec.tsx",
-          "libs/hpc-core/**/*.spec.js",
-          "libs/hpc-core/**/*.spec.jsx",
-          "libs/hpc-core/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "libs/hpc-core/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/hpc-core/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/libs/hpc-core"]
     }

diff --git a/libs/hpc-data/project.json b/libs/hpc-data/project.json
@@ -6,24 +6,13 @@
   "generators": {},
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/hpc-data/**/*.ts",
-          "libs/hpc-data/**/*.spec.ts",
-          "libs/hpc-data/**/*.spec.tsx",
-          "libs/hpc-data/**/*.spec.js",
-          "libs/hpc-data/**/*.spec.jsx",
-          "libs/hpc-data/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "libs/hpc-data/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/hpc-data/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/libs/hpc-data"]
     }

diff --git a/libs/hpc-dummy/project.json b/libs/hpc-dummy/project.json
@@ -6,24 +6,13 @@
   "generators": {},
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/hpc-dummy/**/*.ts",
-          "libs/hpc-dummy/**/*.spec.ts",
-          "libs/hpc-dummy/**/*.spec.tsx",
-          "libs/hpc-dummy/**/*.spec.js",
-          "libs/hpc-dummy/**/*.spec.jsx",
-          "libs/hpc-dummy/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "libs/hpc-dummy/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/hpc-dummy/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/libs/hpc-dummy"]
     }

diff --git a/libs/hpc-live/project.json b/libs/hpc-live/project.json
@@ -6,24 +6,13 @@
   "generators": {},
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/hpc-live/**/*.ts",
-          "libs/hpc-live/**/*.spec.ts",
-          "libs/hpc-live/**/*.spec.tsx",
-          "libs/hpc-live/**/*.spec.js",
-          "libs/hpc-live/**/*.spec.jsx",
-          "libs/hpc-live/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "libs/hpc-live/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/hpc-live/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/libs/hpc-live"]
     }

diff --git a/libs/hpc-ui/project.json b/libs/hpc-ui/project.json
@@ -6,27 +6,13 @@
   "generators": {},
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/hpc-ui/**/*.js",
-          "libs/hpc-ui/**/*.jsx",
-          "libs/hpc-ui/**/*.ts",
-          "libs/hpc-ui/**/*.tsx",
-          "libs/hpc-ui/**/*.spec.ts",
-          "libs/hpc-ui/**/*.spec.tsx",
-          "libs/hpc-ui/**/*.spec.js",
-          "libs/hpc-ui/**/*.spec.jsx",
-          "libs/hpc-ui/**/*.d.ts"
-        ]
-      },
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "options": {
-        "jestConfig": "libs/hpc-ui/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/hpc-ui/jest.config.ts"
       },
       "outputs": ["{workspaceRoot}/coverage/libs/hpc-ui"]
     }

diff --git a/nx.json b/nx.json
@@ -1,17 +1,4 @@
 {
-  "npmScope": "unocha",
-  "affected": {
-    "defaultBase": "HEAD"
-  },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build", "lint", "test", "e2e"],
-        "parallel": 1
-      }
-    }
-  },
   "defaultProject": "hpc-cdm",
   "generators": {
     "@nrwl/next": {
@@ -82,16 +69,29 @@
   "targetDefaults": {
     "build": {
       "dependsOn": ["^build"],
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "cache": true
     },
-    "test": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    "e2e": {
+      "inputs": ["default", "^production"],
+      "cache": true
     },
-    "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+    "@nx/jest:jest": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
+      "cache": true,
+      "options": {
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
     },
-    "e2e": {
-      "inputs": ["default", "^production"]
+    "@nx/eslint:lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
     }
   },
   "namedInputs": {
@@ -110,5 +110,8 @@
       "!{projectRoot}/.eslintrc.json",
       "!{projectRoot}/src/test-setup.[jt]s"
     ]
-  }
+  },
+  "parallel": 1,
+  "useInferencePlugins": false,
+  "defaultBase": "HEAD"
 }