feat(amplify-util-uibuilder): support StorageField (aws-amplify#12386)

* feat((amplify-util-uibuilder): support StorageField * chore: update all aws-sdk versions to ^2.1350.0 * fix: revert changes to package.json.ejs * chore: add **/aws-sdk to package.json under resolutions * fix: revert white space changes in package.json.ejs * fix: bump codegen-ui to 2.12.1 * chore: bump lint memory --------- Co-authored-by: Hein Jeong <[email protected]> Co-authored-by: Kamil Sobol <[email protected]>
akshbhu · Apr 17, 2023 · 951cd41 · 951cd41
1 parent c09aa75
commit 951cd41
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 36 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -201,6 +201,8 @@ jobs:
       - run: yarn lint-check
       - run: yarn lint-check-package-json
       - run: yarn prettier-check
+    environment:
+      NODE_OPTIONS: --max-old-space-size=5120
 
   verify-api-extract:
     <<: *linux-e2e-executor-xlarge

diff --git a/package.json b/package.json
@@ -150,6 +150,7 @@
     "typescript": "^4.9.4"
   },
   "resolutions": {
+    "**/aws-sdk": "^2.1350.0",
     "**/cross-fetch": "^2.2.6",
     "**/glob-parent": "^6.0.2",
     "**/got": "^11.8.5",

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -35,7 +35,7 @@
     "@graphql-tools/utils": "^8.5.1",
     "amplify-cli-core": "4.0.3",
     "amplify-velocity-template": "1.4.11",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -37,7 +37,7 @@
     "amplify-headless-interface": "1.17.3",
     "amplify-util-headless-input": "1.9.12",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "axios": "^0.26.0",
     "chalk": "^4.1.1",
     "change-case": "^4.1.1",

diff --git a/packages/amplify-category-auth/resources/adminAuth/admin-auth-package.json b/packages/amplify-category-auth/resources/adminAuth/admin-auth-package.json
@@ -10,6 +10,6 @@
     "express": "^4.17.1"
   },
   "devDependencies": {
-    "aws-sdk": "^2.1113.0"
+    "aws-sdk": "^2.1350.0"
   }
 }
diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -31,7 +31,7 @@
     "@aws-amplify/amplify-prompts": "2.6.8",
     "amplify-cli-core": "4.0.3",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "cloudform-types": "^4.2.0",
     "enquirer": "^2.3.6",

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -32,7 +32,7 @@
     "amplify-headless-interface": "1.17.3",
     "amplify-util-headless-input": "1.9.12",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "constructs": "^10.0.5",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",

diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-amplify/amplify-prompts": "2.6.8",
     "amplify-cli-core": "4.0.3",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"

diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
@@ -35,7 +35,7 @@
     "amplify-headless-interface": "1.17.3",
     "amplify-util-headless-input": "1.9.12",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "constructs": "^10.0.5",
     "enquirer": "^2.3.6",

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -76,7 +76,7 @@
     "amplify-nodejs-function-runtime-provider": "2.3.16",
     "amplify-python-function-runtime-provider": "2.4.16",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "ci-info": "^2.0.0",
     "cli-table3": "^0.6.0",

diff --git a/packages/amplify-console-integration-tests/package.json b/packages/amplify-console-integration-tests/package.json
@@ -24,7 +24,7 @@
     "@aws-amplify/amplify-e2e-core": "4.8.3",
     "@types/ini": "^1.3.30",
     "amplify-cli-core": "4.0.3",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "dotenv": "^8.2.0",
     "fs-extra": "^8.1.0",
     "ini": "^1.3.5",

diff --git a/packages/amplify-dynamodb-simulator/package.json b/packages/amplify-dynamodb-simulator/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "amplify-cli-core": "4.0.3",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "amplify-cli-core": "4.0.3",
     "amplify-headless-interface": "1.17.3",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "dotenv": "^8.2.0",
     "execa": "^5.1.1",

diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -35,7 +35,7 @@
     "aws-amplify": "^4.2.8",
     "aws-appsync": "^4.1.1",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "axios": "^0.26.0",
     "circleci-api": "^4.1.4",
     "constructs": "^10.0.5",

diff --git a/packages/amplify-environment-parameters/package.json b/packages/amplify-environment-parameters/package.json
@@ -32,7 +32,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "mkdirp": "^1.0.4",
     "ts-json-schema-generator": "~1.1.2"
   },

diff --git a/packages/amplify-opensearch-simulator/package.json b/packages/amplify-opensearch-simulator/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aws-amplify/amplify-prompts": "2.6.8",
     "amplify-cli-core": "4.0.3",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
@@ -40,7 +40,7 @@
     "amplify-codegen": "^3.4.0",
     "archiver": "^5.3.0",
     "aws-cdk-lib": "~2.68.0",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "bottleneck": "2.19.5",
     "chalk": "^4.1.1",
     "cloudform-types": "^4.2.0",

diff --git a/packages/amplify-storage-simulator/package.json b/packages/amplify-storage-simulator/package.json
@@ -44,6 +44,6 @@
     "@types/serve-static": "^1.13.3",
     "@types/uuid": "^8.3.1",
     "@types/xml": "^1.0.4",
-    "aws-sdk": "^2.1233.0"
+    "aws-sdk": "^2.1350.0"
   }
 }
diff --git a/packages/amplify-util-import/package.json b/packages/amplify-util-import/package.json
@@ -20,7 +20,7 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "aws-sdk": "^2.1233.0"
+    "aws-sdk": "^2.1350.0"
   },
   "devDependencies": {
     "@types/node": "^12.12.6"

diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
@@ -76,7 +76,7 @@
     "@types/which": "^1.3.2",
     "amplify-nodejs-function-runtime-provider": "2.3.16",
     "aws-appsync": "^4.1.4",
-    "aws-sdk": "^2.1233.0",
+    "aws-sdk": "^2.1350.0",
     "aws-sdk-mock": "^5.8.0",
     "axios": "^0.26.0",
     "graphql": "^15.5.0",

diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-prompts": "2.6.8",
-    "@aws-amplify/codegen-ui": "2.11.0",
-    "@aws-amplify/codegen-ui-react": "2.11.0",
+    "@aws-amplify/codegen-ui": "2.12.1",
+    "@aws-amplify/codegen-ui-react": "2.12.1",
     "amplify-cli-core": "4.0.3",
     "amplify-codegen": "^3.4.0",
     "aws-sdk": "^2.1233.0",

diff --git a/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts b/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts
@@ -53,13 +53,13 @@ describe('should notify when packages are missing', () => {
       },
     };
     notifyMissingPackages(context as unknown as $TSContext);
-    expect(printerDependency.printer.warn).toBeCalledTimes(2);
+    expect(printerDependency.printer.warn).toBeCalledTimes(3);
   });
 
   it('notifies for partial missing dependencies', async () => {
     JSONUtilitiesDependency.JSONUtilities.readJson = jest.fn().mockImplementation(() => ({
       projectPath: __dirname,
-      dependencies: { '@aws-amplify/ui-react': '4.2.0' },
+      dependencies: { '@aws-amplify/ui-react': '4.6.0' },
     }));
     const context = {
       input: {
@@ -69,6 +69,6 @@ describe('should notify when packages are missing', () => {
       },
     };
     notifyMissingPackages(context as unknown as $TSContext);
-    expect(printerDependency.printer.warn).toBeCalledTimes(1);
+    expect(printerDependency.printer.warn).toBeCalledTimes(2);
   });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -176,21 +176,21 @@
   dependencies:
     "@aws-amplify/core" "4.3.11"
 
-"@aws-amplify/codegen-ui-react@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui-react/-/codegen-ui-react-2.11.0.tgz#95943ef10a69fc63c2c76f64f84fe42220d50f47"
-  integrity sha512-QLgXeMTgXnw3PxmD7u/+S3iQ4dvGkxwlv6o6zofVmcRlT34o5H+LnKLTHOGtIGeZ9X6WHPiMOD33K6K/7KVLGQ==
+"@aws-amplify/codegen-ui-react@2.12.1":
+  version "2.12.1"
+  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui-react/-/codegen-ui-react-2.12.1.tgz#7fe833c0845462072a29612cff5aebb0a9e42b71"
+  integrity sha512-gmAVSxt9EPkqW7Ti1zFPIMUqFWQSbrBrRU04fKBp5vpnRTlS2G9su1+lKxmja33CCk8mSUPVpd35nI/GF2iKeA==
   dependencies:
-    "@aws-amplify/codegen-ui" "2.11.0"
+    "@aws-amplify/codegen-ui" "2.12.1"
     "@typescript/vfs" "~1.3.5"
     typescript "<=4.5.0"
   optionalDependencies:
     prettier "2.3.2"
 
-"@aws-amplify/codegen-ui@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui/-/codegen-ui-2.11.0.tgz#b94f310257036a0e63460b1184e2852dd5b27e6d"
-  integrity sha512-zJPUvOhrvRRgZ1dzFPga4kBU9Pk1U3zhmZbhj3oumLv3nxbMsU5a26k+cDkrPYhRpfyQzenRgYhSlN+2X+rDeA==
+"@aws-amplify/codegen-ui@2.12.1":
+  version "2.12.1"
+  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui/-/codegen-ui-2.12.1.tgz#d6a991e3db6883e14f835af4f88b1bcfe5af2072"
+  integrity sha512-4uqzNA2xyaKjzMFfntzvwZEmJzKAumqVnXV0S+XPsrqreDfnzfxldYv/v3JQsQE4e5NjK/08BsWxm0jCkifAHw==
   dependencies:
     change-case "^4.1.2"
     yup "^0.32.11"
@@ -9727,10 +9727,10 @@ aws-sdk-mock@^5.8.0:
     sinon "^14.0.1"
     traverse "^0.6.6"
 
-aws-sdk@^2.1231.0, aws-sdk@^2.1233.0:
-  version "2.1233.0"
-  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1233.0.tgz#3386515966ca8a5baac048d986ad0977119c0765"
-  integrity sha512-e1GbVltsoQpWvx0gxQlEtKOdOrNWyjhD8bjFIMx/3Nwwzw4ac2KOy7CyC5I+lBj8el4AB0399umLHJZmL5WcVg==
+aws-sdk@^2.1231.0, aws-sdk@^2.1350.0:
+  version "2.1350.0"
+  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1350.0.tgz#e538768b842a345db63f2cd0dfa8c7c60e0d8e78"
+  integrity sha512-b0BHug2iCtIsKgstj3FEyZYZCv8RZnie5vUQzkw0rr581Z6DOcJof7gGn19E6mPQp1l4j0d274SjvdFQS4JCMw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"