From 2ca8fcbc2f18aa12343222e1b810e807bd949e5b Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 28 Feb 2025 09:46:08 +0000 Subject: [PATCH] chore: setup @aws-cdk/tmp-toolkit-helpers as a package to temporarily hold code shared between Toolkit CLI and Library --- .projenrc.ts | 52 +++++++++++++++++-- aws-cdk-cli.code-workspace | 3 ++ package.json | 4 +- .../@aws-cdk/cli-lib-alpha/.projen/tasks.json | 4 +- .../@aws-cdk/toolkit-lib/.projen/deps.json | 4 ++ .../@aws-cdk/toolkit-lib/.projen/tasks.json | 6 +-- packages/@aws-cdk/toolkit-lib/package.json | 1 + .../@aws-cdk/toolkit-lib/tsconfig.dev.json | 3 ++ packages/@aws-cdk/toolkit-lib/tsconfig.json | 3 ++ packages/aws-cdk/.projen/deps.json | 4 ++ packages/aws-cdk/.projen/tasks.json | 6 +-- packages/aws-cdk/package.json | 1 + packages/aws-cdk/tsconfig.dev.json | 3 ++ packages/aws-cdk/tsconfig.json | 3 ++ packages/cdk/.projen/tasks.json | 4 +- tsconfig.dev.json | 3 ++ tsconfig.json | 3 ++ yarn.lock | 16 ++---- 18 files changed, 96 insertions(+), 27 deletions(-) diff --git a/.projenrc.ts b/.projenrc.ts index 9ddf8156..b3aebeca 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -156,6 +156,21 @@ function transitiveFeaturesAndFixes(thisPkg: string, depPkgs: string[]) { ].join(' ')); } +/** + * Returns all packages that are considered part of the toolkit, + * as relative paths from the provided package. + */ +function transitiveToolkitPackages(thisPkg: string) { + const toolkitPackages = [ + 'aws-cdk', + '@aws-cdk/tmp-toolkit-helpers', + '@aws-cdk/cloud-assembly-schema', + '@aws-cdk/cloudformation-diff', + ]; + + return transitiveFeaturesAndFixes(thisPkg, toolkitPackages.filter(name => name !== thisPkg)); +} + const repoProject = new yarn.Monorepo({ projenrcTs: true, name: 'aws-cdk-cli', @@ -669,6 +684,31 @@ cdkAssets.eslint?.addRules({ 'jest/no-export': ['off'] }); ////////////////////////////////////////////////////////////////////// +const tmpToolkitHelpers = configureProject( + new yarn.TypeScriptWorkspace({ + ...genericCdkProps({ + private: true, + }), + parent: repo, + name: '@aws-cdk/tmp-toolkit-helpers', + description: 'A temporary package to hold code shared between aws-cdk and @aws-cdk/toolkit-lib', + deps: [], + devDeps: [ + cdkBuildTools, + ], + tsconfig: { + compilerOptions: { + target: 'es2022', + lib: ['es2022', 'esnext.disposable'], + module: 'NodeNext', + esModuleInterop: false, + }, + }, + }), +); + +////////////////////////////////////////////////////////////////////// + let CLI_SDK_VERSION: '2' | '3' = ('3' as any); const cli = configureProject( @@ -684,6 +724,7 @@ const cli = configureProject( cdkBuildTools, yargsGen, cliPluginContract, + tmpToolkitHelpers, '@octokit/rest', '@types/archiver', '@types/fs-extra@^9', @@ -827,7 +868,7 @@ const cli = configureProject( // Append a specific version string for testing nextVersionCommand: 'tsx ../../projenrc/next-version.ts maybeRc', - releasableCommits: transitiveFeaturesAndFixes('aws-cdk', [cloudAssemblySchema.name, cloudFormationDiff.name]), + releasableCommits: transitiveToolkitPackages('aws-cdk'), }), ); @@ -963,7 +1004,7 @@ const cliLib = configureProject( devDeps: ['aws-cdk-lib', cli, 'constructs'], disableTsconfig: true, nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson} append:-alpha.0`, - releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/cli-lib-alpha', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]), + releasableCommits: transitiveToolkitPackages('@aws-cdk/cli-lib-alpha'), eslintOptions: { dirs: ['lib'], ignorePatterns: [ @@ -1119,13 +1160,14 @@ const toolkitLib = configureProject( '@types/fs-extra', '@types/split2', cli, + tmpToolkitHelpers, 'aws-cdk-lib', 'aws-sdk-client-mock', 'esbuild', 'typedoc', ], // Watch 2 directories at once - releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/toolkit-lib', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]), + releasableCommits: transitiveToolkitPackages('@aws-cdk/toolkit-lib'), eslintOptions: { dirs: ['lib'], ignorePatterns: [ @@ -1266,7 +1308,7 @@ const cdkCliWrapper = configureProject( srcdir: 'lib', devDeps: ['aws-cdk-lib', cli, 'constructs', '@aws-cdk/integ-runner'], nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson}`, - releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/cdk-cli-wrapper', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]), + releasableCommits: transitiveToolkitPackages('@aws-cdk/cdk-cli-wrapper'), jestOptions: jestOptionsForProject({ jestConfig: { @@ -1296,7 +1338,7 @@ const cdkAliasPackage = configureProject( srcdir: 'lib', deps: [cli], nextVersionCommand: `tsx ../../projenrc/next-version.ts copyVersion:../../${cliPackageJson}`, - releasableCommits: transitiveFeaturesAndFixes('cdk', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]), + releasableCommits: transitiveToolkitPackages('cdk'), }), ); void cdkAliasPackage; diff --git a/aws-cdk-cli.code-workspace b/aws-cdk-cli.code-workspace index 15ad8a73..acae91b7 100644 --- a/aws-cdk-cli.code-workspace +++ b/aws-cdk-cli.code-workspace @@ -26,6 +26,9 @@ { "path": "packages/@aws-cdk/node-bundle" }, + { + "path": "packages/@aws-cdk/tmp-toolkit-helpers" + }, { "path": "packages/@aws-cdk/toolkit-lib" }, diff --git a/package.json b/package.json index 8f7df4a3..eed7912f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@aws-sdk/credential-providers": "3.741", "@aws-sdk/lib-storage": "3.741", "@cdklabs/eslint-plugin": "^1.3.2", - "@stylistic/eslint-plugin": "^2.13.0", + "@stylistic/eslint-plugin": "^3.1.0", "@types/node": "^22.13.5", "@typescript-eslint/eslint-plugin": "^8", "@typescript-eslint/parser": "^8", @@ -66,6 +66,7 @@ "packages/@aws-cdk/cdk-build-tools", "packages/@aws-cdk/cli-plugin-contract", "packages/cdk-assets", + "packages/@aws-cdk/tmp-toolkit-helpers", "packages/aws-cdk", "packages/@aws-cdk/cli-lib-alpha", "packages/@aws-cdk/toolkit-lib", @@ -89,6 +90,7 @@ "/packages/@aws-cdk/cdk-build-tools", "/packages/@aws-cdk/cli-plugin-contract", "/packages/cdk-assets", + "/packages/@aws-cdk/tmp-toolkit-helpers", "/packages/aws-cdk", "/packages/@aws-cdk/cli-lib-alpha", "/packages/@aws-cdk/toolkit-lib", diff --git a/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json b/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json index 9b4551a3..68719d7c 100644 --- a/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json +++ b/packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json @@ -33,7 +33,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../../projenrc/next-version.ts copyVersion:../../../packages/aws-cdk/package.json append:-alpha.0", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../cloud-assembly-schema ../cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../tmp-toolkit-helpers ../cloud-assembly-schema ../cloudformation-diff" }, "steps": [ { @@ -299,7 +299,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../../projenrc/next-version.ts copyVersion:../../../packages/aws-cdk/package.json append:-alpha.0", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../cloud-assembly-schema ../cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../tmp-toolkit-helpers ../cloud-assembly-schema ../cloudformation-diff" }, "steps": [ { diff --git a/packages/@aws-cdk/toolkit-lib/.projen/deps.json b/packages/@aws-cdk/toolkit-lib/.projen/deps.json index 91cc3e33..370f12f9 100644 --- a/packages/@aws-cdk/toolkit-lib/.projen/deps.json +++ b/packages/@aws-cdk/toolkit-lib/.projen/deps.json @@ -4,6 +4,10 @@ "name": "@aws-cdk/cdk-build-tools", "type": "build" }, + { + "name": "@aws-cdk/tmp-toolkit-helpers", + "type": "build" + }, { "name": "@cdklabs/eslint-plugin", "type": "build" diff --git a/packages/@aws-cdk/toolkit-lib/.projen/tasks.json b/packages/@aws-cdk/toolkit-lib/.projen/tasks.json index 8f6490f2..90245fbb 100644 --- a/packages/@aws-cdk/toolkit-lib/.projen/tasks.json +++ b/packages/@aws-cdk/toolkit-lib/.projen/tasks.json @@ -32,7 +32,7 @@ "RELEASE_TAG_PREFIX": "@aws-cdk/toolkit-lib@", "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../cloud-assembly-schema ../cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../tmp-toolkit-helpers ../cloud-assembly-schema ../cloudformation-diff" }, "steps": [ { @@ -109,7 +109,7 @@ "name": "gather-versions", "steps": [ { - "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" @aws-cdk/toolkit-lib MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/cdk-build-tools cdk-assets aws-cdk", + "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" @aws-cdk/toolkit-lib MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/cdk-build-tools cdk-assets @aws-cdk/tmp-toolkit-helpers aws-cdk", "receiveArgs": true } ] @@ -235,7 +235,7 @@ "RELEASE_TAG_PREFIX": "@aws-cdk/toolkit-lib@", "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../cloud-assembly-schema ../cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../../aws-cdk ../tmp-toolkit-helpers ../cloud-assembly-schema ../cloudformation-diff" }, "steps": [ { diff --git a/packages/@aws-cdk/toolkit-lib/package.json b/packages/@aws-cdk/toolkit-lib/package.json index 885e9203..50af4210 100644 --- a/packages/@aws-cdk/toolkit-lib/package.json +++ b/packages/@aws-cdk/toolkit-lib/package.json @@ -34,6 +34,7 @@ }, "devDependencies": { "@aws-cdk/cdk-build-tools": "^0.0.0", + "@aws-cdk/tmp-toolkit-helpers": "^0.0.0", "@cdklabs/eslint-plugin": "^1.3.2", "@smithy/types": "^4.1.0", "@stylistic/eslint-plugin": "^3.1.0", diff --git a/packages/@aws-cdk/toolkit-lib/tsconfig.dev.json b/packages/@aws-cdk/toolkit-lib/tsconfig.dev.json index 639bf305..49a6cf38 100644 --- a/packages/@aws-cdk/toolkit-lib/tsconfig.dev.json +++ b/packages/@aws-cdk/toolkit-lib/tsconfig.dev.json @@ -51,6 +51,9 @@ }, { "path": "../../aws-cdk" + }, + { + "path": "../tmp-toolkit-helpers" } ] } diff --git a/packages/@aws-cdk/toolkit-lib/tsconfig.json b/packages/@aws-cdk/toolkit-lib/tsconfig.json index 81b21551..0b63f963 100644 --- a/packages/@aws-cdk/toolkit-lib/tsconfig.json +++ b/packages/@aws-cdk/toolkit-lib/tsconfig.json @@ -48,6 +48,9 @@ }, { "path": "../../aws-cdk" + }, + { + "path": "../tmp-toolkit-helpers" } ] } diff --git a/packages/aws-cdk/.projen/deps.json b/packages/aws-cdk/.projen/deps.json index f904a0ce..d55dc0d9 100644 --- a/packages/aws-cdk/.projen/deps.json +++ b/packages/aws-cdk/.projen/deps.json @@ -12,6 +12,10 @@ "name": "@aws-cdk/node-bundle", "type": "build" }, + { + "name": "@aws-cdk/tmp-toolkit-helpers", + "type": "build" + }, { "name": "@aws-cdk/user-input-gen", "type": "build" diff --git a/packages/aws-cdk/.projen/tasks.json b/packages/aws-cdk/.projen/tasks.json index c1c93d53..9b84b987 100644 --- a/packages/aws-cdk/.projen/tasks.json +++ b/packages/aws-cdk/.projen/tasks.json @@ -33,7 +33,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../projenrc/next-version.ts maybeRc", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../@aws-cdk/tmp-toolkit-helpers ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" }, "steps": [ { @@ -101,7 +101,7 @@ "name": "gather-versions", "steps": [ { - "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" aws-cdk MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/yarn-cling @aws-cdk/user-input-gen @aws-cdk/node-bundle @aws-cdk/cdk-build-tools @aws-cdk/cli-plugin-contract cdk-assets", + "exec": "node -e \"require(path.join(path.dirname(require.resolve('cdklabs-projen-project-types')), 'yarn', 'gather-versions.exec.js'))\" aws-cdk MAJOR --deps @aws-cdk/cloud-assembly-schema @aws-cdk/cloudformation-diff @aws-cdk/yarn-cling @aws-cdk/user-input-gen @aws-cdk/node-bundle @aws-cdk/cdk-build-tools @aws-cdk/cli-plugin-contract cdk-assets @aws-cdk/tmp-toolkit-helpers", "receiveArgs": true } ] @@ -209,7 +209,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../projenrc/next-version.ts maybeRc", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../@aws-cdk/tmp-toolkit-helpers ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" }, "steps": [ { diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index 367494fb..afedce13 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -37,6 +37,7 @@ "@aws-cdk/cdk-build-tools": "^0.0.0", "@aws-cdk/cli-plugin-contract": "^0.0.0", "@aws-cdk/node-bundle": "^0.0.0", + "@aws-cdk/tmp-toolkit-helpers": "^0.0.0", "@aws-cdk/user-input-gen": "^0.0.0", "@aws-cdk/yarn-cling": "^0.0.0", "@cdklabs/eslint-plugin": "^1.3.2", diff --git a/packages/aws-cdk/tsconfig.dev.json b/packages/aws-cdk/tsconfig.dev.json index 97f85d9d..870390ac 100644 --- a/packages/aws-cdk/tsconfig.dev.json +++ b/packages/aws-cdk/tsconfig.dev.json @@ -62,6 +62,9 @@ }, { "path": "../@aws-cdk/cli-plugin-contract" + }, + { + "path": "../@aws-cdk/tmp-toolkit-helpers" } ] } diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json index 70a76b17..5a43d097 100644 --- a/packages/aws-cdk/tsconfig.json +++ b/packages/aws-cdk/tsconfig.json @@ -61,6 +61,9 @@ }, { "path": "../@aws-cdk/cli-plugin-contract" + }, + { + "path": "../@aws-cdk/tmp-toolkit-helpers" } ] } diff --git a/packages/cdk/.projen/tasks.json b/packages/cdk/.projen/tasks.json index 9ad34ce9..0d0cab3e 100644 --- a/packages/cdk/.projen/tasks.json +++ b/packages/cdk/.projen/tasks.json @@ -33,7 +33,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../projenrc/next-version.ts copyVersion:../../packages/aws-cdk/package.json", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../aws-cdk ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../aws-cdk ../@aws-cdk/tmp-toolkit-helpers ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" }, "steps": [ { @@ -192,7 +192,7 @@ "VERSIONRCOPTIONS": "{\"path\":\".\"}", "BUMP_PACKAGE": "commit-and-tag-version@^12", "NEXT_VERSION_COMMAND": "tsx ../../projenrc/next-version.ts copyVersion:../../packages/aws-cdk/package.json", - "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../aws-cdk ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" + "RELEASABLE_COMMITS": "git log --no-merges --oneline $LATEST_TAG..HEAD -E --grep \"^(feat|fix){1}(\\([^()[:space:]]+\\))?(!)?:[[:blank:]]+.+\" -- . ../aws-cdk ../@aws-cdk/tmp-toolkit-helpers ../@aws-cdk/cloud-assembly-schema ../@aws-cdk/cloudformation-diff" }, "steps": [ { diff --git a/tsconfig.dev.json b/tsconfig.dev.json index 21d106db..393d79ec 100644 --- a/tsconfig.dev.json +++ b/tsconfig.dev.json @@ -57,6 +57,9 @@ { "path": "packages/cdk-assets" }, + { + "path": "packages/@aws-cdk/tmp-toolkit-helpers" + }, { "path": "packages/aws-cdk" }, diff --git a/tsconfig.json b/tsconfig.json index e585685f..9840db28 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -54,6 +54,9 @@ { "path": "packages/cdk-assets" }, + { + "path": "packages/@aws-cdk/tmp-toolkit-helpers" + }, { "path": "packages/aws-cdk" }, diff --git a/yarn.lock b/yarn.lock index 3cef79fe..3de4ffa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3667,17 +3667,6 @@ "@smithy/types" "^4.1.0" tslib "^2.6.2" -"@stylistic/eslint-plugin@^2.13.0": - version "2.13.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-2.13.0.tgz#53bf175dac8c1ec055b370a6ff77d491cae9a70d" - integrity sha512-RnO1SaiCFHn666wNz2QfZEFxvmiNRqhzaMXHXxXXKt+MEP7aajlPxUSMIQpKAaJfverpovEYqjBOXDq6dDcaOQ== - dependencies: - "@typescript-eslint/utils" "^8.13.0" - eslint-visitor-keys "^4.2.0" - espree "^10.3.0" - estraverse "^5.3.0" - picomatch "^4.0.2" - "@stylistic/eslint-plugin@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-3.1.0.tgz#a9f655c518f76bfc5feb46b467d0f06e511b289d" @@ -6101,6 +6090,11 @@ eslint-config-prettier@^10.0.1: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz#fbb03bfc8db0651df9ce4e8b7150d11c5fe3addf" integrity sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw== +eslint-config-prettier@^10.0.2: + version "10.0.2" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz#47444de8aa104ce82c2f91ad2a5e96b62c01e20d" + integrity sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg== + eslint-import-resolver-node@^0.3.9: version "0.3.9" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"