fix: fixing typescript version to 4.4.x, since 4.5.2 breaks the imports

aws-amplify · Nov 18, 2021 · b726682 · b726682
1 parent 9d3c881
commit b726682
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 9 deletions.
diff --git a/packages/codegen-ui-react/package-lock.json b/packages/codegen-ui-react/package-lock.json
diff --git a/packages/codegen-ui-react/package.json b/packages/codegen-ui-react/package.json
@@ -25,7 +25,7 @@
     "@types/temp": "^0.9.1",
     "prettier": "2.3.2",
     "temp": "^0.9.4",
-    "typescript": "^4.2.4"
+    "typescript": "~4.4.4"
   },
   "peerDependencies": {
     "react": "^17.0.2",

diff --git a/packages/codegen-ui/lib/errors/error-transformer.ts b/packages/codegen-ui/lib/errors/error-transformer.ts
@@ -20,7 +20,13 @@ export const transformCodegenError = (error: any | unknown): InternalError | Inv
     return error;
   }
 
-  return new InternalError('Unhandled internal error occurred - see stack trace.');
+  let errorMsg = 'Unhandled Codegen Error Occurred';
+
+  if (error.stack) {
+    errorMsg += ` - ${JSON.stringify(error.stack)}`;
+  }
+
+  return new InternalError(errorMsg);
 };
 
 export const handleCodegenErrors = (target: Object, propertyKey: string, descriptor: PropertyDescriptor) => {

diff --git a/packages/codegen-ui/package-lock.json b/packages/codegen-ui/package-lock.json
diff --git a/packages/test-generator/lib/generators/GenerateTestApp.ts b/packages/test-generator/lib/generators/GenerateTestApp.ts
@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
+import { ModuleKind, ScriptTarget, ScriptKind } from '@aws-amplify/codegen-ui-react/dist/lib/react-render-config';
 import { NodeTestGenerator } from './NodeTestGenerator';
 
 const DISABLED_SCHEMAS = [
@@ -24,12 +25,32 @@ const DISABLED_SCHEMAS = [
   'CardWithInvalidChildComponentType', // Expected failure cases
 ];
 
-const generator = new NodeTestGenerator({
+const INTEG_TEST_PATH = 'packages/integration-test/src/ui-components';
+
+const tsxGenerator = new NodeTestGenerator({
   writeToLogger: false,
   writeToDisk: true,
+  renderConfigOverride: {}, // Use Defaults
   outputConfigOverride: {
-    outputPathDir: 'packages/integration-test/src/ui-components',
+    outputPathDir: INTEG_TEST_PATH,
   },
 });
 
-generator.generate(generator.getTestCases(DISABLED_SCHEMAS));
+const jsxGenerator = new NodeTestGenerator({
+  writeToLogger: false,
+  writeToDisk: true,
+  renderConfigOverride: {
+    module: ModuleKind.ESNext,
+    target: ScriptTarget.ESNext,
+    script: ScriptKind.JSX,
+    renderTypeDeclarations: true,
+  },
+  outputConfigOverride: {
+    outputPathDir: INTEG_TEST_PATH,
+  },
+});
+
+const testCases = tsxGenerator.getTestCases(DISABLED_SCHEMAS);
+
+// tsxGenerator.generate(testCases);
+jsxGenerator.generate(testCases);
diff --git a/packages/test-generator/package-lock.json b/packages/test-generator/package-lock.json