Merge

.gitallowed

@@ -21,3 +21,4 @@ account: '123456789012'
 account: '772975370895'
 account: '856666278305'
 account: '840364872350'
+account: '422531588944'

.github/ISSUE_TEMPLATE/bug.md

@@ -1,7 +1,7 @@
 ---
 name: "\U0001F41B Bug Report"
 about: Report a bug
-title: "[module] "
+title: "(module name): short issue description"
 labels: bug, needs-triage
 ---
 
@@ -33,7 +33,7 @@ What is the unexpected behavior you were seeing? If you got an error, paste it h
 
 ### Environment
 
- - **CLI Version  :**
+ - **CDK CLI Version :**
  - **Framework Version:**
  - **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
  - **OS :**

.github/ISSUE_TEMPLATE/doc.md

@@ -1,7 +1,7 @@
 ---
 name: "📕 Documentation Issue"
 about: Issue in the reference documentation or developer guide
-title: "[module] "
+title: "(module name): short issue description"
 labels: feature-request, documentation, needs-triage
 ---
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,7 @@
 ---
 name: "\U0001F680 Feature Request"
 about: Request a new feature
-title: "[module] "
+title: "(module name): short issue description"
 labels: feature-request, needs-triage
 ---
 

.github/ISSUE_TEMPLATE/general-issues.md

@@ -1,7 +1,7 @@
 ---
 name: "\U00002753 General Issue"
 about: Create a new issue
-title: "[module] "
+title: "(module name): short issue description"
 labels: needs-triage, guidance
 ---
 
@@ -27,7 +27,7 @@ falling prey to the [X/Y problem][2]!
  - **CDK CLI Version:** <!-- Output of `cdk version` -->
  - **Module Version:** <!-- Version of the module in question -->
  - **Node.js Version:** <!-- Version of Node.js (run the command `node -v`) -->
- - **OS:** <!-- [all | Windows 10 | OSX Mojave | Ubuntu | etc... ] -->
+ - **OS:** <!-- [all | Windows 10 | macOS Mojave | Ubuntu | etc... ] -->
  - **Language (Version):** <!-- [all | TypeScript (3.8.3) | Java (8)| Python (3.7.3) | etc... ] -->
 
 

.github/workflows/yarn-upgrade.yml

@@ -43,19 +43,18 @@ jobs:
  - name: Run "ncu -u"
  # We special-case @types/node because we want to stay on the current major (minimum supported node release)
  # We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
- # We special-case parcel because we are currently on a pre-release and don't want to move to nightlies
  # We special-case aws-sdk because of breaking changes with TS interface exports in recent minor versions - https://github.com/aws/aws-sdk-js/issues/3453
  # We special-case typescript because it's not semantically versionned
  # We special-case constructs because we want to stay in control of the minimum compatible version
  run: |-
  # Upgrade dependencies at repository root
  ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
  ncu --upgrade --filter=typescript --target=patch
- ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,parcel,typescript --target=minor
+ ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript --target=minor
  # Upgrade all the packages
  lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
  lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
- lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,parcel,typescript,aws-sdk,${{ steps.list-packages.outputs.list }}' --target=minor
+ lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,${{ steps.list-packages.outputs.list }}' --target=minor
  # This will create a brand new `yarn.lock` file (this is more efficient than `yarn install && yarn upgrade`)
  - name: Run "yarn install --force"
  run: yarn install --force

.gitignore

@@ -37,11 +37,10 @@ cdk.out/
 # Yarn error log
 yarn-error.log
 
-# Parcel default cache directory
-.parcel-cache
-
 # VSCode history plugin
 .vscode/.history/
 
 # Cloud9
 .c9
+
+/.versionrc.json

.mergify.yml

@@ -19,7 +19,6 @@ pull_request_rules:
  commit_message: title+body
  conditions:
  - base!=release
- - -base~=^v2
  - -title~=(WIP|wip)
  - -label~=(blocked|do-not-merge|no-squash|two-approvers)
  - -merged
@@ -34,15 +33,14 @@ pull_request_rules:
  - name: automatic merge (2+ approvers)
  actions:
  comment:
- message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
+ message: Thank you for contributing! Your pull request will be automatically updated and merged (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
  merge:
  strict: smart
  method: squash
  strict_method: merge
  commit_message: title+body
  conditions:
  - base!=release
- - -base~=^v2
  - -title~=(WIP|wip)
  - label~=two-approvers
  - -label~=(blocked|do-not-merge|no-squash)
@@ -58,15 +56,14 @@ pull_request_rules:
  - name: automatic merge (no-squash)
  actions:
  comment:
- message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
+ message: Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
  merge:
  strict: smart
  # Merge instead of squash
  method: merge
  strict_method: merge
  commit_message: title+body
  conditions:
- - -base~=^v2
  - -title~=(WIP|wip)
  - -label~=(blocked|do-not-merge)
  # Only if no-squash is set
@@ -121,22 +118,4 @@ pull_request_rules:
  - "#approved-reviews-by>=1"
  - "#changes-requested-reviews-by=0"
  - status-success~=AWS CodeBuild us-east-1
- - status-success=validate-pr
- - name: automatic merge of v2 forward merges
- actions:
- comment:
- message: Forward merge successful!
- merge:
- method: merge
- strict: smart+fasttrack
- strict_method: merge
- commit_message: title+body
- conditions:
- - base=v2-main
- - label~=forward-merge
- - -label~=(blocked|do-not-merge)
- - -merged
- - -closed
- - author~=aws-cdk-automation
- - "#approved-reviews-by>=1"
- - status-success~=AWS CodeBuild us-east-1
+ - status-success=validate-pr