Merge branch 'master' into huijbers/cli-cyclic-deps

mergify[bot] · web-flow · commit 7f77310b9c8d · 2022-02-07T13:51:57.000Z
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,3 +11,10 @@ updates:
     labels:
       - "auto-approve"
     open-pull-requests-limit: 5
+  - package-ecosystem: "pip"
+    directory: "/packages/@aws-cdk/lambda-layer-awscli"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5
diff --git a/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint-service.ts b/packages/@aws-cdk/aws-ec2/lib/vpc-endpoint-service.ts
@@ -11,6 +11,8 @@ import { CfnVPCEndpointService, CfnVPCEndpointServicePermissions } from './ec2.g
 export interface IVpcEndpointServiceLoadBalancer {
   /**
    * The ARN of the load balancer that hosts the VPC Endpoint Service
+   *
+   * @attribute
    */
   readonly loadBalancerArn: string;
 }
diff --git a/packages/awslint/tsconfig.json b/packages/awslint/tsconfig.json
@@ -11,6 +11,7 @@
       "noUnusedLocals": true,
       "noUnusedParameters": true,
       "noImplicitReturns": true,
+      "experimentalDecorators": true,
       "noFallthroughCasesInSwitch": true,
       "resolveJsonModule": true,
       "composite": true,
diff --git a/tools/@aws-cdk/ubergen/bin/ubergen.ts b/tools/@aws-cdk/ubergen/bin/ubergen.ts
@@ -511,6 +511,14 @@ async function copyOrTransformFiles(from: string, to: string, libraries: readonl
 async function copyLiterateSources(from: string, to: string, libraries: readonly LibraryReference[], uberPackageJson: PackageJson) {
   const libRoot = resolveLibRoot(uberPackageJson);
   await Promise.all((await fs.readdir(from)).flatMap(async name => {
+    const source = path.join(from, name);
+    const stat = await fs.stat(source);
+
+    if (stat.isDirectory()) {
+      await copyLiterateSources(source, path.join(to, name), libraries, uberPackageJson);
+      return;
+    }
+
     if (!name.endsWith('.lit.ts')) {
       return [];
     }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ import { CfnVPCEndpointService, CfnVPCEndpointServicePermissions } from './ec2.g`
`11`	`11`	`export interface IVpcEndpointServiceLoadBalancer {`
`12`	`12`	`/**`
`13`	`13`	`* The ARN of the load balancer that hosts the VPC Endpoint Service`
	`14`	`+ *`
	`15`	`+ * @attribute`
`14`	`16`	`*/`
`15`	`17`	`readonly loadBalancerArn: string;`
`16`	`18`	`}`