Merge branch 'master' into update-support-node-version

Author: shivlaks

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.36.1](https://github.com/aws/aws-cdk/compare/v1.36.0...v1.36.1) (2020-04-29)
+
+### Bug Fixes
+
+* multiple breakages due to jest version upgrade ([#7667](https://github.com/aws/aws-cdk/pull/7667)) ([e18312](https://github.com/aws/aws-cdk/commit/e18312c4de42857d893913bd3124bd06bb16982e)), closes [#7657](https://github.com/aws/aws-cdk/issues/7657)
+
 ## [1.36.0](https://github.com/aws/aws-cdk/compare/v1.35.0...v1.36.0) (2020-04-28)
 
 

lerna.json

@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.36.0"
+  "version": "1.36.1"
 }

package.json

@@ -46,8 +46,8 @@
       "**/jszip/**",
       "@aws-cdk/cdk-assets-schema/semver",
       "@aws-cdk/cdk-assets-schema/semver/**",
-      "@aws-cdk/assets/minimatch",
-      "@aws-cdk/assets/minimatch/**",
+      "@aws-cdk/core/minimatch",
+      "@aws-cdk/core/minimatch/**",
       "@aws-cdk/aws-codepipeline-actions/case",
       "@aws-cdk/aws-codepipeline-actions/case/**",
       "@aws-cdk/aws-ecr-assets/minimatch",

packages/@aws-cdk/alexa-ask/README.md

@@ -14,5 +14,5 @@
 <!--END STABILITY BANNER-->
 
 ```ts
-const alexaAsk = require('@aws-cdk/alexa-ask');
+import * as alexaAsk from '@aws-cdk/alexa-ask';
 ```

packages/@aws-cdk/app-delivery/README.md

@@ -41,11 +41,11 @@ The example below defines a *CDK App* that contains 3 stacks:
 #### `index.ts`
 
 ```typescript
-import codebuild = require('@aws-cdk/aws-codebuild');
-import codepipeline = require('@aws-cdk/aws-codepipeline');
-import codepipeline_actions = require('@aws-cdk/aws-codepipeline-actions');
-import cdk = require('@aws-cdk/core');
-import cicd = require('@aws-cdk/app-delivery');
+import * as codebuild from '@aws-cdk/aws-codebuild';
+import * as codepipeline from '@aws-cdk/aws-codepipeline';
+import * as codepipeline_actions from '@aws-cdk/aws-codepipeline-actions';
+import * as cdk from '@aws-cdk/core';
+import * as cicd from '@aws-cdk/app-delivery';
 
 const app = new cdk.App();
 

packages/@aws-cdk/assert/package.json

@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/jest": "^25.2.1",
     "cdk-build-tools": "0.0.0",
-    "jest": "^25.5.2",
+    "jest": "^25.5.3",
     "pkglint": "0.0.0",
     "ts-jest": "^25.4.0"
   },
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "@aws-cdk/core": "0.0.0",
-    "jest": "^25.5.2",
+    "jest": "^25.5.3",
     "constructs": "^3.0.2"
   },
   "repository": {

packages/@aws-cdk/assets/README.md

@@ -2,15 +2,11 @@
 <!--BEGIN STABILITY BANNER-->
 ---
 
-![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)
+![Deprecated](https://img.shields.io/badge/deprecated-critical.svg?style=for-the-badge)
 
-> The APIs of higher level constructs in this module are experimental and under active development. They are subject to non-backward compatible changes or removal in any future version. These are not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be announced in the release notes. This means that while you may use them, you may need to update your source code when upgrading to a newer version of this package.
+> This API may emit warnings. Backward compatibility is not guaranteed.
 
 ---
 <!--END STABILITY BANNER-->
 
-This module includes core classes for to CDK assets, used for copying asset
-files to a staging area. Most CDK users should not need to use the classes in
-this package directly.
-
-
+All types moved to @aws-cdk/core.

packages/@aws-cdk/assets/lib/compat.ts

@@ -0,0 +1,17 @@
+import { SymlinkFollowMode } from '@aws-cdk/core';
+import { FollowMode } from './fs/follow-mode';
+
+export function toSymlinkFollow(follow?: FollowMode): SymlinkFollowMode | undefined {
+  if (!follow) {
+    return undefined;
+  }
+
+  switch (follow) {
+    case FollowMode.NEVER: return SymlinkFollowMode.NEVER;
+    case FollowMode.ALWAYS: return SymlinkFollowMode.ALWAYS;
+    case FollowMode.BLOCK_EXTERNAL: return SymlinkFollowMode.BLOCK_EXTERNAL;
+    case FollowMode.EXTERNAL: return SymlinkFollowMode.EXTERNAL;
+    default:
+      throw new Error(`unknown follow mode: ${follow}`);
+  }
+}

packages/@aws-cdk/assets/lib/fs/follow-mode.ts

@@ -1,3 +1,7 @@
+/**
+ * Symlink follow mode.
+ * @deprecated see `core.SymlinkFollowMode`
+ */
 export enum FollowMode {
   /**
    * Never follow symlinks.