From 86f8c80879debcb5d83af894d570adccb277aeed Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Wed, 9 Oct 2024 23:37:59 +0000 Subject: [PATCH 1/9] generate nx plugin --- .eslintrc.json | 5 ++ .vscode/extensions.json | 3 +- .vscode/settings.json | 15 +++--- .../nx-sage-monorepo/.eslintrc.json | 37 ++++++++++++++ libs/sage-monorepo/nx-sage-monorepo/README.md | 11 ++++ .../nx-sage-monorepo/jest.config.ts | 9 ++++ .../nx-sage-monorepo/package.json | 11 ++++ .../nx-sage-monorepo/project.json | 51 +++++++++++++++++++ .../nx-sage-monorepo/src/index.ts | 0 .../nx-sage-monorepo/tsconfig.json | 16 ++++++ .../nx-sage-monorepo/tsconfig.lib.json | 10 ++++ .../nx-sage-monorepo/tsconfig.spec.json | 9 ++++ nx.json | 2 +- tsconfig.base.json | 1 + 14 files changed, 170 insertions(+), 10 deletions(-) create mode 100644 libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json create mode 100644 libs/sage-monorepo/nx-sage-monorepo/README.md create mode 100644 libs/sage-monorepo/nx-sage-monorepo/jest.config.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/package.json create mode 100644 libs/sage-monorepo/nx-sage-monorepo/project.json create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/index.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/tsconfig.json create mode 100644 libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json create mode 100644 libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json diff --git a/.eslintrc.json b/.eslintrc.json index 9a60ffeb04..60dee5bdaf 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,6 +3,11 @@ "ignorePatterns": ["**/*"], "plugins": ["@nx"], "overrides": [ + { + "files": "*.json", + "parser": "jsonc-eslint-parser", + "rules": {} + }, { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} diff --git a/.vscode/extensions.json b/.vscode/extensions.json index cfd54a8385..965933caeb 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,4 +1,3 @@ { - // Extensions should be defined in `.devcontainer/devcontainer.json` instead of here. - "recommendations": [] + "recommendations": ["esbenp.prettier-vscode", "firsttris.vscode-jest-runner"] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 21a0cb2f11..931547af97 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,10 +22,14 @@ "editor.inlayHints.enabled": "off", "eslint.enable": true, "eslint.workingDirectories": ["."], - "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "html"], - // We need to explicitly set Prettier as the format for JSON formats, otherwise the formatter - // provided with VS Code will set itself as the default one, despite us specifying that Prettier - // is the default formatter (editor.defaultFormatter). + "eslint.validate": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "html", + "json" + ], "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, @@ -42,16 +46,13 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "typescript.tsdk": "node_modules/typescript/lib", - // Python settings "python.analysis.autoImportCompletions": true, "python.analysis.typeCheckingMode": "basic", - // "python.terminal.activateEnvironment": false, "python.terminal.activateEnvInCurrentTerminal": false, "[python]": { "editor.defaultFormatter": "ms-python.black-formatter", "editor.tabSize": 4 }, - // SQL settings "sqltools.autoOpenSessionFiles": false, "sqltools.connections": [ { diff --git a/libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json b/libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json new file mode 100644 index 0000000000..ad5db50eff --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json @@ -0,0 +1,37 @@ +{ + "extends": ["../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.json"], + "parser": "jsonc-eslint-parser", + "rules": { + "@nx/dependency-checks": [ + "error", + { + "ignoredFiles": ["{projectRoot}/eslint.config.{js,cjs,mjs}"] + } + ] + } + }, + { + "files": ["./package.json"], + "parser": "jsonc-eslint-parser", + "rules": { + "@nx/nx-plugin-checks": "error" + } + } + ] +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/README.md b/libs/sage-monorepo/nx-sage-monorepo/README.md new file mode 100644 index 0000000000..76effa7cf3 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/README.md @@ -0,0 +1,11 @@ +# sage-monorepo + +This library was generated with [Nx](https://nx.dev). + +## Building + +Run `nx build sage-monorepo` to build the library. + +## Running unit tests + +Run `nx test sage-monorepo` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/sage-monorepo/nx-sage-monorepo/jest.config.ts b/libs/sage-monorepo/nx-sage-monorepo/jest.config.ts new file mode 100644 index 0000000000..7e5d3a797a --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/jest.config.ts @@ -0,0 +1,9 @@ +export default { + displayName: 'sage-monorepo', + preset: '../../../jest.preset.js', + transform: { + '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], + }, + moduleFileExtensions: ['ts', 'js', 'html'], + coverageDirectory: '../../../coverage/libs/sage-monorepo/nx-sage-monorepo', +}; diff --git a/libs/sage-monorepo/nx-sage-monorepo/package.json b/libs/sage-monorepo/nx-sage-monorepo/package.json new file mode 100644 index 0000000000..2353ffb23e --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/package.json @@ -0,0 +1,11 @@ +{ + "name": "@sagebionetworks/nx-sage-monorepo", + "version": "0.0.1", + "dependencies": { + "tslib": "^2.3.0" + }, + "type": "commonjs", + "main": "./src/index.js", + "typings": "./src/index.d.ts", + "private": true +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/project.json b/libs/sage-monorepo/nx-sage-monorepo/project.json new file mode 100644 index 0000000000..9be553180a --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/project.json @@ -0,0 +1,51 @@ +{ + "name": "sage-monorepo", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/sage-monorepo/nx-sage-monorepo/src", + "projectType": "library", + "tags": [], + "targets": { + "build": { + "executor": "@nx/js:tsc", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/libs/sage-monorepo/nx-sage-monorepo", + "main": "libs/sage-monorepo/nx-sage-monorepo/src/index.ts", + "tsConfig": "libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json", + "assets": [ + "libs/sage-monorepo/nx-sage-monorepo/*.md", + { + "input": "./libs/sage-monorepo/nx-sage-monorepo/src", + "glob": "**/!(*.ts)", + "output": "./src" + }, + { + "input": "./libs/sage-monorepo/nx-sage-monorepo/src", + "glob": "**/*.d.ts", + "output": "./src" + }, + { + "input": "./libs/sage-monorepo/nx-sage-monorepo", + "glob": "generators.json", + "output": "." + }, + { + "input": "./libs/sage-monorepo/nx-sage-monorepo", + "glob": "executors.json", + "output": "." + } + ] + } + }, + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@nx/jest:jest", + "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], + "options": { + "jestConfig": "libs/sage-monorepo/nx-sage-monorepo/jest.config.ts" + } + } + } +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/index.ts b/libs/sage-monorepo/nx-sage-monorepo/src/index.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.json b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.json new file mode 100644 index 0000000000..25f7201d87 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "module": "commonjs" + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json new file mode 100644 index 0000000000..4befa7f099 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "types": ["node"] + }, + "include": ["src/**/*.ts"], + "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"] +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json new file mode 100644 index 0000000000..b2ee74a6b1 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"] +} diff --git a/nx.json b/nx.json index a126de6add..0101415553 100644 --- a/nx.json +++ b/nx.json @@ -41,7 +41,7 @@ } }, "defaultProject": "openchallenges-app", - "plugins": ["@nxlv/python"], + "plugins": ["@nxlv/python", "@sagebionetworks/nx-sage-monorepo"], "$schema": "./node_modules/nx/schemas/nx-schema.json", "targetDefaults": { "build": { diff --git a/tsconfig.base.json b/tsconfig.base.json index f844616736..f1e4e1274a 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -38,6 +38,7 @@ "@sagebionetworks/model-ad/not-found": ["libs/model-ad/not-found/src/index.ts"], "@sagebionetworks/model-ad/ui": ["libs/model-ad/ui/src/index.ts"], "@sagebionetworks/model-ad/util": ["libs/model-ad/util/src/index.ts"], + "@sagebionetworks/nx-sage-monorepo": ["libs/sage-monorepo/nx-sage-monorepo/src/index.ts"], "@sagebionetworks/openchallenges/about": ["libs/openchallenges/about/src/index.ts"], "@sagebionetworks/openchallenges/api-client-angular": [ "libs/openchallenges/api-client-angular/src/index.ts" From ccc6735154de122f58722accfe43748e0749f9a0 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Wed, 9 Oct 2024 23:53:35 +0000 Subject: [PATCH 2/9] update pnpm lockfile --- pnpm-lock.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c6f83c7b5..1f9d2122ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -513,6 +513,12 @@ importers: specifier: ^1.3.1 version: 1.6.0(@types/node@22.5.1)(@vitest/ui@1.6.0)(jsdom@22.1.0(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6) + libs/sage-monorepo/nx-sage-monorepo: + dependencies: + tslib: + specifier: ^2.3.0 + version: 2.4.1 + packages: 2-thenable@1.0.0: @@ -12192,8 +12198,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20241007: - resolution: {integrity: sha512-oIOWWuGS7GI51GWoNlP9O/eKmV1P+lKbIzVzg2i8Ul6n8vWHjQISb8MkPBxDj+alhYG2sl+HxtFHHG/LCgN/hg==} + typescript@5.7.0-dev.20241009: + resolution: {integrity: sha512-NhJGDOqw0Wef3qCmG1yVVOHfZu365OED2CQvqFRIR1AXSirHf2Z/uGKjACdmrvm97IQpuszvQL15yaXwydCIVg==} engines: {node: '>=14.17'} hasBin: true @@ -21279,7 +21285,7 @@ snapshots: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.7.0-dev.20241007 + typescript: 5.7.0-dev.20241009 duplexer@0.1.2: {} @@ -28497,7 +28503,7 @@ snapshots: typescript@5.5.4: {} - typescript@5.7.0-dev.20241007: {} + typescript@5.7.0-dev.20241009: {} ua-parser-js@1.0.38: {} From 0701f02680a9c931e5ca462ca2fa46c5eac053f4 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Thu, 10 Oct 2024 04:20:51 +0000 Subject: [PATCH 3/9] copy-paste files from previous plugin --- apps/openchallenges/apex/project.json | 22 --- .../nx-sage-monorepo/package.json | 5 +- .../nx-sage-monorepo/src/index.ts | 1 + .../nx-sage-monorepo/src/plugin.ts | 1 + .../src/plugins/build-image-target.ts | 58 ++++++++ .../plugins/build-project-configuration.ts | 28 ++++ .../src/plugins/plugin-configuration.ts | 13 ++ .../src/plugins/plugin-options.ts | 3 + .../nx-sage-monorepo/src/plugins/plugin.ts | 125 ++++++++++++++++++ .../project-configuration-builder-options.ts | 10 ++ .../src/plugins/project-metadata.ts | 64 +++++++++ .../src/plugins/project-type.ts | 11 ++ .../nx-sage-monorepo/src/plugins/project.ts | 26 ++++ .../sage-monorepo-project-configuration.ts | 11 ++ .../src/utils/memoize-utils.ts | 15 +++ .../src/utils/project-utils.ts | 22 +++ nx.json | 10 +- 17 files changed, 401 insertions(+), 24 deletions(-) create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts create mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts diff --git a/apps/openchallenges/apex/project.json b/apps/openchallenges/apex/project.json index dd3f5cb3d0..c43ebc208a 100644 --- a/apps/openchallenges/apex/project.json +++ b/apps/openchallenges/apex/project.json @@ -17,28 +17,6 @@ "command": "docker/openchallenges/serve-detach.sh openchallenges-apex" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "{projectRoot}" - }, - "configurations": { - "local": { - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - } - }, - "ci": { - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=semver,pattern={{version}},value=${VERSION}", "type=sha"] - }, - "push": true - } - }, - "defaultConfiguration": "local" - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/libs/sage-monorepo/nx-sage-monorepo/package.json b/libs/sage-monorepo/nx-sage-monorepo/package.json index 2353ffb23e..eeca64f6f0 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/package.json +++ b/libs/sage-monorepo/nx-sage-monorepo/package.json @@ -2,7 +2,10 @@ "name": "@sagebionetworks/nx-sage-monorepo", "version": "0.0.1", "dependencies": { - "tslib": "^2.3.0" + "tslib": "^2.3.0", + "@nx/devkit": "19.8.0", + "nx": "19.8.0", + "@nx/js": "19.8.0" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/index.ts b/libs/sage-monorepo/nx-sage-monorepo/src/index.ts index e69de29bb2..1912a88231 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/src/index.ts +++ b/libs/sage-monorepo/nx-sage-monorepo/src/index.ts @@ -0,0 +1 @@ +export { createNodesV2 } from './plugins/plugin'; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts new file mode 100644 index 0000000000..7b17ccd07b --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts @@ -0,0 +1 @@ +export { createNodesV2 } from './src/plugins/plugin'; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts new file mode 100644 index 0000000000..75904e5140 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts @@ -0,0 +1,58 @@ +import { TargetConfiguration } from '@nx/devkit'; +import { Builder } from './project-metadata'; + +export async function buildImageTarget( + projectRoot: string, + projectName: string, + projectBuilder: Builder | undefined | null, // TODO: builder could be app or image, be more specific +): Promise { + const dependsOn = []; + if (projectBuilder === 'gradle') { + dependsOn.push({ + target: 'build-image-base', + }); + } else if (projectBuilder === 'webpack') { + dependsOn.push({ + // TODO: the task `server` is more about Angular that the build itself. To revisit. Also, + // shall we let the user decide between CSR and SSR? + target: 'server', + }); + } else { + dependsOn.push({ + target: 'build', + }); + } + + let context = projectRoot; + // TODO: The context must be set to '.' for Angular app. Be more specific. + if (projectBuilder === 'webpack') { + context = '.'; + } + + return { + executor: '@nx-tools/nx-container:build', + outputs: [], + + options: { + context, + }, + cache: false, + configurations: { + local: { + metadata: { + images: [`ghcr.io/sage-bionetworks/${projectName}`], + tags: ['type=edge,branch=main', 'type=raw,value=local', 'type=sha'], + }, + }, + ci: { + metadata: { + images: [`ghcr.io/sage-bionetworks/${projectName}`], + tags: ['type=semver,pattern={{version}},value=${VERSION}', 'type=sha'], + }, + push: true, + }, + }, + defaultConfiguration: 'local', + dependsOn, + }; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts new file mode 100644 index 0000000000..7458237225 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts @@ -0,0 +1,28 @@ +import { TargetConfiguration } from '@nx/devkit'; +import { buildImageTarget } from './build-image-target'; +import { SageMonorepoProjectConfiguration } from './sage-monorepo-project-configuration'; +import { ProjectConfigurationBuilderOptions } from './project-configuration-builder-options'; + +export async function buildProjectConfiguration( + options: ProjectConfigurationBuilderOptions, +): Promise { + const targets: Record = {}; + + const pluginConfig = options.pluginConfig; + + if (options.dockerized) { + targets[pluginConfig.buildImageTargetName] = await buildImageTarget( + options.projectRoot, + options.projectName, + options.projectMetadata.builder, + ); + } + + const metadata = {}; + const tags: string[] = []; + if (options.projectMetadata.builder) { + tags.push(`builder:${options.projectMetadata.builder}`); + } + + return { targets, metadata, tags }; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts new file mode 100644 index 0000000000..b8af9391f8 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts @@ -0,0 +1,13 @@ +import { PluginOptions } from './plugin-options'; + +export type PluginConfiguration = { + buildImageTargetName: string; +}; + +export function createPluginConfiguration({ + buildImageTargetName = 'build-image', +}: PluginOptions): PluginConfiguration { + return { + buildImageTargetName, + }; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts new file mode 100644 index 0000000000..6bbbc8f3c4 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts @@ -0,0 +1,3 @@ +export type PluginOptions = { + buildImageTargetName?: string; +}; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts new file mode 100644 index 0000000000..43917237e3 --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts @@ -0,0 +1,125 @@ +import { + CreateNodesContext, + createNodesFromFiles, + CreateNodesV2, + detectPackageManager, + ProjectConfiguration, + readJsonFile, + workspaceRoot, + writeJsonFile, +} from '@nx/devkit'; +import { hashObject } from 'nx/src/hasher/file-hasher'; +import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; +import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; +import { dirname, join } from 'path'; +import { existsSync, readdirSync } from 'fs'; +import { getLockFileName } from '@nx/js'; +import { SageMonorepoProjectConfiguration } from './sage-monorepo-project-configuration'; +import { createPluginConfiguration } from './plugin-configuration'; +import { PluginOptions } from './plugin-options'; +import { buildProjectConfiguration } from './build-project-configuration'; +import { inferProjectType } from './project-type'; +import { ProjectConfigurationBuilderOptions } from './project-configuration-builder-options'; +import { inferProjectMetadata } from './project-metadata'; + +function readProjectCOnfigurationsCache( + cachePath: string, +): Record { + console.log(`cachePath: ${cachePath}`); + return existsSync(cachePath) ? readJsonFile(cachePath) : {}; +} + +function writeProjectConfigurationsToCache( + cachePath: string, + results: Record, +) { + writeJsonFile(cachePath, results); +} + +const projectFilePattern = '{apps,libs}/openchallenges/**/project.json'; + +export const createNodesV2: CreateNodesV2 = [ + projectFilePattern, + async (configFilePaths, options, context) => { + options ??= {}; + const optionsHash = hashObject(options); + + // Reads the cached targets for all the projects + const cachePath = join(workspaceDataDirectory, `sage-monorepo-${optionsHash}.hash`); + const projectConfigurationsCache = readProjectCOnfigurationsCache(cachePath); + try { + return await createNodesFromFiles( + (configFile, options, context) => { + return createNodesInternal(configFile, options, context, projectConfigurationsCache); + }, + configFilePaths, + options, + context, + ); + } finally { + writeProjectConfigurationsToCache(cachePath, projectConfigurationsCache); + } + }, +]; + +async function createNodesInternal( + configFilePath: string, + options: PluginOptions | undefined, + context: CreateNodesContext, + projectConfigurationsCache: Record, +) { + const projectRoot = dirname(configFilePath); + const siblingFiles = readdirSync(join(context.workspaceRoot, projectRoot)); + + // Content of the project file + const projectFileContent: ProjectConfiguration = readJsonFile(configFilePath); + + const projectName = projectFileContent.name; + if (typeof projectName !== 'string') { + throw new Error('Project name is undefined or not a valid string.'); + } + // console.log(`projectName: ${projectName}`); + + const projectType = inferProjectType(projectRoot); + // console.log(`projectType: ${projectType}`); + + const dockerized = projectType === 'application' && siblingFiles.includes('Dockerfile'); + // console.log(`dockerized: ${dockerized}`); + + const projectMetadata = inferProjectMetadata(workspaceRoot, projectRoot, projectFileContent); + // console.log(`projectMetadata: ${JSON.stringify(projectMetadata)}`); + + const pluginConfig = createPluginConfiguration(options || {}); + + // We do not want to alter how the hash is calculated, so appending the config file path to the + // hash to prevent the project files overwriting the target cache created by the other project + const hash = + (await calculateHashForCreateNodes(projectRoot, pluginConfig, context, [ + getLockFileName(detectPackageManager(context.workspaceRoot)), + ])) + configFilePath; + + const projectConfigurationBuilderOptions: ProjectConfigurationBuilderOptions = { + projectRoot, + projectName, + pluginConfig, + projectMetadata, + dockerized, + }; + projectConfigurationsCache[hash] ??= await buildProjectConfiguration( + projectConfigurationBuilderOptions, + ); + + const { targets, metadata, tags } = projectConfigurationsCache[hash]; + const project: ProjectConfiguration = { + root: projectRoot, + targets, + metadata, + tags, + }; + + return { + projects: { + [projectRoot]: project, + }, + }; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts new file mode 100644 index 0000000000..f0b49e7b5e --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts @@ -0,0 +1,10 @@ +import { PluginConfiguration } from './plugin-configuration'; +import { ProjectMetadata } from './project-metadata'; + +export type ProjectConfigurationBuilderOptions = { + projectRoot: string; + projectName: string; + pluginConfig: PluginConfiguration; + projectMetadata: ProjectMetadata; + dockerized?: boolean; +}; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts new file mode 100644 index 0000000000..3296b3311e --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts @@ -0,0 +1,64 @@ +import { ProjectConfiguration, ProjectType } from '@nx/devkit'; +import { join } from 'path'; +import { readdirSync } from 'fs'; + +export type Builder = 'esbuild' | 'webpack' | 'gradle' | 'maven' | 'poetry' | null; +// export type Linter = 'eslint' | 'pylint'; +// export type TypeChecker = 'mypy' | 'pyright'; +// export type TestingTool = 'pytest' | null; +// export type Formatter = 'Black' | 'Prettier'; +// export type ContainerType = 'Docker' | 'Singularity'; +// export type Language = 'python' | 'typescript' | 'javascript'; +// export type Framework = 'Flask' | 'React' | 'Angular' | 'Vue' | null; + +export type ProjectMetadata = { + projectType: ProjectType; + builder: Builder; + // linter: Linter; + // typeChecker: TypeChecker[]; + // testing: { + // unit: TestingTool; + // integration: TestingTool; + // e2e: TestingTool; + // }; + // formatter: Formatter; + // containerType: ContainerType; + // language: Language; + // framework: Framework; +}; + +export function inferProjectMetadata( + workspaceRoot: string, + projectRoot: string, + localProjectConfiguration: ProjectConfiguration, +): ProjectMetadata { + const siblingFiles = readdirSync(join(workspaceRoot, projectRoot)); + return { + projectType: inferProjectType(projectRoot), + builder: inferBuilder(siblingFiles, localProjectConfiguration), + }; +} + +export function inferProjectType(projectRoot: string): ProjectType { + if (projectRoot.startsWith('apps/')) { + return 'application'; + } else if (projectRoot.startsWith('libs/')) { + return 'library'; + } + throw new Error(`Unknown project type for project root: ${projectRoot}`); +} + +function inferBuilder( + siblingFiles: string[], + localProjectConfiguration: ProjectConfiguration, +): Builder { + if (siblingFiles.includes('poetry.lock')) return 'poetry'; + if (siblingFiles.includes('build.gradle')) return 'gradle'; + if ( + localProjectConfiguration?.targets?.['build']?.executor === + '@angular-devkit/build-angular:browser' + ) { + return 'webpack'; + } + return null; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts new file mode 100644 index 0000000000..73fc1d48cb --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts @@ -0,0 +1,11 @@ +import { ProjectType } from '@nx/devkit'; + +export function inferProjectType(projectRoot: string): ProjectType { + if (projectRoot.startsWith('apps/')) { + return 'application'; + } else if (projectRoot.startsWith('libs/')) { + return 'library'; + } + + throw new Error(`Unknown project type for project root: ${projectRoot}`); +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts new file mode 100644 index 0000000000..754e009f1c --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts @@ -0,0 +1,26 @@ +import { ProjectType } from '@nx/devkit'; + +export type Builder = 'esbuild' | 'gradle' | 'poetry' | 'wheel'; +export type Linter = 'eslint' | 'pylint'; +export type TypeChecker = 'mypy' | 'pyright'; +export type TestingTool = 'pytest' | null; +export type Formatter = 'Black' | 'Prettier'; +export type ContainerType = 'Docker' | 'Singularity'; +export type Language = 'python' | 'typescript' | 'javascript'; +export type Framework = 'Flask' | 'React' | 'Angular' | 'Vue' | null; + +export type ProjectMetadata = { + projectType: ProjectType; + builder: Builder; + linter: Linter; + typeChecker: TypeChecker[]; + testing: { + unit: TestingTool; + integration: TestingTool; + e2e: TestingTool; + }; + formatter: Formatter; + containerType: ContainerType; + language: Language; + framework: Framework; +}; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts new file mode 100644 index 0000000000..47b78cd62f --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts @@ -0,0 +1,11 @@ +import { ProjectConfiguration } from '@nx/devkit'; + +export type CreateProjectConfiguration = ( + projectRoot: string, +) => Omit; + +// Omit; +export type SageMonorepoProjectConfiguration = Pick< + ProjectConfiguration, + 'targets' | 'metadata' | 'tags' +>; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts b/libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts new file mode 100644 index 0000000000..f73a7f5b8b --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts @@ -0,0 +1,15 @@ +import type { TargetConfiguration } from 'nx/src/config/workspace-json-project-json'; + +export type MemoizeFnType = (projectPath: string) => Record; + +export function memoize(fn: MemoizeFnType): MemoizeFnType { + const cache: Record> = {}; + + return (projectPath) => { + if (!(projectPath in cache)) { + cache[projectPath] = fn(projectPath); + } + + return cache[projectPath]; + }; +} diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts b/libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts new file mode 100644 index 0000000000..bf77dd627b --- /dev/null +++ b/libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts @@ -0,0 +1,22 @@ +import { normalizePath } from 'nx/src/utils/path'; + +export type ProjectType = 'APP'; + +const projectTypeRegExps: Record = { + APP: /^apps\/(.+)apex\/project.json$/, +}; + +export const getProjectType = (projectPath: string): ProjectType | undefined => { + // console.log(`projectPath: ${projectPath}`); + return Object.entries(projectTypeRegExps).find(([, regExp]) => + regExp.test(normalizePath(projectPath)), + )?.[0] as ProjectType; +}; + +export const getProjectRoot = (projectPath: string): string => { + const normalizedPath = normalizePath(projectPath); + return normalizedPath.replace('/project.json', ''); +}; + +export const getProjectName = (projectPath: string): string | undefined => + getProjectRoot(projectPath).split('/').pop(); diff --git a/nx.json b/nx.json index 0101415553..ab7ec25477 100644 --- a/nx.json +++ b/nx.json @@ -41,7 +41,15 @@ } }, "defaultProject": "openchallenges-app", - "plugins": ["@nxlv/python", "@sagebionetworks/nx-sage-monorepo"], + "plugins": [ + "@nxlv/python", + { + "plugin": "@sagebionetworks/nx-sage-monorepo", + "options": { + "buildImageTargetName": "build-image" + } + } + ], "$schema": "./node_modules/nx/schemas/nx-schema.json", "targetDefaults": { "build": { From 757b4281878ffacd1d0c6f44ea05cb1b03e59904 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Thu, 10 Oct 2024 04:27:50 +0000 Subject: [PATCH 4/9] undo VS Code extensions added automatically --- .vscode/extensions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 965933caeb..cfd54a8385 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,4 @@ { - "recommendations": ["esbenp.prettier-vscode", "firsttris.vscode-jest-runner"] + // Extensions should be defined in `.devcontainer/devcontainer.json` instead of here. + "recommendations": [] } From 27a687b207d53c8771d763fcff8fe477f7eda338 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Thu, 10 Oct 2024 04:57:15 +0000 Subject: [PATCH 5/9] update plugin dependencies --- .../nx-sage-monorepo/package.json | 4 +- pnpm-lock.yaml | 543 +++++++++++++----- 2 files changed, 402 insertions(+), 145 deletions(-) diff --git a/libs/sage-monorepo/nx-sage-monorepo/package.json b/libs/sage-monorepo/nx-sage-monorepo/package.json index eeca64f6f0..db1d8b0735 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/package.json +++ b/libs/sage-monorepo/nx-sage-monorepo/package.json @@ -2,10 +2,10 @@ "name": "@sagebionetworks/nx-sage-monorepo", "version": "0.0.1", "dependencies": { - "tslib": "^2.3.0", "@nx/devkit": "19.8.0", + "@nx/js": "19.8.0", "nx": "19.8.0", - "@nx/js": "19.8.0" + "tslib": "^2.3.0" }, "type": "commonjs", "main": "./src/index.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f9d2122ac..e83bde3f0c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -340,13 +340,13 @@ importers: version: 10.4.13(postcss@8.4.38) babel-jest: specifier: 29.7.0 - version: 29.7.0(@babel/core@7.24.9) + version: 29.7.0(@babel/core@7.25.2) browser-sync: specifier: ^3.0.0 version: 3.0.2(debug@4.3.7) cdktf-cli: specifier: 0.16.1 - version: 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + version: 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) colors: specifier: 1.4.0 version: 1.4.0 @@ -409,7 +409,7 @@ importers: version: 29.7.0(canvas@2.11.2(encoding@0.1.13)) jest-preset-angular: specifier: 14.1.1 - version: 14.1.1(rxdnqqbwzvya4gnit5obuxoooe) + version: 14.1.1(seb2x65ufkoxwwqpwvegfujhfm) jsdom: specifier: ~22.1.0 version: 22.1.0(canvas@2.11.2(encoding@0.1.13)) @@ -499,7 +499,7 @@ importers: version: 3.4.3(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) ts-jest: specifier: 29.1.1 - version: 29.1.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) + version: 29.1.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) ts-node: specifier: 10.9.1 version: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4) @@ -515,6 +515,15 @@ importers: libs/sage-monorepo/nx-sage-monorepo: dependencies: + '@nx/devkit': + specifier: 19.8.0 + version: 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nx/js': + specifier: 19.8.0 + version: 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) + nx: + specifier: 19.8.0 + version: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) tslib: specifier: ^2.3.0 version: 2.4.1 @@ -13387,7 +13396,7 @@ snapshots: '@babel/helper-function-name': 7.24.7 '@babel/helper-member-expression-to-functions': 7.24.8 '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.24.7(@babel/core@7.24.9) + '@babel/helper-replace-supers': 7.25.0(@babel/core@7.24.9) '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 semver: 6.3.1 @@ -13402,7 +13411,7 @@ snapshots: '@babel/helper-function-name': 7.24.7 '@babel/helper-member-expression-to-functions': 7.24.8 '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.24.7(@babel/core@7.25.2) + '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 semver: 6.3.1 @@ -13458,8 +13467,8 @@ snapshots: '@babel/helper-function-name@7.24.7': dependencies: - '@babel/template': 7.24.7 - '@babel/types': 7.24.9 + '@babel/template': 7.25.0 + '@babel/types': 7.25.6 '@babel/helper-hoist-variables@7.24.7': dependencies: @@ -13467,8 +13476,8 @@ snapshots: '@babel/helper-member-expression-to-functions@7.24.8': dependencies: - '@babel/traverse': 7.24.8 - '@babel/types': 7.24.9 + '@babel/traverse': 7.25.6 + '@babel/types': 7.25.6 transitivePeerDependencies: - supports-color @@ -13562,6 +13571,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-replace-supers@7.25.0(@babel/core@7.24.9)': + dependencies: + '@babel/core': 7.24.9 + '@babel/helper-member-expression-to-functions': 7.24.8 + '@babel/helper-optimise-call-expression': 7.24.7 + '@babel/traverse': 7.25.6 + transitivePeerDependencies: + - supports-color + '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -13698,12 +13716,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.24.9)': + '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 - '@babel/helper-create-class-features-plugin': 7.24.8(@babel/core@7.24.9) + '@babel/core': 7.25.2 + '@babel/helper-create-class-features-plugin': 7.24.8(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.24.9) + '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -13730,6 +13748,11 @@ snapshots: '@babel/core': 7.24.9 '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 @@ -13750,9 +13773,9 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.24.9)': + '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.9)': @@ -13820,6 +13843,11 @@ snapshots: '@babel/core': 7.24.9 '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 @@ -13905,6 +13933,11 @@ snapshots: '@babel/core': 7.24.9 '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 @@ -14511,18 +14544,6 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-transform-runtime@7.24.7(@babel/core@7.24.9)': - dependencies: - '@babel/core': 7.24.9 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-plugin-utils': 7.24.8 - babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.9) - babel-plugin-polyfill-corejs3: 0.10.4(@babel/core@7.24.9) - babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.24.9) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-runtime@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -14601,6 +14622,16 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/plugin-transform-typescript@7.24.8(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-annotate-as-pure': 7.24.7 + '@babel/helper-create-class-features-plugin': 7.24.8(@babel/core@7.25.2) + '@babel/helper-plugin-utils': 7.24.8 + '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2) + transitivePeerDependencies: + - supports-color + '@babel/plugin-transform-unicode-escapes@7.24.7(@babel/core@7.24.9)': dependencies: '@babel/core': 7.24.9 @@ -14860,6 +14891,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/preset-typescript@7.24.7(@babel/core@7.25.2)': + dependencies: + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/helper-validator-option': 7.24.8 + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) + '@babel/plugin-transform-typescript': 7.24.8(@babel/core@7.25.2) + transitivePeerDependencies: + - supports-color + '@babel/regjsgen@0.8.0': {} '@babel/runtime-corejs3@7.24.8': @@ -14941,10 +14983,10 @@ snapshots: '@types/tough-cookie': 4.0.5 tough-cookie: 4.1.4 - '@cdktf/cli-core@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': + '@cdktf/cli-core@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': dependencies: - '@cdktf/commons': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) - '@cdktf/hcl2cdk': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/commons': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/hcl2cdk': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) '@cdktf/hcl2json': 0.16.1 '@cdktf/node-pty-prebuilt-multiarch': 0.10.1-pre.10 '@sentry/node': 6.19.7 @@ -14980,7 +15022,7 @@ snapshots: - supports-color - ts-node - '@cdktf/commons@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@16.18.23)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': + '@cdktf/commons@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@16.18.23)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': dependencies: '@npmcli/ci-detect': 1.4.0 '@sentry/node': 6.19.7 @@ -14993,7 +15035,7 @@ snapshots: is-valid-domain: 0.1.6 jest: 29.7.0(@types/node@16.18.23)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) log4js: 6.9.1 - ts-jest: 29.1.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) + ts-jest: 29.1.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) typescript: 5.5.4 uuid: 8.3.2 transitivePeerDependencies: @@ -15008,7 +15050,7 @@ snapshots: - supports-color - ts-node - '@cdktf/commons@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': + '@cdktf/commons@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': dependencies: '@npmcli/ci-detect': 1.4.0 '@sentry/node': 6.19.7 @@ -15021,7 +15063,7 @@ snapshots: is-valid-domain: 0.1.6 jest: 29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) log4js: 6.9.1 - ts-jest: 29.1.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) + ts-jest: 29.1.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) typescript: 5.5.4 uuid: 8.3.2 transitivePeerDependencies: @@ -15036,14 +15078,14 @@ snapshots: - supports-color - ts-node - '@cdktf/hcl2cdk@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': + '@cdktf/hcl2cdk@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': dependencies: '@babel/generator': 7.24.10 '@babel/template': 7.24.7 '@babel/types': 7.24.9 - '@cdktf/commons': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/commons': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) '@cdktf/hcl2json': 0.16.1 - '@cdktf/provider-generator': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/provider-generator': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) camelcase: 6.3.0 deep-equal: 2.2.3 glob: 9.3.4 @@ -15079,9 +15121,9 @@ snapshots: cdktf: 0.16.1(constructs@10.2.13) constructs: 10.2.13 - '@cdktf/provider-generator@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': + '@cdktf/provider-generator@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4))': dependencies: - '@cdktf/commons': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@16.18.23)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/commons': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@16.18.23)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) '@cdktf/hcl2json': 0.16.1 '@types/node': 16.18.23 codemaker: 1.101.0 @@ -16113,20 +16155,20 @@ snapshots: '@emnapi/runtime': 1.2.0 '@tybys/wasm-util': 0.9.0 - '@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5)': + '@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1)': dependencies: axios: 0.26.1(debug@4.3.7) iterare: 1.2.1 reflect-metadata: 0.1.13 - rxjs: 7.5.5 + rxjs: 7.8.1 tslib: 2.3.1 uuid: 8.3.2 transitivePeerDependencies: - debug - '@nestjs/core@8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5)': + '@nestjs/core@8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5)': dependencies: - '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5) + '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1) '@nuxtjs/opencollective': 0.3.2(encoding@0.1.13) fast-safe-stringify: 2.1.1 iterare: 1.2.1 @@ -16290,6 +16332,12 @@ snapshots: transitivePeerDependencies: - nx + '@nrwl/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': + dependencies: + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + transitivePeerDependencies: + - nx + '@nrwl/eslint-plugin-nx@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(debug@4.3.7)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)': dependencies: '@nx/eslint-plugin': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(debug@4.3.7)(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) @@ -16347,9 +16395,9 @@ snapshots: - typescript - verdaccio - '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5)': + '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)': dependencies: - '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5) + '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -16362,9 +16410,9 @@ snapshots: - typescript - verdaccio - '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)': + '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009)': dependencies: - '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) + '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -16467,6 +16515,15 @@ snapshots: - '@swc/core' - debug + '@nrwl/tao@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + dependencies: + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + tslib: 2.4.1 + transitivePeerDependencies: + - '@swc-node/register' + - '@swc/core' + - debug + '@nrwl/vite@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)(vite@5.2.11(@types/node@22.5.1)(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6))(vitest@1.6.0(@types/node@22.5.1)(@vitest/ui@1.6.0)(jsdom@22.1.0(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6))': dependencies: '@nx/vite': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)(vite@5.2.11(@types/node@22.5.1)(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6))(vitest@1.6.0(@types/node@22.5.1)(@vitest/ui@1.6.0)(jsdom@22.1.0(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6)) @@ -16541,6 +16598,14 @@ snapshots: - '@swc/core' - debug + '@nrwl/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + dependencies: + '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + transitivePeerDependencies: + - '@swc-node/register' + - '@swc/core' + - debug + '@nuxtjs/opencollective@0.3.2(encoding@0.1.13)': dependencies: chalk: 4.1.2 @@ -16685,10 +16750,23 @@ snapshots: '@nrwl/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) ejs: 3.1.10 enquirer: 2.3.6 - ignore: 5.3.1 + ignore: 5.3.2 minimatch: 9.0.3 nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) - semver: 7.6.2 + semver: 7.6.3 + tmp: 0.2.3 + tslib: 2.4.1 + yargs-parser: 21.1.1 + + '@nx/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': + dependencies: + '@nrwl/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + ejs: 3.1.10 + enquirer: 2.3.6 + ignore: 5.3.2 + minimatch: 9.0.3 + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + semver: 7.6.3 tmp: 0.2.3 tslib: 2.4.1 yargs-parser: 21.1.1 @@ -16805,31 +16883,31 @@ snapshots: '@nx/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5)': dependencies: - '@babel/core': 7.24.9 - '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-runtime': 7.24.7(@babel/core@7.24.9) - '@babel/preset-env': 7.24.8(@babel/core@7.24.9) - '@babel/preset-typescript': 7.24.7(@babel/core@7.24.9) - '@babel/runtime': 7.24.8 - '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5) + '@babel/core': 7.25.2 + '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-runtime': 7.24.7(@babel/core@7.25.2) + '@babel/preset-env': 7.25.3(@babel/core@7.25.2) + '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) + '@babel/runtime': 7.25.0 + '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) - babel-plugin-const-enum: 1.2.0(@babel/core@7.24.9) + babel-plugin-const-enum: 1.2.0(@babel/core@7.25.2) babel-plugin-macros: 2.8.0 - babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.24.9)(@babel/traverse@7.25.6) + babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.25.2)(@babel/traverse@7.25.6) chalk: 4.1.2 columnify: 1.6.0 detect-port: 1.6.1 fast-glob: 3.2.7 - ignore: 5.3.1 + ignore: 5.3.2 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 ora: 5.3.0 - semver: 7.6.2 + semver: 7.6.3 source-map-support: 0.5.19 ts-node: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.4.5) tsconfig-paths: 4.2.0 @@ -16847,31 +16925,31 @@ snapshots: '@nx/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)': dependencies: - '@babel/core': 7.24.9 - '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-transform-runtime': 7.24.7(@babel/core@7.24.9) - '@babel/preset-env': 7.24.8(@babel/core@7.24.9) - '@babel/preset-typescript': 7.24.7(@babel/core@7.24.9) - '@babel/runtime': 7.24.8 + '@babel/core': 7.25.2 + '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-runtime': 7.24.7(@babel/core@7.25.2) + '@babel/preset-env': 7.25.3(@babel/core@7.25.2) + '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) + '@babel/runtime': 7.25.0 '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) - babel-plugin-const-enum: 1.2.0(@babel/core@7.24.9) + babel-plugin-const-enum: 1.2.0(@babel/core@7.25.2) babel-plugin-macros: 2.8.0 - babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.24.9)(@babel/traverse@7.25.6) + babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.25.2)(@babel/traverse@7.25.6) chalk: 4.1.2 columnify: 1.6.0 detect-port: 1.6.1 fast-glob: 3.2.7 - ignore: 5.3.1 + ignore: 5.3.2 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 ora: 5.3.0 - semver: 7.6.2 + semver: 7.6.3 source-map-support: 0.5.19 ts-node: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4) tsconfig-paths: 4.2.0 @@ -16887,6 +16965,48 @@ snapshots: - supports-color - typescript + '@nx/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009)': + dependencies: + '@babel/core': 7.25.2 + '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-runtime': 7.24.7(@babel/core@7.25.2) + '@babel/preset-env': 7.25.3(@babel/core@7.25.2) + '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) + '@babel/runtime': 7.25.0 + '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + babel-plugin-const-enum: 1.2.0(@babel/core@7.25.2) + babel-plugin-macros: 2.8.0 + babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.25.2)(@babel/traverse@7.25.6) + chalk: 4.1.2 + columnify: 1.6.0 + detect-port: 1.6.1 + fast-glob: 3.2.7 + ignore: 5.3.2 + 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 + ora: 5.3.0 + semver: 7.6.3 + source-map-support: 0.5.19 + ts-node: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241009) + tsconfig-paths: 4.2.0 + tslib: 2.4.1 + transitivePeerDependencies: + - '@babel/traverse' + - '@swc-node/register' + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - debug + - nx + - supports-color + - typescript + '@nx/linter@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(@zkochan/js-yaml@0.0.7)(debug@4.3.7)(eslint@8.57.0)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': dependencies: '@nx/eslint': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(@zkochan/js-yaml@0.0.7)(debug@4.3.7)(eslint@8.57.0)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) @@ -17226,6 +17346,20 @@ snapshots: - '@swc/core' - debug + '@nx/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + dependencies: + '@nrwl/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + chalk: 4.1.2 + enquirer: 2.3.6 + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + tslib: 2.4.1 + yargs-parser: 21.1.1 + transitivePeerDependencies: + - '@swc-node/register' + - '@swc/core' + - debug + '@nxlv/python@19.1.2(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': dependencies: '@iarna/toml': 2.2.5 @@ -17315,8 +17449,8 @@ snapshots: '@openapitools/openapi-generator-cli@2.5.2(debug@4.3.7)(encoding@0.1.13)': dependencies: - '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5) - '@nestjs/core': 8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5) + '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1) + '@nestjs/core': 8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5) '@nuxtjs/opencollective': 0.3.2(encoding@0.1.13) chalk: 4.1.2 commander: 8.3.0 @@ -17684,7 +17818,7 @@ snapshots: axios: 1.7.2(debug@4.3.7) fast-glob: 3.3.2 https-proxy-agent: 5.0.1(supports-color@8.1.1) - ignore: 5.3.1 + ignore: 5.3.2 isomorphic-ws: 4.0.1(ws@7.5.10) js-yaml: 3.14.1 jwt-decode: 2.2.0 @@ -18070,54 +18204,54 @@ snapshots: dependencies: storybook: 8.3.2 - '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.24.9)': + '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 - '@svgr/babel-preset@8.1.0(@babel/core@7.24.9)': + '@svgr/babel-preset@8.1.0(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.24.9 - '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.24.9) - '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.24.9) - '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.24.9) + '@babel/core': 7.25.2 + '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.25.2) + '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.25.2) + '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.25.2) '@svgr/core@8.1.0(typescript@5.5.4)': dependencies: - '@babel/core': 7.24.9 - '@svgr/babel-preset': 8.1.0(@babel/core@7.24.9) + '@babel/core': 7.25.2 + '@svgr/babel-preset': 8.1.0(@babel/core@7.25.2) camelcase: 6.3.0 cosmiconfig: 8.3.6(typescript@5.5.4) snake-case: 3.0.4 @@ -18132,8 +18266,8 @@ snapshots: '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.5.4))': dependencies: - '@babel/core': 7.24.9 - '@svgr/babel-preset': 8.1.0(@babel/core@7.24.9) + '@babel/core': 7.25.2 + '@svgr/babel-preset': 8.1.0(@babel/core@7.25.2) '@svgr/core': 8.1.0(typescript@5.5.4) '@svgr/hast-util-to-babel-ast': 8.0.0 svg-parser: 2.0.4 @@ -18182,6 +18316,21 @@ snapshots: - '@swc/types' - supports-color + '@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009)': + dependencies: + '@swc-node/core': 1.13.3(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9) + '@swc-node/sourcemap-support': 0.5.1 + '@swc/core': 1.5.29(@swc/helpers@0.5.12) + colorette: 2.0.20 + debug: 4.3.7(supports-color@8.1.1) + pirates: 4.0.6 + tslib: 2.6.3 + typescript: 5.7.0-dev.20241009 + transitivePeerDependencies: + - '@swc/types' + - supports-color + optional: true + '@swc-node/sourcemap-support@0.5.1': dependencies: source-map-support: 0.5.21 @@ -18286,7 +18435,7 @@ snapshots: '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.24.7 - '@babel/runtime': 7.24.8 + '@babel/runtime': 7.25.0 '@types/aria-query': 5.0.4 aria-query: 5.3.0 chalk: 4.1.2 @@ -19511,6 +19660,19 @@ snapshots: transitivePeerDependencies: - supports-color + babel-jest@29.7.0(@babel/core@7.25.2): + dependencies: + '@babel/core': 7.25.2 + '@jest/transform': 29.7.0 + '@types/babel__core': 7.20.5 + babel-plugin-istanbul: 6.1.1 + babel-preset-jest: 29.6.3(@babel/core@7.25.2) + chalk: 4.1.2 + graceful-fs: 4.2.11 + slash: 3.0.0 + transitivePeerDependencies: + - supports-color + babel-loader@9.1.3(@babel/core@7.24.9)(webpack@5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0)): dependencies: '@babel/core': 7.24.9 @@ -19525,12 +19687,12 @@ snapshots: schema-utils: 4.2.0 webpack: 5.94.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0) - babel-plugin-const-enum@1.2.0(@babel/core@7.24.9): + babel-plugin-const-enum@1.2.0(@babel/core@7.25.2): dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.24.9) - '@babel/traverse': 7.24.8 + '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2) + '@babel/traverse': 7.25.6 transitivePeerDependencies: - supports-color @@ -19553,7 +19715,7 @@ snapshots: babel-plugin-macros@2.8.0: dependencies: - '@babel/runtime': 7.24.8 + '@babel/runtime': 7.25.0 cosmiconfig: 6.0.0 resolve: 1.22.8 @@ -19605,9 +19767,9 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-transform-typescript-metadata@0.3.2(@babel/core@7.24.9)(@babel/traverse@7.25.6): + babel-plugin-transform-typescript-metadata@0.3.2(@babel/core@7.25.2)(@babel/traverse@7.25.6): dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 optionalDependencies: '@babel/traverse': 7.25.6 @@ -19628,12 +19790,34 @@ snapshots: '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.9) '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.9) + babel-preset-current-node-syntax@1.0.1(@babel/core@7.25.2): + dependencies: + '@babel/core': 7.25.2 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.2) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.2) + babel-preset-jest@29.6.3(@babel/core@7.24.9): dependencies: '@babel/core': 7.24.9 babel-plugin-jest-hoist: 29.6.3 babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.9) + babel-preset-jest@29.6.3(@babel/core@7.25.2): + dependencies: + '@babel/core': 7.25.2 + babel-plugin-jest-hoist: 29.6.3 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.25.2) + balanced-match@1.0.2: {} balanced-match@2.0.0: {} @@ -19848,7 +20032,7 @@ snapshots: builtins@5.1.0: dependencies: - semver: 7.6.2 + semver: 7.6.3 bundle-name@4.1.0: dependencies: @@ -19946,11 +20130,11 @@ snapshots: caseless@0.12.0: {} - cdktf-cli@0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)): + cdktf-cli@0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)): dependencies: - '@cdktf/cli-core': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) - '@cdktf/commons': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) - '@cdktf/hcl2cdk': 0.16.1(@babel/core@7.24.9)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.24.9))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/cli-core': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(encoding@0.1.13)(esbuild@0.23.0)(ink@3.2.0(@types/react@18.3.7)(react@18.3.1))(jsii-rosetta@5.4.25)(react@18.3.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/commons': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) + '@cdktf/hcl2cdk': 0.16.1(@babel/core@7.25.2)(@jest/types@29.6.3)(@types/node@22.5.1)(babel-jest@29.7.0(@babel/core@7.25.2))(debug@4.3.7)(esbuild@0.23.0)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)) '@cdktf/hcl2json': 0.16.1 '@sentry/node': 6.19.7 cdktf: 0.16.1(constructs@10.3.0) @@ -20601,7 +20785,7 @@ snapshots: postcss-modules-scope: 3.2.0(postcss@8.4.38) postcss-modules-values: 4.0.0(postcss@8.4.38) postcss-value-parser: 4.2.0 - semver: 7.6.2 + semver: 7.6.3 optionalDependencies: webpack: 5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0) @@ -22413,7 +22597,7 @@ snapshots: minimatch: 3.1.2 node-abort-controller: 3.1.1 schema-utils: 3.3.0 - semver: 7.6.2 + semver: 7.6.3 tapable: 2.2.1 typescript: 5.5.4 webpack: 5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0) @@ -22527,7 +22711,7 @@ snapshots: deferred: 0.7.11 es5-ext: 0.10.64 event-emitter: 0.3.5 - ignore: 5.3.1 + ignore: 5.3.2 memoizee: 0.4.17 type: 2.7.3 @@ -22717,7 +22901,7 @@ snapshots: dir-glob: 3.0.1 fast-glob: 3.3.2 glob: 7.2.3 - ignore: 5.3.1 + ignore: 5.3.2 merge2: 1.4.1 slash: 3.0.0 @@ -22735,7 +22919,7 @@ snapshots: array-union: 3.0.1 dir-glob: 3.0.1 fast-glob: 3.3.2 - ignore: 5.3.1 + ignore: 5.3.2 merge2: 1.4.1 slash: 4.0.0 @@ -22743,7 +22927,7 @@ snapshots: dependencies: '@sindresorhus/merge-streams': 2.3.0 fast-glob: 3.3.2 - ignore: 5.3.1 + ignore: 5.3.2 path-type: 5.0.0 slash: 5.1.0 unicorn-magic: 0.1.0 @@ -23754,7 +23938,7 @@ snapshots: optionalDependencies: jest-resolve: 29.7.0 - jest-preset-angular@14.1.1(rxdnqqbwzvya4gnit5obuxoooe): + jest-preset-angular@14.1.1(seb2x65ufkoxwwqpwvegfujhfm): dependencies: '@angular-devkit/build-angular': 18.2.5(sf6mqyuwcku55psgk2yme7vkrq) '@angular/compiler-cli': 18.2.5(@angular/compiler@18.2.5(@angular/core@18.2.5(rxjs@7.8.1)(zone.js@0.14.4)))(typescript@5.5.4) @@ -23766,7 +23950,7 @@ snapshots: jest-environment-jsdom: 29.7.0(canvas@2.11.2(encoding@0.1.13)) jest-util: 29.7.0 pretty-format: 29.7.0 - ts-jest: 29.2.2(@babel/core@7.24.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) + ts-jest: 29.2.2(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4) typescript: 5.5.4 optionalDependencies: esbuild: 0.23.0 @@ -23856,15 +24040,15 @@ snapshots: jest-snapshot@29.7.0: dependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@babel/generator': 7.24.10 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.9) - '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.24.9) + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2) '@babel/types': 7.24.9 '@jest/expect-utils': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.9) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.25.2) chalk: 4.1.2 expect: 29.7.0 graceful-fs: 4.2.11 @@ -25229,7 +25413,7 @@ snapshots: dependencies: hosted-git-info: 7.0.2 proc-log: 3.0.0 - semver: 7.6.2 + semver: 7.6.3 validate-npm-package-name: 5.0.1 npm-package-arg@11.0.3: @@ -25320,7 +25504,7 @@ snapshots: flat: 5.0.2 front-matter: 4.0.2 fs-extra: 11.2.0 - ignore: 5.3.1 + ignore: 5.3.2 jest-diff: 29.7.0 jsonc-parser: 3.2.0 lines-and-columns: 2.0.3 @@ -25329,7 +25513,7 @@ snapshots: npm-run-path: 4.0.1 open: 8.4.2 ora: 5.3.0 - semver: 7.6.2 + semver: 7.6.3 string-width: 4.2.3 strong-log-transformer: 2.1.0 tar-stream: 2.2.0 @@ -25354,6 +25538,59 @@ snapshots: transitivePeerDependencies: - debug + nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7): + dependencies: + '@napi-rs/wasm-runtime': 0.2.4 + '@nrwl/tao': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@yarnpkg/lockfile': 1.1.0 + '@yarnpkg/parsers': 3.0.0-rc.46 + '@zkochan/js-yaml': 0.0.7 + axios: 1.7.7(debug@4.3.7) + chalk: 4.1.2 + cli-cursor: 3.1.0 + cli-spinners: 2.6.1 + cliui: 8.0.1 + dotenv: 16.4.5 + dotenv-expand: 11.0.6 + enquirer: 2.3.6 + figures: 3.2.0 + flat: 5.0.2 + front-matter: 4.0.2 + fs-extra: 11.2.0 + ignore: 5.3.2 + jest-diff: 29.7.0 + jsonc-parser: 3.2.0 + lines-and-columns: 2.0.3 + minimatch: 9.0.3 + node-machine-id: 1.1.12 + npm-run-path: 4.0.1 + open: 8.4.2 + ora: 5.3.0 + semver: 7.6.3 + string-width: 4.2.3 + strong-log-transformer: 2.1.0 + tar-stream: 2.2.0 + tmp: 0.2.3 + tsconfig-paths: 4.2.0 + tslib: 2.4.1 + yargs: 17.7.2 + yargs-parser: 21.1.1 + optionalDependencies: + '@nx/nx-darwin-arm64': 19.8.0 + '@nx/nx-darwin-x64': 19.8.0 + '@nx/nx-freebsd-x64': 19.8.0 + '@nx/nx-linux-arm-gnueabihf': 19.8.0 + '@nx/nx-linux-arm64-gnu': 19.8.0 + '@nx/nx-linux-arm64-musl': 19.8.0 + '@nx/nx-linux-x64-gnu': 19.8.0 + '@nx/nx-linux-x64-musl': 19.8.0 + '@nx/nx-win32-arm64-msvc': 19.8.0 + '@nx/nx-win32-x64-msvc': 19.8.0 + '@swc-node/register': 1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009) + '@swc/core': 1.5.29(@swc/helpers@0.5.12) + transitivePeerDependencies: + - debug + oas-kit-common@1.0.8: dependencies: fast-safe-stringify: 2.1.1 @@ -25987,7 +26224,7 @@ snapshots: cosmiconfig: 7.1.0 klona: 2.0.6 postcss: 8.4.38 - semver: 7.6.2 + semver: 7.6.3 webpack: 5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0) postcss-loader@8.1.1(postcss@8.4.41)(typescript@5.5.4)(webpack@5.94.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0)): @@ -28273,7 +28510,7 @@ snapshots: ts-is-present@1.2.2: {} - ts-jest@29.1.1(@babel/core@7.24.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4): + ts-jest@29.1.1(@babel/core@7.25.2)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 @@ -28286,12 +28523,12 @@ snapshots: typescript: 5.5.4 yargs-parser: 21.1.1 optionalDependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.24.9) + babel-jest: 29.7.0(@babel/core@7.25.2) esbuild: 0.23.0 - ts-jest@29.2.2(@babel/core@7.24.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.9))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4): + ts-jest@29.2.2(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(esbuild@0.23.0)(jest@29.7.0(@types/node@22.5.1)(ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(typescript@5.5.4)))(typescript@5.5.4): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 @@ -28301,14 +28538,14 @@ snapshots: json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 - semver: 7.6.2 + semver: 7.6.3 typescript: 5.5.4 yargs-parser: 21.1.1 optionalDependencies: - '@babel/core': 7.24.9 + '@babel/core': 7.25.2 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.24.9) + babel-jest: 29.7.0(@babel/core@7.25.2) esbuild: 0.23.0 ts-loader@9.5.1(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0)): @@ -28316,7 +28553,7 @@ snapshots: chalk: 4.1.2 enhanced-resolve: 5.17.0 micromatch: 4.0.8 - semver: 7.6.2 + semver: 7.6.3 source-map: 0.7.4 typescript: 5.5.4 webpack: 5.93.0(@swc/core@1.5.29(@swc/helpers@0.5.12))(esbuild@0.23.0) @@ -28363,6 +28600,26 @@ snapshots: optionalDependencies: '@swc/core': 1.5.29(@swc/helpers@0.5.12) + ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241009): + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.11 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 22.5.5 + acorn: 8.12.1 + acorn-walk: 8.3.3 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.7.0-dev.20241009 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + optionalDependencies: + '@swc/core': 1.5.29(@swc/helpers@0.5.12) + tsconfig-paths-webpack-plugin@4.0.0: dependencies: chalk: 4.1.2 From fa5d9dcd5e4f1711dbd8d805bc9067f205b3594c Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Fri, 11 Oct 2024 13:45:59 +0000 Subject: [PATCH 6/9] rename plugin folder --- .../.eslintrc.json | 0 .../{nx-sage-monorepo => nx-plugin}/README.md | 0 .../jest.config.ts | 2 +- .../package.json | 2 +- .../project.json | 22 ++--- .../src/index.ts | 0 libs/sage-monorepo/nx-plugin/src/plugin.ts | 1 + .../src/plugins/build-image-target.ts | 0 .../plugins/build-project-configuration.ts | 0 .../src/plugins/plugin-configuration.ts | 0 .../src/plugins/plugin-options.ts | 0 .../src/plugins/plugin.ts | 0 .../project-configuration-builder-options.ts | 0 .../src/plugins/project-metadata.ts | 0 .../src/plugins/project-type.ts | 0 .../src/plugins/project.ts | 0 .../sage-monorepo-project-configuration.ts | 0 .../src/utils/memoize-utils.ts | 0 .../src/utils/project-utils.ts | 0 .../tsconfig.json | 0 .../tsconfig.lib.json | 0 .../tsconfig.spec.json | 0 .../nx-sage-monorepo/src/plugin.ts | 1 - nx.json | 2 +- pnpm-lock.yaml | 99 +++++++++++-------- tsconfig.base.json | 2 +- 26 files changed, 73 insertions(+), 58 deletions(-) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/.eslintrc.json (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/README.md (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/jest.config.ts (75%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/package.json (82%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/project.json (55%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/index.ts (100%) create mode 100644 libs/sage-monorepo/nx-plugin/src/plugin.ts rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/build-image-target.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/build-project-configuration.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/plugin-configuration.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/plugin-options.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/plugin.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/project-configuration-builder-options.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/project-metadata.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/project-type.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/project.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/plugins/sage-monorepo-project-configuration.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/utils/memoize-utils.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/src/utils/project-utils.ts (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/tsconfig.json (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/tsconfig.lib.json (100%) rename libs/sage-monorepo/{nx-sage-monorepo => nx-plugin}/tsconfig.spec.json (100%) delete mode 100644 libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json b/libs/sage-monorepo/nx-plugin/.eslintrc.json similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/.eslintrc.json rename to libs/sage-monorepo/nx-plugin/.eslintrc.json diff --git a/libs/sage-monorepo/nx-sage-monorepo/README.md b/libs/sage-monorepo/nx-plugin/README.md similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/README.md rename to libs/sage-monorepo/nx-plugin/README.md diff --git a/libs/sage-monorepo/nx-sage-monorepo/jest.config.ts b/libs/sage-monorepo/nx-plugin/jest.config.ts similarity index 75% rename from libs/sage-monorepo/nx-sage-monorepo/jest.config.ts rename to libs/sage-monorepo/nx-plugin/jest.config.ts index 7e5d3a797a..a9e34bc60d 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/jest.config.ts +++ b/libs/sage-monorepo/nx-plugin/jest.config.ts @@ -5,5 +5,5 @@ export default { '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }], }, moduleFileExtensions: ['ts', 'js', 'html'], - coverageDirectory: '../../../coverage/libs/sage-monorepo/nx-sage-monorepo', + coverageDirectory: '../../../coverage/libs/sage-monorepo/nx-plugin', }; diff --git a/libs/sage-monorepo/nx-sage-monorepo/package.json b/libs/sage-monorepo/nx-plugin/package.json similarity index 82% rename from libs/sage-monorepo/nx-sage-monorepo/package.json rename to libs/sage-monorepo/nx-plugin/package.json index db1d8b0735..07d229f7c3 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/package.json +++ b/libs/sage-monorepo/nx-plugin/package.json @@ -1,5 +1,5 @@ { - "name": "@sagebionetworks/nx-sage-monorepo", + "name": "@sagebionetworks/sage-monorepo-nx-plugin", "version": "0.0.1", "dependencies": { "@nx/devkit": "19.8.0", diff --git a/libs/sage-monorepo/nx-sage-monorepo/project.json b/libs/sage-monorepo/nx-plugin/project.json similarity index 55% rename from libs/sage-monorepo/nx-sage-monorepo/project.json rename to libs/sage-monorepo/nx-plugin/project.json index 9be553180a..2a32bba7f4 100644 --- a/libs/sage-monorepo/nx-sage-monorepo/project.json +++ b/libs/sage-monorepo/nx-plugin/project.json @@ -1,7 +1,7 @@ { - "name": "sage-monorepo", + "name": "sage-monorepo-nx-plugin", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/sage-monorepo/nx-sage-monorepo/src", + "sourceRoot": "libs/sage-monorepo/nx-plugin/src", "projectType": "library", "tags": [], "targets": { @@ -9,28 +9,28 @@ "executor": "@nx/js:tsc", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/libs/sage-monorepo/nx-sage-monorepo", - "main": "libs/sage-monorepo/nx-sage-monorepo/src/index.ts", - "tsConfig": "libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json", + "outputPath": "dist/libs/sage-monorepo/nx-plugin", + "main": "libs/sage-monorepo/nx-plugin/src/index.ts", + "tsConfig": "libs/sage-monorepo/nx-plugin/tsconfig.lib.json", "assets": [ - "libs/sage-monorepo/nx-sage-monorepo/*.md", + "libs/sage-monorepo/nx-plugin/*.md", { - "input": "./libs/sage-monorepo/nx-sage-monorepo/src", + "input": "./libs/sage-monorepo/nx-plugin/src", "glob": "**/!(*.ts)", "output": "./src" }, { - "input": "./libs/sage-monorepo/nx-sage-monorepo/src", + "input": "./libs/sage-monorepo/nx-plugin/src", "glob": "**/*.d.ts", "output": "./src" }, { - "input": "./libs/sage-monorepo/nx-sage-monorepo", + "input": "./libs/sage-monorepo/nx-plugin", "glob": "generators.json", "output": "." }, { - "input": "./libs/sage-monorepo/nx-sage-monorepo", + "input": "./libs/sage-monorepo/nx-plugin", "glob": "executors.json", "output": "." } @@ -44,7 +44,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/sage-monorepo/nx-sage-monorepo/jest.config.ts" + "jestConfig": "libs/sage-monorepo/nx-plugin/jest.config.ts" } } } diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/index.ts b/libs/sage-monorepo/nx-plugin/src/index.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/index.ts rename to libs/sage-monorepo/nx-plugin/src/index.ts diff --git a/libs/sage-monorepo/nx-plugin/src/plugin.ts b/libs/sage-monorepo/nx-plugin/src/plugin.ts new file mode 100644 index 0000000000..1912a88231 --- /dev/null +++ b/libs/sage-monorepo/nx-plugin/src/plugin.ts @@ -0,0 +1 @@ +export { createNodesV2 } from './plugins/plugin'; diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts b/libs/sage-monorepo/nx-plugin/src/plugins/build-image-target.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-image-target.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/build-image-target.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/build-project-configuration.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-configuration.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin-options.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/plugin.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-configuration-builder-options.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-metadata.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/project-type.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/project.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/project.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/sage-monorepo-project-configuration.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/plugins/sage-monorepo-project-configuration.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/sage-monorepo-project-configuration.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts b/libs/sage-monorepo/nx-plugin/src/utils/memoize-utils.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/utils/memoize-utils.ts rename to libs/sage-monorepo/nx-plugin/src/utils/memoize-utils.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts b/libs/sage-monorepo/nx-plugin/src/utils/project-utils.ts similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/src/utils/project-utils.ts rename to libs/sage-monorepo/nx-plugin/src/utils/project-utils.ts diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.json b/libs/sage-monorepo/nx-plugin/tsconfig.json similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/tsconfig.json rename to libs/sage-monorepo/nx-plugin/tsconfig.json diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json b/libs/sage-monorepo/nx-plugin/tsconfig.lib.json similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/tsconfig.lib.json rename to libs/sage-monorepo/nx-plugin/tsconfig.lib.json diff --git a/libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json b/libs/sage-monorepo/nx-plugin/tsconfig.spec.json similarity index 100% rename from libs/sage-monorepo/nx-sage-monorepo/tsconfig.spec.json rename to libs/sage-monorepo/nx-plugin/tsconfig.spec.json diff --git a/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts b/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts deleted file mode 100644 index 7b17ccd07b..0000000000 --- a/libs/sage-monorepo/nx-sage-monorepo/src/plugin.ts +++ /dev/null @@ -1 +0,0 @@ -export { createNodesV2 } from './src/plugins/plugin'; diff --git a/nx.json b/nx.json index ab7ec25477..9cfaba75b4 100644 --- a/nx.json +++ b/nx.json @@ -44,7 +44,7 @@ "plugins": [ "@nxlv/python", { - "plugin": "@sagebionetworks/nx-sage-monorepo", + "plugin": "@sagebionetworks/sage-monorepo-nx-plugin", "options": { "buildImageTargetName": "build-image" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e83bde3f0c..8c998d1677 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -513,17 +513,17 @@ importers: specifier: ^1.3.1 version: 1.6.0(@types/node@22.5.1)(@vitest/ui@1.6.0)(jsdom@22.1.0(canvas@2.11.2(encoding@0.1.13)))(less@4.1.3)(sass@1.77.8)(stylus@0.59.0)(terser@5.31.6) - libs/sage-monorepo/nx-sage-monorepo: + libs/sage-monorepo/nx-plugin: dependencies: '@nx/devkit': specifier: 19.8.0 - version: 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + version: 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) '@nx/js': specifier: 19.8.0 - version: 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) + version: 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241010) nx: specifier: 19.8.0 - version: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + version: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) tslib: specifier: ^2.3.0 version: 2.4.1 @@ -12207,8 +12207,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20241009: - resolution: {integrity: sha512-NhJGDOqw0Wef3qCmG1yVVOHfZu365OED2CQvqFRIR1AXSirHf2Z/uGKjACdmrvm97IQpuszvQL15yaXwydCIVg==} + typescript@5.7.0-dev.20241010: + resolution: {integrity: sha512-gwxQ3UbMRwrAs1FedvBB+FkkrTVy0cjyxN7MBtpyUsmx2wHl+izVmFLpb6YPJyc/NC8sv9cdN61216rYJJyJcg==} engines: {node: '>=14.17'} hasBin: true @@ -16155,20 +16155,20 @@ snapshots: '@emnapi/runtime': 1.2.0 '@tybys/wasm-util': 0.9.0 - '@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1)': + '@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5)': dependencies: axios: 0.26.1(debug@4.3.7) iterare: 1.2.1 reflect-metadata: 0.1.13 - rxjs: 7.8.1 + rxjs: 7.5.5 tslib: 2.3.1 uuid: 8.3.2 transitivePeerDependencies: - debug - '@nestjs/core@8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5)': + '@nestjs/core@8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5)': dependencies: - '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1) + '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5) '@nuxtjs/opencollective': 0.3.2(encoding@0.1.13) fast-safe-stringify: 2.1.1 iterare: 1.2.1 @@ -16332,9 +16332,9 @@ snapshots: transitivePeerDependencies: - nx - '@nrwl/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': + '@nrwl/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': dependencies: - '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) transitivePeerDependencies: - nx @@ -16395,6 +16395,21 @@ snapshots: - typescript - verdaccio + '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5)': + dependencies: + '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5) + transitivePeerDependencies: + - '@babel/traverse' + - '@swc-node/register' + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - debug + - nx + - supports-color + - typescript + - verdaccio + '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4)': dependencies: '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) @@ -16410,9 +16425,9 @@ snapshots: - typescript - verdaccio - '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009)': + '@nrwl/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241010)': dependencies: - '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) + '@nx/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241010) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -16515,9 +16530,9 @@ snapshots: - '@swc/core' - debug - '@nrwl/tao@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + '@nrwl/tao@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': dependencies: - nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) tslib: 2.4.1 transitivePeerDependencies: - '@swc-node/register' @@ -16598,9 +16613,9 @@ snapshots: - '@swc/core' - debug - '@nrwl/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + '@nrwl/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': dependencies: - '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) transitivePeerDependencies: - '@swc-node/register' - '@swc/core' @@ -16758,14 +16773,14 @@ snapshots: tslib: 2.4.1 yargs-parser: 21.1.1 - '@nx/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': + '@nx/devkit@19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))': dependencies: - '@nrwl/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nrwl/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) ejs: 3.1.10 enquirer: 2.3.6 ignore: 5.3.2 minimatch: 9.0.3 - nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) semver: 7.6.3 tmp: 0.2.3 tslib: 2.4.1 @@ -16890,7 +16905,7 @@ snapshots: '@babel/preset-env': 7.25.3(@babel/core@7.25.2) '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) '@babel/runtime': 7.25.0 - '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.5.4) + '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.1)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.4.5) '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.5.4))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) babel-plugin-const-enum: 1.2.0(@babel/core@7.25.2) @@ -16965,7 +16980,7 @@ snapshots: - supports-color - typescript - '@nx/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009)': + '@nx/js@19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241010)': dependencies: '@babel/core': 7.25.2 '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) @@ -16974,9 +16989,9 @@ snapshots: '@babel/preset-env': 7.25.3(@babel/core@7.25.2) '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) '@babel/runtime': 7.25.0 - '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241009) - '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) - '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@nrwl/js': 19.8.0(@babel/traverse@7.25.6)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(debug@4.3.7)(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7))(typescript@5.7.0-dev.20241010) + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nx/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) babel-plugin-const-enum: 1.2.0(@babel/core@7.25.2) babel-plugin-macros: 2.8.0 babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.25.2)(@babel/traverse@7.25.6) @@ -16993,7 +17008,7 @@ snapshots: ora: 5.3.0 semver: 7.6.3 source-map-support: 0.5.19 - ts-node: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241009) + ts-node: 10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241010) tsconfig-paths: 4.2.0 tslib: 2.4.1 transitivePeerDependencies: @@ -17346,13 +17361,13 @@ snapshots: - '@swc/core' - debug - '@nx/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': + '@nx/workspace@19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)': dependencies: - '@nrwl/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) - '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) + '@nrwl/workspace': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@nx/devkit': 19.8.0(nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7)) chalk: 4.1.2 enquirer: 2.3.6 - nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + nx: 19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) tslib: 2.4.1 yargs-parser: 21.1.1 transitivePeerDependencies: @@ -17449,8 +17464,8 @@ snapshots: '@openapitools/openapi-generator-cli@2.5.2(debug@4.3.7)(encoding@0.1.13)': dependencies: - '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1) - '@nestjs/core': 8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5) + '@nestjs/common': 8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.5.5) + '@nestjs/core': 8.4.4(@nestjs/common@8.4.4(debug@4.3.7)(reflect-metadata@0.1.13)(rxjs@7.8.1))(encoding@0.1.13)(reflect-metadata@0.1.13)(rxjs@7.5.5) '@nuxtjs/opencollective': 0.3.2(encoding@0.1.13) chalk: 4.1.2 commander: 8.3.0 @@ -18316,7 +18331,7 @@ snapshots: - '@swc/types' - supports-color - '@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009)': + '@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010)': dependencies: '@swc-node/core': 1.13.3(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9) '@swc-node/sourcemap-support': 0.5.1 @@ -18325,7 +18340,7 @@ snapshots: debug: 4.3.7(supports-color@8.1.1) pirates: 4.0.6 tslib: 2.6.3 - typescript: 5.7.0-dev.20241009 + typescript: 5.7.0-dev.20241010 transitivePeerDependencies: - '@swc/types' - supports-color @@ -21469,7 +21484,7 @@ snapshots: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.7.0-dev.20241009 + typescript: 5.7.0-dev.20241010 duplexer@0.1.2: {} @@ -25538,10 +25553,10 @@ snapshots: transitivePeerDependencies: - debug - nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7): + nx@19.8.0(patch_hash=vxuy2ap6ceuowh22gcuahf5n2m)(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7): dependencies: '@napi-rs/wasm-runtime': 0.2.4 - '@nrwl/tao': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) + '@nrwl/tao': 19.8.0(@swc-node/register@1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010))(@swc/core@1.5.29(@swc/helpers@0.5.12))(debug@4.3.7) '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.7 @@ -25586,7 +25601,7 @@ snapshots: '@nx/nx-linux-x64-musl': 19.8.0 '@nx/nx-win32-arm64-msvc': 19.8.0 '@nx/nx-win32-x64-msvc': 19.8.0 - '@swc-node/register': 1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241009) + '@swc-node/register': 1.9.2(@swc/core@1.5.29(@swc/helpers@0.5.12))(@swc/types@0.1.9)(typescript@5.7.0-dev.20241010) '@swc/core': 1.5.29(@swc/helpers@0.5.12) transitivePeerDependencies: - debug @@ -28600,7 +28615,7 @@ snapshots: optionalDependencies: '@swc/core': 1.5.29(@swc/helpers@0.5.12) - ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241009): + ts-node@10.9.1(@swc/core@1.5.29(@swc/helpers@0.5.12))(@types/node@22.5.5)(typescript@5.7.0-dev.20241010): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 @@ -28614,7 +28629,7 @@ snapshots: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.7.0-dev.20241009 + typescript: 5.7.0-dev.20241010 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 optionalDependencies: @@ -28760,7 +28775,7 @@ snapshots: typescript@5.5.4: {} - typescript@5.7.0-dev.20241009: {} + typescript@5.7.0-dev.20241010: {} ua-parser-js@1.0.38: {} diff --git a/tsconfig.base.json b/tsconfig.base.json index f1e4e1274a..1389cd2427 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -38,7 +38,7 @@ "@sagebionetworks/model-ad/not-found": ["libs/model-ad/not-found/src/index.ts"], "@sagebionetworks/model-ad/ui": ["libs/model-ad/ui/src/index.ts"], "@sagebionetworks/model-ad/util": ["libs/model-ad/util/src/index.ts"], - "@sagebionetworks/nx-sage-monorepo": ["libs/sage-monorepo/nx-sage-monorepo/src/index.ts"], + "@sagebionetworks/sage-monorepo-nx-plugin": ["libs/sage-monorepo/nx-plugin/src/index.ts"], "@sagebionetworks/openchallenges/about": ["libs/openchallenges/about/src/index.ts"], "@sagebionetworks/openchallenges/api-client-angular": [ "libs/openchallenges/api-client-angular/src/index.ts" From c53b1142e5aad3a4cd4a7c432c4dfc6998698dac Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Fri, 11 Oct 2024 14:14:45 +0000 Subject: [PATCH 7/9] remove old files --- .../plugins/build-project-configuration.ts | 2 +- .../src/plugins/plugin-configuration.ts | 10 +++---- .../nx-plugin/src/plugins/plugin-options.ts | 3 --- .../nx-plugin/src/plugins/plugin.ts | 12 ++++----- .../project-configuration-builder-options.ts | 4 +-- ...figuration.ts => project-configuration.ts} | 0 .../nx-plugin/src/plugins/project-type.ts | 11 -------- .../nx-plugin/src/plugins/project.ts | 26 ------------------- 8 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts rename libs/sage-monorepo/nx-plugin/src/plugins/{sage-monorepo-project-configuration.ts => project-configuration.ts} (100%) delete mode 100644 libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts delete mode 100644 libs/sage-monorepo/nx-plugin/src/plugins/project.ts diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts index 7458237225..522e5106e5 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts @@ -1,6 +1,6 @@ import { TargetConfiguration } from '@nx/devkit'; import { buildImageTarget } from './build-image-target'; -import { SageMonorepoProjectConfiguration } from './sage-monorepo-project-configuration'; +import { SageMonorepoProjectConfiguration } from './project-configuration'; import { ProjectConfigurationBuilderOptions } from './project-configuration-builder-options'; export async function buildProjectConfiguration( diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts index b8af9391f8..d109a2f9ba 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/plugin-configuration.ts @@ -1,12 +1,12 @@ -import { PluginOptions } from './plugin-options'; - -export type PluginConfiguration = { - buildImageTargetName: string; +export type SageMonorepoPluginOptions = { + buildImageTargetName?: string; }; +export type SageMonorepoPluginConfiguration = Required; + export function createPluginConfiguration({ buildImageTargetName = 'build-image', -}: PluginOptions): PluginConfiguration { +}: SageMonorepoPluginOptions): SageMonorepoPluginConfiguration { return { buildImageTargetName, }; diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts deleted file mode 100644 index 6bbbc8f3c4..0000000000 --- a/libs/sage-monorepo/nx-plugin/src/plugins/plugin-options.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type PluginOptions = { - buildImageTargetName?: string; -}; diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts index 43917237e3..94bea42422 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts @@ -14,13 +14,11 @@ import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash import { dirname, join } from 'path'; import { existsSync, readdirSync } from 'fs'; import { getLockFileName } from '@nx/js'; -import { SageMonorepoProjectConfiguration } from './sage-monorepo-project-configuration'; -import { createPluginConfiguration } from './plugin-configuration'; -import { PluginOptions } from './plugin-options'; +import { SageMonorepoProjectConfiguration } from './project-configuration'; +import { createPluginConfiguration, SageMonorepoPluginOptions } from './plugin-configuration'; import { buildProjectConfiguration } from './build-project-configuration'; -import { inferProjectType } from './project-type'; import { ProjectConfigurationBuilderOptions } from './project-configuration-builder-options'; -import { inferProjectMetadata } from './project-metadata'; +import { inferProjectMetadata, inferProjectType } from './project-metadata'; function readProjectCOnfigurationsCache( cachePath: string, @@ -38,7 +36,7 @@ function writeProjectConfigurationsToCache( const projectFilePattern = '{apps,libs}/openchallenges/**/project.json'; -export const createNodesV2: CreateNodesV2 = [ +export const createNodesV2: CreateNodesV2 = [ projectFilePattern, async (configFilePaths, options, context) => { options ??= {}; @@ -64,7 +62,7 @@ export const createNodesV2: CreateNodesV2 = [ async function createNodesInternal( configFilePath: string, - options: PluginOptions | undefined, + options: SageMonorepoPluginOptions | undefined, context: CreateNodesContext, projectConfigurationsCache: Record, ) { diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts index f0b49e7b5e..394f688e9a 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts @@ -1,10 +1,10 @@ -import { PluginConfiguration } from './plugin-configuration'; +import { SageMonorepoPluginConfiguration } from './plugin-configuration'; import { ProjectMetadata } from './project-metadata'; export type ProjectConfigurationBuilderOptions = { projectRoot: string; projectName: string; - pluginConfig: PluginConfiguration; + pluginConfig: SageMonorepoPluginConfiguration; projectMetadata: ProjectMetadata; dockerized?: boolean; }; diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/sage-monorepo-project-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration.ts similarity index 100% rename from libs/sage-monorepo/nx-plugin/src/plugins/sage-monorepo-project-configuration.ts rename to libs/sage-monorepo/nx-plugin/src/plugins/project-configuration.ts diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts deleted file mode 100644 index 73fc1d48cb..0000000000 --- a/libs/sage-monorepo/nx-plugin/src/plugins/project-type.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ProjectType } from '@nx/devkit'; - -export function inferProjectType(projectRoot: string): ProjectType { - if (projectRoot.startsWith('apps/')) { - return 'application'; - } else if (projectRoot.startsWith('libs/')) { - return 'library'; - } - - throw new Error(`Unknown project type for project root: ${projectRoot}`); -} diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/project.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project.ts deleted file mode 100644 index 754e009f1c..0000000000 --- a/libs/sage-monorepo/nx-plugin/src/plugins/project.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ProjectType } from '@nx/devkit'; - -export type Builder = 'esbuild' | 'gradle' | 'poetry' | 'wheel'; -export type Linter = 'eslint' | 'pylint'; -export type TypeChecker = 'mypy' | 'pyright'; -export type TestingTool = 'pytest' | null; -export type Formatter = 'Black' | 'Prettier'; -export type ContainerType = 'Docker' | 'Singularity'; -export type Language = 'python' | 'typescript' | 'javascript'; -export type Framework = 'Flask' | 'React' | 'Angular' | 'Vue' | null; - -export type ProjectMetadata = { - projectType: ProjectType; - builder: Builder; - linter: Linter; - typeChecker: TypeChecker[]; - testing: { - unit: TestingTool; - integration: TestingTool; - e2e: TestingTool; - }; - formatter: Formatter; - containerType: ContainerType; - language: Language; - framework: Framework; -}; From 128235726715e66b9d4b1051340d04c5bede93ec Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Fri, 11 Oct 2024 14:30:04 +0000 Subject: [PATCH 8/9] rely only on metadata --- .../src/plugins/build-project-configuration.ts | 2 +- .../nx-plugin/src/plugins/plugin.ts | 12 ++---------- .../project-configuration-builder-options.ts | 1 - .../nx-plugin/src/plugins/project-metadata.ts | 18 ++++++++++++------ 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts b/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts index 522e5106e5..62c69fafc8 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/build-project-configuration.ts @@ -10,7 +10,7 @@ export async function buildProjectConfiguration( const pluginConfig = options.pluginConfig; - if (options.dockerized) { + if (options.projectMetadata.containerType === 'Docker') { targets[pluginConfig.buildImageTargetName] = await buildImageTarget( options.projectRoot, options.projectName, diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts b/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts index 94bea42422..c3f317dee6 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/plugin.ts @@ -12,13 +12,13 @@ import { hashObject } from 'nx/src/hasher/file-hasher'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { dirname, join } from 'path'; -import { existsSync, readdirSync } from 'fs'; +import { existsSync } from 'fs'; import { getLockFileName } from '@nx/js'; import { SageMonorepoProjectConfiguration } from './project-configuration'; import { createPluginConfiguration, SageMonorepoPluginOptions } from './plugin-configuration'; import { buildProjectConfiguration } from './build-project-configuration'; import { ProjectConfigurationBuilderOptions } from './project-configuration-builder-options'; -import { inferProjectMetadata, inferProjectType } from './project-metadata'; +import { inferProjectMetadata } from './project-metadata'; function readProjectCOnfigurationsCache( cachePath: string, @@ -67,7 +67,6 @@ async function createNodesInternal( projectConfigurationsCache: Record, ) { const projectRoot = dirname(configFilePath); - const siblingFiles = readdirSync(join(context.workspaceRoot, projectRoot)); // Content of the project file const projectFileContent: ProjectConfiguration = readJsonFile(configFilePath); @@ -78,12 +77,6 @@ async function createNodesInternal( } // console.log(`projectName: ${projectName}`); - const projectType = inferProjectType(projectRoot); - // console.log(`projectType: ${projectType}`); - - const dockerized = projectType === 'application' && siblingFiles.includes('Dockerfile'); - // console.log(`dockerized: ${dockerized}`); - const projectMetadata = inferProjectMetadata(workspaceRoot, projectRoot, projectFileContent); // console.log(`projectMetadata: ${JSON.stringify(projectMetadata)}`); @@ -101,7 +94,6 @@ async function createNodesInternal( projectName, pluginConfig, projectMetadata, - dockerized, }; projectConfigurationsCache[hash] ??= await buildProjectConfiguration( projectConfigurationBuilderOptions, diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts index 394f688e9a..7799aadbb9 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/project-configuration-builder-options.ts @@ -6,5 +6,4 @@ export type ProjectConfigurationBuilderOptions = { projectName: string; pluginConfig: SageMonorepoPluginConfiguration; projectMetadata: ProjectMetadata; - dockerized?: boolean; }; diff --git a/libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts b/libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts index 3296b3311e..f6cdb19aa0 100644 --- a/libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts +++ b/libs/sage-monorepo/nx-plugin/src/plugins/project-metadata.ts @@ -2,18 +2,18 @@ import { ProjectConfiguration, ProjectType } from '@nx/devkit'; import { join } from 'path'; import { readdirSync } from 'fs'; -export type Builder = 'esbuild' | 'webpack' | 'gradle' | 'maven' | 'poetry' | null; +export type Builder = 'esbuild' | 'webpack' | 'gradle' | 'maven' | 'poetry'; // export type Linter = 'eslint' | 'pylint'; // export type TypeChecker = 'mypy' | 'pyright'; // export type TestingTool = 'pytest' | null; // export type Formatter = 'Black' | 'Prettier'; -// export type ContainerType = 'Docker' | 'Singularity'; +export type ContainerType = 'Docker' | 'Singularity'; // export type Language = 'python' | 'typescript' | 'javascript'; // export type Framework = 'Flask' | 'React' | 'Angular' | 'Vue' | null; export type ProjectMetadata = { projectType: ProjectType; - builder: Builder; + builder: Builder | null; // linter: Linter; // typeChecker: TypeChecker[]; // testing: { @@ -22,7 +22,7 @@ export type ProjectMetadata = { // e2e: TestingTool; // }; // formatter: Formatter; - // containerType: ContainerType; + containerType: ContainerType | null; // language: Language; // framework: Framework; }; @@ -36,10 +36,11 @@ export function inferProjectMetadata( return { projectType: inferProjectType(projectRoot), builder: inferBuilder(siblingFiles, localProjectConfiguration), + containerType: inferContainerType(siblingFiles), }; } -export function inferProjectType(projectRoot: string): ProjectType { +function inferProjectType(projectRoot: string): ProjectType { if (projectRoot.startsWith('apps/')) { return 'application'; } else if (projectRoot.startsWith('libs/')) { @@ -51,7 +52,7 @@ export function inferProjectType(projectRoot: string): ProjectType { function inferBuilder( siblingFiles: string[], localProjectConfiguration: ProjectConfiguration, -): Builder { +): Builder | null { if (siblingFiles.includes('poetry.lock')) return 'poetry'; if (siblingFiles.includes('build.gradle')) return 'gradle'; if ( @@ -62,3 +63,8 @@ function inferBuilder( } return null; } + +function inferContainerType(siblingFiles: string[]): ContainerType | null { + if (siblingFiles.includes('Dockerfile')) return 'Docker'; + return null; +} From ba2a1e9abf00325773728e36a394c497bbe75d0e Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Fri, 11 Oct 2024 14:41:35 +0000 Subject: [PATCH 9/9] remove `build-image` task from OC project.json --- apps/openchallenges/api-docs/project.json | 12 ------------ apps/openchallenges/api-gateway/project.json | 12 ------------ apps/openchallenges/app/project.json | 12 ------------ apps/openchallenges/challenge-service/project.json | 12 ------------ apps/openchallenges/config-server/project.json | 12 ------------ apps/openchallenges/edam-etl/project.json | 11 ----------- apps/openchallenges/elasticsearch/project.json | 11 ----------- apps/openchallenges/grafana/project.json | 11 ----------- apps/openchallenges/image-service/project.json | 12 ------------ apps/openchallenges/mariadb/project.json | 11 ----------- apps/openchallenges/mysqld-exporter/project.json | 11 ----------- .../openchallenges/organization-service/project.json | 12 ------------ apps/openchallenges/prometheus/project.json | 11 ----------- apps/openchallenges/service-registry/project.json | 12 ------------ apps/openchallenges/thumbor/project.json | 11 ----------- apps/openchallenges/zipkin/project.json | 11 ----------- 16 files changed, 184 deletions(-) diff --git a/apps/openchallenges/api-docs/project.json b/apps/openchallenges/api-docs/project.json index e8275b1966..7613d59951 100644 --- a/apps/openchallenges/api-docs/project.json +++ b/apps/openchallenges/api-docs/project.json @@ -31,18 +31,6 @@ "command": "docker/openchallenges/serve-detach.sh openchallenges-api-docs" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/api-docs", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-api-docs"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/api-gateway/project.json b/apps/openchallenges/api-gateway/project.json index 4efd0fe3fe..87e6b9ef8d 100644 --- a/apps/openchallenges/api-gateway/project.json +++ b/apps/openchallenges/api-gateway/project.json @@ -67,18 +67,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/api-gateway", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-api-gateway"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/app/project.json b/apps/openchallenges/app/project.json index e0645032c1..9def3c471b 100644 --- a/apps/openchallenges/app/project.json +++ b/apps/openchallenges/app/project.json @@ -132,18 +132,6 @@ "jestConfig": "apps/openchallenges/app/jest.config.ts" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": ".", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-app"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["server"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/challenge-service/project.json b/apps/openchallenges/challenge-service/project.json index 9754524c1c..061930b37d 100644 --- a/apps/openchallenges/challenge-service/project.json +++ b/apps/openchallenges/challenge-service/project.json @@ -75,18 +75,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/challenge-service", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "context": "apps/openchallenges/challenge-service", diff --git a/apps/openchallenges/config-server/project.json b/apps/openchallenges/config-server/project.json index 0471888812..c347d4527d 100644 --- a/apps/openchallenges/config-server/project.json +++ b/apps/openchallenges/config-server/project.json @@ -67,18 +67,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/config-server", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-config-server"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/edam-etl/project.json b/apps/openchallenges/edam-etl/project.json index ee5d8f735c..576ae515ed 100644 --- a/apps/openchallenges/edam-etl/project.json +++ b/apps/openchallenges/edam-etl/project.json @@ -31,17 +31,6 @@ "command": "docker/openchallenges/serve-detach.sh {projectName}" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "{projectRoot}", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/elasticsearch/project.json b/apps/openchallenges/elasticsearch/project.json index 79794b2498..7b24303d61 100644 --- a/apps/openchallenges/elasticsearch/project.json +++ b/apps/openchallenges/elasticsearch/project.json @@ -18,17 +18,6 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/elasticsearch", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-elasticsearch"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/grafana/project.json b/apps/openchallenges/grafana/project.json index 9026145ffd..308685e57c 100644 --- a/apps/openchallenges/grafana/project.json +++ b/apps/openchallenges/grafana/project.json @@ -21,17 +21,6 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/grafana", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-grafana"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/image-service/project.json b/apps/openchallenges/image-service/project.json index 406563127d..519241650f 100644 --- a/apps/openchallenges/image-service/project.json +++ b/apps/openchallenges/image-service/project.json @@ -75,18 +75,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/image-service", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-image-service"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/mariadb/project.json b/apps/openchallenges/mariadb/project.json index 0043c01d64..0aadd5c90c 100644 --- a/apps/openchallenges/mariadb/project.json +++ b/apps/openchallenges/mariadb/project.json @@ -16,17 +16,6 @@ "command": "docker/openchallenges/serve-detach.sh {projectName}" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "{projectRoot}", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/mysqld-exporter/project.json b/apps/openchallenges/mysqld-exporter/project.json index 7bc082a518..a71a31ecce 100644 --- a/apps/openchallenges/mysqld-exporter/project.json +++ b/apps/openchallenges/mysqld-exporter/project.json @@ -18,17 +18,6 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/mysqld-exporter", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-mysqld-exporter"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/organization-service/project.json b/apps/openchallenges/organization-service/project.json index 0ccd51bff7..2936b44d73 100644 --- a/apps/openchallenges/organization-service/project.json +++ b/apps/openchallenges/organization-service/project.json @@ -75,18 +75,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "{projectRoot}", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/{projectName}"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/prometheus/project.json b/apps/openchallenges/prometheus/project.json index e7e8960398..f6f0d4fd06 100644 --- a/apps/openchallenges/prometheus/project.json +++ b/apps/openchallenges/prometheus/project.json @@ -18,17 +18,6 @@ }, "dependsOn": [] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/prometheus", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-prometheus"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/service-registry/project.json b/apps/openchallenges/service-registry/project.json index 616ff987ce..bd63175724 100644 --- a/apps/openchallenges/service-registry/project.json +++ b/apps/openchallenges/service-registry/project.json @@ -67,18 +67,6 @@ }, "dependsOn": ["^install"] }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/service-registry", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-service-registry"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - }, - "dependsOn": ["build-image-base"] - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/thumbor/project.json b/apps/openchallenges/thumbor/project.json index e5205c804d..1a18cc5d97 100644 --- a/apps/openchallenges/thumbor/project.json +++ b/apps/openchallenges/thumbor/project.json @@ -17,17 +17,6 @@ "command": "docker/openchallenges/serve-detach.sh openchallenges-thumbor" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/thumbor", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-thumbor"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": { diff --git a/apps/openchallenges/zipkin/project.json b/apps/openchallenges/zipkin/project.json index 60d9266c88..ea798d0ad3 100644 --- a/apps/openchallenges/zipkin/project.json +++ b/apps/openchallenges/zipkin/project.json @@ -17,17 +17,6 @@ "command": "docker/openchallenges/serve-detach.sh openchallenges-zipkin" } }, - "build-image": { - "executor": "@nx-tools/nx-container:build", - "options": { - "context": "apps/openchallenges/zipkin", - "metadata": { - "images": ["ghcr.io/sage-bionetworks/openchallenges-zipkin"], - "tags": ["type=edge,branch=main", "type=raw,value=local", "type=sha"] - }, - "push": false - } - }, "publish-image": { "executor": "@nx-tools/nx-container:build", "options": {