@aws-amplify/amplify-util-uibuilder 1.6.0-beta.2 → 1.6.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/lib/commands/cloneComponentsFromEnv.js +2 -2
- package/lib/commands/cloneComponentsFromEnv.js.map +1 -1
- package/lib/commands/utils/codegenResources.d.ts.map +1 -1
- package/lib/commands/utils/codegenResources.js +3 -1
- package/lib/commands/utils/codegenResources.js.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/createUiBuilderComponent.test.ts +4 -0
- package/src/commands/cloneComponentsFromEnv.ts +1 -1
- package/src/commands/utils/codegenResources.ts +3 -1
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,30 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.6.0-beta.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.2...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.4) (2022-12-28)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* address UI Builder component generation errors ([#11536](https://github.com/aws-amplify/amplify-cli/issues/11536)) ([aceec4c](https://github.com/aws-amplify/amplify-cli/commit/aceec4c098bc85d2e8da0738bbc5e8089ad8ae6e))
|
|
12
|
+
* **cli:** fix grammar in pull warning message ([#11407](https://github.com/aws-amplify/amplify-cli/issues/11407)) ([984c0f8](https://github.com/aws-amplify/amplify-cli/commit/984c0f8548cec80d0e14269757cd49b031403097))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
# [1.6.0-beta.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.2...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.3) (2022-12-13)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
* address UI Builder component generation errors ([#11536](https://github.com/aws-amplify/amplify-cli/issues/11536)) ([aceec4c](https://github.com/aws-amplify/amplify-cli/commit/aceec4c098bc85d2e8da0738bbc5e8089ad8ae6e))
|
|
24
|
+
* **cli:** fix grammar in pull warning message ([#11407](https://github.com/aws-amplify/amplify-cli/issues/11407)) ([984c0f8](https://github.com/aws-amplify/amplify-cli/commit/984c0f8548cec80d0e14269757cd49b031403097))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
6
30
|
# [1.6.0-beta.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.2...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.2) (2022-12-01)
|
|
7
31
|
|
|
8
32
|
|
|
@@ -5,12 +5,12 @@ const amplify_prompts_1 = require("amplify-prompts");
|
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
const clients_1 = require("../clients");
|
|
7
7
|
const run = async (context) => {
|
|
8
|
-
var _a;
|
|
8
|
+
var _a, _b, _c, _d, _e;
|
|
9
9
|
amplify_prompts_1.printer.debug('Running create components command in amplify-util-uibuilder');
|
|
10
10
|
const args = (0, utils_1.extractArgs)(context);
|
|
11
11
|
const sourceEnvName = args.sourceEnvName ? args.sourceEnvName : context.exeInfo.sourceEnvName;
|
|
12
12
|
const newEnvName = args.newEnvName ? args.newEnvName : context.exeInfo.localEnvInfo.envName;
|
|
13
|
-
const appId = (_a = args.appId) !== null && _a !== void 0 ? _a : context.exeInfo.teamProviderInfo[sourceEnvName].awscloudformation.AmplifyAppId;
|
|
13
|
+
const appId = (_a = args.appId) !== null && _a !== void 0 ? _a : (_e = (_d = (_c = (_b = context.exeInfo) === null || _b === void 0 ? void 0 : _b.teamProviderInfo) === null || _c === void 0 ? void 0 : _c[sourceEnvName]) === null || _d === void 0 ? void 0 : _d.awscloudformation) === null || _e === void 0 ? void 0 : _e.AmplifyAppId;
|
|
14
14
|
const studioClient = await clients_1.AmplifyStudioClient.setClientInfo(context, sourceEnvName, appId);
|
|
15
15
|
const [existingComponents, existingComponentsNewEnv] = await Promise.all([
|
|
16
16
|
studioClient.listComponents(sourceEnvName), studioClient.listComponents(newEnvName)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,mCAAsC;AACtC,wCAAiD;AAK1C,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;;IAC9D,yBAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;IAC5F,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,mCAAsC;AACtC,wCAAiD;AAK1C,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;;IAC9D,yBAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;IAC5F,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,MAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,gBAAgB,0CAAG,aAAa,CAAC,0CAAE,iBAAiB,0CAAE,YAAY,CAAC;IAChH,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvE,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC;KAAC,CAAC,CAAC;IACxF,IAAI,kBAAkB,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,yBAAO,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,yEAAyE,CAAC,CAAC;QAC9H,OAAO;KACR;IAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAChD,yBAAO,CAAC,KAAK,CACX,GAAG,wBAAwB,CAAC,QAAQ,CAAC,MAAM,8EAA8E,CAC1H,CAAC;QACF,OAAO;KACR;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,yBAAO,CAAC,KAAK,CAAC,wCAAwC,KAAK,aAAa,aAAa,qCAAqC,CAAC,CAAC;QAC5H,OAAO;KACR;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,EACJ,KAAK,EAAE,MAAM,EACb,eAAe,EACf,EAAE,EACF,SAAS,EACT,UAAU,EACV,GAAG,mBAAmB,EACvB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,YAAY,CAAC,eAAe,CAChC,mBAAmB,EACnB,UAAU,EACV,KAAK,CACN,CAAC;KACH;IAED,yBAAO,CAAC,IAAI,CACV,uBAAuB,UAAU,CAAC,MAAM,gCAAgC,KAAK,aAAa,aAAa,WAAW,UAAU,GAAG,CAChI,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,GAAG,OA8Cd"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,EAKX,iBAAiB,EAEjB,UAAU,EACV,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAUL,uCAAuC,EACxC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAYpD,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,iDAAmC,eAcvH,CAAC;AAKF,eAAO,MAAM,oBAAoB,YACtB,UAAU,UACX,WAAW,oEAElB,WA0BF,CAAC;AAKF,eAAO,MAAM,mBAAmB,YAAa,UAAU,UAAU,UAAU,iDAAmC,UA0B7G,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,YAAY,EAAE,KAAG,
|
|
1
|
+
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,EAKX,iBAAiB,EAEjB,UAAU,EACV,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAUL,uCAAuC,EACxC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAYpD,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,iDAAmC,eAcvH,CAAC;AAKF,eAAO,MAAM,oBAAoB,YACtB,UAAU,UACX,WAAW,oEAElB,WA0BF,CAAC;AAKF,eAAO,MAAM,mBAAmB,YAAa,UAAU,UAAU,UAAU,iDAAmC,UA0B7G,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,YAAY,EAAE,KAAG,IA0BhG,CAAC;AAEF,aAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAKF,eAAO,MAAM,gCAAgC,YAAa,UAAU,0BAA0B,cAAc,KAAG,IAiC9G,CAAC;AAMF,eAAO,MAAM,oBAAoB,iBACjB,mBAAmB,KAChC,QAAQ,iBAAiB,GAAG,SAAS,CAsBvC,CAAC;AAKF,eAAO,MAAM,iBAAiB;;MAA4D,UAAU,EAiBnG,CAAC"}
|
|
@@ -69,7 +69,9 @@ const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
|
69
69
|
outputPathDir,
|
|
70
70
|
});
|
|
71
71
|
try {
|
|
72
|
-
|
|
72
|
+
if (schemas.length) {
|
|
73
|
+
rendererManager.renderSchemaToTemplate(schemas);
|
|
74
|
+
}
|
|
73
75
|
}
|
|
74
76
|
catch (e) {
|
|
75
77
|
amplify_prompts_1.printer.debug(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":";;;AAEA,wDAYiC;AACjC,oEAWuC;AACvC,qDAA0C;AAC1C,uDAE0B;AAC1B,6EAA0E;AAG1E,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,6BAAU,CAAC,MAAM;IACzB,MAAM,EAAE,+BAAY,CAAC,MAAM;IAC3B,MAAM,EAAE,6BAAU,CAAC,GAAG;IACtB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAKK,MAAM,wBAAwB,GAAG,CAAC,OAAmB,EAAE,MAAuB,EAAE,UAA8B,EAAmB,EAAE;IACxI,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,SAA0B,EAAE,EAAE,CAAC,IAAI,kCAAe,CAAC,SAA4B,EAAE,MAAM,EAAE,UAAU,CAAC,CACtG,CAAC;IAEF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,0CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,wBAAwB,4BAcnC;AAKK,MAAM,oBAAoB,GAAG,CAClC,OAAmB,EACnB,MAAmB,EACnB,OAAiD,EACpC,EAAE;IACf,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,SAAsB,EAAE,EAAE,CAAE,IAAI,mDAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAKzF,CACJ,CAAC;IAEF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,0CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,IAAI;QACF,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,yBAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACpD,yBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,CAAC;KACT;AACH,CAAC,CAAC;AA9BW,QAAA,oBAAoB,wBA8B/B;AAKK,MAAM,mBAAmB,GAAG,CAAC,OAAmB,EAAE,MAAkB,EAAE,UAA8B,EAAc,EAAE;IACzH,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,IAAgB,EAAE,EAAE,CAAE,IAAI,sCAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAKpE,CACJ,CAAC;IAEF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,0CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,IAAI;QACF,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,yBAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACnD,yBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,CAAC;KACT;AACH,CAAC,CAAC;AA1BW,QAAA,mBAAmB,uBA0B9B;AAKK,MAAM,iCAAiC,GAAG,CAAC,OAAmB,EAAE,OAAuB,EAAQ,EAAE;IACtG,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,MAAsB,EAAE,EAAE,CAAE,IAAI,mDAAgC,CAAC,MAAM,EAAE,MAAM,CAK7E,CACJ,CAAC;IAEF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,0CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,IAAI;QACF,eAAe,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.6.0-beta.
|
|
3
|
+
"version": "1.6.0-beta.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@aws-amplify/codegen-ui": "2.5.
|
|
18
|
-
"@aws-amplify/codegen-ui-react": "2.5.
|
|
19
|
-
"amplify-cli-core": "4.0.0-beta.
|
|
20
|
-
"amplify-prompts": "2.6.2-beta.
|
|
17
|
+
"@aws-amplify/codegen-ui": "2.5.6",
|
|
18
|
+
"@aws-amplify/codegen-ui-react": "2.5.6",
|
|
19
|
+
"amplify-cli-core": "4.0.0-beta.4",
|
|
20
|
+
"amplify-prompts": "2.6.2-beta.3",
|
|
21
21
|
"aws-sdk": "^2.1233.0",
|
|
22
22
|
"fs-extra": "^8.1.0",
|
|
23
23
|
"ora": "^4.0.3"
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"usePathForSuiteName": "true",
|
|
70
70
|
"addFileAttribute": "true"
|
|
71
71
|
},
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "5e034311352f054994517123f3e4fa1980f89210"
|
|
73
73
|
}
|
|
@@ -69,6 +69,10 @@ describe('can create a ui builder component', () => {
|
|
|
69
69
|
generateAmplifyUiBuilderIndexFile(context, [schema]);
|
|
70
70
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
|
|
71
71
|
});
|
|
72
|
+
it('does not call renderSchemaToTemplate for index file if no schema', () => {
|
|
73
|
+
generateAmplifyUiBuilderIndexFile(context, []);
|
|
74
|
+
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).not.toBeCalled();
|
|
75
|
+
})
|
|
72
76
|
it('calls the renderManager for utils file w/ validation, formatter, and fetchByPath helpers if there is a form', () => {
|
|
73
77
|
generateAmplifyUiBuilderUtilFile(context, { hasForms: true, hasViews: false });
|
|
74
78
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(expect.arrayContaining(['validation', 'formatter', 'fetchByPath']));
|
|
@@ -11,7 +11,7 @@ export const run = async (context: $TSContext): Promise<void> => {
|
|
|
11
11
|
const args = extractArgs(context);
|
|
12
12
|
const sourceEnvName = args.sourceEnvName ? args.sourceEnvName : context.exeInfo.sourceEnvName;
|
|
13
13
|
const newEnvName = args.newEnvName ? args.newEnvName : context.exeInfo.localEnvInfo.envName;
|
|
14
|
-
const appId = args.appId ?? context.exeInfo
|
|
14
|
+
const appId = args.appId ?? context.exeInfo?.teamProviderInfo?.[sourceEnvName]?.awscloudformation?.AmplifyAppId;
|
|
15
15
|
const studioClient = await AmplifyStudioClient.setClientInfo(context, sourceEnvName, appId);
|
|
16
16
|
|
|
17
17
|
const [existingComponents, existingComponentsNewEnv] = await Promise.all([
|
|
@@ -145,7 +145,9 @@ export const generateAmplifyUiBuilderIndexFile = (context: $TSContext, schemas:
|
|
|
145
145
|
});
|
|
146
146
|
|
|
147
147
|
try {
|
|
148
|
-
|
|
148
|
+
if(schemas.length) {
|
|
149
|
+
rendererManager.renderSchemaToTemplate(schemas);
|
|
150
|
+
}
|
|
149
151
|
} catch (e) {
|
|
150
152
|
printer.debug(e);
|
|
151
153
|
printer.debug('Failed to generate component index file');
|