feat(create-nx-cmake,nx-cmake): support nx@17.1.1

clemenscodes · Nov 9, 2023 · 9bd4ab1 · 9bd4ab1
1 parent b779665
commit 9bd4ab1
Show file tree

Hide file tree

Showing 23 changed files with 420 additions and 631 deletions.
diff --git a/e2e/e2e-create-nx-cmake/project.json b/e2e/e2e-create-nx-cmake/project.json
@@ -10,14 +10,7 @@
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "e2e/{projectName}/jest.config.ts",
-                "passWithNoTests": true,
                 "runInBand": true
-            },
-            "configurations": {
-                "ci": {
-                    "ci": true,
-                    "codeCoverage": true
-                }
             }
         },
         "finish-e2e": {

diff --git a/e2e/e2e-nx-cmake/project.json b/e2e/e2e-nx-cmake/project.json
@@ -10,14 +10,7 @@
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "e2e/{projectName}/jest.config.ts",
-                "passWithNoTests": true,
                 "runInBand": true
-            },
-            "configurations": {
-                "ci": {
-                    "ci": true,
-                    "codeCoverage": true
-                }
             }
         },
         "finish-e2e": {

diff --git a/nx.json b/nx.json
@@ -1,4 +1,14 @@
 {
+    "pluginsConfig": {
+        "@nx/js": {
+            "analyzeSourceFiles": true
+        },
+        "nx-cmake": {
+            "language": "C",
+            "cmakeConfigDir": ".cmake",
+            "workspaceName": "workspace"
+        }
+    },
     "extends": "nx/presets/npm.json",
     "defaultProject": "verdaccio",
     "tasksRunnerOptions": {
@@ -20,16 +30,6 @@
             }
         }
     },
-    "pluginsConfig": {
-        "@nx/js": {
-            "analyzeSourceFiles": true
-        },
-        "nx-cmake": {
-            "language": "C",
-            "cmakeConfigDir": ".cmake",
-            "workspaceName": "workspace"
-        }
-    },
     "$schema": "./node_modules/nx/schemas/nx-schema.json",
     "affected": {
         "defaultBase": "origin/main"
@@ -43,37 +43,23 @@
         "build": {
             "dependsOn": ["lint", "^build"]
         },
-        "cmake": {
-            "dependsOn": ["^cmake"],
-            "inputs": ["cmake"],
-            "cache": true
-        },
-        "compile": {
-            "dependsOn": ["^cmake", "^compile", "cmake"],
-            "inputs": ["default"]
-        },
-        "fmt": {
-            "dependsOn": [],
-            "inputs": ["clangFormat"],
-            "cache": true
-        },
         "lint": {
             "dependsOn": ["cmake"],
             "inputs": ["default", "clangTidy"],
             "cache": true
         },
-        "test": {
-            "dependsOn": ["build", "compile"],
-            "inputs": ["default"],
-            "cache": true
-        },
-        "execute": {
-            "dependsOn": ["build", "compile"],
-            "inputs": ["default"]
-        },
-        "debug": {
-            "dependsOn": ["build", "compile"],
-            "inputs": ["default"]
+        "@nx/jest:jest": {
+            "cache": true,
+            "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
+            "options": {
+                "passWithNoTests": true
+            },
+            "configurations": {
+                "ci": {
+                    "ci": true,
+                    "codeCoverage": true
+                }
+            }
         }
     },
     "namedInputs": {

diff --git a/package.json b/package.json
@@ -26,38 +26,38 @@
         "@commitlint/config-conventional": "^18.1.0",
         "@commitlint/config-nx-scopes": "^18.3.0",
         "@jscutlery/semver": "^4.0.0",
-        "@nx/eslint-plugin": "17.0.2",
-        "@nx/jest": "17.0.2",
-        "@nx/js": "17.0.2",
-        "@nx/plugin": "17.0.2",
+        "@nx/eslint-plugin": "17.1.1",
+        "@nx/jest": "17.1.1",
+        "@nx/js": "17.1.1",
+        "@nx/plugin": "17.1.1",
         "@swc-node/register": "1.6.8",
         "@swc/cli": "~0.1.62",
         "@swc/core": "1.3.95",
-        "@types/jest": "^29.5.5",
+        "@types/jest": "^29.5.8",
         "@types/node": "20.8.9",
-        "@typescript-eslint/eslint-plugin": "^5.62.0",
-        "@typescript-eslint/parser": "^5.62.0",
+        "@typescript-eslint/eslint-plugin": "6.10.0",
+        "@typescript-eslint/parser": "6.10.0",
         "commitizen": "^4.3.0",
         "commitlint": "^18.2.0",
         "cz-git": "^1.7.1",
-        "eslint": "~8.51.0",
+        "eslint": "~8.53.0",
         "eslint-config-prettier": "9.0.0",
         "husky": "^8.0.3",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "jest-environment-node": "^29.4.1",
-        "nx": "17.0.2",
+        "nx": "17.1.1",
         "prettier": "^3.0.3",
         "ts-jest": "^29.1.1",
         "ts-node": "10.9.1",
         "typescript": "~5.2.2",
-        "verdaccio": "^5.26.3",
-        "@nx/eslint": "17.0.2"
+        "verdaccio": "^5.27.0",
+        "@nx/eslint": "17.1.1"
     },
     "dependencies": {
         "tslib": "^2.6.2",
         "@swc/helpers": "0.5.3",
-        "@nx/devkit": "17.0.2",
-        "create-nx-workspace": "17.0.2"
+        "@nx/devkit": "17.1.1",
+        "create-nx-workspace": "17.1.1"
     }
 }
diff --git a/packages/command/package.json b/packages/command/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/command/project.json b/packages/command/project.json
@@ -38,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/command/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/command/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/file/package.json b/packages/file/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/file/project.json b/packages/file/project.json
@@ -1,7 +1,6 @@
 {
     "name": "file",
     "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "root": "packages/file",
     "sourceRoot": "packages/file/src",
     "projectType": "library",
     "targets": {
@@ -39,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/file/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/file/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/log/package.json b/packages/log/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/log/project.json b/packages/log/project.json
@@ -38,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/log/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/log/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/mocks/package.json b/packages/mocks/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/mocks/project.json b/packages/mocks/project.json
@@ -38,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/mocks/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/mocks/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/types/project.json b/packages/types/project.json
@@ -38,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/types/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/types/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/util/project.json b/packages/util/project.json
@@ -38,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "packages/util/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "packages/util/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         }

diff --git a/packages/verdaccio/package.json b/packages/verdaccio/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "dependencies": {
         "tslib": "^2.3.0",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     },
     "private": true,
     "type": "commonjs",

diff --git a/packages/verdaccio/project.json b/packages/verdaccio/project.json
@@ -37,14 +37,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "{projectRoot}/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "{projectRoot}/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         },

diff --git a/plugins/create-nx-cmake/package.json b/plugins/create-nx-cmake/package.json
@@ -3,7 +3,7 @@
     "version": "0.5.0",
     "dependencies": {
         "tslib": "^2.3.0",
-        "create-nx-workspace": "17.0.2"
+        "create-nx-workspace": "17.1.1"
     },
     "type": "commonjs",
     "main": "./src/index.js",

diff --git a/plugins/create-nx-cmake/project.json b/plugins/create-nx-cmake/project.json
@@ -1,7 +1,6 @@
 {
     "name": "create-nx-cmake",
     "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "root": "plugins/create-nx-cmake",
     "sourceRoot": "plugins/create-nx-cmake/bin",
     "projectType": "library",
     "targets": {
@@ -39,14 +38,11 @@
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
-                "jestConfig": "plugins/create-nx-cmake/jest.config.ts",
-                "passWithNoTests": true
+                "jestConfig": "plugins/create-nx-cmake/jest.config.ts"
             },
             "configurations": {
                 "ci": {
-                    "ci": true,
-                    "coverageReporters": ["lcov"],
-                    "codeCoverage": true
+                    "coverageReporters": ["lcov"]
                 }
             }
         },

diff --git a/plugins/nx-cmake/package.json b/plugins/nx-cmake/package.json
@@ -34,6 +34,6 @@
     },
     "dependencies": {
         "tslib": "^2.6.2",
-        "@nx/devkit": "17.0.2"
+        "@nx/devkit": "17.1.1"
     }
 }