Merge pull request aws#7437 from aws/patch/v1.33.1

chore: patch release v1.33.1
SungjinYoo · Apr 19, 2020 · 8ad4d34 · 8ad4d34
2 parents a52133f + d818e4b
commit 8ad4d34
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 202 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.33.1](https://github.com/aws/aws-cdk/compare/v1.33.0...v1.33.1) (2020-04-19)
+
+
+### Bug Fixes
+
+* jsii version conflict due to upgrade from v1.1.0 to v1.3.0 ([f2fdfe5](https://github.com/aws/aws-cdk/commit/f2fdfe57759248eec23d6e8579b367058a619a97)), closes [#7426](https://github.com/aws/aws-cdk/issues/7426)
+
 ## [1.33.0](https://github.com/aws/aws-cdk/compare/v1.32.2...v1.33.0) (2020-04-17)
 
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.33.0"
+  "version": "1.33.1"
 }
diff --git a/package.json b/package.json
@@ -16,9 +16,9 @@
   "devDependencies": {
     "conventional-changelog-cli": "^2.0.31",
     "fs-extra": "^8.1.0",
-    "jsii-diff": "^1.3.0",
-    "jsii-pacmak": "^1.3.0",
-    "jsii-rosetta": "^1.3.0",
+    "jsii-diff": "^1.1.0",
+    "jsii-pacmak": "^1.1.0",
+    "jsii-rosetta": "^1.1.0",
     "lerna": "^3.20.2",
     "standard-version": "^7.1.0",
     "typescript": "~3.8.3"

diff --git a/packages/decdk/package.json b/packages/decdk/package.json
@@ -174,7 +174,7 @@
     "@aws-cdk/region-info": "0.0.0",
     "constructs": "^3.0.0",
     "fs-extra": "^8.1.0",
-    "jsii-reflect": "^1.3.0",
+    "jsii-reflect": "^1.1.0",
     "jsonschema": "^1.2.6",
     "yaml": "1.9.0",
     "yargs": "^15.3.1"
@@ -185,7 +185,7 @@
     "@types/yaml": "1.2.0",
     "@types/yargs": "^15.0.4",
     "jest": "^25.3.0",
-    "jsii": "^1.3.0"
+    "jsii": "^1.1.0"
   },
   "keywords": [
     "aws",

diff --git a/tools/awslint/lib/rules/docs.ts b/tools/awslint/lib/rules/docs.ts
@@ -98,6 +98,6 @@ function isCfnType(ctx: DocsLinterContext) {
   }
 }
 
-function flatMap<T, U>(array: readonly T[], callbackfn: (value: T, index: number, array: readonly T[]) => U[]): U[] {
+function flatMap<T, U>(array: T[], callbackfn: (value: T, index: number, array: T[]) => U[]): U[] {
   return Array.prototype.concat(...array.map(callbackfn));
 }
diff --git a/tools/awslint/lib/rules/exports.ts b/tools/awslint/lib/rules/exports.ts
@@ -1,6 +1,6 @@
 import { Linter } from '../linter';
 
-export const exportsLinter = new Linter(assembly => [...assembly.types]);
+export const exportsLinter = new Linter(assembly => assembly.types);
 
 exportsLinter.add({
   code: 'no-export',
@@ -10,4 +10,4 @@ exportsLinter.add({
       e.assert(!e.ctx.allMethods.some(m => m.name === 'export'), e.ctx.fqn);
     }
   }
-});
+});
diff --git a/tools/awslint/package.json b/tools/awslint/package.json
@@ -16,11 +16,11 @@
     "awslint": "bin/awslint"
   },
   "dependencies": {
-    "@jsii/spec": "^1.3.0",
+    "@jsii/spec": "^1.1.0",
     "camelcase": "^6.0.0",
     "colors": "^1.4.0",
     "fs-extra": "^8.1.0",
-    "jsii-reflect": "^1.3.0",
+    "jsii-reflect": "^1.1.0",
     "yargs": "^15.3.1"
   },
   "devDependencies": {

diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json
@@ -49,8 +49,8 @@
     "eslint-plugin-import": "^2.20.2",
     "fs-extra": "^8.1.0",
     "jest": "^25.3.0",
-    "jsii": "^1.3.0",
-    "jsii-pacmak": "^1.3.0",
+    "jsii": "^1.1.0",
+    "jsii-pacmak": "^1.1.0",
     "nodeunit": "^0.11.3",
     "nyc": "^15.0.1",
     "ts-jest": "^25.4.0",