fix: build break, chore: typescript, lerna update (#2640)

* fix: build break, chore: typescript, lerna update * fix: missing lock file * fix: failing mock test
aws-amplify · Oct 29, 2019 · 29fae36 · 29fae36
1 parent fb92a9d
commit 29fae36
Show file tree

Hide file tree

Showing 27 changed files with 1,502 additions and 1,323 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,8 +1,6 @@
 {
-  "lerna": "3.16.4",
-  "packages": [
-    "packages/*"
-  ],
+  "lerna": "3.18.3",
+  "packages": ["packages/*"],
   "version": "independent",
   "npmClient": "yarn",
   "useWorkspaces": true

diff --git a/package.json b/package.json
@@ -43,8 +43,7 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "lerna": "^3.16.4",
-    "tslint": "^5.20.0"
+    "lerna": "^3.16.4"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -65,7 +65,7 @@
     "jest": "^24.8.0",
     "ts-jest": "^24.0.2",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -78,7 +78,7 @@
     "ts-jest": "^24.0.2",
     "tslint": "^5.17.0",
     "tslint-config-airbnb-base": "^0.3.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -25,7 +25,7 @@
     "rimraf": "^3.0.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
@@ -13,7 +13,7 @@
     "prop-types": "^15.7.2",
     "react": "16.8.6",
     "react-dom": "16.8.6",
-    "react-scripts": "3.1.1",
+    "react-scripts": "3.2.0",
     "semantic-ui-css": "^2.4.1",
     "semantic-ui-react": "0.87.3"
   },
@@ -23,7 +23,7 @@
     "@types/react-dom": "16.8.5",
     "cross-env": "^5.2.0",
     "eslint": "^6.1.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "author": "Amazon Web Services",
   "license": "Apache-2.0",

diff --git a/packages/amplify-graphql-docs-generator/package.json b/packages/amplify-graphql-docs-generator/package.json
@@ -36,7 +36,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "dependencies": {
     "camel-case": "^3.0.0",

diff --git a/packages/amplify-graphql-types-generator/package.json b/packages/amplify-graphql-types-generator/package.json
@@ -41,7 +41,7 @@
     "jest-matcher-utils": "^23.6.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "dependencies": {
     "@babel/generator": "7.0.0-beta.4",

diff --git a/packages/amplify-storage-simulator/package.json b/packages/amplify-storage-simulator/package.json
@@ -30,7 +30,7 @@
     "@types/cors": "^2.8.5",
     "@types/glob": "^7.1.1",
     "@types/serve-static": "^1.13.2",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-ui-tests/package.json b/packages/amplify-ui-tests/package.json
@@ -28,7 +28,7 @@
     "rimraf": "2.6.2",
     "ts-jest": "22.4.6",
     "tslint": "5.10.0",
-    "typescript": "3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
@@ -47,7 +47,7 @@
     "node-fetch": "^2.6.0",
     "ts-jest": "^24.0.2",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3",
+    "typescript": "^3.6.4",
     "uuid": "^3.3.3",
     "ws": "4.0.0"
   },

diff --git a/packages/amplify-util-mock/src/__e2e__/subscriptions-with-auth.e2e.test.ts b/packages/amplify-util-mock/src/__e2e__/subscriptions-with-auth.e2e.test.ts
@@ -4,7 +4,7 @@ import { GraphQLTransform } from 'graphql-transformer-core';
 import { deploy, launchDDBLocal, terminateDDB } from './utils/index';
 import AWSAppSyncClient, { AUTH_TYPE } from 'aws-appsync';
 import { signUpAddToGroupAndGetJwtToken } from './utils/cognito-utils';
-import { AWS } from '@aws-amplify/core';
+import AWS = require('aws-sdk');
 import gql from 'graphql-tag';
 import 'isomorphic-fetch';
 

diff --git a/packages/graphql-auth-transformer/package.json b/packages/graphql-auth-transformer/package.json
@@ -36,7 +36,7 @@
     "rimraf": "^3.0.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "testURL": "http://localhost",

diff --git a/packages/graphql-connection-transformer/package.json b/packages/graphql-connection-transformer/package.json
@@ -34,7 +34,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-dynamodb-transformer/package.json b/packages/graphql-dynamodb-transformer/package.json
@@ -32,7 +32,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-elasticsearch-transformer/package.json b/packages/graphql-elasticsearch-transformer/package.json
@@ -31,7 +31,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-function-transformer/package.json b/packages/graphql-function-transformer/package.json
@@ -24,7 +24,7 @@
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
     "tslint-config-airbnb": "^5.11.1",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-http-transformer/package.json b/packages/graphql-http-transformer/package.json
@@ -32,7 +32,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-key-transformer/package.json b/packages/graphql-key-transformer/package.json
@@ -25,7 +25,7 @@
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
     "tslint-config-airbnb": "^5.11.1",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-mapping-template/package.json b/packages/graphql-mapping-template/package.json
@@ -23,7 +23,7 @@
     "jest": "^23.0.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "author": "Amazon Web Services",
   "license": "Apache-2.0",

diff --git a/packages/graphql-relational-schema-transformer/package.json b/packages/graphql-relational-schema-transformer/package.json
@@ -33,7 +33,7 @@
     "cloudform": "^3.5.0",
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "collectCoverage": true,

diff --git a/packages/graphql-transformer-common/package.json b/packages/graphql-transformer-common/package.json
@@ -29,7 +29,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/graphql-transformer-core/package.json b/packages/graphql-transformer-core/package.json
@@ -25,7 +25,7 @@
     "jest": "^23.0.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "dependencies": {
     "cloudform": "^3.5.0",

diff --git a/packages/graphql-transformers-e2e-tests/package.json b/packages/graphql-transformers-e2e-tests/package.json
@@ -47,7 +47,7 @@
     "node-fetch": "^2.6.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3",
+    "typescript": "^3.6.4",
     "ws": "4.0.0"
   },
   "jest": {

diff --git a/packages/graphql-transformers-e2e-tests/src/__tests__/KeyTransformerLocal.e2e.test.ts b/packages/graphql-transformers-e2e-tests/src/__tests__/KeyTransformerLocal.e2e.test.ts
@@ -346,7 +346,7 @@ test('Test that connection type is generated for custom query when queries is se
     `;
 
   const transformer = new GraphQLTransform({
-    transformers: [new ModelTransformer(), new KeyTransformer()],
+    transformers: [new DynamoDBModelTransformer(), new KeyTransformer()],
   });
 
   const out = transformer.transform(validSchema);

diff --git a/packages/graphql-versioned-transformer/package.json b/packages/graphql-versioned-transformer/package.json
@@ -32,7 +32,7 @@
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.6.4"
   },
   "jest": {
     "transform": {