chore: ensure correct major version for some more packages (#670)

Definitely keeping the following additional packages on the current
major version:

```
@aws-cdk/cli-plugin-contract
@aws-cdk/cloudformation-diff
@aws-cdk/integ-runner
```


---
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license

Author: mrgrain

.projenrc.ts

@@ -17,6 +17,8 @@ import { RecordPublishingTimestamp } from './projenrc/record-publishing-timestam
 import { DocType, S3DocsPublishing } from './projenrc/s3-docs-publishing';
 import { TypecheckTests } from './projenrc/TypecheckTests';
 
+// #region shared config
+
 // 5.7 sometimes gives a weird error in `ts-jest` in `@aws-cdk/cli-lib-alpha`
 // https://github.com/microsoft/TypeScript/issues/60159
 const TYPESCRIPT_VERSION = '5.6';
@@ -97,10 +99,6 @@ function configureProject<A extends pj.typescript.TypeScriptProject>(x: A): A {
 
 const POWERFUL_RUNNER = 'aws-cdk_ubuntu-latest_16-core';
 
-const workflowRunsOn = [
-  POWERFUL_RUNNER,
-];
-
 // Ignore patterns that apply both to the CLI and to cli-lib
 const ADDITIONAL_CLI_IGNORE_PATTERNS = [
   'db.json.gz',
@@ -203,6 +201,10 @@ function transitiveToolkitPackages(thisPkg: string) {
   return transitiveFeaturesAndFixes(thisPkg, toolkitPackages.filter(name => name !== thisPkg));
 }
 
+// #endregion
+//////////////////////////////////////////////////////////////////////
+// #region Monorepo
+
 const repoProject = new yarn.Monorepo({
   projenrcTs: true,
   name: 'aws-cdk-cli',
@@ -232,7 +234,7 @@ const repoProject = new yarn.Monorepo({
   },
 
   workflowNodeVersion: 'lts/*',
-  workflowRunsOn,
+  workflowRunsOn: [POWERFUL_RUNNER],
   gitignore: ['.DS_Store', '.tools'],
 
   autoApproveUpgrades: true,
@@ -367,7 +369,9 @@ function genericCdkProps(props: GenericProps = {}) {
   } satisfies Partial<yarn.TypeScriptWorkspaceOptions>;
 }
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cloud-assembly-schema
 
 const cloudAssemblySchema = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -438,14 +442,17 @@ new JsiiBuild(cloudAssemblySchema, {
   cloudAssemblySchema.addPackageIgnore('**/scripts');
 })();
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cloudformation-diff
 
 const cloudFormationDiff = configureProject(
   new yarn.TypeScriptWorkspace({
     ...genericCdkProps(),
     parent: repo,
     name: '@aws-cdk/cloudformation-diff',
     description: 'Utilities to diff CDK stacks against CloudFormation templates',
+    majorVersion: 2,
     srcdir: 'lib',
     devDeps: [
       'fast-check',
@@ -483,7 +490,9 @@ const cloudFormationDiff = configureProject(
   }),
 );
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cx-api
 
 // cx-api currently is generated from `aws-cdk-lib` at build time. Not breaking
 // this dependency right now.
@@ -520,7 +529,9 @@ const cxApi = overrideEslint(
 );
 */
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/yarn-cling
 
 const yarnCling = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -550,7 +561,9 @@ const yarnCling = configureProject(
 );
 yarnCling.testTask.prependExec('ln -sf ../../cdk test/test-fixture/jsii/node_modules/');
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/user-input-gen
 
 const yargsGen = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -572,7 +585,9 @@ const yargsGen = configureProject(
   }),
 );
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cli-plugin-contract
 
 // This should be deprecated, but only after the move
 const cliPluginContract = configureProject(
@@ -581,6 +596,7 @@ const cliPluginContract = configureProject(
     parent: repo,
     name: '@aws-cdk/cli-plugin-contract',
     description: 'Contract between the CLI and authentication plugins, for the exchange of AWS credentials',
+    majorVersion: 2,
     srcdir: 'lib',
     deps: [
     ],
@@ -594,7 +610,9 @@ const cliPluginContract = configureProject(
   }),
 );
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cdk-assets-lib
 
 const cdkAssetsLib = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -676,14 +694,17 @@ cdkAssetsLib.gitignore.addPatterns(
 // This package happens do something only slightly naughty
 cdkAssetsLib.eslint?.addRules({ 'jest/no-export': ['off'] });
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region cdk-assets
 
 const cdkAssetsCli = configureProject(
   new yarn.TypeScriptWorkspace({
     ...genericCdkProps(),
     parent: repo,
     name: 'cdk-assets',
     description: 'CDK Asset Publishing Tool',
+    majorVersion: 4,
     srcdir: 'lib',
     deps: [
       cdkAssetsLib,
@@ -710,7 +731,6 @@ const cdkAssetsCli = configureProject(
       },
       include: ['bin/**/*.ts'],
     },
-    majorVersion: 4,
 
     jestOptions: jestOptionsForProject({
       jestConfig: {
@@ -743,7 +763,9 @@ new BundleCli(cdkAssetsCli, {
   minifyWhitespace: true,
 });
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/toolkit-lib
 
 const TOOLKIT_LIB_EXCLUDE_PATTERNS = [
   'lib/init-templates/*/typescript/*/*.template.ts',
@@ -763,6 +785,7 @@ const toolkitLib = configureProject(
     parent: repo,
     name: '@aws-cdk/toolkit-lib',
     description: 'AWS CDK Programmatic Toolkit Library',
+    majorVersion: 1,
     srcdir: 'lib',
     peerDeps: [
       cliPluginContract.customizeReference({ versionType: 'any-minor' }), // allow consumers to easily de-depulicate this
@@ -868,7 +891,6 @@ const toolkitLib = configureProject(
         rootDir: '.', // shouldn't be required but something broke... check again once we have gotten rid of the tmpToolkitHelpers package
       },
     },
-    majorVersion: 1,
     nextVersionCommand: 'tsx ../../../projenrc/next-version.ts maybeRc',
   }),
 );
@@ -1045,14 +1067,17 @@ toolkitLib.addTask('publish-local', {
   receiveArgs: true,
 });
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region aws-cdk
 
 const cli = configureProject(
   new yarn.TypeScriptWorkspace({
     ...genericCdkProps(),
     parent: repo,
     name: 'aws-cdk',
     description: 'AWS CDK CLI, the command line tool for CDK apps',
+    majorVersion: 2,
     srcdir: 'lib',
     devDeps: [
       yargsGen,
@@ -1189,7 +1214,6 @@ const cli = configureProject(
     nextVersionCommand: 'tsx ../../projenrc/next-version.ts neverMajor maybeRc',
 
     releasableCommits: transitiveToolkitPackages('aws-cdk'),
-    majorVersion: 2,
   }),
 );
 
@@ -1303,7 +1327,9 @@ for (const tsconfig of [cli.tsconfig, cli.tsconfigDev]) {
   tsconfig?.addExclude('vendor/**/*');
 }
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cli-lib-alpha
 
 const CLI_LIB_EXCLUDE_PATTERNS = [
   'lib/init-templates/*/typescript/*/*.template.ts',
@@ -1316,12 +1342,12 @@ const cliLibAlpha = configureProject(
     name: '@aws-cdk/cli-lib-alpha',
     entrypoint: 'lib/main.js', // Bundled entrypoint
     description: 'AWS CDK Programmatic CLI library',
+    majorVersion: 2,
     srcdir: 'lib',
     devDeps: ['aws-cdk-lib', cli.customizeReference({ versionType: 'exact' }), 'constructs'],
     disableTsconfig: true,
     nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson} append:-alpha.0`,
     releasableCommits: transitiveToolkitPackages('@aws-cdk/cli-lib-alpha'),
-    majorVersion: 2,
     eslintOptions: {
       dirs: ['lib'],
       ignorePatterns: [
@@ -1411,7 +1437,9 @@ for (const tsconfig of [cliLibAlpha.tsconfigDev]) {
   }
 }
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/cdk-cli-wrapper
 
 const cdkCliWrapper = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -1453,7 +1481,9 @@ const cdkCliWrapper = configureProject(
 })();
 */
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region cdk
 
 const cdkAliasPackage = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -1475,14 +1505,17 @@ const cdkAliasPackage = configureProject(
 );
 void cdkAliasPackage;
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk/integ-runner
 
 const integRunner = configureProject(
   new yarn.TypeScriptWorkspace({
     ...genericCdkProps(),
     parent: repo,
     name: '@aws-cdk/integ-runner',
     description: 'CDK Integration Testing Tool',
+    majorVersion: 2,
     srcdir: 'lib',
     deps: [
       cloudAssemblySchema.customizeReference({ versionType: 'any-future' }),
@@ -1566,7 +1599,9 @@ new BundleCli(integRunner, {
   minifyWhitespace: true,
 });
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region @aws-cdk-testing/cli-integ
 
 const cliInteg = configureProject(
   new yarn.TypeScriptWorkspace({
@@ -1675,7 +1710,9 @@ cliInteg.npmignore?.addPatterns('!resources/**/*');
 cliInteg.postCompileTask.exec('yarn-cling');
 cliInteg.gitignore.addPatterns('npm-shrinkwrap.json');
 
+// #endregion
 //////////////////////////////////////////////////////////////////////
+// #region shared setup
 
 // The pj.github.Dependabot component is only for a single Node project,
 // but we need multiple non-Node projects
@@ -1778,3 +1815,5 @@ repoProject.github?.tryFindWorkflow('pull-request-lint')?.file?.patch(
 );
 
 repo.synth();
+
+// #endregion