diff --git a/jest.config.ts b/jest.config.ts index d0dbd1b..6b3f2d6 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,5 +1,5 @@ -import { getJestProjects } from '@nx/jest'; +import { getJestProjectsAsync } from '@nx/jest'; -export default { - projects: getJestProjects(), -}; +export default async () => ({ + projects: await getJestProjectsAsync(), +}); diff --git a/nx.json b/nx.json index addde94..23dcf0e 100644 --- a/nx.json +++ b/nx.json @@ -1,14 +1,6 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", "npmScope": "nxazure", - "tasksRunnerOptions": { - "default": { - "runner": "nx/tasks-runners/default", - "options": { - "cacheableOperations": ["build", "lint", "test", "e2e"] - } - } - }, "targetDefaults": { "build": { "dependsOn": ["^build"] diff --git a/package-lock.json b/package-lock.json index 9377b46..c83bb1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,13 +16,13 @@ }, "devDependencies": { "@eslint/eslintrc": "^2.1.1", - "@nx/devkit": "19.8.4", - "@nx/eslint-plugin": "19.8.4", - "@nx/jest": "19.8.4", - "@nx/js": "19.8.4", - "@nx/linter": "19.8.4", - "@nx/plugin": "19.8.4", - "@nx/workspace": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/eslint": "20.0.8", + "@nx/eslint-plugin": "20.0.8", + "@nx/jest": "20.0.8", + "@nx/js": "20.0.8", + "@nx/plugin": "20.0.8", + "@nx/workspace": "20.0.8", "@swc-node/register": "1.10.9", "@swc/cli": "0.4.0", "@swc/core": "1.7.26", @@ -38,7 +38,7 @@ "jest-environment-jsdom": "29.7.0", "jsonc-eslint-parser": "^2.4.0", "lint-staged": "^15.2.10", - "nx": "19.8.4", + "nx": "20.0.8", "prettier": "^3.3.3", "ts-jest": "29.2.5", "ts-node": "10.9.2", @@ -2136,16 +2136,6 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, - "node_modules/@eslint/compat": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.1.1.tgz", - "integrity": "sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, "node_modules/@eslint/config-array": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", @@ -2815,88 +2805,13 @@ "node": ">= 8" } }, - "node_modules/@nrwl/devkit": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.8.4.tgz", - "integrity": "sha512-OoIqDjj2mWzLs3aSF6w5OiC2xywYi/jBxHc7t7Lyi56Vc4dQq8vJMELa9WtG6qH0k05fF7N+jAoKlfvLgbbEFA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/devkit": "19.8.4" - } - }, - "node_modules/@nrwl/eslint-plugin-nx": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-19.8.4.tgz", - "integrity": "sha512-D2RsuKOwuF3SO9/tA2R93zL2ixampDlQC8+6E7wfcU+KdfMhhGFG2+r53F98Q8cZKMt5Wls2nGSGpj2CWxCk5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/eslint-plugin": "19.8.4" - } - }, - "node_modules/@nrwl/jest": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-19.8.4.tgz", - "integrity": "sha512-N18UVEqTrOUotXdjpVZOe/qgT4m0cX9YIS6ATKXAYxX9Nl6Qo3hhbRDo9WHHulXE2Hql6S/RpnwwUP5TJthkZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/jest": "19.8.4" - } - }, - "node_modules/@nrwl/js": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/js/-/js-19.8.4.tgz", - "integrity": "sha512-XuPOJc77waJ3zgg42zntTy5eGCKTc6EjVvRVdUSf1iXWaMHAsknPjb4kz16iwdGhoRMQpZxHRr1KjY5WmcWq0A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/js": "19.8.4" - } - }, - "node_modules/@nrwl/nx-plugin": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/nx-plugin/-/nx-plugin-19.8.4.tgz", - "integrity": "sha512-nPE+7iUTIEsO080MQNrZptFTQsPnKojGGdC9q9+T5Fj0TaAAKVKTrPQjRmgEoiG1JD+8r0BwR+e3YAXu/OhynQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/plugin": "19.8.4" - } - }, - "node_modules/@nrwl/tao": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.8.4.tgz", - "integrity": "sha512-03/+QZ4/6HmKbEmvzCutLI1XIclBspNYtiVHmGPRWuwhnZViqYfnyl8J7RWVdFEoKKA5fhJqpg7e28aGuoMBvQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "nx": "19.8.4", - "tslib": "^2.3.0" - }, - "bin": { - "tao": "index.js" - } - }, - "node_modules/@nrwl/workspace": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nrwl/workspace/-/workspace-19.8.4.tgz", - "integrity": "sha512-ZdzVMuVDkD5nYRXkvBIZe6yUTcbllYanoIh38a7l3MfPqw+2cFY2Cr9uPNfH3LXpzZYgKcr4vffYWwLXeIwbjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/workspace": "19.8.4" - } - }, "node_modules/@nx/devkit": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.8.4.tgz", - "integrity": "sha512-FPFT8gVDFRSEmU0n7nRkT4Rnqy7OMznfPXLfDZtVuzEi5Cl6ftG3UBUvCgJcJFCYJVAZAUuv6vRSRarHd51XFQ==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.0.8.tgz", + "integrity": "sha512-MRUGgWSMzYtdwtolvWL5EZlX+7xYgu7JIXf1+3rmZU5adMmlqWKrIbyvDf53XocQlT8oxx/xXTEFHhIymGTQCg==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/devkit": "19.8.4", "ejs": "^3.1.7", "enquirer": "~2.3.6", "ignore": "^5.0.4", @@ -2907,19 +2822,18 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": ">= 17 <= 20" + "nx": ">= 19 <= 21" } }, "node_modules/@nx/eslint": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-19.8.4.tgz", - "integrity": "sha512-gJGtYd9ThKSM1pbV/iG/PGwtVKg1PwjAly2AjgebYmAey+hgxzwgjQy84Lf+FdkKNUQZjB0sYaKCw26oKXXYaA==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-20.0.8.tgz", + "integrity": "sha512-mh8zup1mzDcDFY3pjC6rxl8ftzFmtV3upWEbbMcg+P5e4UaDG4vnDyGwOSzZaewL+e864hNzmDN5Xfluz4lNPw==", "dev": true, "license": "MIT", "dependencies": { - "@nx/devkit": "19.8.4", - "@nx/js": "19.8.4", - "@nx/linter": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/js": "20.0.8", "semver": "^7.5.3", "tslib": "^2.3.0", "typescript": "~5.4.2" @@ -2935,16 +2849,14 @@ } }, "node_modules/@nx/eslint-plugin": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-19.8.4.tgz", - "integrity": "sha512-0Q/2y/FZJyRxk5SbIXP+FlIY8//3chtaQz+FuorHGs0mDBN5FtBFqBL0atWClJO+B+QByO70ue/qHEHSiNrcJw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-20.0.8.tgz", + "integrity": "sha512-E64qOinUI+LHROHFKgHgDue5wiKWVBZfMVlWXl3/7IfWTf3aTUjQUfMHVTogJWR9Ry7A7tQkXc0Ex/4ISDzUrQ==", "dev": true, "license": "MIT", "dependencies": { - "@eslint/compat": "^1.1.1", - "@nrwl/eslint-plugin-nx": "19.8.4", - "@nx/devkit": "19.8.4", - "@nx/js": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/js": "20.0.8", "@typescript-eslint/type-utils": "^8.0.0", "@typescript-eslint/utils": "^8.0.0", "chalk": "^4.1.0", @@ -2992,17 +2904,16 @@ } }, "node_modules/@nx/jest": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-19.8.4.tgz", - "integrity": "sha512-oAC0zLkktCduq3ZNjIqPK/gCGPxPZMiWDFKqeEpZnIqgYuQfy6wUk3aSVWGPud0kuPJGJA0G1hkxCXtCmCXMNw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-20.0.8.tgz", + "integrity": "sha512-LEs1EKl0RezDycGKxCaJivvKKXXHL5HUGp9dxE2FuS2nzimYhYldxlOH+zr73J5SWEZtxnMHHjRPkbDffnoxug==", "dev": true, "license": "MIT", "dependencies": { "@jest/reporters": "^29.4.1", "@jest/test-result": "^29.4.1", - "@nrwl/jest": "19.8.4", - "@nx/devkit": "19.8.4", - "@nx/js": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/js": "20.0.8", "@phenomnomnominal/tsquery": "~5.0.1", "chalk": "^4.1.0", "identity-obj-proxy": "3.0.0", @@ -3017,9 +2928,9 @@ } }, "node_modules/@nx/js": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/js/-/js-19.8.4.tgz", - "integrity": "sha512-rBiBi0A9NsxA5cnMcDRXllNXFJYjk+YiNP4T5e+GmqHmicjRjF+mORrhQ4zBZXvZwS2O+ZO9iBOZX41IVqzFaw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/js/-/js-20.0.8.tgz", + "integrity": "sha512-PDkjhen4Gl1bMw65XfgebSceNH7HOeTr1f5C+WY/II+7pcAx2lqWj4n6t0XkzBMWlOyfHt/H+O/F4GuZ/hjIyg==", "dev": true, "license": "MIT", "dependencies": { @@ -3030,9 +2941,9 @@ "@babel/preset-env": "^7.23.2", "@babel/preset-typescript": "^7.22.5", "@babel/runtime": "^7.22.6", - "@nrwl/js": "19.8.4", - "@nx/devkit": "19.8.4", - "@nx/workspace": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/workspace": "20.0.8", + "@zkochan/js-yaml": "0.0.7", "babel-plugin-const-enum": "^1.0.1", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-typescript-metadata": "^0.3.1", @@ -3119,20 +3030,10 @@ } } }, - "node_modules/@nx/linter": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/linter/-/linter-19.8.4.tgz", - "integrity": "sha512-aK6Bic/iup5nkZDFQgBgilgtqfjuy+dT0agnE6HEdXKOIR++LJXpka5nrJ9VNNglp22DrFtBDAH/hfRpIwm8uw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nx/eslint": "19.8.4" - } - }, "node_modules/@nx/nx-darwin-arm64": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.8.4.tgz", - "integrity": "sha512-mbSGt63hYcVCSQ54kpHl0lFqr5CsbkGJ4L3liWE30Da7vXZJwUBr9f+b9DnQ64IZzlu6vAhNcaiYQXa9lAk0yQ==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.0.8.tgz", + "integrity": "sha512-tDoafq5YUyOwxR1Y796WXA6j49OLJRO7TA/Fym52SSuD3AULbgo3/X5XeY6oL2PWM044CuUVrp3V4cIDUtyJpA==", "cpu": [ "arm64" ], @@ -3147,9 +3048,9 @@ } }, "node_modules/@nx/nx-darwin-x64": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.8.4.tgz", - "integrity": "sha512-lTcXUCXNvqHdLmrNCOyDF+u6pDx209Ew7nSR47sQPvkycIHYi0gvgk0yndFn1Swah0lP4OxWg7rzAfmOlZd6ew==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.0.8.tgz", + "integrity": "sha512-bvfZ6VhSvOpPV00veaJDO1a4X+f0dn8S1A73/2ThbGZrZLAQIFrA8v+ysax+bfCGRHNdtlAL+f7TG2buh/4BRg==", "cpu": [ "x64" ], @@ -3164,9 +3065,9 @@ } }, "node_modules/@nx/nx-freebsd-x64": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.8.4.tgz", - "integrity": "sha512-4BUplOxPZeUwlUNfzHHMmebNVgDFW/jNX6TWRS+jINwOHnpWLkLFAXu27G80/S3OaniVCzEQklXO9b+1UsdgXw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.0.8.tgz", + "integrity": "sha512-AdOme0o/pTFy+TutIOAamuGTqbh6nOLrkNEX8f4ogfDRH+k/WvjRQ4z4ne58wf/2EVXua4jKTIEipIZAP/Ad1w==", "cpu": [ "x64" ], @@ -3181,9 +3082,9 @@ } }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.8.4.tgz", - "integrity": "sha512-Wahul8oz9huEm/Jv3wud5IGWdZxkGG4tdJm9i5TV5wxfUMAWbKU9v2nzZZins452UYESWvwvDkiuBPZqSto3qw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.0.8.tgz", + "integrity": "sha512-PYf7Z30A1TCZq9HVUP6JjT3ghTLYkaBpR6vDwiGWUV/exuNmhUgfYW6TiTpiSArXwnAgSIbaoGe537iEvYzA7A==", "cpu": [ "arm" ], @@ -3198,9 +3099,9 @@ } }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.8.4.tgz", - "integrity": "sha512-L0RVCZkNAtZDplLT7uJV7M9cXxq2Fxw+8ex3eb9XSp7eyLeFO21T0R6vTouJ42E/PEvGApCAcyGqtnyPNMZFfw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.0.8.tgz", + "integrity": "sha512-3VpvhjmNR78HVxGzpWiwqZsG5sNvLUv2Qfohtxyc3561o8VU41R9Onf/LJmbbZvmdDaPvvXQp3rs0OXT4i7T1g==", "cpu": [ "arm64" ], @@ -3215,9 +3116,9 @@ } }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.8.4.tgz", - "integrity": "sha512-0q8r8I8WCsY3xowDI2j109SCUSkFns/BJ40aCfRh9hhrtaIIc5qXUw2YFTjxUZNcRJXx9j9+hTe9jBkUSIGvCw==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.0.8.tgz", + "integrity": "sha512-3Z7fTJGG8h4VCHhD8Ix0zr6eFMfa1y3YDlzm8Clxu4Enzz0pEsUrT+ph6qrsArnIyUgiCowSi8+xgHFg7V/F1Q==", "cpu": [ "arm64" ], @@ -3232,9 +3133,9 @@ } }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.8.4.tgz", - "integrity": "sha512-XcRBNe0ws7KB0PMcUlpQqzzjjxMP8VdqirBz7CfB2XQ8xKmP3370p0cDvqs/4oKDHK4PCkmvVFX60tzakutylA==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.0.8.tgz", + "integrity": "sha512-Uttl1RHzWpjZgdzowCUNjC6/b3YhZR31wyXWgVF4PDWpDVgy4EigGc19tdrvv8pUVKQFuj0uaSTPUklguN7c3A==", "cpu": [ "x64" ], @@ -3249,9 +3150,9 @@ } }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.8.4.tgz", - "integrity": "sha512-JB4tAuZBCF0yqSnKF3pHXa0b7LA3ebi3Bw08QmMr//ON4aU+eXURGBuj9XvULD2prY+gpBrvf+MsG1XJAHL6Zg==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.0.8.tgz", + "integrity": "sha512-llc6ywSPaOWQzEzD73USyAXd/y3Slu+GHS02IsQqZeA23EIOEzhvEeeeKgs4F8LKuFW/TpV6T5IhvSHw9/mvBg==", "cpu": [ "x64" ], @@ -3266,9 +3167,9 @@ } }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.8.4.tgz", - "integrity": "sha512-WvQag/pN9ofRWRDvOZxj3jvJoTetlvV1uyirnDrhupRgi+Fj67OlGGt2zVUHaXFGEa1MfCEG6Vhk6152m4KyaQ==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.0.8.tgz", + "integrity": "sha512-GhPVVNrL0QcQ3B6r0P0Dta3TIesJz7uso7iI5rCZ/oOGa02UsT4NkQBpIhxYQZ4TnHYNy84g4rHtYHrSlpDlEw==", "cpu": [ "arm64" ], @@ -3283,9 +3184,9 @@ } }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.8.4.tgz", - "integrity": "sha512-//JntLrN3L7WL/WgP3D0FE34caYTPcG/GIMBguC9w7YDyTlEikLgLbobjdCPz+2f9OWGvIZbJgGmtHNjnETM/g==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.0.8.tgz", + "integrity": "sha512-yLlcgM0zFdmsExdLv8O2g5FWQ6d2vyN5OynKV+F5BrWHC4LvrqyYJ99y++5bLFoEi19RYIK6sLnzGIRSF6dHGg==", "cpu": [ "x64" ], @@ -3300,32 +3201,30 @@ } }, "node_modules/@nx/plugin": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-19.8.4.tgz", - "integrity": "sha512-ONukvL6/zbUA3GK4s/zR8XIK3vC4hcPPnuAJ7s99A2w8iD4V1J8ziqVgCmvqAtiwPE7tzhX9c3wIyrb/QTESEA==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-20.0.8.tgz", + "integrity": "sha512-F355zSv1xs+V/gfROMFC66Kc8DhlqW34tLGN6UA8jTgZ25GN/2qjCR77S9wRDrEs2AE+KhSD8PmxudOazUrIJg==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/nx-plugin": "19.8.4", - "@nx/devkit": "19.8.4", - "@nx/eslint": "19.8.4", - "@nx/jest": "19.8.4", - "@nx/js": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/eslint": "20.0.8", + "@nx/jest": "20.0.8", + "@nx/js": "20.0.8", "tslib": "^2.3.0" } }, "node_modules/@nx/workspace": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-19.8.4.tgz", - "integrity": "sha512-ub4nD2klOj00onF1KrNXIlLB9hXN9ybHs7XSP9YW+52qz79KaJWJm46ebTqeLnDZApYbAcB0vSCp2+kaEV24Ew==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-20.0.8.tgz", + "integrity": "sha512-G7nON6s3KDWNAH9P8IBvvAmTGgTsFZPuWH7We9px0ZwsRcURDDP1OqZsYmfr0zTHTS58wu4Uax/uQLwnTVC1xQ==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/workspace": "19.8.4", - "@nx/devkit": "19.8.4", + "@nx/devkit": "20.0.8", "chalk": "^4.1.0", "enquirer": "~2.3.6", - "nx": "19.8.4", + "nx": "20.0.8", "tslib": "^2.3.0", "yargs-parser": "21.1.1" } @@ -5776,12 +5675,6 @@ "url": "https://dotenvx.com" } }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -7590,43 +7483,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-circus/node_modules/babel-plugin-macros": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", - "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/runtime": "^7.12.5", - "cosmiconfig": "^7.0.0", - "resolve": "^1.19.0" - }, - "engines": { - "node": ">=10", - "npm": ">=6" - } - }, - "node_modules/jest-circus/node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/jest-circus/node_modules/dedent": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", @@ -9257,15 +9113,14 @@ "dev": true }, "node_modules/nx": { - "version": "19.8.4", - "resolved": "https://registry.npmjs.org/nx/-/nx-19.8.4.tgz", - "integrity": "sha512-fc833c3UKo6kuoG4z0kSKet17yWym3VzcQ+yPWYspxxxd8GFVVk42+9wieyVQDi9YqtKZQ6PdQfSEPm59/M7SA==", + "version": "20.0.8", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.0.8.tgz", + "integrity": "sha512-cMtb+u5Eji7Xm9xMHZkRXMcO8GH6FFqS2+nMgtLUZ/+ZmquEgoV8mbsKVw1u1sJ6osOpWAu9OwXcilwtvSOoBw==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", - "@nrwl/tao": "19.8.4", "@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/parsers": "3.0.0-rc.46", "@zkochan/js-yaml": "0.0.7", @@ -9291,7 +9146,6 @@ "ora": "5.3.0", "semver": "^7.5.3", "string-width": "^4.2.3", - "strong-log-transformer": "^2.1.0", "tar-stream": "~2.2.0", "tmp": "~0.2.1", "tsconfig-paths": "^4.1.2", @@ -9304,16 +9158,16 @@ "nx-cloud": "bin/nx-cloud.js" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "19.8.4", - "@nx/nx-darwin-x64": "19.8.4", - "@nx/nx-freebsd-x64": "19.8.4", - "@nx/nx-linux-arm-gnueabihf": "19.8.4", - "@nx/nx-linux-arm64-gnu": "19.8.4", - "@nx/nx-linux-arm64-musl": "19.8.4", - "@nx/nx-linux-x64-gnu": "19.8.4", - "@nx/nx-linux-x64-musl": "19.8.4", - "@nx/nx-win32-arm64-msvc": "19.8.4", - "@nx/nx-win32-x64-msvc": "19.8.4" + "@nx/nx-darwin-arm64": "20.0.8", + "@nx/nx-darwin-x64": "20.0.8", + "@nx/nx-freebsd-x64": "20.0.8", + "@nx/nx-linux-arm-gnueabihf": "20.0.8", + "@nx/nx-linux-arm64-gnu": "20.0.8", + "@nx/nx-linux-arm64-musl": "20.0.8", + "@nx/nx-linux-x64-gnu": "20.0.8", + "@nx/nx-linux-x64-musl": "20.0.8", + "@nx/nx-win32-arm64-msvc": "20.0.8", + "@nx/nx-win32-x64-msvc": "20.0.8" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -10697,23 +10551,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/strong-log-transformer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", - "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", - "dev": true, - "dependencies": { - "duplexer": "^0.1.1", - "minimist": "^1.2.0", - "through": "^2.3.4" - }, - "bin": { - "sl-log-transformer": "bin/sl-log-transformer.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/strtok3": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz", @@ -10829,12 +10666,6 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, - "node_modules/through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", diff --git a/package.json b/package.json index c59cb47..66e2d7e 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,13 @@ }, "devDependencies": { "@eslint/eslintrc": "^2.1.1", - "@nx/devkit": "19.8.4", - "@nx/eslint-plugin": "19.8.4", - "@nx/jest": "19.8.4", - "@nx/js": "19.8.4", - "@nx/linter": "19.8.4", - "@nx/plugin": "19.8.4", - "@nx/workspace": "19.8.4", + "@nx/devkit": "20.0.8", + "@nx/eslint": "20.0.8", + "@nx/eslint-plugin": "20.0.8", + "@nx/jest": "20.0.8", + "@nx/js": "20.0.8", + "@nx/plugin": "20.0.8", + "@nx/workspace": "20.0.8", "@swc-node/register": "1.10.9", "@swc/cli": "0.4.0", "@swc/core": "1.7.26", @@ -36,7 +36,7 @@ "jest-environment-jsdom": "29.7.0", "jsonc-eslint-parser": "^2.4.0", "lint-staged": "^15.2.10", - "nx": "19.8.4", + "nx": "20.0.8", "prettier": "^3.3.3", "ts-jest": "29.2.5", "ts-node": "10.9.2", diff --git a/packages/func/package.json b/packages/func/package.json index 39163c7..ee53fd2 100644 --- a/packages/func/package.json +++ b/packages/func/package.json @@ -15,8 +15,8 @@ "migrations": "./migrations.json" }, "dependencies": { - "@nx/devkit": "19.3.2", - "@nx/workspace": "19.3.2", + "@nx/devkit": "20.0.8", + "@nx/workspace": "20.0.8", "typescript": "5.5.2", "glob": "^10.2.2", "tree-kill": "^1.2.2", diff --git a/packages/func/src/executors/common/get-copy-package-to-app-transformer-factory.ts b/packages/func/src/executors/common/get-copy-package-to-app-transformer-factory.ts index f8ef996..7a9d144 100644 --- a/packages/func/src/executors/common/get-copy-package-to-app-transformer-factory.ts +++ b/packages/func/src/executors/common/get-copy-package-to-app-transformer-factory.ts @@ -23,7 +23,7 @@ const findModule = (dependencies: Record, moduleName: string) => }; export const getCopyPackageToAppTransformerFactory = (context: ExecutorContext) => { - const appRoot = context.workspace?.projects[context.projectName].root; + const appRoot = context.projectsConfigurations?.projects[context.projectName].root; const appPackageJson = readJsonFile<{ dependencies: Record }>(path.join(appRoot, 'package.json')); const originalPackageJson = readJsonFile<{ dependencies: Record }>(path.join(context.cwd, 'package.json')); @@ -32,11 +32,10 @@ export const getCopyPackageToAppTransformerFactory = (context: ExecutorContext) if (isImportDeclaration(node)) { const cleanedModuleName = node.moduleSpecifier.getText().replace(/['"]/g, ''); const moduleInOriginalPackageJson = findModule(originalPackageJson.dependencies, cleanedModuleName); - // Create a dependencies section in the app package.json if it doesn't exist - if (!appPackageJson.dependencies) - appPackageJson.dependencies = {}; - - // If the original package.json has the dependency, copy it to the app package.json + // Create a dependencies section in the app package.json if it doesn't exist + if (!appPackageJson.dependencies) appPackageJson.dependencies = {}; + + // If the original package.json has the dependency, copy it to the app package.json if ( moduleInOriginalPackageJson && appPackageJson.dependencies[moduleInOriginalPackageJson] !== originalPackageJson.dependencies[moduleInOriginalPackageJson] diff --git a/packages/func/src/executors/common/prepare-build.ts b/packages/func/src/executors/common/prepare-build.ts index 233919b..a932d0a 100644 --- a/packages/func/src/executors/common/prepare-build.ts +++ b/packages/func/src/executors/common/prepare-build.ts @@ -5,7 +5,7 @@ import { CompilerOptions } from 'typescript'; import { TS_CONFIG_BASE_FILE, TS_CONFIG_BUILD_FILE } from '../../common'; export const prepareBuild = (context: ExecutorContext) => { - const appRoot = context.workspace?.projects[context.projectName].root; + const appRoot = context.projectsConfigurations?.projects[context.projectName].root; const relativePathToRoot = offsetFromRoot(appRoot); const configPath = path.join(appRoot, TS_CONFIG_BUILD_FILE); diff --git a/packages/func/src/executors/publish/executor.ts b/packages/func/src/executors/publish/executor.ts index 67d5760..992c9b5 100644 --- a/packages/func/src/executors/publish/executor.ts +++ b/packages/func/src/executors/publish/executor.ts @@ -9,7 +9,7 @@ const executor: Executor = async (options, context) => { const success = await build(context); if (success) { - const { projectName, workspace, isVerbose, target } = context; + const { projectName, projectsConfigurations, isVerbose, target } = context; const { name, additionalFlags } = options; const installCommand = 'npm i'; @@ -17,7 +17,7 @@ const executor: Executor = async (options, context) => { console.log(`Running ${target.executor} command: ${installCommand}.`); } - const cwd = workspace?.projects[projectName].root; + const cwd = projectsConfigurations?.projects[projectName].root; execSync(installCommand, { stdio: 'inherit', cwd }); const publishCommand = `func azure functionapp publish ${name}${additionalFlags ? ` ${additionalFlags}` : ''}`; diff --git a/packages/func/src/executors/start/executor.ts b/packages/func/src/executors/start/executor.ts index cdff836..9a115a7 100644 --- a/packages/func/src/executors/start/executor.ts +++ b/packages/func/src/executors/start/executor.ts @@ -22,7 +22,7 @@ const loadProcessEnvWithoutOverrides = (projectCwd: string) => { const executor: Executor = async (options, context) => { const { port, disableWatch, additionalFlags } = options; - const { workspace, projectName, isVerbose, target } = context; + const { projectsConfigurations, projectName, isVerbose, target } = context; const logger = new FuncLogger(projectName); let spawned: ChildProcessWithoutNullStreams | null = null; @@ -33,7 +33,7 @@ const executor: Executor = async (options, context) => { if (isVerbose) console.log(`Running ${target.executor} command: func ${params.join(' ')}.`); - const cwd = workspace?.projects[projectName].root; + const cwd = projectsConfigurations?.projects[projectName].root; const noOverridesEnvVars = loadProcessEnvWithoutOverrides(cwd); spawned = spawn('func', params, { cwd, detached: false, shell: true, env: noOverridesEnvVars }); diff --git a/packages/func/tsconfig.spec.json b/packages/func/tsconfig.spec.json index 546f128..a2f7dd3 100644 --- a/packages/func/tsconfig.spec.json +++ b/packages/func/tsconfig.spec.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "../../dist/out-tsc", "module": "commonjs", - "types": ["jest", "node"] + "types": ["jest", "node"], + "allowJs": true }, "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"] }