chore: cloudform update, typescript version lock (aws-amplify#2816)

robertjrichardson · Nov 27, 2019 · 2169539 · 2169539
1 parent 2da430b
commit 2169539
Show file tree

Hide file tree

Showing 45 changed files with 772 additions and 864 deletions.
diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -59,14 +59,14 @@
     "@types/graphql": "^0.13.4",
     "@types/jest": "^24.0.16",
     "@types/moment-timezone": "0.5.12",
-    "@types/node": "^8.10.51",
+    "@types/node": "^8.10.59",
     "@types/pino": "4.7.1",
     "amplify-graphiql-explorer": "1.0.2",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "jest": "^24.8.0",
     "ts-jest": "^24.0.2",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-category-api/package.json b/packages/amplify-category-api/package.json
@@ -13,7 +13,7 @@
     "amplify-category-auth": "2.1.1",
     "amplify-category-function": "2.1.1",
     "amplify-category-storage": "2.0.2",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "fs-extra": "^8.1.0",
     "graphql": "^0.13.2",
     "graphql-relational-schema-transformer": "2.1.1",

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "amplify-category-function": "2.1.1",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "chalk": "^2.4.2",
     "chalk-pipe": "^2.0.0",
     "enquirer": "^2.3.1",

diff --git a/...y-category-auth/provider-utils/awscloudformation/assets/adminAuth/admin-auth-package.json b/...y-category-auth/provider-utils/awscloudformation/assets/adminAuth/admin-auth-package.json
@@ -10,7 +10,7 @@
   "author": "Richard Threlkeld",
   "license": "Apache-2.0",
   "dependencies": {
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "aws-serverless-express": "^3.3.5",
     "body-parser": "^1.17.2",
     "express": "^4.15.2"

diff --git a/...ory-function/provider-utils/awscloudformation/function-template-dir/crud-package.json.ejs b/...ory-function/provider-utils/awscloudformation/function-template-dir/crud-package.json.ejs
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "aws-serverless-express": "^3.3.5",
     "body-parser": "^1.17.1",
     "express": "^4.15.2"

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -27,7 +27,6 @@
   "dependencies": {
     "@types/fs-extra": "^8.0.1",
     "@types/global-prefix": "^3.0.0",
-    "@types/ora": "^3.2.0",
     "amplify-category-analytics": "2.1.1",
     "amplify-category-api": "2.1.1",
     "amplify-category-auth": "2.1.1",
@@ -81,7 +80,7 @@
     "ts-jest": "^24.0.2",
     "tslint": "^5.17.0",
     "tslint-config-airbnb-base": "^0.3.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-codegen-appsync-model-plugin/package.json b/packages/amplify-codegen-appsync-model-plugin/package.json
@@ -5,9 +5,9 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "@graphql-codegen/core": "^1.8.1",
-    "@graphql-codegen/java-common": "^1.8.2",
-    "@graphql-codegen/visitor-plugin-common": "^1.8.1",
+    "@graphql-codegen/core": "~1.8.1",
+    "@graphql-codegen/java-common": "~1.8.2",
+    "@graphql-codegen/visitor-plugin-common": "~1.8.1",
     "auto-bind": "^2.1.1",
     "change-case": "^3.1.0",
     "graphql-tag": "^2.10.1",
@@ -47,7 +47,7 @@
     "java-ast": "0.1.0",
     "jest": "24.9.0",
     "ts-jest": "24.1.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "scripts": {
     "build": "tsc",

diff --git a/packages/amplify-dynamodb-simulator/package.json b/packages/amplify-dynamodb-simulator/package.json
@@ -11,7 +11,7 @@
     "test-ci": "jest"
   },
   "dependencies": {
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "detect-port": "^1.3.0",
     "event-to-promise": "^0.8.0",
     "execa": "^2.0.3",

diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -24,7 +24,7 @@
     "ts-jest": "^24.2.0",
     "ts-node": "^8.5.2",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "verbose": false,

diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
@@ -19,11 +19,11 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.15",
-    "@types/node": "^8.10.51",
+    "@types/node": "^8.10.59",
     "@types/react-dom": "16.8.5",
     "cross-env": "^5.2.0",
     "eslint": "^6.1.0",
-    "typescript": "^3.6.4"
+    "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
@@ -31,12 +31,12 @@
     "@types/ejs": "^2.6.0",
     "@types/graphql": "^0.13.4",
     "@types/jest": "23.3.1",
-    "@types/node": "^8.10.51",
+    "@types/node": "^8.10.59",
     "@types/prettier": "^1.13.2",
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "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
@@ -34,14 +34,14 @@
     "@types/inflected": "^1.1.29",
     "@types/jest": "20.0.6",
     "@types/mkdirp": "0.5.0",
-    "@types/node": "^8.10.51",
+    "@types/node": "^8.10.59",
     "@types/node-fetch": "1.6.7",
     "@types/yargs": "12.0.1",
     "jest": "^23.1.0",
     "jest-matcher-utils": "^23.6.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "dependencies": {
     "@babel/generator": "7.0.0-beta.4",

diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
@@ -11,7 +11,7 @@
     "amplify-category-storage": "2.0.2",
     "amplify-codegen": "2.1.1",
     "archiver": "^2.1.1",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "bottleneck": "2.16.2",
     "cfn-lint": "^1.7.2",
     "chalk": "^2.4.2",

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.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-ui-tests/package.json b/packages/amplify-ui-tests/package.json
@@ -19,7 +19,7 @@
     "@types/nexpect": "0.4.30",
     "@types/node": "10.3.4",
     "aws-amplify": "1.1.4",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "dotenv": "6.2.0",
     "jest": "23.1.0",
     "jest-junit": "^8.0.0",
@@ -28,7 +28,7 @@
     "rimraf": "2.6.2",
     "ts-jest": "22.4.6",
     "tslint": "5.10.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "transform": {

diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
@@ -26,9 +26,9 @@
   "devDependencies": {
     "@types/jest": "^24.0.16",
     "@types/lodash": "^4.14.129",
-    "@types/node": "^8.10.51",
+    "@types/node": "^8.10.59",
     "aws-amplify": "^1.1.36",
-    "aws-sdk": "^2.577.0",
+    "aws-sdk": "^2.580.0",
     "axios": "^0.19.0",
     "graphql-auth-transformer": "6.1.1",
     "graphql-connection-transformer": "4.1.1",
@@ -46,7 +46,7 @@
     "node-fetch": "^2.6.0",
     "ts-jest": "^24.0.2",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4",
+    "typescript": "~3.6.4",
     "uuid": "^3.3.3",
     "ws": "4.0.0"
   },

diff --git a/packages/graphql-auth-transformer/package.json b/packages/graphql-auth-transformer/package.json
@@ -27,16 +27,16 @@
   "devDependencies": {
     "@types/graphql": "^0.13.4",
     "@types/jest": "23.1.1",
-    "@types/node": "^8.10.51",
-    "cloudform": "^3.5.0",
-    "cloudform-types": "^3.7.0",
+    "@types/node": "^8.10.59",
+    "cloudform": "^4.1.0",
+    "cloudform-types": "^4.1.0",
     "graphql-dynamodb-transformer": "6.1.1",
     "graphql-elasticsearch-transformer": "3.23.0",
     "jest": "^23.1.0",
     "rimraf": "^3.0.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "testURL": "http://localhost",

diff --git a/packages/graphql-auth-transformer/src/graphQlApi.ts b/packages/graphql-auth-transformer/src/graphQlApi.ts
diff --git a/packages/graphql-auth-transformer/src/resources.ts b/packages/graphql-auth-transformer/src/resources.ts
@@ -27,7 +27,12 @@ import {
   newline,
 } from 'graphql-mapping-template';
 import { ResourceConstants, NONE_VALUE } from 'graphql-transformer-common';
-import GraphQLApi, { UserPoolConfig, GraphQLApiProperties, OpenIDConnectConfig, AdditionalAuthenticationProvider } from './graphQlApi';
+import GraphQLApi, {
+  GraphQLApiProperties,
+  UserPoolConfig,
+  AdditionalAuthenticationProvider,
+  OpenIDConnectConfig,
+} from 'cloudform-types/types/appSync/graphQlApi';
 import * as Transformer from './ModelAuthTransformer';
 import { FieldDefinitionNode } from 'graphql';
 

diff --git a/packages/graphql-connection-transformer/package.json b/packages/graphql-connection-transformer/package.json
@@ -17,8 +17,8 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "cloudform": "^3.5.0",
-    "cloudform-types": "^3.7.0",
+    "cloudform": "^4.1.0",
+    "cloudform-types": "^4.1.0",
     "graphql": "^0.13.2",
     "graphql-dynamodb-transformer": "6.1.1",
     "graphql-key-transformer": "2.1.1",
@@ -29,12 +29,12 @@
   "devDependencies": {
     "@types/graphql": "^0.13.4",
     "@types/jest": "23.1.1",
-    "@types/node": "^8.10.51",
-    "aws-sdk": "^2.577.0",
+    "@types/node": "^8.10.59",
+    "aws-sdk": "^2.580.0",
     "jest": "^23.1.0",
     "ts-jest": "^22.4.6",
     "tslint": "^5.18.0",
-    "typescript": "^3.6.4"
+    "typescript": "~3.6.4"
   },
   "jest": {
     "transform": {