Merge branch 'main' into mrgrain/s3-publish

Author: mrgrain

.github/workflows/release.yml

@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { yarn, CdkCliIntegTestsWorkflow } from 'cdklabs-projen-project-types';
 import * as pj from 'projen';
 import { Stability } from 'projen/lib/cdk';
@@ -143,6 +144,13 @@ function jestOptionsForProject(options: pj.javascript.JestOptions): pj.javascrip
   };
 }
 
+function transitiveFeaturesAndFixes(thisPkg: string, depPkgs: string[]) {
+  return pj.ReleasableCommits.featuresAndFixes([
+    '.',
+    ...depPkgs.map(p => path.relative(`packages/${thisPkg}`, `packages/${p}`)),
+  ].join(' '));
+}
+
 const repoProject = new yarn.Monorepo({
   projenrcTs: true,
   name: 'aws-cdk-cli',
@@ -217,8 +225,6 @@ const repoProject = new yarn.Monorepo({
   },
 });
 
-new AdcPublishing(repoProject);
-
 // Eslint for projen config
 // @ts-ignore
 repoProject.eslint = new pj.javascript.Eslint(repoProject, {
@@ -228,6 +234,12 @@ repoProject.eslint = new pj.javascript.Eslint(repoProject, {
   fileExtensions: ['.ts', '.tsx'],
   lintProjenRc: false,
 });
+// always lint projen files as part of the build
+if (repoProject.eslint?.eslintTask) {
+  repoProject.tasks.tryFind('build')?.spawn(repoProject.eslint?.eslintTask);
+}
+
+new AdcPublishing(repoProject);
 
 const repo = configureProject(repoProject);
 
@@ -792,6 +804,8 @@ 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]),
   }),
 );
 
@@ -924,8 +938,7 @@ const cliLib = configureProject(
     devDeps: ['aws-cdk-lib', cli, 'constructs'],
     disableTsconfig: true,
     nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson} append:-alpha.0`,
-    // Watch 2 directories at once
-    releasableCommits: pj.ReleasableCommits.featuresAndFixes(`. ../../${cli.name}`),
+    releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/cli-lib-alpha', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]),
     eslintOptions: {
       dirs: ['lib'],
       ignorePatterns: [
@@ -1007,9 +1020,7 @@ const TOOLKIT_LIB_EXCLUDE_PATTERNS = [
 
 const toolkitLib = configureProject(
   new yarn.TypeScriptWorkspace({
-    ...genericCdkProps({
-      private: true,
-    }),
+    ...genericCdkProps(),
     parent: repo,
     name: '@aws-cdk/toolkit-lib',
     description: 'AWS CDK Programmatic Toolkit Library',
@@ -1082,7 +1093,7 @@ const toolkitLib = configureProject(
       'typedoc',
     ],
     // Watch 2 directories at once
-    releasableCommits: pj.ReleasableCommits.featuresAndFixes(`. ../../${cli.name}`),
+    releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/toolkit-lib', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]),
     eslintOptions: {
       dirs: ['lib'],
       ignorePatterns: [
@@ -1218,8 +1229,7 @@ const cdkCliWrapper = configureProject(
     srcdir: 'lib',
     devDeps: ['aws-cdk-lib', cli, 'constructs', '@aws-cdk/integ-runner'],
     nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson}`,
-    // Watch 2 directories at once
-    releasableCommits: pj.ReleasableCommits.featuresAndFixes(`. ../../${cli.name}`),
+    releasableCommits: transitiveFeaturesAndFixes('@aws-cdk/cdk-cli-wrapper', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]),
 
     jestOptions: jestOptionsForProject({
       jestConfig: {
@@ -1249,8 +1259,7 @@ const cdkAliasPackage = configureProject(
     srcdir: 'lib',
     deps: [cli],
     nextVersionCommand: `tsx ../../projenrc/next-version.ts copyVersion:../../${cliPackageJson}`,
-    // Watch 2 directories at once
-    releasableCommits: pj.ReleasableCommits.featuresAndFixes(`. ../${cli.name}`),
+    releasableCommits: transitiveFeaturesAndFixes('cdk', [cli.name, cloudAssemblySchema.name, cloudFormationDiff.name]),
   }),
 );
 void cdkAliasPackage;

.projen/tasks.json

@@ -27,7 +27,7 @@ export class StackAssembly extends CloudAssembly implements ICloudAssemblySource
       throw new ToolkitError('This app contains no stacks');
     }
 
-    const extend = convertExtend(selector.extend);
+    const extend = expandToExtendEnum(selector.expand);
     const patterns = sanitizePatterns(selector.patterns ?? []);
 
     switch (selector.strategy) {
@@ -94,7 +94,7 @@ export class StackAssembly extends CloudAssembly implements ICloudAssemblySource
   }
 }
 
-function convertExtend(extend?: ExpandStackSelection): CliExtendedStackSelection | undefined {
+function expandToExtendEnum(extend?: ExpandStackSelection): CliExtendedStackSelection | undefined {
   switch (extend) {
     case ExpandStackSelection.DOWNSTREAM:
       return CliExtendedStackSelection.Downstream;

.projenrc.ts

@@ -82,10 +82,10 @@ export interface StackSelector {
   patterns?: string[];
 
   /**
-   * Extend the selection to upstream/downstream stacks.
-   * @default ExtendedStackSelection.None only select the specified/matched stacks
+   * Expand the selection to upstream/downstream stacks.
+   * @default ExpandStackSelection.None only select the specified/matched stacks
    */
-  extend?: ExpandStackSelection;
+  expand?: ExpandStackSelection;
 
   /**
    * By default, we throw an exception if the assembly contains no stacks.