@aws/nx-plugin 0.1.5 → 0.2.0

package/src/cloudscape-website/app/generator.js

@@ -12,45 +12,65 @@ const typescript_1 = require("typescript");
 const react_1 = require("@nx/react");
 const shared_constructs_1 = require("../../utils/shared-constructs");
 const npm_scope_1 = require("../../utils/npm-scope");
-const lodash_kebabcase_1 = tslib_1.__importDefault(require("lodash.kebabcase"));
 const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
 const versions_1 = require("../../utils/versions");
 const paths_1 = require("../../utils/paths");
 const format_1 = require("../../utils/format");
+const names_1 = require("../../utils/names");
+const ast_1 = require("../../utils/ast");
 function appGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-        const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;
-        const websiteContentPath = (0, devkit_1.joinPathFragments)((_a = schema.directory) !== null && _a !== void 0 ? _a : '.', schema.name);
-        // Nx 20 is still working on revamping the generator for the TS preset, but our generator applies
-        process.env.NX_IGNORE_UNSUPPORTED_TS_SETUP = 'true';
+        const websiteNameClassName = (0, names_1.toClassName)(schema.name);
+        const websiteNameKebabCase = (0, names_1.toKebabCase)(schema.name);
+        const fullyQualifiedName = `${npmScopePrefix}${websiteNameKebabCase}`;
+        const websiteContentPath = (0, devkit_1.joinPathFragments)((_a = schema.directory) !== null && _a !== void 0 ? _a : '.', websiteNameKebabCase);
         // TODO: consider exposing and supporting e2e tests
         const e2eTestRunner = 'none';
-        yield (0, react_1.applicationGenerator)(tree, Object.assign(Object.assign({}, schema), { name: fullyQualifiedName, directory: websiteContentPath, routing: false, addPlugin: true, e2eTestRunner }));
+        yield (0, react_1.applicationGenerator)(tree, Object.assign(Object.assign({}, schema), { name: fullyQualifiedName, directory: websiteContentPath, routing: false, addPlugin: (_b = schema.addPlugin) !== null && _b !== void 0 ? _b : true, e2eTestRunner, linter: 'eslint', bundler: 'vite', unitTestRunner: 'vitest' }));
+        if (!tree.exists(`${websiteContentPath}/project.json`)) {
+            (0, devkit_1.addProjectConfiguration)(tree, fullyQualifiedName, {
+                root: websiteContentPath,
+                name: fullyQualifiedName,
+                sourceRoot: `${websiteContentPath}/src`,
+                projectType: 'application',
+                tags: [],
+                targets: {
+                    'load:runtime-config': {
+                        executor: 'nx:run-commands',
+                        metadata: {
+                            description: `Load runtime config from your deployed stack for dev purposes. You must set the AWS_REGION and CDK_APP_DIR env variables whilst calling i.e: AWS_REGION=ap-southeast-2 CDK_APP_DIR=./dist/packages/infra/cdk.out pnpm exec nx run ${fullyQualifiedName}:load:runtime-config`,
+                        },
+                        options: {
+                            command: `cdk-app WebsiteBucket get --key runtime-config.json './${websiteContentPath}/public/runtime-config.json'`,
+                        },
+                    },
+                },
+            });
+        }
         (0, ts_project_utils_1.configureTsProject)(tree, {
             dir: websiteContentPath,
             fullyQualifiedName,
         });
         yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
-        const websiteNameKebabCase = (0, lodash_kebabcase_1.default)(schema.name);
-        const constructsPath = (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', websiteNameKebabCase, 'index.ts');
-        if (!tree.exists(constructsPath)) {
+        if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'static-websites', `${websiteNameKebabCase}.ts`))) {
             const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR), Object.assign(Object.assign({}, schema), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix), websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath), websiteNameKebabCase }));
-            (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', '@aws/pdk', 'cdk-nag', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@aws-sdk/client-wafv2']));
-            const sharedConstructsIndexTsPath = (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'index.ts');
-            const sharedConstructsIndexContents = tree
-                .read(sharedConstructsIndexTsPath)
-                .toString();
-            const staticWebsiteExportDeclaration = typescript_1.factory.createExportDeclaration(undefined, undefined, undefined, typescript_1.factory.createStringLiteral(`./${websiteNameKebabCase}/index.js`));
-            const updatedIndex = tsquery_1.tsquery
-                .map((0, tsquery_1.ast)(sharedConstructsIndexContents), 'SourceFile', (node) => {
-                return Object.assign(Object.assign({}, node), { statements: [staticWebsiteExportDeclaration, ...node.statements] });
-            })
-                .getFullText();
-            if (sharedConstructsIndexContents !== updatedIndex) {
-                tree.write(sharedConstructsIndexTsPath, updatedIndex);
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), Object.assign(Object.assign({}, schema), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix), websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath), websiteNameKebabCase,
+                websiteNameClassName }), {
+                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            });
+            const shouldGenerateCoreStaticWebsiteConstruct = !tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'static-website.ts'));
+            if (shouldGenerateCoreStaticWebsiteConstruct) {
+                (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), Object.assign(Object.assign({}, schema), { npmScopePrefix, scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix), websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath), websiteNameKebabCase,
+                    websiteNameClassName }), {
+                    overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+                });
+            }
+            (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'index.ts'), './static-websites/index.js');
+            (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'static-websites', 'index.ts'), `./${websiteNameKebabCase}.js`);
+            if (shouldGenerateCoreStaticWebsiteConstruct) {
+                (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './static-website.js');
             }
         }
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'project.json'), (config) => {
@@ -69,60 +89,58 @@ function appGenerator(tree, schema) {
         });
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
         const libraryRoot = projectConfig.root;
-        tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src/app'));
+        tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src', 'app'));
         (0, devkit_1.generateFiles)(tree, // the virtual file system
         (0, devkit_1.joinPathFragments)(__dirname, './files/app'), // path to the file templates
-        libraryRoot, // destination path of the files
-        schema // config object to replace variable in file templates
-        );
+        libraryRoot, Object.assign(Object.assign({}, schema), { fullyQualifiedName, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec }), // config object to replace variable in file templates
+        {
+            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        });
         if (e2eTestRunner !== 'none') {
             const e2eFullyQualifiedName = `${fullyQualifiedName}-e2e`;
             const e2eRoot = (0, devkit_1.readProjectConfiguration)(tree, e2eFullyQualifiedName).root;
             (0, devkit_1.generateFiles)(tree, // the virtual file system
             (0, devkit_1.joinPathFragments)(__dirname, `./files/e2e/${e2eTestRunner}`), // path to the file templates
-            e2eRoot, Object.assign(Object.assign({}, schema), (0, devkit_1.names)(fullyQualifiedName)));
+            e2eRoot, Object.assign(Object.assign({}, schema), (0, devkit_1.names)(fullyQualifiedName)), {
+                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            });
             (0, ts_project_utils_1.configureTsProject)(tree, {
                 fullyQualifiedName: e2eFullyQualifiedName,
                 dir: e2eRoot,
             });
         }
         const viteConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'vite.config.ts');
-        const viteConfigContents = (_b = tree.read(viteConfigPath)) === null || _b === void 0 ? void 0 : _b.toString();
+        const viteConfigContents = (_c = tree.read(viteConfigPath)) === null || _c === void 0 ? void 0 : _c.toString();
         if (viteConfigContents) {
             let viteConfigUpdatedContents = viteConfigContents;
-            if (schema.unitTestRunner === 'vitest') {
-                viteConfigUpdatedContents = tsquery_1.tsquery
-                    .map((0, tsquery_1.ast)(viteConfigContents), 'ObjectLiteralExpression', (node) => {
-                    return typescript_1.factory.createObjectLiteralExpression([
-                        typescript_1.factory.createPropertyAssignment('define', typescript_1.factory.createObjectLiteralExpression([
-                            typescript_1.factory.createPropertyAssignment('global', typescript_1.factory.createObjectLiteralExpression()),
-                        ], true)),
-                        ...node.properties,
-                    ], true);
-                })
-                    .getFullText();
-            }
-            if (schema.bundler === 'vite') {
-                viteConfigUpdatedContents = tsquery_1.tsquery
-                    .map((0, tsquery_1.ast)(viteConfigUpdatedContents), 'ObjectLiteralExpression', (node) => {
-                    const updatedProperties = node.properties.map((prop) => {
-                        if ((0, typescript_1.isPropertyAssignment)(prop) &&
-                            prop.name.getText() === 'build') {
-                            const buildConfig = prop.initializer;
-                            return typescript_1.factory.createPropertyAssignment('build', typescript_1.factory.createObjectLiteralExpression(buildConfig.properties.map((buildProp) => {
-                                if ((0, typescript_1.isPropertyAssignment)(buildProp) &&
-                                    buildProp.name.getText() === 'outDir') {
-                                    return typescript_1.factory.createPropertyAssignment('outDir', typescript_1.factory.createStringLiteral((0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, fullyQualifiedName), 'dist', websiteContentPath)));
-                                }
-                                return buildProp;
-                            }), true));
-                        }
-                        return prop;
-                    });
-                    return typescript_1.factory.createObjectLiteralExpression(updatedProperties, true);
-                })
-                    .getFullText();
-            }
+            viteConfigUpdatedContents = tsquery_1.tsquery
+                .map((0, tsquery_1.ast)(viteConfigContents), 'ObjectLiteralExpression', (node) => {
+                return typescript_1.factory.createObjectLiteralExpression([
+                    typescript_1.factory.createPropertyAssignment('define', typescript_1.factory.createObjectLiteralExpression([
+                        typescript_1.factory.createPropertyAssignment('global', typescript_1.factory.createObjectLiteralExpression()),
+                    ], true)),
+                    ...node.properties,
+                ], true);
+            })
+                .getFullText();
+            viteConfigUpdatedContents = tsquery_1.tsquery
+                .map((0, tsquery_1.ast)(viteConfigUpdatedContents), 'ObjectLiteralExpression', (node) => {
+                const updatedProperties = node.properties.map((prop) => {
+                    if ((0, typescript_1.isPropertyAssignment)(prop) && prop.name.getText() === 'build') {
+                        const buildConfig = prop.initializer;
+                        return typescript_1.factory.createPropertyAssignment('build', typescript_1.factory.createObjectLiteralExpression(buildConfig.properties.map((buildProp) => {
+                            if ((0, typescript_1.isPropertyAssignment)(buildProp) &&
+                                buildProp.name.getText() === 'outDir') {
+                                return typescript_1.factory.createPropertyAssignment('outDir', typescript_1.factory.createStringLiteral((0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, fullyQualifiedName), 'dist', websiteContentPath)));
+                            }
+                            return buildProp;
+                        }), true));
+                    }
+                    return prop;
+                });
+                return typescript_1.factory.createObjectLiteralExpression(updatedProperties, true);
+            })
+                .getFullText();
             if (viteConfigContents !== viteConfigUpdatedContents) {
                 tree.write(viteConfigPath, viteConfigUpdatedContents);
             }
@@ -130,11 +148,11 @@ function appGenerator(tree, schema) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(websiteContentPath, 'tsconfig.json'), (tsconfig) => (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { moduleResolution: 'Bundler', module: 'Preserve' }) })));
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(websiteContentPath, 'tsconfig.app.json'), (tsconfig) => (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { lib: ['DOM'] }) })));
         (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
-            '@aws-northstar/ui',
             '@cloudscape-design/components',
             '@cloudscape-design/board-components',
+            '@cloudscape-design/global-styles',
             'react-router-dom',
-        ]), {});
+        ]), (0, versions_1.withVersions)(['cdk-app-cli']));
         yield (0, format_1.formatFilesInSubtree)(tree, websiteContentPath);
         return () => {
             if (!schema.skipInstall) {

package/src/cloudscape-website/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/cloudscape-website/app/generator.ts"],"names":[],"mappings":"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"}

package/src/cloudscape-website/app/schema.d.ts

@@ -2,23 +2,20 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import { SupportedStyles } from '@nx/react';
-import { Linter } from '@nx/eslint';
 
 export interface AppGeneratorSchema {
   name: string;
   style: SupportedStyles;
   skipFormat?: boolean;
   directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  //   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;
   // TODO: consider exposing if swc paths issue can be addressed https://github.com/swc-project/swc/discussions/8396
   // or if alternative compiler can be used for e2e tests
   // e2eTestRunner: 'cypress' | 'playwright' | 'none';
-  linter: Linter;
+  //   linter: Linter;
   pascalCaseFiles?: boolean;
   classComponent?: boolean;
   routing?: boolean;
@@ -32,7 +29,7 @@ export interface AppGeneratorSchema {
   devServerPort?: number;
   skipPackageJson?: boolean;
   rootProject?: boolean;
-  bundler?: 'webpack' | 'vite' | 'rspack';
+  //   bundler?: 'webpack' | 'vite' | 'rspack';
   minimal?: boolean;
   addPlugin?: boolean;
   skipInstall?: boolean;

package/src/cloudscape-website/app/schema.json

@@ -34,11 +34,6 @@
       "default": "packages",
       "x-prompt": "What directory would you like to store your application in?"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -83,12 +78,6 @@
         ]
       }
     },
-    "linter": {
-      "description": "The tool to use for running lint checks.",
-      "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
@@ -101,14 +90,6 @@
       "default": false,
       "x-priority": "internal"
     },
-    "unitTestRunner": {
-      "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "x-prompt": "Which unit test runner would you like to use?",
-      "default": "vitest",
-      "x-priority": "important"
-    },
     "inSourceTests": {
       "type": "boolean",
       "default": false,
@@ -155,8 +136,7 @@
       "type": "string",
       "description": "The compiler to use.",
       "enum": ["babel", "swc"],
-      "default": "swc",
-      "x-priority": "important"
+      "default": "swc"
     },
     "skipPackageJson": {
       "description": "Do not add dependencies to `package.json`.",
@@ -170,14 +150,6 @@
       "default": false,
       "hidden": true
     },
-    "bundler": {
-      "description": "The bundler to use.",
-      "type": "string",
-      "enum": ["vite", "webpack", "rspack"],
-      "x-prompt": "Which bundler do you want to use to build the application?",
-      "default": "vite",
-      "x-priority": "important"
-    },
     "minimal": {
       "description": "Generate a React app with a minimal setup, no separate test files.",
       "type": "boolean",

package/src/cloudscape-website/cognito-auth/README.md

@@ -1,7 +1,8 @@
 # Cognito Auth Generator
 
 ## Overview
-This generator adds AWS Cognito authentication to an existing Cloudscape React application. It sets up the necessary components and infrastructure for user authentication using Amazon Cognito, including sign-in, sign-up, and password recovery flows. The generator integrates seamlessly with the Cloudscape Design System components and configures all required AWS resources through CDK.
+
+This generator adds AWS Cognito authentication to an existing Cloudscape React application. It sets up the necessary components and infrastructure for user authentication using Amazon Cognito hosted UI, including sign-in, sign-up, and password recovery flows. The generator integrates seamlessly with the Cloudscape Design System components and configures all required AWS resources through CDK.
 
 ## Prerequisites
 
@@ -12,14 +13,11 @@ Before using this generator, ensure your project meets these requirements:
 3. The project must be a valid Cloudscape application
 
 Example of required `main.tsx` structure:
+
 ```typescript
 import { RuntimeConfigProvider } from './components/RuntimeConfig';
 
-const App = () => (
-  <RuntimeConfigProvider>
-    {/* Your app components */}
-  </RuntimeConfigProvider>
-);
+const App = () => <RuntimeConfigProvider>{/* Your app components */}</RuntimeConfigProvider>;
 ```
 
 If these prerequisites are not met, the generator will fail with an error.
@@ -31,12 +29,14 @@ You can add Cognito authentication to your Cloudscape website in two ways:
 ### 1. Using VSCode IDE
 
 First, install the NX Console extension for VSCode:
+
 1. Open VSCode
 2. Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X)
 3. Search for "Nx Console"
 4. Install [Nx Console](https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console)
 
 Then add authentication:
+
 1. Open the NX Console in VSCode
 2. Click on "Generate"
 3. Search for "cloudscape-website#cognito-auth"
@@ -48,62 +48,77 @@ Then add authentication:
 ### 2. Using CLI
 
 Add authentication to your existing Cloudscape application:
+
 ```bash
-nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app
+nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app --cognito-domain=<your-domain-prefix>
 ```
 
 Enable self-signup:
+
 ```bash
-nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app --allowSignup=true
+nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app --allowSignup=true --cognito-domain=<your-domain-prefix>
 ```
 
 You can also perform a dry-run to see what files would be generated without actually creating them:
+
 ```bash
-nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app --dry-run
+nx g @aws/nx-plugin:cloudscape-website#cognito-auth --project=my-cloudscape-app --cognito-domain=<your-domain-prefix> --dry-run
 ```
 
 All methods will add Cognito authentication to your existing Cloudscape website application with all the necessary components and infrastructure code.
 
 ## Input Parameters
 
-| Parameter | Type | Default | Description |
-|-----------|------|---------|-------------|
-| project* | string | - | The root directory of the Cloudscape application (required) |
-| allowSignup | boolean | false | Whether to allow self-signup |
+| Parameter       | Type    | Default | Description                                                 |
+| --------------- | ------- | ------- | ----------------------------------------------------------- |
+| project\*       | string  | -       | The root directory of the Cloudscape application (required) |
+| cognitoDomain\* | string  | -       | domain prefix when creating the Cognito Hosted UI           |
+| allowSignup     | boolean | false   | Whether to allow self-signup                                |
 
-*Required parameter
+\*Required parameter
 
 ## Expected Output
 
 The generator adds authentication-related components and infrastructure:
 
 ### 1. React Components
+
 ```
-<directory>/<project>/
+<directory>/<websiteProject>/
 ├── src/
-│   └── components/
-│       └── CognitoAuth/
-│           └── index.tsx         # Main authentication component
+    └── components/
+    |   └── CognitoAuth/
+    |       └── index.tsx         # Main authentication component
+    └── layouts/
+        └── App/
+            └── index.tsx         # Updates this file to add auth support
+
 ```
 
 ### 2. Infrastructure Code
+
 ```
-common/constructs/
-├── src/
-│   └── identity/
-│       ├── index.ts              # Exports for identity constructs
-│       ├── user-identity.ts      # Main identity construct
-│       └── userpool-with-mfa.ts  # User pool configuration
+common
+    └── constructs/
+        └── src/
+            └── core/
+                └── index.ts              # Adds export for identity construct
+                └── user-identity.ts      # Main identity construct
+    └── types/
+        └── src/
+            └── runtime-config.ts         # Updates IRuntimeConfig to add cognitoProps
 ```
 
 Additionally, it:
+
 1. Installs required dependencies:
-   - @aws-northstar/ui
    - aws-cdk-lib
    - constructs
    - @aws-cdk/aws-cognito-identitypool-alpha
+   - react-oidc-context
+   - oidc-client-ts
 2. Updates the application's runtime configuration to include Cognito settings
-3. Automatically integrates the authentication component into your application's main.tsx
+3. Automatically integrates the authentication component into your website code
 
 ## Infrastructure Architecture
 
@@ -111,36 +126,42 @@ Additionally, it:
 graph TD
     subgraph AWS Cloud
         UP[Cognito User Pool] --> IP[Identity Pool]
+        UP --> CognitoDomain
         UP --> Client[Web Client]
         IP --> IAM[IAM Roles]
     end
 ```
 
 The infrastructure stack adds:
+
 1. **Cognito User Pool**
+
    - User directory management
    - Sign-up and sign-in flows
    - MFA configuration
 
 2. **Cognito Identity Pool**
+
    - Federated identities
    - AWS credentials mapping
    - IAM role assignment
 
 3. **Web Client**
+
    - User Password and SRP auth flows
    - Token handling
 
+4. **Cognito Domain**
+   - Domain configured using the cognitoDomain provided
+
 ## Authentication Components
 
 The generator automatically sets up authentication in your application by:
+
 1. Importing the CognitoAuth component in main.tsx
 2. Wrapping your application with the CognitoAuth component inside the RuntimeConfigProvider
-3. Configuring the authentication UI with:
-   - Sign in form
-   - Sign up form (if enabled)
-   - Password recovery
-   - MFA setup and verification
+3. Configuring authenticated using the Cognito hosted UI
+4. Updating the layout add add a singout button and display the logged in user.
 
 No manual setup is required as the generator handles all the necessary component integration.
 
@@ -161,7 +182,7 @@ export class MyWebsiteStack extends Stack {
 
     // Create the Cognito authentication resources
     new UserIdentity(this, 'Identity');
-    
+
     // The runtime config is automatically updated with Cognito settings
   }
 }