Merge branch 'main' into conroy/link

Author: mrgrain

.github/workflows/release.yml

@@ -146,11 +146,10 @@ 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}`))
+    ...depPkgs.map(p => path.relative(`packages/${thisPkg}`, `packages/${p}`)),
   ].join(' '));
 }
 
-
 const repoProject = new yarn.Monorepo({
   projenrcTs: true,
   name: 'aws-cdk-cli',
@@ -225,8 +224,6 @@ const repoProject = new yarn.Monorepo({
   },
 });
 
-new AdcPublishing(repoProject);
-
 // Eslint for projen config
 // @ts-ignore
 repoProject.eslint = new pj.javascript.Eslint(repoProject, {
@@ -236,6 +233,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);
 
@@ -1016,9 +1019,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',

.projen/tasks.json

@@ -1,6 +1,6 @@
-import { Monorepo } from "cdklabs-projen-project-types/lib/yarn";
-import { Component, github } from "projen";
-import { JobPermission } from "projen/lib/github/workflows-model";
+import { Monorepo } from 'cdklabs-projen-project-types/lib/yarn';
+import { Component, github } from 'projen';
+import { JobPermission } from 'projen/lib/github/workflows-model';
 
 export class AdcPublishing extends Component {
   constructor(private readonly project_: Monorepo) {
@@ -22,19 +22,19 @@ export class AdcPublishing extends Component {
       with: {
         name: 'standalone_build-artifact',
         path: 'dist/standalone',
-        overwrite: true
+        overwrite: true,
       },
     });
 
     releaseWf.addJob('standalone_release_adc', {
       name: 'standalone: publish to ADC',
-      environment: 'releasing',  // <-- this has the configuration
+      environment: 'releasing', // <-- this has the configuration
       needs: ['release'],
       runsOn: ['ubuntu-latest'],
       permissions: {
         contents: JobPermission.WRITE,
       },
-      if: `\${{ needs.release.outputs.latest_commit == github.sha }}`,
+      if: '${{ needs.release.outputs.latest_commit == github.sha }}',
       steps: [
         {
           uses: 'actions/setup-node@v4',

.projenrc.ts

@@ -7,7 +7,6 @@ import { glob } from 'glob';
 async function main() {
   const outdir = await fs.mkdtemp(path.join(os.tmpdir(), 'bundling'));
   try {
-
     const pkgs = ['aws-cdk'];
     // this is a build task, so we are safe either way
     // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism