@aws-amplify/amplify-util-uibuilder 1.2.16-pin-codegen-dependency.0 → 1.2.16

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.2.16-pin-codegen-dependency.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.2.15...@aws-amplify/amplify-util-uibuilder@1.2.16-pin-codegen-dependency.0) (2022-03-09)
+## [1.2.16](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.2.15...@aws-amplify/amplify-util-uibuilder@1.2.16) (2022-03-14)
 
 **Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
 

package/lib/commands/generateComponents.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare const run: (context: $TSContext) => Promise<void>;
+export declare function run(context: $TSContext): Promise<void>;
 //# sourceMappingURL=generateComponents.d.ts.map

package/lib/commands/generateComponents.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAyC5C"}

package/lib/commands/generateComponents.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const amplify_prompts_1 = require("amplify-prompts");
-const ora_1 = __importDefault(require("ora"));
 const notifyMissingPackages_1 = require("./utils/notifyMissingPackages");
 const shouldRenderComponents_1 = require("./utils/shouldRenderComponents");
 const syncAmplifyUiBuilderComponents_1 = require("./utils/syncAmplifyUiBuilderComponents");
 const createUiBuilderComponent_1 = require("./utils/createUiBuilderComponent");
-const run = async (context) => {
+const amplify_prompts_1 = require("amplify-prompts");
+const ora_1 = __importDefault(require("ora"));
+async function run(context) {
     amplify_prompts_1.printer.debug('Running generate components command in amplify-util-uibuilder');
     if (!(await (0, shouldRenderComponents_1.shouldRenderComponents)(context))) {
         return;
@@ -39,16 +39,15 @@ const run = async (context) => {
         else {
             spinner.succeed('Synced UI components.');
         }
-        const invalidComponentNames = componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name);
-        if (invalidComponentNames.length) {
-            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.`);
-        }
-        (0, notifyMissingPackages_1.notifyMissingPackages)(context);
+        (0, notifyMissingPackages_1.notifyMissingPackages)(context, [
+            ...generatedComponentResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ component }) => component),
+            ...generatedThemeResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ theme }) => theme),
+        ]);
     }
     catch (e) {
         amplify_prompts_1.printer.debug(e);
         spinner.fail('Failed to sync UI components');
     }
-};
+}
 exports.run = run;
 //# sourceMappingURL=generateComponents.js.map

package/lib/commands/generateComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}

package/lib/commands/utils/createUiBuilderComponent.d.ts

@@ -1,6 +1,7 @@
-import { StudioComponent, StudioTheme, RenderTextComponentResponse } from '@aws-amplify/codegen-ui';
+import { StudioComponent, RenderTextComponentResponse } from '@aws-amplify/codegen-ui-old';
+import { StudioComponent as StudioComponentNew, StudioTheme } from '@aws-amplify/codegen-ui-new';
 import { $TSContext } from 'amplify-cli-core';
-export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent) => StudioComponent;
+export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent) => StudioComponentNew | StudioComponent;
 export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme) => StudioTheme;
-export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioComponent[]) => RenderTextComponentResponse;
+export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioComponentNew[]) => RenderTextComponentResponse;
 //# sourceMappingURL=createUiBuilderComponent.d.ts.map

package/lib/commands/utils/createUiBuilderComponent.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"createUiBuilderComponent.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,eAAe,EAAiF,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AASzM,OAAO,EAAC,eAAe,IAAI,kBAAkB,EAAE,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAG/F,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,yCAuBpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,UAAU,UAAU,WAAW,gBAmB5E,CAAC;AAEF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,kBAAkB,EAAE,gCAgBhG,CAAC"}

package/lib/commands/utils/createUiBuilderComponent.js

@@ -1,21 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAmplifyUiBuilderIndexFile = exports.createUiBuilderTheme = exports.createUiBuilderComponent = void 0;
-const codegen_ui_1 = require("@aws-amplify/codegen-ui");
-const codegen_ui_react_1 = require("@aws-amplify/codegen-ui-react");
-const amplify_prompts_1 = require("amplify-prompts");
+const codegen_ui_old_1 = require("@aws-amplify/codegen-ui-old");
+const codegen_ui_react_old_1 = require("@aws-amplify/codegen-ui-react-old");
 const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
+const amplify_prompts_1 = require("amplify-prompts");
+const createUiBuilderComponentNew_1 = require("./createUiBuilderComponentNew");
+const codegen_ui_react_new_1 = require("@aws-amplify/codegen-ui-react-new");
 const config = {
-    module: codegen_ui_react_1.ModuleKind.ES2020,
-    target: codegen_ui_react_1.ScriptTarget.ES2020,
-    script: codegen_ui_react_1.ScriptKind.JSX,
+    module: codegen_ui_react_old_1.ModuleKind.ES2020,
+    target: codegen_ui_react_old_1.ScriptTarget.ES2020,
+    script: codegen_ui_react_old_1.ScriptKind.JSX,
     renderTypeDeclarations: true,
 };
+const isUpdatedSchema = (schema) => {
+    return schema.schemaVersion && schema.schemaVersion === '1.0';
+};
 const createUiBuilderComponent = (context, schema) => {
+    if (isUpdatedSchema(schema)) {
+        return (0, createUiBuilderComponentNew_1.createUiBuilderComponent)(context, schema);
+    }
     const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
-    const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.AmplifyRenderer(component, config));
+    const rendererFactory = new codegen_ui_old_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_old_1.AmplifyRenderer(component, config));
     const outputPathDir = uiBuilderComponentsPath;
-    const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
+    const rendererManager = new codegen_ui_old_1.StudioTemplateRendererManager(rendererFactory, {
         outputPathDir,
     });
     rendererManager.renderSchemaToTemplate(schema);
@@ -24,9 +32,9 @@ const createUiBuilderComponent = (context, schema) => {
 exports.createUiBuilderComponent = createUiBuilderComponent;
 const createUiBuilderTheme = (context, schema) => {
     const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
-    const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactThemeStudioTemplateRenderer(component, config));
+    const rendererFactory = new codegen_ui_old_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_old_1.ReactThemeStudioTemplateRenderer(component, config));
     const outputPathDir = uiBuilderComponentsPath;
-    const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
+    const rendererManager = new codegen_ui_old_1.StudioTemplateRendererManager(rendererFactory, {
         outputPathDir,
     });
     try {
@@ -43,9 +51,9 @@ const createUiBuilderTheme = (context, schema) => {
 exports.createUiBuilderTheme = createUiBuilderTheme;
 const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
     const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
-    const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactIndexStudioTemplateRenderer(component, config));
+    const rendererFactory = new codegen_ui_old_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_new_1.ReactIndexStudioTemplateRenderer(component, config));
     const outputPathDir = uiBuilderComponentsPath;
-    const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
+    const rendererManager = new codegen_ui_old_1.StudioTemplateRendererManager(rendererFactory, {
         outputPathDir,
     });
     try {

package/lib/commands/utils/createUiBuilderComponent.js.map

@@ -1 +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"}
+{"version":3,"file":"createUiBuilderComponent.js","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponent.ts"],"names":[],"mappings":";;;AAAA,gEAAyM;AACzM,4EAM2C;AAG3C,6EAA0E;AAC1E,qDAA0C;AAE1C,+EAAwG;AACxG,4EAAqF;AACrF,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,iCAAU,CAAC,MAAM;IACzB,MAAM,EAAE,mCAAY,CAAC,MAAM;IAC3B,MAAM,EAAE,iCAAU,CAAC,GAAG;IACtB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAuB,EAAE,EAAE;IAClD,OAAQ,MAAwC,CAAC,aAAa,IAAK,MAAwC,CAAC,aAAa,KAAK,KAAK,CAAC;AACtI,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,CAAC,OAAmB,EAAE,MAAuB,EAAE,EAAE;IACvF,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,IAAA,sDAA2B,EAAC,OAAO,EAAE,MAAuC,CAAC,CAAC;KACtF;IACD,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,8CAA6B,CACvD,CAAC,SAA0B,EAAE,EAAE,CAC7B,IAAI,sCAAe,CAAC,SAA4B,EAAE,MAAM,CAKvD,CACJ,CAAC;IAEF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAvBW,QAAA,wBAAwB,4BAuBnC;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAE,MAAmB,EAAE,EAAE;IAC/E,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,CAAC,SAAsB,EAAE,EAAE,CAAC,IAAI,uDAAgC,CAAC,SAAS,EAAE,MAAM,CAA0H,CAAC,CAAC;IAExQ,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,8CAA6B,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;AAnBW,QAAA,oBAAoB,wBAmB/B;AAEK,MAAM,iCAAiC,GAAG,CAAC,OAAmB,EAAE,OAA6B,EAAE,EAAE;IACtG,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,CAAC,SAA+B,EAAE,EAAE,CAAC,IAAI,uDAAgC,CAAC,SAAS,EAAE,MAAM,CAAmI,CAAC,CAAC;IAE1R,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,8CAA6B,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;AAAA,CAAC,CAAC;AAhBQ,QAAA,iCAAiC,qCAgBzC"}

package/lib/commands/utils/createUiBuilderComponentNew.d.ts

@@ -0,0 +1,5 @@
+import { StudioComponent, StudioTheme } from '@aws-amplify/codegen-ui-new';
+import { $TSContext } from 'amplify-cli-core';
+export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent) => StudioComponent;
+export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme) => StudioTheme;
+//# sourceMappingURL=createUiBuilderComponentNew.d.ts.map

package/lib/commands/utils/createUiBuilderComponentNew.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUiBuilderComponentNew.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponentNew.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgE,eAAe,EAAE,WAAW,EAA+E,MAAM,6BAA6B,CAAC;AAWtN,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,oBAYpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,UAAU,UAAU,WAAW,gBAmB5E,CAAC"}

package/lib/commands/utils/createUiBuilderComponentNew.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUiBuilderTheme = exports.createUiBuilderComponent = void 0;
+const codegen_ui_new_1 = require("@aws-amplify/codegen-ui-new");
+const codegen_ui_react_new_1 = require("@aws-amplify/codegen-ui-react-new");
+const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
+const amplify_prompts_1 = require("amplify-prompts");
+const config = {
+    module: codegen_ui_react_new_1.ModuleKind.ES2020,
+    target: codegen_ui_react_new_1.ScriptTarget.ES2020,
+    script: codegen_ui_react_new_1.ScriptKind.JSX,
+    renderTypeDeclarations: true,
+};
+const createUiBuilderComponent = (context, schema) => {
+    const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
+    const rendererFactory = new codegen_ui_new_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_new_1.AmplifyRenderer(component, config));
+    const outputPathDir = uiBuilderComponentsPath;
+    const rendererManager = new codegen_ui_new_1.StudioTemplateRendererManager(rendererFactory, {
+        outputPathDir,
+    });
+    rendererManager.renderSchemaToTemplate(schema);
+    return schema;
+};
+exports.createUiBuilderComponent = createUiBuilderComponent;
+const createUiBuilderTheme = (context, schema) => {
+    const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
+    const rendererFactory = new codegen_ui_new_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_new_1.ReactThemeStudioTemplateRenderer(component, config));
+    const outputPathDir = uiBuilderComponentsPath;
+    const rendererManager = new codegen_ui_new_1.StudioTemplateRendererManager(rendererFactory, {
+        outputPathDir,
+    });
+    try {
+        rendererManager.renderSchemaToTemplate(schema);
+        return schema;
+    }
+    catch (e) {
+        amplify_prompts_1.printer.debug(e);
+        amplify_prompts_1.printer.debug('Skipping invalid theme with schema');
+        amplify_prompts_1.printer.debug(JSON.stringify(schema, null, 2));
+        throw e;
+    }
+};
+exports.createUiBuilderTheme = createUiBuilderTheme;
+//# sourceMappingURL=createUiBuilderComponentNew.js.map

package/lib/commands/utils/createUiBuilderComponentNew.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createUiBuilderComponentNew.js","sourceRoot":"","sources":["../../../src/commands/utils/createUiBuilderComponentNew.ts"],"names":[],"mappings":";;;AAAA,gEAAsN;AACtN,4EAO2C;AAC3C,6EAA0E;AAC1E,qDAA0C;AAE1C,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,iCAAU,CAAC,MAAM;IACzB,MAAM,EAAE,mCAAY,CAAC,MAAM;IAC3B,MAAM,EAAE,iCAAU,CAAC,GAAG;IACtB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAEK,MAAM,wBAAwB,GAAG,CAAC,OAAmB,EAAE,MAAuB,EAAE,EAAE;IACvF,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,CAAC,SAA0B,EAAE,EAAE,CAAC,IAAI,sCAAe,CAAC,SAAS,EAAE,MAAM,CAA8H,CAAC,CAAC;IAE/P,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,eAAe,EAAE;QACzE,aAAa;KACd,CAAC,CAAC;IAEH,eAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAZW,QAAA,wBAAwB,4BAYnC;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAE,MAAmB,EAAE,EAAE;IAC/E,MAAM,uBAAuB,GAAG,IAAA,uDAA0B,EAAC,OAAO,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,IAAI,8CAA6B,CAAC,CAAC,SAAsB,EAAE,EAAE,CAAC,IAAI,uDAAgC,CAAC,SAAS,EAAE,MAAM,CAA0H,CAAC,CAAC;IAExQ,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAI,8CAA6B,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;AAnBW,QAAA,oBAAoB,wBAmB/B"}

package/lib/commands/utils/notifyMissingPackages.d.ts

@@ -1,3 +1,4 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare const notifyMissingPackages: (context: $TSContext) => void;
+import { StudioComponent } from '@aws-amplify/codegen-ui-new';
+export declare const notifyMissingPackages: (context: $TSContext, schemas: StudioComponent[]) => void;
 //# sourceMappingURL=notifyMissingPackages.d.ts.map

package/lib/commands/utils/notifyMissingPackages.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"notifyMissingPackages.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAQlF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAa9D,eAAO,MAAM,qBAAqB,YAAa,UAAU,WAAW,eAAe,EAAE,SA8BpF,CAAC"}

package/lib/commands/utils/notifyMissingPackages.js

@@ -9,10 +9,19 @@ const amplify_prompts_1 = require("amplify-prompts");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const subset_1 = __importDefault(require("semver/ranges/subset"));
-const codegen_ui_react_1 = require("@aws-amplify/codegen-ui-react");
 const extractArgs_1 = require("./extractArgs");
-const getRequiredDependencies = () => new codegen_ui_react_1.ReactRequiredDependencyProvider().getRequiredDependencies();
-const notifyMissingPackages = (context) => {
+const codegen_ui_react_old_1 = require("@aws-amplify/codegen-ui-react-old");
+const codegen_ui_react_new_1 = require("@aws-amplify/codegen-ui-react-new");
+const isUpdatedSchema = (schemas) => {
+    return schemas.some(schema => schema.schemaVersion && schema.schemaVersion === '1.0');
+};
+const getRequiredDependencies = (schemas) => {
+    if (isUpdatedSchema(schemas)) {
+        return new codegen_ui_react_new_1.ReactRequiredDependencyProvider().getRequiredDependencies();
+    }
+    return new codegen_ui_react_old_1.ReactRequiredDependencyProvider().getRequiredDependencies();
+};
+const notifyMissingPackages = (context, schemas) => {
     var _a;
     const args = (0, extractArgs_1.extractArgs)(context);
     const localEnvFilePath = (_a = args.localEnvFilePath) !== null && _a !== void 0 ? _a : amplify_cli_core_1.pathManager.getLocalEnvFilePath();
@@ -27,7 +36,7 @@ const notifyMissingPackages = (context) => {
         return;
     }
     const packageJson = amplify_cli_core_1.JSONUtilities.readJson(packageJsonPath);
-    getRequiredDependencies().forEach((dependency) => {
+    getRequiredDependencies(schemas).forEach((dependency) => {
         const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
         if (!packageIsInstalled) {
             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}`);

package/lib/commands/utils/notifyMissingPackages.js.map

@@ -1 +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"}
+{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAkF;AAClF,qDAA0C;AAC1C,wDAA0B;AAC1B,gDAAwB;AACxB,kEAA+C;AAC/C,+CAA4C;AAC5C,4EAAoF;AACpF,4EAA0H;AAG1H,MAAM,eAAe,GAAG,CAAC,OAA0B,EAAE,EAAE;IACrD,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAA0B,EAAE,EAAE;IAC7D,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,sDAAkC,EAAE,CAAC,uBAAuB,EAAE,CAAC;KAC3E;IACD,OAAO,IAAI,sDAA+B,EAAE,CAAC,uBAAuB,EAAE,CAAC;AACzE,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAE,OAA0B,EAAE,EAAE;;IACvF,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,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QAC9D,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"}

package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts

@@ -7,7 +7,7 @@ export declare function listUiBuilderComponents(context: $TSContext, envName?: s
 export declare function listUiBuilderThemes(context: $TSContext, envName?: string): Promise<import("aws-sdk/lib/request").PromiseResult<aws.AmplifyUIBuilder.ExportThemesResponse, aws.AWSError>>;
 export declare function generateUiBuilderComponents(context: $TSContext, componentSchemas: any[]): ({
     resultType: string;
-    component: import("@aws-amplify/codegen-ui").StudioComponent;
+    component: import("@aws-amplify/codegen-ui-new").StudioComponent | import("@aws-amplify/codegen-ui-old").StudioComponent;
     schemaName?: undefined;
     error?: undefined;
 } | {
@@ -18,7 +18,7 @@ export declare function generateUiBuilderComponents(context: $TSContext, compone
 })[];
 export declare function generateUiBuilderThemes(context: $TSContext, themeSchemas: any[]): ({
     resultType: string;
-    theme: import("@aws-amplify/codegen-ui").StudioTheme;
+    theme: import("@aws-amplify/codegen-ui-new").StudioTheme;
     schemaName?: undefined;
     error?: undefined;
 } | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.2.16-pin-codegen-dependency.0",
+  "version": "1.2.16",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,15 +13,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.1.2",
-    "@aws-amplify/codegen-ui-react": "2.1.2",
-    "@types/fs-extra": "^8.0.1",
-    "@types/semver": "^7.1.0",
-    "amplify-cli-core": "2.4.18-pin-codegen-dependency.0",
+    "@aws-amplify/codegen-ui-new": "npm:@aws-amplify/codegen-ui@2.1.0",
+    "@aws-amplify/codegen-ui-old": "npm:@aws-amplify/codegen-ui@1.2.0",
+    "@aws-amplify/codegen-ui-react-new": "npm:@aws-amplify/codegen-ui-react@2.1.0",
+    "@aws-amplify/codegen-ui-react-old": "npm:@aws-amplify/codegen-ui-react@1.2.0",
+    "amplify-cli-core": "2.4.18",
     "amplify-prompts": "1.6.3",
-    "amplify-provider-awscloudformation": "5.9.10-pin-codegen-dependency.0",
-    "aws-sdk": "2.1084.0",
-    "ora": "^4.0.3"
+    "amplify-provider-awscloudformation": "5.9.10",
+    "aws-sdk": "2.1084.0"
+  },
+  "devDependencies": {
+    "@aws-amplify/codegen-ui": "2.1.0"
   },
   "jest": {
     "testRunner": "jest-circus/runner",
@@ -58,5 +60,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "04d7b3f7c3ec5a3ac95968a05a3a963832ac9b6f"
+  "gitHead": "f4fca61223f56eb79e6363d32fc16083fd043759"
 }

package/src/__tests__/createUiBuilderComponent.test.ts

@@ -1,10 +1,10 @@
-import * as codegen from '@aws-amplify/codegen-ui';
+import * as codegen from '@aws-amplify/codegen-ui-old';
 import {
   generateAmplifyUiBuilderIndexFile,
   createUiBuilderTheme,
   createUiBuilderComponent,
 } from '../commands/utils/createUiBuilderComponent';
-jest.mock('@aws-amplify/codegen-ui');
+jest.mock('@aws-amplify/codegen-ui-old');
 const codegen_mock = codegen as any;
 const renderSchemaToTemplateMock = jest.fn();
 

package/src/__tests__/generateComponents.test.ts

@@ -33,8 +33,6 @@ describe('can generate components', () => {
         {
           resultType: 'SUCCESS',
           schemaName: 'testSchema',
-          name: 'testSchema',
-          schemaVersion: '1.0',
         },
       ],
     };

package/src/__tests__/notifyMissingPackages.test.ts

@@ -23,7 +23,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext, []);
     expect(printerDependency.printer.debug).toBeCalledTimes(1);
   });
 
@@ -39,7 +39,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext, []);
     expect(printerDependency.printer.debug).toBeCalledTimes(1);
   });
 
@@ -51,7 +51,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext, []);
     expect(printerDependency.printer.warn).toBeCalledTimes(1);
   });
 
@@ -67,7 +67,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext, []);
     expect(printerDependency.printer.warn).toBeCalledTimes(1);
   });
 });

package/src/commands/generateComponents.ts

@@ -1,7 +1,3 @@
-import { StudioComponent } from '@aws-amplify/codegen-ui';
-import { printer } from 'amplify-prompts';
-import ora from 'ora';
-import { $TSContext } from 'amplify-cli-core';
 import { notifyMissingPackages } from './utils/notifyMissingPackages';
 import { shouldRenderComponents } from './utils/shouldRenderComponents';
 import {
@@ -10,12 +6,13 @@ import {
   generateUiBuilderComponents,
   generateUiBuilderThemes,
 } from './utils/syncAmplifyUiBuilderComponents';
+import { StudioComponent as StudioComponentNew } from '@aws-amplify/codegen-ui-new';
 import { generateAmplifyUiBuilderIndexFile } from './utils/createUiBuilderComponent';
+import { printer } from 'amplify-prompts';
+import ora from 'ora';
+import { $TSContext } from 'amplify-cli-core';
 
-/**
- * Pulls ui components from Studio backend and generates the code in the user's file system
- */
-export const run = async (context: $TSContext): Promise<void> => {
+export async function run(context: $TSContext) {
   printer.debug('Running generate components command in amplify-util-uibuilder');
   if (!(await shouldRenderComponents(context))) {
     return;
@@ -35,7 +32,7 @@ export const run = async (context: $TSContext): Promise<void> => {
     generateAmplifyUiBuilderIndexFile(context, [
       ...generatedComponentResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ component }) => component),
       ...generatedThemeResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ theme }) => theme),
-    ] as StudioComponent[]);
+    ] as StudioComponentNew[]);
 
     const failedSchemas = [
       ...generatedComponentResults.filter(({ resultType }) => resultType === 'FAILURE').map(({ schemaName }) => schemaName),
@@ -48,14 +45,12 @@ export const run = async (context: $TSContext): Promise<void> => {
       spinner.succeed('Synced UI components.');
     }
 
-    const invalidComponentNames = componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name);
-    if (invalidComponentNames.length) {
-      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.`);
-    }
-
-    notifyMissingPackages(context);
+    notifyMissingPackages(context, [
+      ...generatedComponentResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ component }) => component),
+      ...generatedThemeResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ theme }) => theme),
+    ] as StudioComponentNew[]);
   } catch (e) {
     printer.debug(e);
     spinner.fail('Failed to sync UI components');
   }
-};
+}

package/src/commands/utils/createUiBuilderComponent.ts

@@ -1,25 +1,18 @@
-import {
-  StudioTemplateRendererManager,
-  StudioComponent,
-  StudioTheme,
-  StudioTemplateRendererFactory,
-  StudioTemplateRenderer,
-  FrameworkOutputManager,
-  RenderTextComponentResponse,
-} from '@aws-amplify/codegen-ui';
+import { StudioTemplateRendererManager, StudioComponent, StudioTemplateRendererFactory, StudioTemplateRenderer, FrameworkOutputManager, RenderTextComponentResponse } from '@aws-amplify/codegen-ui-old';
 import {
   AmplifyRenderer,
   ReactThemeStudioTemplateRenderer,
-  ReactIndexStudioTemplateRenderer,
   ModuleKind,
   ScriptTarget,
   ScriptKind,
-} from '@aws-amplify/codegen-ui-react';
+} from '@aws-amplify/codegen-ui-react-old';
 
+import {StudioComponent as StudioComponentNew, StudioTheme} from '@aws-amplify/codegen-ui-new';
+import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
 import { printer } from 'amplify-prompts';
 import { $TSContext } from 'amplify-cli-core';
-import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
-
+import { createUiBuilderComponent as createUiBuilderComponentNew } from './createUiBuilderComponentNew';
+import { ReactIndexStudioTemplateRenderer } from '@aws-amplify/codegen-ui-react-new';
 const config = {
   module: ModuleKind.ES2020,
   target: ScriptTarget.ES2020,
@@ -27,13 +20,18 @@ const config = {
   renderTypeDeclarations: true,
 };
 
-/**
- * Writes component file to the work space
- */
-export const createUiBuilderComponent = (context: $TSContext, schema: StudioComponent): StudioComponent => {
+const isUpdatedSchema = (schema: StudioComponent) => {
+  return (schema as unknown as StudioComponentNew).schemaVersion && (schema as unknown as StudioComponentNew).schemaVersion === '1.0';
+};
+
+export const createUiBuilderComponent = (context: $TSContext, schema: StudioComponent) => {
+  if (isUpdatedSchema(schema)) {
+    return createUiBuilderComponentNew(context, schema as unknown as StudioComponentNew);
+  }
   const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
   const rendererFactory = new StudioTemplateRendererFactory(
-    (component: StudioComponent) => new AmplifyRenderer(component as StudioComponent, config) as unknown as StudioTemplateRenderer<
+    (component: StudioComponent) =>
+      new AmplifyRenderer(component as StudioComponent, config) as unknown as StudioTemplateRenderer<
         unknown,
         StudioComponent,
         FrameworkOutputManager<unknown>,
@@ -51,19 +49,9 @@ export const createUiBuilderComponent = (context: $TSContext, schema: StudioComp
   return schema;
 };
 
-/**
- * Writes theme file to the work space
- */
-export const createUiBuilderTheme = (context: $TSContext, schema: StudioTheme): StudioTheme => {
+export const createUiBuilderTheme = (context: $TSContext, schema: StudioTheme) => {
   const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
-  const rendererFactory = new StudioTemplateRendererFactory(
-    (component: StudioTheme) => new ReactThemeStudioTemplateRenderer(component, config) as unknown as StudioTemplateRenderer<
-        unknown,
-        StudioTheme,
-        FrameworkOutputManager<unknown>,
-        RenderTextComponentResponse
-      >,
-  );
+  const rendererFactory = new StudioTemplateRendererFactory((component: StudioTheme) => new ReactThemeStudioTemplateRenderer(component, config) as unknown as StudioTemplateRenderer<unknown, StudioTheme, FrameworkOutputManager<unknown>, RenderTextComponentResponse>);
 
   const outputPathDir = uiBuilderComponentsPath;
 
@@ -82,19 +70,9 @@ export const createUiBuilderTheme = (context: $TSContext, schema: StudioTheme):
   }
 };
 
-/**
- * Writes index file to the work space
- */
-export const generateAmplifyUiBuilderIndexFile = (context: $TSContext, schemas: StudioComponent[]): RenderTextComponentResponse => {
+export const generateAmplifyUiBuilderIndexFile = (context: $TSContext, schemas: StudioComponentNew[]) => {
   const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
-  const rendererFactory = new StudioTemplateRendererFactory(
-    (component: StudioComponent[]) => new ReactIndexStudioTemplateRenderer(component, config) as unknown as StudioTemplateRenderer<
-        unknown,
-        StudioComponent[],
-        FrameworkOutputManager<unknown>,
-        RenderTextComponentResponse
-      >,
-  );
+  const rendererFactory = new StudioTemplateRendererFactory((component: StudioComponentNew[]) => new ReactIndexStudioTemplateRenderer(component, config) as unknown as StudioTemplateRenderer<unknown, StudioComponentNew[], FrameworkOutputManager<unknown>, RenderTextComponentResponse>);
 
   const outputPathDir = uiBuilderComponentsPath;
 
@@ -108,5 +86,4 @@ export const generateAmplifyUiBuilderIndexFile = (context: $TSContext, schemas:
     printer.debug(e);
     printer.debug('Failed to generate component index file');
     throw e;
-  }
-};
+  }};