@aws-amplify/amplify-util-uibuilder 1.2.20-optimize-pipeline-2.0 → 1.2.21-alpha.23
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 +1 -1
- package/lib/commands/cloneComponentsFromEnv.d.ts.map +1 -1
- package/lib/commands/cloneComponentsFromEnv.js +2 -16
- package/lib/commands/cloneComponentsFromEnv.js.map +1 -1
- package/lib/commands/generateComponents.d.ts +1 -1
- package/lib/commands/generateComponents.d.ts.map +1 -1
- package/lib/commands/generateComponents.js +9 -8
- package/lib/commands/generateComponents.js.map +1 -1
- package/lib/commands/utils/amplifyUiBuilderService.d.ts +5 -0
- package/lib/commands/utils/amplifyUiBuilderService.d.ts.map +1 -0
- package/lib/commands/utils/amplifyUiBuilderService.js +20 -0
- package/lib/commands/utils/amplifyUiBuilderService.js.map +1 -0
- package/lib/commands/utils/createUiBuilderComponent.d.ts +3 -4
- package/lib/commands/utils/createUiBuilderComponent.d.ts.map +1 -1
- package/lib/commands/utils/createUiBuilderComponent.js +12 -20
- package/lib/commands/utils/createUiBuilderComponent.js.map +1 -1
- package/lib/commands/utils/notifyMissingPackages.d.ts +1 -2
- package/lib/commands/utils/notifyMissingPackages.d.ts.map +1 -1
- package/lib/commands/utils/notifyMissingPackages.js +4 -13
- package/lib/commands/utils/notifyMissingPackages.js.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts +9 -6
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +31 -36
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/package.json +11 -11
- package/src/__tests__/createUiBuilderComponent.test.ts +2 -2
- package/src/__tests__/generateComponents.test.ts +2 -0
- package/src/__tests__/notifyMissingPackages.test.ts +4 -4
- package/src/__tests__/syncAmplifyUiComponents.test.ts +1 -1
- package/src/commands/cloneComponentsFromEnv.ts +3 -17
- package/src/commands/generateComponents.ts +16 -11
- package/src/commands/utils/amplifyUiBuilderService.ts +22 -0
- package/src/commands/utils/createUiBuilderComponent.ts +44 -21
- package/src/commands/utils/notifyMissingPackages.ts +12 -16
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +22 -27
- package/tsconfig.json +7 -7
- package/tsconfig.tsbuildinfo +1 -1
- package/lib/commands/utils/createUiBuilderComponentNew.d.ts +0 -5
- package/lib/commands/utils/createUiBuilderComponentNew.d.ts.map +0 -1
- package/lib/commands/utils/createUiBuilderComponentNew.js +0 -44
- package/lib/commands/utils/createUiBuilderComponentNew.js.map +0 -1
- package/src/commands/utils/createUiBuilderComponentNew.ts +0 -53
package/CHANGELOG.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
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.2.20
|
|
6
|
+
## [1.2.20](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.2.19...@aws-amplify/amplify-util-uibuilder@1.2.20) (2022-04-11)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
9
9
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloneComponentsFromEnv.d.ts","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cloneComponentsFromEnv.d.ts","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAmD5C"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.run = void 0;
|
|
7
|
-
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
8
4
|
const extractArgs_1 = require("./utils/extractArgs");
|
|
9
5
|
const syncAmplifyUiBuilderComponents_1 = require("./utils/syncAmplifyUiBuilderComponents");
|
|
10
6
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
7
|
+
const amplifyUiBuilderService_1 = require("./utils/amplifyUiBuilderService");
|
|
11
8
|
async function run(context) {
|
|
12
9
|
var _a, _b;
|
|
13
10
|
amplify_prompts_1.printer.debug('Running create components command in amplify-util-uibuilder');
|
|
@@ -26,18 +23,7 @@ async function run(context) {
|
|
|
26
23
|
}
|
|
27
24
|
const environmentName = (_a = args.environmentName) !== null && _a !== void 0 ? _a : context.exeInfo.localEnvInfo.envName;
|
|
28
25
|
const appId = (_b = args.appId) !== null && _b !== void 0 ? _b : context.exeInfo.teamProviderInfo[environmentName].awscloudformation.AmplifyAppId;
|
|
29
|
-
const
|
|
30
|
-
context,
|
|
31
|
-
newEnvName,
|
|
32
|
-
appId,
|
|
33
|
-
]));
|
|
34
|
-
if (process.env.UI_BUILDER_ENDPOINT) {
|
|
35
|
-
awsConfigInfo.endpoint = process.env.UI_BUILDER_ENDPOINT;
|
|
36
|
-
}
|
|
37
|
-
if (process.env.UI_BUILDER_REGION) {
|
|
38
|
-
awsConfigInfo.region = process.env.UI_BUILDER_REGION;
|
|
39
|
-
}
|
|
40
|
-
const amplifyUIBuilder = new aws_sdk_1.default.AmplifyUIBuilder(awsConfigInfo);
|
|
26
|
+
const amplifyUIBuilder = await (0, amplifyUiBuilderService_1.getAmplifyUIBuilderService)(context, environmentName, appId);
|
|
41
27
|
const components = existingComponents.entities;
|
|
42
28
|
if (!components.length) {
|
|
43
29
|
amplify_prompts_1.printer.debug(`No UIBuilder components found in app ${appId} from env ${sourceEnvName}. Skipping component clone process.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,2FAAiF;AACjF,qDAA0C;AAE1C,6EAA6E;AAEtE,KAAK,UAAU,GAAG,CAAC,OAAmB;;IAC3C,yBAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,yBAAW,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;IAE5F,MAAM,kBAAkB,GAAG,MAAM,IAAA,wDAAuB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACjF,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;IACD,MAAM,wBAAwB,GAAG,MAAM,IAAA,wDAAuB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpF,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,eAAe,GAAG,MAAA,IAAI,CAAC,eAAe,mCAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;IACrF,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC;IAC7G,MAAM,gBAAgB,GAAG,MAAM,IAAA,oDAA0B,EAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;IAC3F,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,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAc,EAAE,EAAE;QACvD,OAAO,MAAM,gBAAgB;aAC1B,eAAe,CAAC;YACf,KAAK;YACL,eAAe;YACf,iBAAiB,EAAE;gBACjB,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;gBAC9C,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;gBACtC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;aAC7B;SACF,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5B,yBAAO,CAAC,IAAI,CACV,uBAAuB,UAAU,CAAC,MAAM,gCAAgC,KAAK,aAAa,aAAa,WAAW,UAAU,GAAG,CAChI,CAAC;AACJ,CAAC;AAnDD,kBAmDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CA2C3D,CAAC"}
|
|
@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.run = void 0;
|
|
7
|
+
const amplify_prompts_1 = require("amplify-prompts");
|
|
8
|
+
const ora_1 = __importDefault(require("ora"));
|
|
7
9
|
const notifyMissingPackages_1 = require("./utils/notifyMissingPackages");
|
|
8
10
|
const shouldRenderComponents_1 = require("./utils/shouldRenderComponents");
|
|
9
11
|
const syncAmplifyUiBuilderComponents_1 = require("./utils/syncAmplifyUiBuilderComponents");
|
|
10
12
|
const createUiBuilderComponent_1 = require("./utils/createUiBuilderComponent");
|
|
11
|
-
const
|
|
12
|
-
const ora_1 = __importDefault(require("ora"));
|
|
13
|
-
async function run(context) {
|
|
13
|
+
const run = async (context) => {
|
|
14
14
|
amplify_prompts_1.printer.debug('Running generate components command in amplify-util-uibuilder');
|
|
15
15
|
if (!(await (0, shouldRenderComponents_1.shouldRenderComponents)(context))) {
|
|
16
16
|
return;
|
|
@@ -39,15 +39,16 @@ async function run(context) {
|
|
|
39
39
|
else {
|
|
40
40
|
spinner.succeed('Synced UI components.');
|
|
41
41
|
}
|
|
42
|
-
(
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
const invalidComponentNames = componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name);
|
|
43
|
+
if (invalidComponentNames.length) {
|
|
44
|
+
amplify_prompts_1.printer.warn(`The components ${invalidComponentNames.join(', ')} were synced with an older version of Amplify Studio. Please re-sync your components with Figma to get latest features and changes.`);
|
|
45
|
+
}
|
|
46
|
+
(0, notifyMissingPackages_1.notifyMissingPackages)(context);
|
|
46
47
|
}
|
|
47
48
|
catch (e) {
|
|
48
49
|
amplify_prompts_1.printer.debug(e);
|
|
49
50
|
spinner.fail('Failed to sync UI components');
|
|
50
51
|
}
|
|
51
|
-
}
|
|
52
|
+
};
|
|
52
53
|
exports.run = run;
|
|
53
54
|
//# sourceMappingURL=generateComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { AmplifyUIBuilder } from 'aws-sdk';
|
|
2
|
+
import { $TSContext } from 'amplify-cli-core';
|
|
3
|
+
export { Component, Theme } from 'aws-sdk/clients/amplifyuibuilder';
|
|
4
|
+
export declare const getAmplifyUIBuilderService: (context: $TSContext, environmentName: string, appId: string) => Promise<AmplifyUIBuilder>;
|
|
5
|
+
//# sourceMappingURL=amplifyUiBuilderService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"amplifyUiBuilderService.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/amplifyUiBuilderService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAEpE,eAAO,MAAM,0BAA0B,YAAmB,UAAU,mBAAmB,MAAM,SAAS,MAAM,KAAG,QAAQ,gBAAgB,CAgBtI,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAmplifyUIBuilderService = void 0;
|
|
4
|
+
const aws_sdk_1 = require("aws-sdk");
|
|
5
|
+
const getAmplifyUIBuilderService = async (context, environmentName, appId) => {
|
|
6
|
+
const awsConfigInfo = (await context.amplify.invokePluginMethod(context, 'awscloudformation', undefined, 'loadConfigurationForEnv', [
|
|
7
|
+
context,
|
|
8
|
+
environmentName,
|
|
9
|
+
appId,
|
|
10
|
+
]));
|
|
11
|
+
if (process.env.UI_BUILDER_ENDPOINT) {
|
|
12
|
+
awsConfigInfo.endpoint = process.env.UI_BUILDER_ENDPOINT;
|
|
13
|
+
}
|
|
14
|
+
if (process.env.UI_BUILDER_REGION) {
|
|
15
|
+
awsConfigInfo.region = process.env.UI_BUILDER_REGION;
|
|
16
|
+
}
|
|
17
|
+
return new aws_sdk_1.AmplifyUIBuilder(awsConfigInfo);
|
|
18
|
+
};
|
|
19
|
+
exports.getAmplifyUIBuilderService = getAmplifyUIBuilderService;
|
|
20
|
+
//# sourceMappingURL=amplifyUiBuilderService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"amplifyUiBuilderService.js","sourceRoot":"","sources":["../../../src/commands/utils/amplifyUiBuilderService.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAKpC,MAAM,0BAA0B,GAAG,KAAK,EAAE,OAAmB,EAAE,eAAuB,EAAE,KAAa,EAA6B,EAAE;IACzI,MAAM,aAAa,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,yBAAyB,EAAE;QAClI,OAAO;QACP,eAAe;QACf,KAAK;KACN,CAAC,CAAW,CAAC;IAEd,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACnC,aAAa,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;KAC1D;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;QACjC,aAAa,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;KACtD;IAED,OAAO,IAAI,0BAAgB,CAAC,aAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAhBW,QAAA,0BAA0B,8BAgBrC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { StudioComponent, RenderTextComponentResponse } from '@aws-amplify/codegen-ui
|
|
2
|
-
import { StudioComponent as StudioComponentNew, StudioTheme } from '@aws-amplify/codegen-ui-new';
|
|
1
|
+
import { StudioComponent, StudioTheme, RenderTextComponentResponse } from '@aws-amplify/codegen-ui';
|
|
3
2
|
import { $TSContext } from 'amplify-cli-core';
|
|
4
|
-
export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent) =>
|
|
3
|
+
export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent) => StudioComponent;
|
|
5
4
|
export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme) => StudioTheme;
|
|
6
|
-
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas:
|
|
5
|
+
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioComponent[]) => RenderTextComponentResponse;
|
|
7
6
|
//# sourceMappingURL=createUiBuilderComponent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createUiBuilderComponent.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createUiBuilderComponent.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,WAAW,EAIX,2BAA2B,EAC5B,MAAM,yBAAyB,CAAC;AAWjC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa9C,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,KAAG,eAmBvF,CAAC;AAKF,eAAO,MAAM,oBAAoB,YAAa,UAAU,UAAU,WAAW,KAAG,WA0B/E,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,eAAe,EAAE,KAAG,2BAwBnG,CAAC"}
|
|
@@ -1,29 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateAmplifyUiBuilderIndexFile = exports.createUiBuilderTheme = exports.createUiBuilderComponent = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
|
|
4
|
+
const codegen_ui_1 = require("@aws-amplify/codegen-ui");
|
|
5
|
+
const codegen_ui_react_1 = require("@aws-amplify/codegen-ui-react");
|
|
7
6
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
8
|
-
const
|
|
9
|
-
const codegen_ui_react_new_1 = require("@aws-amplify/codegen-ui-react-new");
|
|
7
|
+
const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
|
|
10
8
|
const config = {
|
|
11
|
-
module:
|
|
12
|
-
target:
|
|
13
|
-
script:
|
|
9
|
+
module: codegen_ui_react_1.ModuleKind.ES2020,
|
|
10
|
+
target: codegen_ui_react_1.ScriptTarget.ES2020,
|
|
11
|
+
script: codegen_ui_react_1.ScriptKind.JSX,
|
|
14
12
|
renderTypeDeclarations: true,
|
|
15
13
|
};
|
|
16
|
-
const isUpdatedSchema = (schema) => {
|
|
17
|
-
return schema.schemaVersion && schema.schemaVersion === '1.0';
|
|
18
|
-
};
|
|
19
14
|
const createUiBuilderComponent = (context, schema) => {
|
|
20
|
-
if (isUpdatedSchema(schema)) {
|
|
21
|
-
return (0, createUiBuilderComponentNew_1.createUiBuilderComponent)(context, schema);
|
|
22
|
-
}
|
|
23
15
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
24
|
-
const rendererFactory = new
|
|
16
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.AmplifyRenderer(component, config));
|
|
25
17
|
const outputPathDir = uiBuilderComponentsPath;
|
|
26
|
-
const rendererManager = new
|
|
18
|
+
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
27
19
|
outputPathDir,
|
|
28
20
|
});
|
|
29
21
|
rendererManager.renderSchemaToTemplate(schema);
|
|
@@ -32,9 +24,9 @@ const createUiBuilderComponent = (context, schema) => {
|
|
|
32
24
|
exports.createUiBuilderComponent = createUiBuilderComponent;
|
|
33
25
|
const createUiBuilderTheme = (context, schema) => {
|
|
34
26
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
35
|
-
const rendererFactory = new
|
|
27
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactThemeStudioTemplateRenderer(component, config));
|
|
36
28
|
const outputPathDir = uiBuilderComponentsPath;
|
|
37
|
-
const rendererManager = new
|
|
29
|
+
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
38
30
|
outputPathDir,
|
|
39
31
|
});
|
|
40
32
|
try {
|
|
@@ -51,9 +43,9 @@ const createUiBuilderTheme = (context, schema) => {
|
|
|
51
43
|
exports.createUiBuilderTheme = createUiBuilderTheme;
|
|
52
44
|
const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
53
45
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
54
|
-
const rendererFactory = new
|
|
46
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactIndexStudioTemplateRenderer(component, config));
|
|
55
47
|
const outputPathDir = uiBuilderComponentsPath;
|
|
56
|
-
const rendererManager = new
|
|
48
|
+
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
57
49
|
outputPathDir,
|
|
58
50
|
});
|
|
59
51
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createUiBuilderComponent.js","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createUiBuilderComponent.js","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":";;;AAAA,wDAQiC;AACjC,oEAOuC;AAEvC,qDAA0C;AAE1C,6EAA0E;AAE1E,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,EAAmB,EAAE;IACxG,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,CAKrF,CACJ,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;AAnBW,QAAA,wBAAwB,4BAmBnC;AAKK,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAE,MAAmB,EAAe,EAAE;IAC5F,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,SAAsB,EAAE,EAAE,CAAC,IAAI,mDAAgC,CAAC,SAAS,EAAE,MAAM,CAK/E,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;AA1BW,QAAA,oBAAoB,wBA0B/B;AAKK,MAAM,iCAAiC,GAAG,CAAC,OAAmB,EAAE,OAA0B,EAA+B,EAAE;IAChI,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,0CAA6B,CACvD,CAAC,SAA4B,EAAE,EAAE,CAAC,IAAI,mDAAgC,CAAC,SAAS,EAAE,MAAM,CAKrF,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,OAAO,eAAe,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;KACxD;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,yBAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,MAAM,CAAC,CAAC;KACT;AACH,CAAC,CAAC;AAxBW,QAAA,iCAAiC,qCAwB5C"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { $TSContext } from 'amplify-cli-core';
|
|
2
|
-
|
|
3
|
-
export declare const notifyMissingPackages: (context: $TSContext, schemas: StudioComponent[]) => void;
|
|
2
|
+
export declare const notifyMissingPackages: (context: $TSContext) => void;
|
|
4
3
|
//# sourceMappingURL=notifyMissingPackages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyMissingPackages.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"notifyMissingPackages.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EACuB,UAAU,EACvC,MAAM,kBAAkB,CAAC;AAe1B,eAAO,MAAM,qBAAqB,YAAa,UAAU,KAAG,IA8B3D,CAAC"}
|
|
@@ -9,19 +9,10 @@ const amplify_prompts_1 = require("amplify-prompts");
|
|
|
9
9
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
10
|
const path_1 = __importDefault(require("path"));
|
|
11
11
|
const subset_1 = __importDefault(require("semver/ranges/subset"));
|
|
12
|
+
const codegen_ui_react_1 = require("@aws-amplify/codegen-ui-react");
|
|
12
13
|
const extractArgs_1 = require("./extractArgs");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const isUpdatedSchema = (schemas) => {
|
|
16
|
-
return schemas.some(schema => schema.schemaVersion && schema.schemaVersion === '1.0');
|
|
17
|
-
};
|
|
18
|
-
const getRequiredDependencies = (schemas) => {
|
|
19
|
-
if (isUpdatedSchema(schemas)) {
|
|
20
|
-
return new codegen_ui_react_new_1.ReactRequiredDependencyProvider().getRequiredDependencies();
|
|
21
|
-
}
|
|
22
|
-
return new codegen_ui_react_old_1.ReactRequiredDependencyProvider().getRequiredDependencies();
|
|
23
|
-
};
|
|
24
|
-
const notifyMissingPackages = (context, schemas) => {
|
|
14
|
+
const getRequiredDependencies = () => new codegen_ui_react_1.ReactRequiredDependencyProvider().getRequiredDependencies();
|
|
15
|
+
const notifyMissingPackages = (context) => {
|
|
25
16
|
var _a;
|
|
26
17
|
const args = (0, extractArgs_1.extractArgs)(context);
|
|
27
18
|
const localEnvFilePath = (_a = args.localEnvFilePath) !== null && _a !== void 0 ? _a : amplify_cli_core_1.pathManager.getLocalEnvFilePath();
|
|
@@ -36,7 +27,7 @@ const notifyMissingPackages = (context, schemas) => {
|
|
|
36
27
|
return;
|
|
37
28
|
}
|
|
38
29
|
const packageJson = amplify_cli_core_1.JSONUtilities.readJson(packageJsonPath);
|
|
39
|
-
getRequiredDependencies(
|
|
30
|
+
getRequiredDependencies().forEach((dependency) => {
|
|
40
31
|
const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
|
|
41
32
|
if (!packageIsInstalled) {
|
|
42
33
|
amplify_prompts_1.printer.warn(`UIBuilder components required "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,uDAE0B;AAC1B,qDAA0C;AAC1C,wDAA0B;AAC1B,gDAAwB;AACxB,kEAA+C;AAE/C,oEAAgF;AAChF,+CAA4C;AAE5C,MAAM,uBAAuB,GAAG,GAAyB,EAAE,CAAC,IAAI,kDAA+B,EAAE,CAAC,uBAAuB,EAAE,CAAC;AAMrH,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAQ,EAAE;;IACjE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,8BAAW,CAAC,mBAAmB,EAAE,CAAC;IACpF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC9F,OAAO;KACR;IACD,MAAM,YAAY,GAAG,gCAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAE,YAAuB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACnC,yBAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QACjF,OAAO;KACR;IACD,MAAM,WAAW,GAAG,gCAAa,CAAC,QAAQ,CAAC,eAAe,CAAgD,CAAC;IAC3G,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrG,IAAI,CAAC,kBAAkB,EAAE;YACvB,yBAAO,CAAC,IAAI,CACV,kCAAkC,UAAU,CAAC,cAAc,0DAA0D,UAAU,CAAC,cAAc,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CAC/M,CAAC;SACH;aAAM,IAAI,CAAC,IAAA,gBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE;YAC/G,yBAAO,CAAC,IAAI,CACV,0CAA0C,UAAU,CAAC,sBAAsB,SACzE,UAAU,CAAC,cACb,oCAAoC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,yBACrF,UAAU,CAAC,cACb,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CACjE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Component, Theme } from './amplifyUiBuilderService';
|
|
2
2
|
import { $TSContext } from 'amplify-cli-core';
|
|
3
3
|
export declare const getEnvName: (context: $TSContext, envName?: string | undefined) => any;
|
|
4
4
|
export declare const resolveAppId: (context: $TSContext) => Promise<unknown>;
|
|
5
5
|
export declare const getAppId: (context: $TSContext) => Promise<any>;
|
|
6
|
-
export declare function listUiBuilderComponents(context: $TSContext, envName?: string): Promise<
|
|
7
|
-
|
|
6
|
+
export declare function listUiBuilderComponents(context: $TSContext, envName?: string): Promise<{
|
|
7
|
+
entities: Component[];
|
|
8
|
+
}>;
|
|
9
|
+
export declare function listUiBuilderThemes(context: $TSContext, envName?: string): Promise<{
|
|
10
|
+
entities: Theme[];
|
|
11
|
+
}>;
|
|
8
12
|
export declare function generateUiBuilderComponents(context: $TSContext, componentSchemas: any[]): ({
|
|
9
13
|
resultType: string;
|
|
10
|
-
component: import("@aws-amplify/codegen-ui
|
|
14
|
+
component: import("@aws-amplify/codegen-ui").StudioComponent;
|
|
11
15
|
schemaName?: undefined;
|
|
12
16
|
error?: undefined;
|
|
13
17
|
} | {
|
|
@@ -18,7 +22,7 @@ export declare function generateUiBuilderComponents(context: $TSContext, compone
|
|
|
18
22
|
})[];
|
|
19
23
|
export declare function generateUiBuilderThemes(context: $TSContext, themeSchemas: any[]): ({
|
|
20
24
|
resultType: string;
|
|
21
|
-
theme: import("@aws-amplify/codegen-ui
|
|
25
|
+
theme: import("@aws-amplify/codegen-ui").StudioTheme;
|
|
22
26
|
schemaName?: undefined;
|
|
23
27
|
error?: undefined;
|
|
24
28
|
} | {
|
|
@@ -27,5 +31,4 @@ export declare function generateUiBuilderThemes(context: $TSContext, themeSchema
|
|
|
27
31
|
error: any;
|
|
28
32
|
theme?: undefined;
|
|
29
33
|
})[];
|
|
30
|
-
export declare const getAmplifyUIBuilderService: (context: $TSContext, environmentName: string, appId: string) => Promise<aws.AmplifyUIBuilder>;
|
|
31
34
|
//# sourceMappingURL=syncAmplifyUiBuilderComponents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,SAAS,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAKzF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,eAAO,MAAM,UAAU,YAAa,UAAU,sCAG7C,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,UAAU,qBAErD,CAAC;AAEF,eAAO,MAAM,QAAQ,YAAmB,UAAU,iBASjD,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;CAAE,CAAC,CAyBvH;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAE,CAAC,CAwB/G;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,EAAE;;;;;;;;;;KAkBvF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,EAAE;;;;;;;;;;KAgB/E"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
7
|
-
const
|
|
3
|
+
exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = exports.listUiBuilderThemes = exports.listUiBuilderComponents = exports.getAppId = exports.resolveAppId = exports.getEnvName = void 0;
|
|
4
|
+
const amplifyUiBuilderService_1 = require("./amplifyUiBuilderService");
|
|
8
5
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
9
6
|
const createUiBuilderComponent_1 = require("./createUiBuilderComponent");
|
|
10
7
|
const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
|
|
@@ -30,15 +27,22 @@ async function listUiBuilderComponents(context, envName) {
|
|
|
30
27
|
const environmentName = (0, exports.getEnvName)(context, envName);
|
|
31
28
|
const appId = await (0, exports.getAppId)(context);
|
|
32
29
|
try {
|
|
33
|
-
const amplifyUIBuilder = await (0,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
30
|
+
const amplifyUIBuilder = await (0, amplifyUiBuilderService_1.getAmplifyUIBuilderService)(context, environmentName, appId);
|
|
31
|
+
let nextToken;
|
|
32
|
+
const uiBuilderComponents = [];
|
|
33
|
+
do {
|
|
34
|
+
const response = await amplifyUIBuilder
|
|
35
|
+
.exportComponents({
|
|
36
|
+
appId,
|
|
37
|
+
environmentName,
|
|
38
|
+
nextToken
|
|
39
|
+
})
|
|
40
|
+
.promise();
|
|
41
|
+
uiBuilderComponents.push(...response.entities);
|
|
42
|
+
nextToken = response.nextToken;
|
|
43
|
+
} while (nextToken);
|
|
40
44
|
amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderComponents, null, 2));
|
|
41
|
-
return uiBuilderComponents;
|
|
45
|
+
return { entities: uiBuilderComponents };
|
|
42
46
|
}
|
|
43
47
|
catch (e) {
|
|
44
48
|
amplify_prompts_1.printer.debug(e);
|
|
@@ -50,15 +54,21 @@ async function listUiBuilderThemes(context, envName) {
|
|
|
50
54
|
const environmentName = (0, exports.getEnvName)(context, envName);
|
|
51
55
|
const appId = await (0, exports.getAppId)(context);
|
|
52
56
|
try {
|
|
53
|
-
const amplifyUIBuilder = await (0,
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
const amplifyUIBuilder = await (0, amplifyUiBuilderService_1.getAmplifyUIBuilderService)(context, environmentName, appId);
|
|
58
|
+
let nextToken;
|
|
59
|
+
const uiBuilderThemes = [];
|
|
60
|
+
do {
|
|
61
|
+
const response = await amplifyUIBuilder
|
|
62
|
+
.exportThemes({
|
|
63
|
+
appId,
|
|
64
|
+
environmentName,
|
|
65
|
+
})
|
|
66
|
+
.promise();
|
|
67
|
+
uiBuilderThemes.push(...response.entities);
|
|
68
|
+
nextToken = response.nextToken;
|
|
69
|
+
} while (nextToken);
|
|
60
70
|
amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderThemes, null, 2));
|
|
61
|
-
return uiBuilderThemes;
|
|
71
|
+
return { entities: uiBuilderThemes };
|
|
62
72
|
}
|
|
63
73
|
catch (e) {
|
|
64
74
|
amplify_prompts_1.printer.debug(e);
|
|
@@ -98,19 +108,4 @@ function generateUiBuilderThemes(context, themeSchemas) {
|
|
|
98
108
|
return themeResults;
|
|
99
109
|
}
|
|
100
110
|
exports.generateUiBuilderThemes = generateUiBuilderThemes;
|
|
101
|
-
const getAmplifyUIBuilderService = async (context, environmentName, appId) => {
|
|
102
|
-
const awsConfigInfo = (await context.amplify.invokePluginMethod(context, 'awscloudformation', undefined, 'loadConfigurationForEnv', [
|
|
103
|
-
context,
|
|
104
|
-
environmentName,
|
|
105
|
-
appId,
|
|
106
|
-
]));
|
|
107
|
-
if (process.env.UI_BUILDER_ENDPOINT) {
|
|
108
|
-
awsConfigInfo.endpoint = process.env.UI_BUILDER_ENDPOINT;
|
|
109
|
-
}
|
|
110
|
-
if (process.env.UI_BUILDER_REGION) {
|
|
111
|
-
awsConfigInfo.region = process.env.UI_BUILDER_REGION;
|
|
112
|
-
}
|
|
113
|
-
return new aws_sdk_1.default.AmplifyUIBuilder(awsConfigInfo);
|
|
114
|
-
};
|
|
115
|
-
exports.getAmplifyUIBuilderService = getAmplifyUIBuilderService;
|
|
116
111
|
//# sourceMappingURL=syncAmplifyUiBuilderComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.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.2.
|
|
3
|
+
"version": "1.2.21-alpha.23+eceab8d68",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,17 +13,17 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@aws-amplify/codegen-ui
|
|
17
|
-
"@aws-amplify/codegen-ui-
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"amplify-
|
|
21
|
-
"
|
|
22
|
-
"
|
|
23
|
-
"aws-sdk": "2.1084.0"
|
|
16
|
+
"@aws-amplify/codegen-ui": "^2.2.0",
|
|
17
|
+
"@aws-amplify/codegen-ui-react": "^2.2.0",
|
|
18
|
+
"amplify-cli-core": "2.5.3-alpha.23+eceab8d68",
|
|
19
|
+
"amplify-prompts": "2.0.1-alpha.39+eceab8d68",
|
|
20
|
+
"amplify-provider-awscloudformation": "6.1.1-alpha.23+eceab8d68",
|
|
21
|
+
"aws-sdk": "2.1113.0",
|
|
22
|
+
"ora": "^4.0.3"
|
|
24
23
|
},
|
|
25
24
|
"devDependencies": {
|
|
26
|
-
"@
|
|
25
|
+
"@types/fs-extra": "^8.0.1",
|
|
26
|
+
"@types/semver": "^7.1.0"
|
|
27
27
|
},
|
|
28
28
|
"jest": {
|
|
29
29
|
"testRunner": "jest-circus/runner",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"usePathForSuiteName": "true",
|
|
61
61
|
"addFileAttribute": "true"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "eceab8d6810d59f4d1b24e3179caa066ef59a574"
|
|
64
64
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import * as codegen from '@aws-amplify/codegen-ui
|
|
1
|
+
import * as codegen from '@aws-amplify/codegen-ui';
|
|
2
2
|
import {
|
|
3
3
|
generateAmplifyUiBuilderIndexFile,
|
|
4
4
|
createUiBuilderTheme,
|
|
5
5
|
createUiBuilderComponent,
|
|
6
6
|
} from '../commands/utils/createUiBuilderComponent';
|
|
7
|
-
jest.mock('@aws-amplify/codegen-ui
|
|
7
|
+
jest.mock('@aws-amplify/codegen-ui');
|
|
8
8
|
const codegen_mock = codegen as any;
|
|
9
9
|
const renderSchemaToTemplateMock = jest.fn();
|
|
10
10
|
|
|
@@ -23,7 +23,7 @@ describe('should notify when packages are missing', () => {
|
|
|
23
23
|
},
|
|
24
24
|
},
|
|
25
25
|
};
|
|
26
|
-
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext
|
|
26
|
+
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
|
|
27
27
|
expect(printerDependency.printer.debug).toBeCalledTimes(1);
|
|
28
28
|
});
|
|
29
29
|
|
|
@@ -39,7 +39,7 @@ describe('should notify when packages are missing', () => {
|
|
|
39
39
|
},
|
|
40
40
|
},
|
|
41
41
|
};
|
|
42
|
-
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext
|
|
42
|
+
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
|
|
43
43
|
expect(printerDependency.printer.debug).toBeCalledTimes(1);
|
|
44
44
|
});
|
|
45
45
|
|
|
@@ -51,7 +51,7 @@ describe('should notify when packages are missing', () => {
|
|
|
51
51
|
},
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
|
-
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext
|
|
54
|
+
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
|
|
55
55
|
expect(printerDependency.printer.warn).toBeCalledTimes(1);
|
|
56
56
|
});
|
|
57
57
|
|
|
@@ -67,7 +67,7 @@ describe('should notify when packages are missing', () => {
|
|
|
67
67
|
},
|
|
68
68
|
},
|
|
69
69
|
};
|
|
70
|
-
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext
|
|
70
|
+
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
|
|
71
71
|
expect(printerDependency.printer.warn).toBeCalledTimes(1);
|
|
72
72
|
});
|
|
73
73
|
});
|
|
@@ -5,10 +5,10 @@ import {
|
|
|
5
5
|
getAppId,
|
|
6
6
|
listUiBuilderComponents,
|
|
7
7
|
listUiBuilderThemes,
|
|
8
|
-
getAmplifyUIBuilderService,
|
|
9
8
|
resolveAppId,
|
|
10
9
|
generateUiBuilderThemes,
|
|
11
10
|
} from '../commands/utils/syncAmplifyUiBuilderComponents';
|
|
11
|
+
import { getAmplifyUIBuilderService } from '../commands/utils/amplifyUiBuilderService'
|
|
12
12
|
import aws from 'aws-sdk';
|
|
13
13
|
import * as CLICore from 'amplify-cli-core';
|
|
14
14
|
import * as createUiBuilderComponentDependency from '../commands/utils/createUiBuilderComponent';
|