@aws/nx-plugin 0.88.0 → 0.89.0

package/src/ts/nx-plugin/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,uCAAqE;AACrE,mDAAoD;AACpD,iFAAgD;AAEhD;;GAEG;AACI,MAAM,4BAA4B,GAAG,CAC1C,IAAU,EACV,WAAmB,EACnB,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,2BAA2B,WAAW,8BAA8B,CACrE,CAAC;IACJ,CAAC;IAED,qDAAqD;IACrD,0CAA0C;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;;;QAC1C,MAAA,QAAQ,CAAC,eAAe,oCAAxB,QAAQ,CAAC,eAAe,GAAK,EAAE,EAAC;QAChC,YAAA,QAAQ,CAAC,eAAe,EAAC,MAAM,uCAAN,MAAM,GAAK,UAAU,EAAC;QAC/C,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrC,IAAA,kBAAS,EAAC,IAAI,EAAE,kBAAkB,EAAE;YAClC,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;IACL,CAAC;IAED,oFAAoF;IACpF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACxC,IAAA,kBAAS,EAAC,IAAI,EAAE,qBAAqB,EAAE;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE;;QAC9C,MAAA,GAAG,CAAC,IAAI,oCAAR,GAAG,CAAC,IAAI,GAAK,gBAAgB,EAAC;QAC9B,MAAA,GAAG,CAAC,UAAU,oCAAd,GAAG,CAAC,UAAU,GAAK,mBAAmB,EAAC;QACvC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC;QAChC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,gBAAgB,GAAG,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,MAAK,uBAAuB,CAAC;IAE3E,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,qFAAqF;QACrF,MAAM,IAAI,mCACL,IAAA,uBAAY,EAAC,CAAC,YAAY,CAAC,CAAC;YAC/B,uCAAuC;YACvC,CAAC,sBAAW,CAAC,IAAI,CAAC,EAAE,IAAI,sBAAW,CAAC,OAAO,EAAE,GAC9C,CAAC;QACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AAzDW,QAAA,4BAA4B,gCAyDvC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,uCAAqE;AACrE,mDAAoD;AACpD,iFAAgD;AAEhD;;GAEG;AACI,MAAM,4BAA4B,GAAG,CAC1C,IAAU,EACV,WAAmB,EACnB,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,2BAA2B,WAAW,8BAA8B,CACrE,CAAC;IACJ,CAAC;IAED,qDAAqD;IACrD,0CAA0C;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC1C,QAAQ,CAAC,eAAe,KAAK,EAAE,CAAC;QAChC,QAAQ,CAAC,eAAe,CAAC,MAAM,KAAK,UAAU,CAAC;QAC/C,mFAAmF;QACnF,QAAQ,CAAC,eAAe,CAAC,gBAAgB,KAAK,SAAS,CAAC;QACxD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrC,IAAA,kBAAS,EAAC,IAAI,EAAE,kBAAkB,EAAE;YAClC,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;IACL,CAAC;IAED,oFAAoF;IACpF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACxC,IAAA,kBAAS,EAAC,IAAI,EAAE,qBAAqB,EAAE;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE;QAC9C,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC;QAC9B,GAAG,CAAC,UAAU,KAAK,mBAAmB,CAAC;QACvC,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC;QAChC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,gBAAgB,GAAG,eAAe,EAAE,IAAI,KAAK,uBAAuB,CAAC;IAE3E,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,qFAAqF;QACrF,MAAM,IAAI,GAAG;YACX,GAAG,IAAA,uBAAY,EAAC,CAAC,YAAY,CAAC,CAAC;YAC/B,uCAAuC;YACvC,CAAC,sBAAW,CAAC,IAAI,CAAC,EAAE,IAAI,sBAAW,CAAC,OAAO,EAAE;SAC9C,CAAC;QACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAA,qCAA4B,EAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AA3DW,QAAA,4BAA4B,gCA2DvC"}

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -2446,10 +2446,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "compilerOptions": {
     "paths": {
-      ":proj/test-app": ["test-app/src/index.ts"],
-      ":proj/common-constructs": ["packages/common/constructs/src/index.ts"]
+      ":proj/test-app": ["./test-app/src/index.ts"],
+      ":proj/common-constructs": ["./packages/common/constructs/src/index.ts"]
     },
-    "baseUrl": ".",
     "rootDir": "."
   }
 }
@@ -4235,10 +4234,9 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "compilerOptions": {
     "paths": {
-      ":proj/test-app": ["test-app/src/index.ts"],
-      ":proj/common-constructs": ["packages/common/constructs/src/index.ts"]
+      ":proj/test-app": ["./test-app/src/index.ts"],
+      ":proj/common-constructs": ["./packages/common/constructs/src/index.ts"]
     },
-    "baseUrl": ".",
     "rootDir": "."
   }
 }

package/src/ts/react-website/app/generator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.REACT_WEBSITE_APP_GENERATOR_INFO = exports.SUPPORTED_UX_PROVIDERS = void 0;
 exports.tsReactWebsiteGenerator = tsReactWebsiteGenerator;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -29,280 +28,319 @@ const website_constructs_1 = require("../../../utils/website-constructs/website-
 const iac_1 = require("../../../utils/iac");
 exports.SUPPORTED_UX_PROVIDERS = ['None', 'Cloudscape', 'Shadcn'];
 exports.REACT_WEBSITE_APP_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-function tsReactWebsiteGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const enableTailwind = (_a = schema.enableTailwind) !== null && _a !== void 0 ? _a : true;
-        const enableTanstackRouter = (_b = schema.enableTanstackRouter) !== null && _b !== void 0 ? _b : true;
-        const uxProvider = (_c = schema.uxProvider) !== null && _c !== void 0 ? _c : 'Cloudscape';
-        if (uxProvider === 'Shadcn' && !enableTailwind) {
-            throw new Error('Shadcn requires TailwindCSS to be enabled.');
-        }
-        const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-        const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
-        const websiteNameClassName = (0, names_1.toClassName)(schema.name);
-        const websiteNameKebabCase = (0, names_1.toKebabCase)(schema.name);
-        const fullyQualifiedName = `${npmScopePrefix}${websiteNameKebabCase}`;
-        // NB: interactive nx generator cli can pass empty string
-        const websiteContentPath = (0, devkit_1.joinPathFragments)(schema.directory || '.', schema.subDirectory || 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, e2eTestRunner, linter: 'eslint', bundler: 'vite', unitTestRunner: 'vitest', useProjectJson: true, style: 'css' }));
-        // Replace with simpler sample source code
-        tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src'));
-        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-        const targets = projectConfiguration.targets;
-        // Configure load:runtime-config target based on IaC provider
-        const iacProvider = yield (0, iac_1.resolveIacProvider)(tree, schema.iacProvider);
-        if (iacProvider === 'CDK') {
-            targets['load:runtime-config'] = {
-                executor: 'nx:run-commands',
-                metadata: {
-                    description: `Load runtime config from your deployed stack for dev purposes. You must set your AWS CLI credentials whilst calling '${(0, pkg_manager_1.getPackageManagerDisplayCommands)().exec} nx run ${fullyQualifiedName}:load:runtime-config'`,
-                },
-                options: {
-                    command: `aws s3 cp s3://\`aws cloudformation describe-stacks --query "Stacks[?starts_with(StackName, '${(0, names_1.kebabCase)(npmScopePrefix)}-')][].Outputs[] | [?contains(OutputKey, '${websiteNameClassName}WebsiteBucketName')].OutputValue" --output text\`/runtime-config.json "{projectRoot}/public/runtime-config.json"`,
-                },
-            };
-        }
-        else if (iacProvider === 'Terraform') {
-            targets['load:runtime-config'] = {
-                executor: 'nx:run-commands',
-                metadata: {
-                    description: "Load runtime config from most recently applied terraform env for dev purposes. Copies the runtime config from the Terraform dist directory to the website's public directory.",
-                },
-                options: {
-                    command: 'node -e "const fs=require(\'fs\');fs.mkdirSync(process.env.DEST_DIR,{recursive:true});fs.copyFileSync(process.env.SRC_FILE,process.env.DEST_FILE);"',
-                    env: {
-                        SRC_FILE: 'dist/packages/common/terraform/runtime-config.json',
-                        DEST_DIR: `{projectRoot}/public`,
-                        DEST_FILE: `{projectRoot}/public/runtime-config.json`,
-                    },
-                },
-            };
-        }
-        else {
-            throw new Error(`Unknown iacProvider: ${iacProvider}. Supported providers are: CDK, Terraform`);
-        }
-        const buildTarget = targets['build'];
-        targets['compile'] = {
-            dependsOn: ['bundle'],
+async function tsReactWebsiteGenerator(tree, schema) {
+    const enableTailwind = schema.enableTailwind ?? true;
+    const enableTanstackRouter = schema.enableTanstackRouter ?? true;
+    const uxProvider = schema.uxProvider ?? 'Cloudscape';
+    if (uxProvider === 'Shadcn' && !enableTailwind) {
+        throw new Error('Shadcn requires TailwindCSS to be enabled.');
+    }
+    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
+    const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
+    const websiteNameClassName = (0, names_1.toClassName)(schema.name);
+    const websiteNameKebabCase = (0, names_1.toKebabCase)(schema.name);
+    const fullyQualifiedName = `${npmScopePrefix}${websiteNameKebabCase}`;
+    // NB: interactive nx generator cli can pass empty string
+    const websiteContentPath = (0, devkit_1.joinPathFragments)(schema.directory || '.', schema.subDirectory || websiteNameKebabCase);
+    // TODO: consider exposing and supporting e2e tests
+    const e2eTestRunner = 'none';
+    await (0, react_1.applicationGenerator)(tree, {
+        ...schema,
+        name: fullyQualifiedName,
+        directory: websiteContentPath,
+        routing: false,
+        e2eTestRunner,
+        linter: 'eslint',
+        bundler: 'vite',
+        unitTestRunner: 'vitest',
+        useProjectJson: true,
+        style: 'css',
+    });
+    // Replace with simpler sample source code
+    tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src'));
+    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+    const targets = projectConfiguration.targets;
+    // Configure load:runtime-config target based on IaC provider
+    const iacProvider = await (0, iac_1.resolveIacProvider)(tree, schema.iacProvider);
+    if (iacProvider === 'CDK') {
+        targets['load:runtime-config'] = {
             executor: 'nx:run-commands',
-            outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],
-            options: {
-                command: 'tsc --build tsconfig.app.json',
-                cwd: '{projectRoot}',
+            metadata: {
+                description: `Load runtime config from your deployed stack for dev purposes. You must set your AWS CLI credentials whilst calling '${(0, pkg_manager_1.getPackageManagerDisplayCommands)().exec} nx run ${fullyQualifiedName}:load:runtime-config'`,
             },
-        };
-        targets['bundle'] = Object.assign(Object.assign({}, buildTarget), { options: Object.assign(Object.assign({}, buildTarget.options), { outputPath: 'dist/{projectRoot}/bundle' }) });
-        targets['build'] = {
-            dependsOn: [
-                'lint',
-                'compile',
-                'bundle',
-                'test',
-                ...((_d = buildTarget.dependsOn) !== null && _d !== void 0 ? _d : []),
-            ],
             options: {
-                outputPath: 'dist/{projectRoot}/bundle',
+                command: `aws s3 cp s3://\`aws cloudformation describe-stacks --query "Stacks[?starts_with(StackName, '${(0, names_1.kebabCase)(npmScopePrefix)}-')][].Outputs[] | [?contains(OutputKey, '${websiteNameClassName}WebsiteBucketName')].OutputValue" --output text\`/runtime-config.json "{projectRoot}/public/runtime-config.json"`,
             },
         };
-        targets['test'] = Object.assign(Object.assign({}, targets['test']), { options: Object.assign(Object.assign({}, ((_f = (_e = targets['test']) === null || _e === void 0 ? void 0 : _e.options) !== null && _f !== void 0 ? _f : {})), { reportsDirectory: '{workspaceRoot}/coverage/{projectRoot}' }) });
-        // Add a serve-local target for running the website and its dependencies locally
-        targets['serve-local'] = {
-            executor: '@nx/vite:dev-server',
+    }
+    else if (iacProvider === 'Terraform') {
+        targets['load:runtime-config'] = {
+            executor: 'nx:run-commands',
+            metadata: {
+                description: "Load runtime config from most recently applied terraform env for dev purposes. Copies the runtime config from the Terraform dist directory to the website's public directory.",
+            },
             options: {
-                buildTarget: `${fullyQualifiedName}:build:development`,
-                hmr: true,
-                mode: 'serve-local',
+                command: 'node -e "const fs=require(\'fs\');fs.mkdirSync(process.env.DEST_DIR,{recursive:true});fs.copyFileSync(process.env.SRC_FILE,process.env.DEST_FILE);"',
+                env: {
+                    SRC_FILE: 'dist/packages/common/terraform/runtime-config.json',
+                    DEST_DIR: `{projectRoot}/public`,
+                    DEST_FILE: `{projectRoot}/public/runtime-config.json`,
+                },
             },
-            continuous: true,
         };
-        projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
-        (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
-        (0, nx_1.addGeneratorMetadata)(tree, projectConfiguration.name, exports.REACT_WEBSITE_APP_GENERATOR_INFO, {
-            uxProvider,
-        });
-        yield (0, ts_project_utils_1.configureTsProject)(tree, {
-            dir: websiteContentPath,
-            fullyQualifiedName,
-        });
-        if (uxProvider === 'Shadcn') {
-            yield (0, shared_shadcn_1.sharedShadcnGenerator)(tree);
-        }
-        yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-            iacProvider,
-        });
-        yield (0, website_constructs_1.addWebsiteInfra)(tree, {
-            iacProvider,
-            websiteProjectName: fullyQualifiedName,
-            scopeAlias,
-            websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath),
-            websiteNameKebabCase,
-            websiteNameClassName,
+    }
+    else {
+        throw new Error(`Unknown iacProvider: ${iacProvider}. Supported providers are: CDK, Terraform`);
+    }
+    const buildTarget = targets['build'];
+    targets['compile'] = {
+        dependsOn: ['bundle'],
+        executor: 'nx:run-commands',
+        outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],
+        options: {
+            command: 'tsc --build tsconfig.app.json',
+            cwd: '{projectRoot}',
+        },
+    };
+    targets['bundle'] = {
+        ...buildTarget,
+        options: {
+            ...buildTarget.options,
+            outputPath: 'dist/{projectRoot}/bundle',
+        },
+    };
+    targets['build'] = {
+        dependsOn: [
+            'lint',
+            'compile',
+            'bundle',
+            'test',
+            ...(buildTarget.dependsOn ?? []),
+        ],
+        options: {
+            outputPath: 'dist/{projectRoot}/bundle',
+        },
+    };
+    targets['test'] = {
+        ...targets['test'],
+        options: {
+            ...(targets['test']?.options ?? {}),
+            reportsDirectory: '{workspaceRoot}/coverage/{projectRoot}',
+        },
+    };
+    // Add a serve-local target for running the website and its dependencies locally
+    targets['serve-local'] = {
+        executor: '@nx/vite:dev-server',
+        options: {
+            buildTarget: `${fullyQualifiedName}:build:development`,
+            hmr: true,
+            mode: 'serve-local',
+        },
+        continuous: true,
+    };
+    projectConfiguration.targets = (0, object_1.sortObjectKeys)(targets);
+    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
+    (0, nx_1.addGeneratorMetadata)(tree, projectConfiguration.name, exports.REACT_WEBSITE_APP_GENERATOR_INFO, {
+        uxProvider,
+    });
+    await (0, ts_project_utils_1.configureTsProject)(tree, {
+        dir: websiteContentPath,
+        fullyQualifiedName,
+    });
+    if (uxProvider === 'Shadcn') {
+        await (0, shared_shadcn_1.sharedShadcnGenerator)(tree);
+    }
+    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+        iacProvider,
+    });
+    await (0, website_constructs_1.addWebsiteInfra)(tree, {
+        iacProvider,
+        websiteProjectName: fullyQualifiedName,
+        scopeAlias,
+        websiteContentPath: (0, devkit_1.joinPathFragments)('dist', websiteContentPath),
+        websiteNameKebabCase,
+        websiteNameClassName,
+    });
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+    const libraryRoot = projectConfig.root;
+    const sharedShadcnStylesImport = (0, path_1.relative)((0, devkit_1.joinPathFragments)(libraryRoot, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR, 'src', 'styles', 'globals.css'))
+        .split(path_1.sep)
+        .join('/');
+    const sharedShadcnTsconfigRef = (0, path_1.relative)((0, devkit_1.joinPathFragments)(tree.root, websiteContentPath), (0, devkit_1.joinPathFragments)(tree.root, shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR, 'tsconfig.json'))
+        .split(path_1.sep)
+        .join('/');
+    const templateOptions = {
+        ...schema,
+        fullyQualifiedName,
+        pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
+        enableTailwind,
+        enableTanstackRouter,
+        scopeAlias,
+        sharedShadcnStylesImport,
+    };
+    tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src', 'app'));
+    const appCommonTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, './files/app/common');
+    const appTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, `./files/app/${uxProvider.toLowerCase()}`);
+    (0, devkit_1.generateFiles)(tree, // the virtual file system
+    appCommonTemplatePath, // path to the file templates
+    libraryRoot, // destination path of the files
+    templateOptions, // config object to replace variable in file templates
+    {
+        overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+    });
+    (0, devkit_1.generateFiles)(tree, // the virtual file system
+    appTemplatePath, // path to the file templates
+    libraryRoot, // destination path of the files
+    templateOptions, // config object to replace variable in file templates
+    {
+        overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+    });
+    if (enableTanstackRouter) {
+        const routerCommonTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, './files/tanstack-router/common');
+        const routerTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, `./files/tanstack-router/${uxProvider.toLowerCase()}`);
+        (0, devkit_1.generateFiles)(tree, routerCommonTemplatePath, libraryRoot, templateOptions, {
+            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
         });
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-        const libraryRoot = projectConfig.root;
-        const sharedShadcnStylesImport = (0, path_1.relative)((0, devkit_1.joinPathFragments)(libraryRoot, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR, 'src', 'styles', 'globals.css'))
-            .split(path_1.sep)
-            .join('/');
-        const sharedShadcnTsconfigRef = (0, path_1.relative)((0, devkit_1.joinPathFragments)(tree.root, websiteContentPath), (0, devkit_1.joinPathFragments)(tree.root, shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SHADCN_DIR, 'tsconfig.json'))
-            .split(path_1.sep)
-            .join('/');
-        const templateOptions = Object.assign(Object.assign({}, schema), { fullyQualifiedName, pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec, enableTailwind,
-            enableTanstackRouter,
-            scopeAlias,
-            sharedShadcnStylesImport });
-        tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src', 'app'));
-        const appCommonTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, './files/app/common');
-        const appTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, `./files/app/${uxProvider.toLowerCase()}`);
-        (0, devkit_1.generateFiles)(tree, // the virtual file system
-        appCommonTemplatePath, // path to the file templates
-        libraryRoot, // destination path of the files
-        templateOptions, // config object to replace variable in file templates
+        (0, devkit_1.generateFiles)(tree, routerTemplatePath, libraryRoot, templateOptions, // config object to replace variable in file templates
         {
             overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
         });
+        tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src', 'app.tsx'));
+    }
+    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
-        appTemplatePath, // path to the file templates
-        libraryRoot, // destination path of the files
-        templateOptions, // config object to replace variable in file templates
-        {
-            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        (0, devkit_1.joinPathFragments)(__dirname, `./files/e2e/${e2eTestRunner}`), // path to the file templates
+        e2eRoot, // destination path of the files
+        { ...schema, ...(0, devkit_1.names)(fullyQualifiedName) }, {
+            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        });
+        await (0, ts_project_utils_1.configureTsProject)(tree, {
+            fullyQualifiedName: e2eFullyQualifiedName,
+            dir: e2eRoot,
         });
+    }
+    const viteConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'vite.config.mts');
+    if (tree.exists(viteConfigPath)) {
+        // Add Tanstack Router import if enabled
         if (enableTanstackRouter) {
-            const routerCommonTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, './files/tanstack-router/common');
-            const routerTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, `./files/tanstack-router/${uxProvider.toLowerCase()}`);
-            (0, devkit_1.generateFiles)(tree, routerCommonTemplatePath, libraryRoot, templateOptions, {
-                overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
-            });
-            (0, devkit_1.generateFiles)(tree, routerTemplatePath, libraryRoot, templateOptions, // config object to replace variable in file templates
-            {
-                overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
-            });
-            tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src', 'app.tsx'));
+            await (0, ast_1.addDestructuredImport)(tree, viteConfigPath, ['tanstackRouter'], '@tanstack/router-plugin/vite');
+            await (0, ast_1.addDestructuredImport)(tree, viteConfigPath, ['resolve'], 'path');
         }
-        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)), {
-                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
-            });
-            yield (0, ts_project_utils_1.configureTsProject)(tree, {
-                fullyQualifiedName: e2eFullyQualifiedName,
-                dir: e2eRoot,
-            });
+        await (0, ast_1.addSingleImport)(tree, viteConfigPath, 'tsconfigPaths', 'vite-tsconfig-paths');
+        // Add TailwindCSS import if enabled
+        if (enableTailwind) {
+            await (0, ast_1.addSingleImport)(tree, viteConfigPath, 'tailwindcss', '@tailwindcss/vite');
         }
-        const viteConfigPath = (0, devkit_1.joinPathFragments)(libraryRoot, 'vite.config.mts');
-        if (tree.exists(viteConfigPath)) {
-            // Add Tanstack Router import if enabled
-            if (enableTanstackRouter) {
-                yield (0, ast_1.addDestructuredImport)(tree, viteConfigPath, ['tanstackRouter'], '@tanstack/router-plugin/vite');
-                yield (0, ast_1.addDestructuredImport)(tree, viteConfigPath, ['resolve'], 'path');
-            }
-            yield (0, ast_1.addSingleImport)(tree, viteConfigPath, 'tsconfigPaths', 'vite-tsconfig-paths');
-            // Add TailwindCSS import if enabled
-            if (enableTailwind) {
-                yield (0, ast_1.addSingleImport)(tree, viteConfigPath, 'tailwindcss', '@tailwindcss/vite');
-            }
-            (0, ast_1.replaceIfExists)(tree, viteConfigPath, '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));
-                    }
-                    else if ((0, typescript_1.isPropertyAssignment)(prop) &&
-                        prop.name.getText() === 'plugins') {
-                        const pluginsConfig = prop.initializer;
-                        const pluginsArray = [...pluginsConfig.elements];
-                        if (enableTanstackRouter) {
-                            pluginsArray.unshift(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tanstackRouter'), undefined, [
-                                typescript_1.factory.createObjectLiteralExpression([
-                                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('routesDirectory'), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('resolve'), undefined, [
-                                        typescript_1.factory.createIdentifier('__dirname'),
-                                        typescript_1.factory.createStringLiteral('src/routes'),
-                                    ])),
-                                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('generatedRouteTree'), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('resolve'), undefined, [
-                                        typescript_1.factory.createIdentifier('__dirname'),
-                                        typescript_1.factory.createStringLiteral('src/routeTree.gen.ts'),
-                                    ])),
-                                ]),
-                            ]));
-                        }
-                        // Add TailwindCSS plugin if enabled
-                        if (enableTailwind) {
-                            pluginsArray.push(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tailwindcss'), undefined, []));
+        (0, ast_1.replaceIfExists)(tree, viteConfigPath, '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)));
                         }
-                        pluginsArray.push(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tsconfigPaths'), undefined, []));
-                        return typescript_1.factory.createPropertyAssignment('plugins', typescript_1.factory.createArrayLiteralExpression(pluginsArray, true));
+                        return buildProp;
+                    }), true));
+                }
+                else if ((0, typescript_1.isPropertyAssignment)(prop) &&
+                    prop.name.getText() === 'plugins') {
+                    const pluginsConfig = prop.initializer;
+                    const pluginsArray = [...pluginsConfig.elements];
+                    if (enableTanstackRouter) {
+                        pluginsArray.unshift(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tanstackRouter'), undefined, [
+                            typescript_1.factory.createObjectLiteralExpression([
+                                typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('routesDirectory'), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('resolve'), undefined, [
+                                    typescript_1.factory.createIdentifier('__dirname'),
+                                    typescript_1.factory.createStringLiteral('src/routes'),
+                                ])),
+                                typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('generatedRouteTree'), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('resolve'), undefined, [
+                                    typescript_1.factory.createIdentifier('__dirname'),
+                                    typescript_1.factory.createStringLiteral('src/routeTree.gen.ts'),
+                                ])),
+                            ]),
+                        ]));
                     }
-                    return prop;
-                });
-                return typescript_1.factory.createObjectLiteralExpression(updatedProperties, true);
-            });
-            (0, ast_1.replaceIfExists)(tree, viteConfigPath, '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);
+                    // Add TailwindCSS plugin if enabled
+                    if (enableTailwind) {
+                        pluginsArray.push(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tailwindcss'), undefined, []));
+                    }
+                    pluginsArray.push(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('tsconfigPaths'), undefined, []));
+                    return typescript_1.factory.createPropertyAssignment('plugins', typescript_1.factory.createArrayLiteralExpression(pluginsArray, true));
+                }
+                return prop;
             });
-        }
-        (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' }) })));
-        const outDirToRootRelativePath = (0, path_1.relative)((0, devkit_1.joinPathFragments)(tree.root, websiteContentPath), tree.root);
-        const distDir = (0, devkit_1.joinPathFragments)(outDirToRootRelativePath, 'dist', websiteContentPath, 'tsc');
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(websiteContentPath, 'tsconfig.app.json'), (tsconfig) => {
-            var _a;
-            return (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { outDir: distDir, tsBuildInfoFile: (0, devkit_1.joinPathFragments)(distDir, 'tsconfig.lib.tsbuildinfo'), lib: ['DOM'] }), references: uxProvider === 'Shadcn'
-                    ? [
-                        ...((_a = tsconfig.references) !== null && _a !== void 0 ? _a : []).filter((ref) => ref.path !== sharedShadcnTsconfigRef),
-                        {
-                            path: sharedShadcnTsconfigRef,
-                        },
-                    ]
-                    : tsconfig.references }));
+            return typescript_1.factory.createObjectLiteralExpression(updatedProperties, true);
         });
-        const devDependencies = [
-            'vite-tsconfig-paths',
-            '@nx/react',
-            '@vitest/ui',
-        ];
-        const dependencies = ['react', 'react-dom'];
-        if (uxProvider === 'Cloudscape') {
-            dependencies.push('@cloudscape-design/components', '@cloudscape-design/board-components', '@cloudscape-design/global-styles');
-        }
-        else if (uxProvider === 'Shadcn') {
-            // not required to add any dependencies because dependencies are added by the common/shadcn package.
-        }
-        // Add TailwindCSS dependencies if enabled
-        if (enableTailwind) {
-            dependencies.push('tailwindcss');
-            devDependencies.push('@tailwindcss/vite');
-        }
-        if (enableTanstackRouter) {
-            dependencies.push('@tanstack/react-router');
-            devDependencies.push('@tanstack/router-plugin', '@tanstack/router-generator', '@tanstack/virtual-file-routes', '@tanstack/router-utils');
+        (0, ast_1.replaceIfExists)(tree, viteConfigPath, '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);
+        });
+    }
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(websiteContentPath, 'tsconfig.json'), (tsconfig) => ({
+        ...tsconfig,
+        compilerOptions: {
+            ...tsconfig.compilerOptions,
+            moduleResolution: 'Bundler',
+            module: 'Preserve',
+        },
+    }));
+    const outDirToRootRelativePath = (0, path_1.relative)((0, devkit_1.joinPathFragments)(tree.root, websiteContentPath), tree.root);
+    const distDir = (0, devkit_1.joinPathFragments)(outDirToRootRelativePath, 'dist', websiteContentPath, 'tsc');
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(websiteContentPath, 'tsconfig.app.json'), (tsconfig) => ({
+        ...tsconfig,
+        compilerOptions: {
+            ...tsconfig.compilerOptions,
+            outDir: distDir,
+            tsBuildInfoFile: (0, devkit_1.joinPathFragments)(distDir, 'tsconfig.lib.tsbuildinfo'),
+            lib: ['DOM'],
+        },
+        references: uxProvider === 'Shadcn'
+            ? [
+                ...(tsconfig.references ?? []).filter((ref) => ref.path !== sharedShadcnTsconfigRef),
+                {
+                    path: sharedShadcnTsconfigRef,
+                },
+            ]
+            : tsconfig.references,
+    }));
+    const devDependencies = [
+        'vite-tsconfig-paths',
+        '@nx/react',
+        '@vitest/ui',
+    ];
+    const dependencies = ['react', 'react-dom'];
+    if (uxProvider === 'Cloudscape') {
+        dependencies.push('@cloudscape-design/components', '@cloudscape-design/board-components', '@cloudscape-design/global-styles');
+    }
+    else if (uxProvider === 'Shadcn') {
+        // not required to add any dependencies because dependencies are added by the common/shadcn package.
+    }
+    // Add TailwindCSS dependencies if enabled
+    if (enableTailwind) {
+        dependencies.push('tailwindcss');
+        devDependencies.push('@tailwindcss/vite');
+    }
+    if (enableTanstackRouter) {
+        dependencies.push('@tanstack/react-router');
+        devDependencies.push('@tanstack/router-plugin', '@tanstack/router-generator', '@tanstack/virtual-file-routes', '@tanstack/router-utils');
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(dependencies), (0, versions_1.withVersions)(devDependencies));
+    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
+        exports.REACT_WEBSITE_APP_GENERATOR_INFO,
+    ]);
+    await (0, format_1.formatFilesInSubtree)(tree);
+    return () => {
+        if (!schema.skipInstall) {
+            (0, devkit_1.installPackagesTask)(tree);
         }
-        (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(dependencies), (0, versions_1.withVersions)(devDependencies));
-        yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-            exports.REACT_WEBSITE_APP_GENERATOR_INFO,
-        ]);
-        yield (0, format_1.formatFilesInSubtree)(tree);
-        return () => {
-            if (!schema.skipInstall) {
-                (0, devkit_1.installPackagesTask)(tree);
-            }
-        };
-    });
+    };
 }
 exports.default = tsReactWebsiteGenerator;
 //# sourceMappingURL=generator.js.map