Skip to content

Commit

Permalink
Merge branch 'master' into acm-dns-cf
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jul 10, 2020
2 parents 2742524 + 3562ea1 commit 8b9d7cb
Show file tree
Hide file tree
Showing 347 changed files with 845 additions and 210 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ coverage/
*.sw[a-z]
*~
.idea
junit.xml

# We don't want tsconfig at the root
/tsconfig.json
Expand All @@ -38,3 +39,4 @@ yarn-error.log

# Parcel default cache directory
.parcel-cache

5 changes: 5 additions & 0 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ artifacts:
files:
- "**/*"
base-directory: dist
reports:
jest-tests:
files:
- "**/junit.xml"
file-format: JunitXml
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"conventional-changelog-cli": "^2.0.34",
"fs-extra": "^9.0.1",
"graceful-fs": "^4.2.4",
"jsii-diff": "^1.7.0",
"jsii-pacmak": "^1.7.0",
"jsii-rosetta": "^1.7.0",
"jsii-diff": "^1.8.0",
"jsii-pacmak": "^1.8.0",
"jsii-rosetta": "^1.8.0",
"lerna": "^3.22.1",
"standard-version": "^8.0.0",
"typescript": "~3.9.5"
"typescript": "~3.9.6"
},
"resolutions-comment": "should be removed or reviewed when nodeunit dependency is dropped or adjusted",
"resolutions": {
Expand Down
2 changes: 2 additions & 0 deletions packages/@aws-cdk/alexa-ask/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/alexa-ask/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/app-delivery/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ tsconfig.json
*.snk
coverage
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/app-delivery/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/assert/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/assert/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/assets/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
.LAST_PACKAGE
*.snk
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/assets/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-accessanalyzer/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-accessanalyzer/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-acmpca/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ coverage
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-acmpca/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-amazonmq/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ tsconfig.json
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-amazonmq/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-amplify/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-amplify/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-apigateway/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ nyc.config.js
.LAST_PACKAGE
*.snk
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-apigateway/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-apigatewayv2/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-apigatewayv2/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-appconfig/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ coverage
nyc.config.js
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-appconfig/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-applicationautoscaling/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ nyc.config.js
.LAST_PACKAGE
*.snk
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-applicationautoscaling/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-appmesh/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ coverage
dist
tsconfig.json
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-appmesh/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-appstream/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-appstream/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-appsync/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-appsync/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-athena/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-athena/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-autoscaling-common/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ tsconfig.json

*.snk
!.eslintrc.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling-common/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ tsconfig.json
.eslintrc.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-autoscaling-hooktargets/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling-hooktargets/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js

!jest.config.js
!jest.config.js
junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json

# exclude cdk artifacts
**/cdk.out
jest.config.js
jest.config.js
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-autoscalingplans/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscalingplans/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-backup/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dist
tsconfig.json
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-backup/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-batch/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ nyc.config.js
*.snk
!.eslintrc.js
!jest.config.js

junit.xml
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-batch/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tsconfig.json
jest.config.js

# exclude cdk artifacts
**/cdk.out
**/cdk.out
junit.xml
Loading

0 comments on commit 8b9d7cb

Please sign in to comment.