Merge branch 'master' into rmuller/pic-metadata

aws · Jul 1, 2019 · 39f5c72 · 39f5c72
2 parents 08f9739 + d40fd05
commit 39f5c72
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 217 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@aws-cdk/aws-amplify/.npmignore b/packages/@aws-cdk/aws-amplify/.npmignore
@@ -14,6 +14,5 @@ coverage
 dist
 .LAST_BUILD
 .LAST_PACKAGE
-.jsii
 
-*.tsbuildinfo
+*.tsbuildinfo
diff --git a/packages/@aws-cdk/aws-iotthingsgraph/.npmignore b/packages/@aws-cdk/aws-iotthingsgraph/.npmignore
@@ -14,6 +14,5 @@ coverage
 dist
 .LAST_BUILD
 .LAST_PACKAGE
-.jsii
 
-*.tsbuildinfo
+*.tsbuildinfo
diff --git a/packages/@aws-cdk/aws-msk/.npmignore b/packages/@aws-cdk/aws-msk/.npmignore
@@ -14,6 +14,5 @@ coverage
 dist
 .LAST_BUILD
 .LAST_PACKAGE
-.jsii
 
-*.tsbuildinfo
+*.tsbuildinfo
diff --git a/packages/@aws-cdk/aws-pinpoint/.npmignore b/packages/@aws-cdk/aws-pinpoint/.npmignore
@@ -14,6 +14,5 @@ coverage
 dist
 .LAST_BUILD
 .LAST_PACKAGE
-.jsii
 
-*.tsbuildinfo
+*.tsbuildinfo
diff --git a/packages/decdk/package-lock.json b/packages/decdk/package-lock.json
diff --git a/packages/decdk/package.json b/packages/decdk/package.json
@@ -141,7 +141,7 @@
     "@aws-cdk/cx-api": "^0.36.0",
     "@aws-cdk/region-info": "^0.36.0",
     "fs-extra": "^8.0.1",
-    "jsii-reflect": "^0.13.0",
+    "jsii-reflect": "^0.13.2",
     "jsonschema": "^1.2.4",
     "yaml": "1.6.0",
     "yargs": "^13.2.4"
@@ -152,7 +152,7 @@
     "@types/yaml": "1.0.2",
     "@types/yargs": "^13.0.0",
     "jest": "^24.8.0",
-    "jsii": "^0.13.0"
+    "jsii": "^0.13.2"
   },
   "keywords": [
     "aws",

diff --git a/tools/awslint/package-lock.json b/tools/awslint/package-lock.json
diff --git a/tools/awslint/package.json b/tools/awslint/package.json
@@ -19,8 +19,8 @@
     "camelcase": "^5.3.1",
     "colors": "^1.3.3",
     "fs-extra": "^8.0.1",
-    "jsii-reflect": "^0.13.0",
-    "jsii-spec": "^0.13.0",
+    "jsii-reflect": "^0.13.2",
+    "jsii-spec": "^0.13.2",
     "yargs": "^13.2.4"
   },
   "devDependencies": {