diff --git a/.commitlintrc.ts b/.commitlintrc.ts index 5936d802..b0cd85c8 100644 --- a/.commitlintrc.ts +++ b/.commitlintrc.ts @@ -3,6 +3,6 @@ import { utils } from '@commitlint/config-nx-scopes'; module.exports = { extends: ['@commitlint/config-conventional', '@commitlint/config-nx-scopes'], rules: { - 'scope-enum': async (ctx) => [2, 'always', ['release', ...(await utils.getProjects(ctx))]], + 'scope-enum': async (ctx) => [2, 'always', ['deps', 'release', ...(await utils.getProjects(ctx))]], }, }; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6423f92d..fc3cda0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,10 @@ jobs: with: fetch-depth: 0 - # Connect your workspace on nx.app and uncomment this to enable task distribution. - # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested - - name: Start Nx Agents - if: ${{ ! startsWith(github.head_ref, 'renovate/') }} - run: npx nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="build" + # This enables task distribution via Nx Cloud + # Run this command as early as possible, before dependencies are installed + # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun + - run: npx nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="build" # Cache node_modules - uses: actions/setup-node@v4 @@ -33,9 +32,10 @@ jobs: node-version: 20 cache: 'npm' - - run: npm ci + - run: npm ci --legacy-peer-deps - uses: nrwl/nx-set-shas@v4 # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud - run: npx nx-cloud record -- nx format:check + # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected - run: npx nx affected -t lint test build diff --git a/package-lock.json b/package-lock.json index 8a9d852e..b3f82eb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@actions/exec": "1.1.1", "@actions/github": "6.0.0", "@actions/io": "1.1.3", - "@nx/devkit": "19.6.0", + "@nx/devkit": "19.8.3", "@octokit/openapi-types": "22.2.0", "@renovate/pep440": "1.0.0", "chalk": "4.1.2", @@ -33,12 +33,12 @@ "@commitlint/config-conventional": "19.2.2", "@commitlint/config-nx-scopes": "19.3.1", "@commitlint/cz-commitlint": "19.4.0", - "@nx/eslint": "19.6.0", - "@nx/eslint-plugin": "19.6.0", - "@nx/jest": "19.6.0", - "@nx/js": "19.6.0", - "@nx/plugin": "19.6.0", - "@nx/workspace": "19.6.0", + "@nx/eslint": "19.8.3", + "@nx/eslint-plugin": "19.8.3", + "@nx/jest": "19.8.3", + "@nx/js": "19.8.3", + "@nx/plugin": "19.8.3", + "@nx/workspace": "19.8.3", "@prisma/client": "5.18.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.3.12", @@ -61,7 +61,7 @@ "jest-environment-node": "29.7.0", "lint-staged": "15.2.8", "mocked-env": "1.3.5", - "nx": "19.6.0", + "nx": "19.8.3", "prettier": "2.8.8", "ts-jest": "29.2.4", "ts-node": "10.9.2", @@ -3093,6 +3093,16 @@ "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/eslintrc": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", @@ -3842,61 +3852,61 @@ } }, "node_modules/@nrwl/devkit": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.6.0.tgz", - "integrity": "sha512-WKvuShei1dmjUhbY1J62vkNhvIkcFIc4MPo0YnYzuBbxvNKWB6r3ICRc1BZuFYL3L7pPIEHUcdExyTdIZRDVqQ==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.8.3.tgz", + "integrity": "sha512-67vZJRMCEA543A0uz8dPTZ5lX4wsAlgsr24KJafsUxBC2WCf9z4BqcLj0jVWfmRdKJmu2UwaxtD2UB1bekt3sg==", "license": "MIT", "dependencies": { - "@nx/devkit": "19.6.0" + "@nx/devkit": "19.8.3" } }, "node_modules/@nrwl/eslint-plugin-nx": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-19.6.0.tgz", - "integrity": "sha512-z24P4aV62gTMUsamV2PEMpTCEV/l/gjC/NPLlX8lQEH4yvNz3VQJo+QX2EUn5SFQhsvy8IbRAdCOLBBnxBFooA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-19.8.3.tgz", + "integrity": "sha512-FitfvjOJNUsvpkNaMY321rOwMI4VkRWc1KLJILCaogQs3I10m3oWNSPz3KfMnxPmIUcxicSQ2aQaibTe0vzWFg==", "dev": true, "license": "MIT", "dependencies": { - "@nx/eslint-plugin": "19.6.0" + "@nx/eslint-plugin": "19.8.3" } }, "node_modules/@nrwl/jest": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-19.6.0.tgz", - "integrity": "sha512-+1DhxQ7RSiAGDOKz2LecgqCL7jMCBx5h76p1nWdMzklUdXZlS7uftuENwvFvHuNqav3IFG12zmEhMFlPdYMEyA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-19.8.3.tgz", + "integrity": "sha512-a2sesALDBzNRr56TDs2El7whg+ywUqUwP466ClItRDyikckuRQrcNl5o28r2232vE360eaoMkH/X9aGcQPn78Q==", "dev": true, "license": "MIT", "dependencies": { - "@nx/jest": "19.6.0" + "@nx/jest": "19.8.3" } }, "node_modules/@nrwl/js": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/js/-/js-19.6.0.tgz", - "integrity": "sha512-Qy2UIC1WwaQwHdHQGGcr69KOlfrk3NRYIOyd+YQB193m7vuLZ9twmdME8Dbt34BpMoeEQzFAdn9LpdUrcc+p8Q==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/js/-/js-19.8.3.tgz", + "integrity": "sha512-PIRmAkW2lQGllxrzAfA92Gzm8O6kJQzvMcRTNzOI6GHtsgmZ8hIniu11BFr0oVtnppN4efVRnhYZbPyyP7aOoA==", "dev": true, "license": "MIT", "dependencies": { - "@nx/js": "19.6.0" + "@nx/js": "19.8.3" } }, "node_modules/@nrwl/nx-plugin": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/nx-plugin/-/nx-plugin-19.6.0.tgz", - "integrity": "sha512-mLtMYkDVEtIosjL5tY10GEyicAe1UJSBZwipfqjT0MHb7gNmuhIclXW0/gkYUM8+1tE3VDG2qxWJiklhakR8RQ==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/nx-plugin/-/nx-plugin-19.8.3.tgz", + "integrity": "sha512-cKjoQuy4rQNGuyS2oscWrf9LORKyf7SjaeS/PyAgSugL8XxSH41QZTh769GFe7m0vnNiBzn/C/A1t0B65DoqkQ==", "dev": true, "license": "MIT", "dependencies": { - "@nx/plugin": "19.6.0" + "@nx/plugin": "19.8.3" } }, "node_modules/@nrwl/tao": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.6.0.tgz", - "integrity": "sha512-DlFtKjPtOv401XnRjnIxMaaKUcdyGulCINmQGlrnqJuUA7ABr2uFSuOqOFJS6uGA1QFa+vKU1GhxhefUiTHOaw==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.8.3.tgz", + "integrity": "sha512-byjBtOXx+xGjMu1wKopJSJbrR3gKqTsCEgp1+YSZ45+iFKxFdXLJrGsyhVqBovCKVBM+5/KtGuEkZoUPlP8JWg==", "license": "MIT", "dependencies": { - "nx": "19.6.0", + "nx": "19.8.3", "tslib": "^2.3.0" }, "bin": { @@ -3904,22 +3914,22 @@ } }, "node_modules/@nrwl/workspace": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nrwl/workspace/-/workspace-19.6.0.tgz", - "integrity": "sha512-6s2oQUrU7rRAzZ8bDFSx84Sy9wYwlIdSkYZQqalPaBIJcJbySSMBKUREqvKedy7m8rixqCd3zYnzylwOMIlg/w==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nrwl/workspace/-/workspace-19.8.3.tgz", + "integrity": "sha512-mJURS7J1vtfwa2As1ZHzl5wtp+I9zWwmfOJeUGquqSe3ojS/UiNg0e23di265mGxwK2eknEOV7CtU8hKO/nRTA==", "dev": true, "license": "MIT", "dependencies": { - "@nx/workspace": "19.6.0" + "@nx/workspace": "19.8.3" } }, "node_modules/@nx/devkit": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.6.0.tgz", - "integrity": "sha512-sFDnP+KkR6m5VRi3ThS4Aymfo7squ48Qhkvpwkj3Y0W4q577+QrXlAS4tR9GZM0FAgQeF63kdZ1cLy39ZlGaWA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.8.3.tgz", + "integrity": "sha512-uX50CAM11tzhwswf0ftN0QfzW2FM3M4Mf/pD/nRRnmsTkcPTdMXVu4LHuLVTp4CMsaO+cOQlqgHXujHYfOIctg==", "license": "MIT", "dependencies": { - "@nrwl/devkit": "19.6.0", + "@nrwl/devkit": "19.8.3", "ejs": "^3.1.7", "enquirer": "~2.3.6", "ignore": "^5.0.4", @@ -3934,15 +3944,15 @@ } }, "node_modules/@nx/eslint": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-19.6.0.tgz", - "integrity": "sha512-Gb8rBOdHTv50fSYsbU4nIQZQc/9T9jlHIhXBu7Qpu0TfCjvYF1X8RxRZeBDENeYdV8v6x2fF17xmBFMnR4ON5Q==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-19.8.3.tgz", + "integrity": "sha512-ohYG6tAXFc3gYvFWzOSno8+UmUZaq3FqC6+eMm7SOnZS+Movwdiw7z2Iv5eQ8YXTR5vEBmgbzqpMCk1o+t63ww==", "dev": true, "license": "MIT", "dependencies": { - "@nx/devkit": "19.6.0", - "@nx/js": "19.6.0", - "@nx/linter": "19.6.0", + "@nx/devkit": "19.8.3", + "@nx/js": "19.8.3", + "@nx/linter": "19.8.3", "semver": "^7.5.3", "tslib": "^2.3.0", "typescript": "~5.4.2" @@ -3958,25 +3968,27 @@ } }, "node_modules/@nx/eslint-plugin": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-19.6.0.tgz", - "integrity": "sha512-CXVfXRVWR7Aj3bejYgYrUziTuusLs62f8SmqkMLFzOzuVjDekmNqylHNLu49edX6V77+QvFFcuRNyiA/PK0yWQ==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-19.8.3.tgz", + "integrity": "sha512-HuYRDp5o9xmsQiFOTTAbLFxo5ofHLs+ZR66dQT1qSwPDd0iAPvIucWtXAts/AdBjZy5hNOFtYUUkQZBEzULk4Q==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/eslint-plugin-nx": "19.6.0", - "@nx/devkit": "19.6.0", - "@nx/js": "19.6.0", - "@typescript-eslint/type-utils": "^7.16.0", - "@typescript-eslint/utils": "^7.16.0", + "@eslint/compat": "^1.1.1", + "@nrwl/eslint-plugin-nx": "19.8.3", + "@nx/devkit": "19.8.3", + "@nx/js": "19.8.3", + "@typescript-eslint/type-utils": "^8.0.0", + "@typescript-eslint/utils": "^8.0.0", "chalk": "^4.1.0", "confusing-browser-globals": "^1.0.9", + "globals": "^15.9.0", "jsonc-eslint-parser": "^2.1.0", "semver": "^7.5.3", "tslib": "^2.3.0" }, "peerDependencies": { - "@typescript-eslint/parser": "^6.13.2 || ^7.0.0", + "@typescript-eslint/parser": "^6.13.2 || ^7.0.0 || ^8.0.0", "eslint-config-prettier": "^9.0.0" }, "peerDependenciesMeta": { @@ -3985,6 +3997,192 @@ } } }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz", + "integrity": "sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/visitor-keys": "8.8.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/type-utils": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.0.tgz", + "integrity": "sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.8.0", + "@typescript-eslint/utils": "8.8.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz", + "integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz", + "integrity": "sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/visitor-keys": "8.8.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz", + "integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.8.0", + "@typescript-eslint/types": "8.8.0", + "@typescript-eslint/typescript-estree": "8.8.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz", + "integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.8.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/globals": { + "version": "15.10.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.10.0.tgz", + "integrity": "sha512-tqFIbz83w4Y5TCbtgjZjApohbuh7K9BxGYFm7ifwDR240tvdb7P9x+/9VvUKlmkPoiknoJtanI8UOrqxS3a7lQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@nx/eslint-plugin/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@nx/eslint/node_modules/typescript": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", @@ -4000,17 +4198,17 @@ } }, "node_modules/@nx/jest": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-19.6.0.tgz", - "integrity": "sha512-me9mH8lOG8raZ+dMugplqdEGpQTrA2C4MLDYM0KnPv1Gw1DIZpaaGxaKg4AQotrkiJMKj4xv184u84BtWjiYaA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-19.8.3.tgz", + "integrity": "sha512-qQgx9dlV2jO7u+rXvXuKwuXlp6aHynPoTpWPuvmNz1jFCIted8+lN8xawif6KMCQb91d0PIW03Gt+RtFRah8cQ==", "dev": true, "license": "MIT", "dependencies": { "@jest/reporters": "^29.4.1", "@jest/test-result": "^29.4.1", - "@nrwl/jest": "19.6.0", - "@nx/devkit": "19.6.0", - "@nx/js": "19.6.0", + "@nrwl/jest": "19.8.3", + "@nx/devkit": "19.8.3", + "@nx/js": "19.8.3", "@phenomnomnominal/tsquery": "~5.0.1", "chalk": "^4.1.0", "identity-obj-proxy": "3.0.0", @@ -4025,9 +4223,9 @@ } }, "node_modules/@nx/js": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/js/-/js-19.6.0.tgz", - "integrity": "sha512-uq4YVT5lClVdZtMdHdHOVbNb2pLIRnP8vHOLkblbQUwTBTnySt7ejpkRhegLSq1I9oYsfAJAWb5jRkRluAwnnA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/js/-/js-19.8.3.tgz", + "integrity": "sha512-hugBafx0jwMa8ebs20XINCkhjvPNz+wW4qgSo4TtmPXu9NLZ/yVSM8nwOfdnZn1D4UOHu7LaYCBwp09Hrf2F9Q==", "dev": true, "license": "MIT", "dependencies": { @@ -4038,19 +4236,20 @@ "@babel/preset-env": "^7.23.2", "@babel/preset-typescript": "^7.22.5", "@babel/runtime": "^7.22.6", - "@nrwl/js": "19.6.0", - "@nx/devkit": "19.6.0", - "@nx/workspace": "19.6.0", + "@nrwl/js": "19.8.3", + "@nx/devkit": "19.8.3", + "@nx/workspace": "19.8.3", "babel-plugin-const-enum": "^1.0.1", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-typescript-metadata": "^0.3.1", "chalk": "^4.1.0", "columnify": "^1.6.0", "detect-port": "^1.5.1", + "enquirer": "~2.3.6", "fast-glob": "3.2.7", - "fs-extra": "^11.1.0", "ignore": "^5.0.4", "js-tokens": "^4.0.0", + "jsonc-parser": "3.2.0", "minimatch": "9.0.3", "npm-package-arg": "11.0.1", "npm-run-path": "^4.0.1", @@ -4115,19 +4314,19 @@ } }, "node_modules/@nx/linter": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/linter/-/linter-19.6.0.tgz", - "integrity": "sha512-XAfCH8GC3y03qgSG7ABzl2JrlN7bIoNzZYd5rooZD45MZBLtPQ11+Ls1qFcDTAkKmVhVYLHKKtfOyb0Uj4O1kw==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/linter/-/linter-19.8.3.tgz", + "integrity": "sha512-wo0mXEV1D1WnZsMUYV0kDCIgY0eR8uV9SfP6B0blVNtUL87yDahsr9oEafHHqHFiPBzjSGjSzIMbPt+lXZnoBw==", "dev": true, "license": "MIT", "dependencies": { - "@nx/eslint": "19.6.0" + "@nx/eslint": "19.8.3" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.6.0.tgz", - "integrity": "sha512-8dudAe2HBRwp2P5AxhjinoVqXH5hueZ8bpjNJ2DquBr4dm/ZE62dSoSqURDg/ZnY/XmivByHiyklkDLaXxdkig==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.8.3.tgz", + "integrity": "sha512-ORHFFWMZcvFi0xcpCaXccXVEhFwAevSHOIKfW359+12H9w7VW2O42B+2NcVMK1mrDTOjlXTd+0AmAu7P4NzWFA==", "cpu": [ "arm64" ], @@ -4141,9 +4340,9 @@ } }, "node_modules/@nx/nx-darwin-x64": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.6.0.tgz", - "integrity": "sha512-dGvh0sTFTSN387yEAEGUQIVPAX/I2OwiukcZOns704aKr9yzNpwWWgnhlutvkCFj9A+I3lUJLmt8eHehLDhprg==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.8.3.tgz", + "integrity": "sha512-Ji9DPA0tuzygMcypD/FHRDQSPipcRqMNmSaNKxVpcCbozVTWHvqXFk0rloDIUnxnE0+zvE9LN71H2sS4ZHdTQA==", "cpu": [ "x64" ], @@ -4157,9 +4356,9 @@ } }, "node_modules/@nx/nx-freebsd-x64": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.6.0.tgz", - "integrity": "sha512-sGISTXQz7rH+C2xiGn2MtSI+1qAw/JGxFfqDwhZYTUzP9Yx+0tnUwDCbUt0PJ7d1nnxVY2X6osPcoDsgcShAvg==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.8.3.tgz", + "integrity": "sha512-Ys+PqtBZCS+QBNs7he3fnxVhMWz/lSSaBVUlVHoQcV1Y4clEpP2TWNQSsbaVnnpcB7pdmKN5ymWdaCaAQuqCMw==", "cpu": [ "x64" ], @@ -4173,9 +4372,9 @@ } }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.6.0.tgz", - "integrity": "sha512-rhdpenJOuxQd5gEh5klIsuR2Dsavz2HOYQhxdsP5Yi/L8NSu6wFJO/D+e1YOlQ620NeKIgb5C5eY9BPrcAyLVg==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.8.3.tgz", + "integrity": "sha512-hGOlML60ELXkgkqLHB/w/sXbTbXFhOQGSXC72CjaP5G0u1gj8eTQKJ7WEsqPAFMk5SLFFxqM7eid0LmAYYuZWQ==", "cpu": [ "arm" ], @@ -4189,9 +4388,9 @@ } }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.6.0.tgz", - "integrity": "sha512-cNQ2Gg+kPOGMAghFxox65sPWq+7qRxmLQVdmZIbcUvnng8zI8yaD2VCNNKfBAooAVNlFhTNAlK9JBhi00KPz+A==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.8.3.tgz", + "integrity": "sha512-K/5iVbLbhsx28YtZHvveJgF41rbr2kMdabooZeFqy6VReN7U/zGJMjpV1FzDlf3TNr9jyjPDZgVQRS+qXau2qA==", "cpu": [ "arm64" ], @@ -4205,9 +4404,9 @@ } }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.6.0.tgz", - "integrity": "sha512-8vo/NYua0AlIapLEQxI5HUKooQrWoXOKOV0vDb3IDsOF3PWna8jjTrYim2+HbXiPIynh+R+dAaS+aG6kK07uOA==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.8.3.tgz", + "integrity": "sha512-zqzWjFniZDXiI/3MYxbJ0yIenUKr56apLy70oABTBHx++dsUA3/DxLMNypMA82a8KQtsbePWUi3Pgtr+JIMNXw==", "cpu": [ "arm64" ], @@ -4221,9 +4420,9 @@ } }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.6.0.tgz", - "integrity": "sha512-8PPYt63WjvvwY45EE71HczMkhuUSTWeM+RnwaN/Mr6/PiAuIAhNlqeROyAq0v6+ixNumNPuTt8ao1cmSt3PQ5A==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.8.3.tgz", + "integrity": "sha512-W1RRCqsQvpur4BxP5g5cQwjZB6jhxYLSSXi3QQDaU5ITkaV5Pdj/L7D/G6YgRB8lzKZrXc57aLJ5UKY/Z+di7w==", "cpu": [ "x64" ], @@ -4237,9 +4436,9 @@ } }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.6.0.tgz", - "integrity": "sha512-0Scr/6Ipuj9RLpCZF37xriNzmL84XAWQcuH1a+oDGGLwF3xWBuxCDwyANNOzD7B+KSqwqUjq67Pg4L5jJMD8+w==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.8.3.tgz", + "integrity": "sha512-waTo0zBBGnmU7fS87IpOnVGx7EHa0umzSMlGG0LUoU6swOeNODezsBn1Vbvaw1o7sStWBzdEBlxLxHOQXRAidg==", "cpu": [ "x64" ], @@ -4253,9 +4452,9 @@ } }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.6.0.tgz", - "integrity": "sha512-dDXJfEbJs9g17NzZlfKBF67YxhlBMXkIMYBDqhY2HhX6aE8nWhG9l2D3PN6izySXzY29jfwsJaU/tmakDPKXDg==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.8.3.tgz", + "integrity": "sha512-lio7ulblEMs1otMtVIrdfdMTBqKRZEHim57AcMHSVnwmtl2ENP6TR3YIgyigjfLlkPanNU7i0QQ4h6Nk2I/FRw==", "cpu": [ "arm64" ], @@ -4269,9 +4468,9 @@ } }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.6.0.tgz", - "integrity": "sha512-sU2LD8qSO+4pZ7glrnuDabfpmOSog3VIBf9L+bLAHNFaVa8Ut3FE3O2P7FjrZ1eA3veEJcGfKFsCqPGiKFp57w==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.8.3.tgz", + "integrity": "sha512-RU11iXJzdrw5CmogT2AwsjxK7g8vWf6Oy23NlrvsQFODtavjqAWoD5qpUY/H16s9lVDwrpzCbGbAXph0lbgLKA==", "cpu": [ "x64" ], @@ -4285,33 +4484,32 @@ } }, "node_modules/@nx/plugin": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-19.6.0.tgz", - "integrity": "sha512-QOrZqlmehpsEWgN+bN4c1vIJ7G+XeQ3rDQ1MWAyiWkHub2bskWfwsqQe1qKJAMw1j3hoZ4wuNwFhciC1pupq4w==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/plugin/-/plugin-19.8.3.tgz", + "integrity": "sha512-dVLQHFmz0eqHKsF2L74RTIv7813z1ywzo/5VTGUgKv/sWCLFjl3VRo4WrVSGTJtLBkUEM7rzXL6xCPxizDrahg==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/nx-plugin": "19.6.0", - "@nx/devkit": "19.6.0", - "@nx/eslint": "19.6.0", - "@nx/jest": "19.6.0", - "@nx/js": "19.6.0", - "fs-extra": "^11.1.0", + "@nrwl/nx-plugin": "19.8.3", + "@nx/devkit": "19.8.3", + "@nx/eslint": "19.8.3", + "@nx/jest": "19.8.3", + "@nx/js": "19.8.3", "tslib": "^2.3.0" } }, "node_modules/@nx/workspace": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-19.6.0.tgz", - "integrity": "sha512-R5cqQMGJuRiDfsAqvuf8cIgEYQOIZG9sECDHiQUjRelFSSTVWahjBJrP7Hwz51CLiDaUJj/tjOxVdqpNcZnR4w==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-19.8.3.tgz", + "integrity": "sha512-bIUtPwvt2PGu7k5vLUBB6BNpCviOVCDXRk4JXiE11O+RzWpiNr3rMn9w9fPh7InezAkMi1hiyA7D+SrXaLmJlw==", "dev": true, "license": "MIT", "dependencies": { - "@nrwl/workspace": "19.6.0", - "@nx/devkit": "19.6.0", + "@nrwl/workspace": "19.8.3", + "@nx/devkit": "19.8.3", "chalk": "^4.1.0", "enquirer": "~2.3.6", - "nx": "19.6.0", + "nx": "19.8.3", "tslib": "^2.3.0", "yargs-parser": "21.1.1" } @@ -6566,9 +6764,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -10363,9 +10561,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -10441,20 +10639,6 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -10834,6 +11018,7 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, "license": "ISC" }, "node_modules/graphemer": { @@ -12976,6 +13161,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, "license": "MIT", "dependencies": { "universalify": "^2.0.0" @@ -13141,9 +13327,9 @@ } }, "node_modules/lines-and-columns": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", - "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -14276,18 +14462,18 @@ "license": "MIT" }, "node_modules/nx": { - "version": "19.6.0", - "resolved": "https://registry.npmjs.org/nx/-/nx-19.6.0.tgz", - "integrity": "sha512-vWpmLna/MRk772ichxPlwUmWpJu5FImBXLfii4sFj0KIFA8lG7YiKiK7jiiog0TQXE/B3m7VYvrn2/RuPpLsmg==", + "version": "19.8.3", + "resolved": "https://registry.npmjs.org/nx/-/nx-19.8.3.tgz", + "integrity": "sha512-/3FF4tgwPGRu4bV6O+aHqhTnOGHKF0/HNVkApUwjimSC+YzOX9VH1uBx2eReb4XC1scxDWkIzVi9gkFSXSQDjQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", - "@nrwl/tao": "19.6.0", + "@nrwl/tao": "19.8.3", "@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/parsers": "3.0.0-rc.46", "@zkochan/js-yaml": "0.0.7", - "axios": "^1.7.2", + "axios": "^1.7.4", "chalk": "^4.1.0", "cli-cursor": "3.1.0", "cli-spinners": "2.6.1", @@ -14298,11 +14484,10 @@ "figures": "3.2.0", "flat": "^5.0.2", "front-matter": "^4.0.2", - "fs-extra": "^11.1.0", "ignore": "^5.0.4", "jest-diff": "^29.4.1", "jsonc-parser": "3.2.0", - "lines-and-columns": "~2.0.3", + "lines-and-columns": "2.0.3", "minimatch": "9.0.3", "node-machine-id": "1.1.12", "npm-run-path": "^4.0.1", @@ -14323,16 +14508,16 @@ "nx-cloud": "bin/nx-cloud.js" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "19.6.0", - "@nx/nx-darwin-x64": "19.6.0", - "@nx/nx-freebsd-x64": "19.6.0", - "@nx/nx-linux-arm-gnueabihf": "19.6.0", - "@nx/nx-linux-arm64-gnu": "19.6.0", - "@nx/nx-linux-arm64-musl": "19.6.0", - "@nx/nx-linux-x64-gnu": "19.6.0", - "@nx/nx-linux-x64-musl": "19.6.0", - "@nx/nx-win32-arm64-msvc": "19.6.0", - "@nx/nx-win32-x64-msvc": "19.6.0" + "@nx/nx-darwin-arm64": "19.8.3", + "@nx/nx-darwin-x64": "19.8.3", + "@nx/nx-freebsd-x64": "19.8.3", + "@nx/nx-linux-arm-gnueabihf": "19.8.3", + "@nx/nx-linux-arm64-gnu": "19.8.3", + "@nx/nx-linux-arm64-musl": "19.8.3", + "@nx/nx-linux-x64-gnu": "19.8.3", + "@nx/nx-linux-x64-musl": "19.8.3", + "@nx/nx-win32-arm64-msvc": "19.8.3", + "@nx/nx-win32-x64-msvc": "19.8.3" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -17093,6 +17278,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, "license": "MIT", "engines": { "node": ">= 10.0.0" diff --git a/package.json b/package.json index 1b87805d..6ab51fac 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@actions/exec": "1.1.1", "@actions/github": "6.0.0", "@actions/io": "1.1.3", - "@nx/devkit": "19.6.0", + "@nx/devkit": "19.8.3", "@octokit/openapi-types": "22.2.0", "@renovate/pep440": "1.0.0", "chalk": "4.1.2", @@ -37,12 +37,12 @@ "@commitlint/config-conventional": "19.2.2", "@commitlint/config-nx-scopes": "19.3.1", "@commitlint/cz-commitlint": "19.4.0", - "@nx/eslint": "19.6.0", - "@nx/eslint-plugin": "19.6.0", - "@nx/jest": "19.6.0", - "@nx/js": "19.6.0", - "@nx/plugin": "19.6.0", - "@nx/workspace": "19.6.0", + "@nx/eslint": "19.8.3", + "@nx/eslint-plugin": "19.8.3", + "@nx/jest": "19.8.3", + "@nx/js": "19.8.3", + "@nx/plugin": "19.8.3", + "@nx/workspace": "19.8.3", "@prisma/client": "5.18.0", "@swc-node/register": "1.9.2", "@swc/cli": "0.3.12", @@ -65,7 +65,7 @@ "jest-environment-node": "29.7.0", "lint-staged": "15.2.8", "mocked-env": "1.3.5", - "nx": "19.6.0", + "nx": "19.8.3", "prettier": "2.8.8", "ts-jest": "29.2.4", "ts-node": "10.9.2",