@aws/nx-plugin 1.0.0-rc.8 → 1.0.0-rc.80

package/src/ts/react-website/runtime-config/generator.js

@@ -1,57 +1,55 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RUNTIME_CONFIG_GENERATOR_INFO = void 0;
-exports.runtimeConfigGenerator = runtimeConfigGenerator;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const ast_1 = require("../../../utils/ast");
-const website_1 = require("../../../utils/ast/website");
-const format_1 = require("../../../utils/format");
-const metrics_1 = require("../../../utils/metrics");
-const npm_scope_1 = require("../../../utils/npm-scope");
-const nx_1 = require("../../../utils/nx");
-const paths_1 = require("../../../utils/paths");
-exports.RUNTIME_CONFIG_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-async function runtimeConfigGenerator(tree, options) {
-    const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { addSingleImport, applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { addHookResultToRouterProviderContext } from "../../../utils/ast/website.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { getNpmScopePrefix } from "../../../utils/npm-scope.js";
+import { addComponentGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { toProjectRelativePath } from "../../../utils/paths.js";
+export const RUNTIME_CONFIG_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export async function runtimeConfigGenerator(tree, options) {
+    const projectConfig = readProjectConfigurationUnqualified(tree, options.project);
     const srcRoot = projectConfig.sourceRoot;
-    const mainTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'main.tsx');
+    const mainTsxPath = joinPathFragments(srcRoot, 'main.tsx');
     if (!tree.exists(mainTsxPath)) {
         throw new Error(`Can only run this generator on a project which contains ${mainTsxPath}`);
     }
-    const runtimeConfigPath = (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig', 'index.tsx');
+    const runtimeConfigPath = joinPathFragments(srcRoot, 'components', 'RuntimeConfig', 'index.tsx');
     if (tree.exists(runtimeConfigPath)) {
         console.debug('Runtime config already exists, skipping generation');
         return;
     }
-    const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, {
+    const npmScopePrefix = getNpmScopePrefix(tree);
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'app'), srcRoot, {
         ...options,
         npmScopePrefix,
-        scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
+        scopeAlias: npmScopePrefix
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     // Only add RuntimeConfigProvider wrapper and import if not already present in JSX
-    const alreadyWrapped = await (0, ast_1.matchGritQL)(tree, mainTsxPath, '`<RuntimeConfigProvider>$_</RuntimeConfigProvider>`');
+    const alreadyWrapped = await matchGritQL(tree, mainTsxPath, '`<RuntimeConfigProvider>$_</RuntimeConfigProvider>`');
     if (!alreadyWrapped) {
-        await (0, ast_1.addSingleImport)(tree, mainTsxPath, 'RuntimeConfigProvider', './components/RuntimeConfig');
-        const wrapped = await (0, ast_1.applyGritQL)(tree, mainTsxPath, '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`');
+        await addSingleImport(tree, mainTsxPath, 'RuntimeConfigProvider', './components/RuntimeConfig');
+        const wrapped = await applyGritQL(tree, mainTsxPath, '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`');
         if (!wrapped) {
             throw new Error('Could not locate the App element in main.tsx');
         }
     }
-    await (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
+    await addHookResultToRouterProviderContext(tree, mainTsxPath, {
         hook: 'useRuntimeConfig',
         module: './hooks/useRuntimeConfig',
-        contextProp: 'runtimeConfig',
+        contextProp: 'runtimeConfig'
     });
-    (0, nx_1.addComponentGeneratorMetadata)(tree, options.project, exports.RUNTIME_CONFIG_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig')));
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.RUNTIME_CONFIG_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
+    addComponentGeneratorMetadata(tree, options.project, RUNTIME_CONFIG_GENERATOR_INFO, toProjectRelativePath(projectConfig, joinPathFragments(srcRoot, 'components', 'RuntimeConfig')));
+    await addGeneratorMetricsIfApplicable(tree, [
+        RUNTIME_CONFIG_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
 }
-exports.default = runtimeConfigGenerator;
+export default runtimeConfigGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/react-website/runtime-config/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;AA2BA,wDAsFC;AAjHD;;;GAGG;AACH,uCAKoB;AACpB,4CAA+E;AAC/E,wDAAkF;AAClF,kDAA6D;AAC7D,oDAAyE;AACzE,wDAA2E;AAC3E,0CAK2B;AAC3B,gDAA6D;AAGhD,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAAqC;IAErC,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC;IACzC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,2DAA2D,WAAW,EAAE,CACzE,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,OAAO,EACP,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAC5C,OAAO,EACP;QACE,GAAG,OAAO;QACV,cAAc;QACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC;KACzC,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,kFAAkF;IAClF,MAAM,cAAc,GAAG,MAAM,IAAA,iBAAW,EACtC,IAAI,EACJ,WAAW,EACX,qDAAqD,CACtD,CAAC;IACF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,uBAAuB,EACvB,4BAA4B,CAC7B,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAA,iBAAW,EAC/B,IAAI,EACJ,WAAW,EACX,uEAAuE,CACxE,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,MAAM,IAAA,8CAAoC,EAAC,IAAI,EAAE,WAAW,EAAE;QAC5D,IAAI,EAAE,kBAAkB;QACxB,MAAM,EAAE,0BAA0B;QAClC,WAAW,EAAE,eAAe;KAC7B,CAAC,CAAC;IAEH,IAAA,kCAA6B,EAC3B,IAAI,EACJ,OAAO,CAAC,OAAO,EACf,qCAA6B,EAC7B,IAAA,6BAAqB,EACnB,aAAa,EACb,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC,CAC1D,CACF,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AACD,kBAAe,sBAAsB,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport {\n  addSingleImport,\n  applyGritQL,\n  matchGritQL,\n} from '../../../utils/ast.js';\nimport { addHookResultToRouterProviderContext } from '../../../utils/ast/website.js';\nimport { formatFilesInSubtree } from '../../../utils/format.js';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics.js';\nimport { getNpmScopePrefix } from '../../../utils/npm-scope.js';\nimport {\n  addComponentGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx.js';\nimport { toProjectRelativePath } from '../../../utils/paths.js';\nimport type { RuntimeConfigGeneratorSchema } from './schema';\n\nexport const RUNTIME_CONFIG_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function runtimeConfigGenerator(\n  tree: Tree,\n  options: RuntimeConfigGeneratorSchema,\n) {\n  const projectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.project,\n  );\n  const srcRoot = projectConfig.sourceRoot;\n  const mainTsxPath = joinPathFragments(srcRoot, 'main.tsx');\n  if (!tree.exists(mainTsxPath)) {\n    throw new Error(\n      `Can only run this generator on a project which contains ${mainTsxPath}`,\n    );\n  }\n\n  const runtimeConfigPath = joinPathFragments(\n    srcRoot,\n    'components',\n    'RuntimeConfig',\n    'index.tsx',\n  );\n  if (tree.exists(runtimeConfigPath)) {\n    console.debug('Runtime config already exists, skipping generation');\n    return;\n  }\n\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'app'),\n    srcRoot,\n    {\n      ...options,\n      npmScopePrefix,\n      scopeAlias: npmScopePrefix,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Only add RuntimeConfigProvider wrapper and import if not already present in JSX\n  const alreadyWrapped = await matchGritQL(\n    tree,\n    mainTsxPath,\n    '`<RuntimeConfigProvider>$_</RuntimeConfigProvider>`',\n  );\n  if (!alreadyWrapped) {\n    await addSingleImport(\n      tree,\n      mainTsxPath,\n      'RuntimeConfigProvider',\n      './components/RuntimeConfig',\n    );\n\n    const wrapped = await applyGritQL(\n      tree,\n      mainTsxPath,\n      '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`',\n    );\n\n    if (!wrapped) {\n      throw new Error('Could not locate the App element in main.tsx');\n    }\n  }\n\n  await addHookResultToRouterProviderContext(tree, mainTsxPath, {\n    hook: 'useRuntimeConfig',\n    module: './hooks/useRuntimeConfig',\n    contextProp: 'runtimeConfig',\n  });\n\n  addComponentGeneratorMetadata(\n    tree,\n    options.project,\n    RUNTIME_CONFIG_GENERATOR_INFO,\n    toProjectRelativePath(\n      projectConfig,\n      joinPathFragments(srcRoot, 'components', 'RuntimeConfig'),\n    ),\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [RUNTIME_CONFIG_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n}\nexport default runtimeConfigGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","addSingleImport","applyGritQL","matchGritQL","addHookResultToRouterProviderContext","formatFilesInSubtree","addGeneratorMetricsIfApplicable","getNpmScopePrefix","addComponentGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","toProjectRelativePath","RUNTIME_CONFIG_GENERATOR_INFO","filename","runtimeConfigGenerator","tree","options","projectConfig","project","srcRoot","sourceRoot","mainTsxPath","exists","Error","runtimeConfigPath","console","debug","npmScopePrefix","dirname","scopeAlias","overwriteStrategy","KeepExisting","alreadyWrapped","wrapped","hook","module","contextProp"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QAEZ,aAAa;AACpB,SACEC,eAAe,EACfC,WAAW,EACXC,WAAW,QACN,wBAAwB;AAC/B,SAASC,oCAAoC,QAAQ,gCAAgC;AACrF,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,+BAA+B,QAAQ,4BAA4B;AAC5E,SAASC,iBAAiB,QAAQ,8BAA8B;AAChE,SACEC,6BAA6B,EAC7BC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAuB;AAC9B,SAASC,qBAAqB,QAAQ,0BAA0B;AAGhE,OAAO,MAAMC,gCAAiDH,iBAC5D,YAAYI,QAAQ,EACpB;AAEF,OAAO,eAAeC,uBACpBC,IAAU,EACVC,OAAqC;IAErC,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQE,OAAO;IAEjB,MAAMC,UAAUF,cAAcG,UAAU;IACxC,MAAMC,cAActB,kBAAkBoB,SAAS;IAC/C,IAAI,CAACJ,KAAKO,MAAM,CAACD,cAAc;QAC7B,MAAM,IAAIE,MACR,CAAC,wDAAwD,EAAEF,aAAa;IAE5E;IAEA,MAAMG,oBAAoBzB,kBACxBoB,SACA,cACA,iBACA;IAEF,IAAIJ,KAAKO,MAAM,CAACE,oBAAoB;QAClCC,QAAQC,KAAK,CAAC;QACd;IACF;IAEA,MAAMC,iBAAiBpB,kBAAkBQ;IACzCjB,cACEiB,MACAhB,kBAAkB,YAAY6B,OAAO,EAAE,SAAS,QAChDT,SACA;QACE,GAAGH,OAAO;QACVW;QACAE,YAAYF;IACd,GACA;QACEG,mBAAmB9B,kBAAkB+B,YAAY;IACnD;IAGF,kFAAkF;IAClF,MAAMC,iBAAiB,MAAM7B,YAC3BY,MACAM,aACA;IAEF,IAAI,CAACW,gBAAgB;QACnB,MAAM/B,gBACJc,MACAM,aACA,yBACA;QAGF,MAAMY,UAAU,MAAM/B,YACpBa,MACAM,aACA;QAGF,IAAI,CAACY,SAAS;YACZ,MAAM,IAAIV,MAAM;QAClB;IACF;IAEA,MAAMnB,qCAAqCW,MAAMM,aAAa;QAC5Da,MAAM;QACNC,QAAQ;QACRC,aAAa;IACf;IAEA5B,8BACEO,MACAC,QAAQE,OAAO,EACfN,+BACAD,sBACEM,eACAlB,kBAAkBoB,SAAS,cAAc;IAI7C,MAAMb,gCAAgCS,MAAM;QAACH;KAA8B;IAE3E,MAAMP,qBAAqBU;AAC7B;AACA,eAAeD,uBAAuB"}

package/src/ts/react-website/runtime-config/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/react-website/runtime-config/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface RuntimeConfigGeneratorSchema {\n  project: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAGC"}

package/src/ts/react-website/runtime-config/schema.d.ts

@@ -4,4 +4,5 @@
  */
 export interface RuntimeConfigGeneratorSchema {
   project: string;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/react-website/runtime-config/schema.json

@@ -13,6 +13,11 @@
       "x-priority": "important",
       "x-prompt": "the project to target",
       "x-dropdown": "projects"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["project"]

package/src/ts/sync/generator.d.ts

@@ -4,7 +4,7 @@
  */
 import { type Tree } from '@nx/devkit';
 import type { SyncGeneratorResult } from 'nx/src/utils/sync-generators';
-import { type NxGeneratorInfo } from '../../utils/nx';
+import { type NxGeneratorInfo } from '../../utils/nx.js';
 export declare const TS_SYNC_GENERATOR_INFO: NxGeneratorInfo;
 export declare const SYNC_GENERATOR_NAME: string;
 export declare const tsSyncGeneratorGenerator: (tree: Tree) => Promise<SyncGeneratorResult>;

package/src/ts/sync/generator.js

@@ -1,31 +1,28 @@
-"use strict";
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsSyncGeneratorGenerator = exports.SYNC_GENERATOR_NAME = exports.TS_SYNC_GENERATOR_INFO = void 0;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const package_json_1 = tslib_1.__importDefault(require("../../../package.json"));
-const format_1 = require("../../utils/format");
-const nx_1 = require("../../utils/nx");
-exports.TS_SYNC_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-exports.SYNC_GENERATOR_NAME = `${package_json_1.default.name}:${exports.TS_SYNC_GENERATOR_INFO.id}`;
-const tsSyncGeneratorGenerator = async (tree) => {
+ */ import { createProjectGraphAsync, getProjects, joinPathFragments, readJson, updateJson } from "@nx/devkit";
+import { relative } from "path";
+import PackageJson from "../../../package.json" with {
+    type: 'json'
+};
+import { getLocalDependencySpecifier } from "../../utils/dependencies.js";
+import { getGeneratorInfo } from "../../utils/nx.js";
+export const TS_SYNC_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const SYNC_GENERATOR_NAME = `${PackageJson.name}:${TS_SYNC_GENERATOR_INFO.id}`;
+export const tsSyncGeneratorGenerator = async (tree)=>{
     const basePaths = readBaseTsConfigPaths(tree);
     if (!basePaths) {
         return {};
     }
     const changesByConfigFile = {};
-    for (const project of (0, devkit_1.getProjects)(tree).values()) {
+    for (const project of getProjects(tree).values()){
         for (const tsConfigFileName of [
             'tsconfig.json',
             'tsconfig.lib.json',
-            'tsconfig.app.json',
-        ]) {
-            const tsConfigPath = (0, devkit_1.joinPathFragments)(project.root, tsConfigFileName);
+            'tsconfig.app.json'
+        ]){
+            const tsConfigPath = joinPathFragments(project.root, tsConfigFileName);
             if (!tree.exists(tsConfigPath)) {
                 continue;
             }
@@ -35,88 +32,168 @@ const tsSyncGeneratorGenerator = async (tree) => {
             }
         }
     }
-    if (Object.keys(changesByConfigFile).length === 0) {
+    const localSpecifier = getLocalDependencySpecifier(tree);
+    const localDepChanges = await syncLocalProjectDependencies(tree, localSpecifier);
+    const messages = [];
+    if (Object.keys(changesByConfigFile).length > 0) {
+        messages.push(buildOutOfSyncMessage(changesByConfigFile));
+    }
+    if (Object.keys(localDepChanges).length > 0) {
+        messages.push(buildLocalDepOutOfSyncMessage(localDepChanges, localSpecifier));
+    }
+    if (messages.length === 0) {
         return {};
     }
-    await (0, format_1.formatFilesInSubtree)(tree);
     return {
-        outOfSyncMessage: buildOutOfSyncMessage(changesByConfigFile),
+        outOfSyncMessage: messages.join('\n\n')
     };
 };
-exports.tsSyncGeneratorGenerator = tsSyncGeneratorGenerator;
-exports.default = exports.tsSyncGeneratorGenerator;
-const readBaseTsConfigPaths = (tree) => {
-    const baseConfigPath = ['tsconfig.base.json', 'tsconfig.json'].find((path) => tree.exists(path));
+/**
+ * Declare each project's local workspace dependencies in its own package.json
+ * so `noUndeclaredDependencies` passes. Edges come from the Nx project graph
+ * (the same import analysis `@nx/js:typescript-sync` uses). Returns the
+ * packages added per project manifest.
+ */ const syncLocalProjectDependencies = async (tree, localSpecifier)=>{
+    const projectGraph = await createProjectGraphAsync();
+    const projectInfoByName = collectProjectInfo(tree, projectGraph);
+    const addedByManifest = {};
+    for (const [projectName, info] of projectInfoByName){
+        // Local workspace projects this one depends on (excludes external packages
+        // and implicit edges).
+        const dependencyNames = (projectGraph.dependencies[projectName] ?? []).filter((dep)=>dep.type !== 'implicit' && projectInfoByName.has(dep.target) && dep.target !== projectName).map((dep)=>projectInfoByName.get(dep.target).packageName);
+        if (dependencyNames.length === 0) {
+            continue;
+        }
+        const added = [];
+        updateJson(tree, info.packageJsonPath, (json)=>{
+            const dependencies = {
+                ...json.dependencies ?? {}
+            };
+            const devDependencies = json.devDependencies ?? {};
+            for (const name of [
+                ...new Set(dependencyNames)
+            ].sort()){
+                // Already declared in either list — leave as-is.
+                if (dependencies[name] || devDependencies[name]) {
+                    continue;
+                }
+                dependencies[name] = localSpecifier;
+                added.push(name);
+            }
+            return added.length > 0 ? {
+                ...json,
+                dependencies
+            } : json;
+        });
+        if (added.length > 0) {
+            addedByManifest[info.packageJsonPath] = added;
+        }
+    }
+    return addedByManifest;
+};
+/**
+ * Index workspace projects with a named package.json by project name, so graph
+ * edges (keyed by project name) resolve to the manifest to declare the dep in.
+ */ const collectProjectInfo = (tree, projectGraph)=>{
+    const infoByName = new Map();
+    for (const [name, node] of Object.entries(projectGraph.nodes)){
+        const root = node.data.root;
+        if (!root) {
+            continue;
+        }
+        const packageJsonPath = joinPathFragments(root, 'package.json');
+        if (!tree.exists(packageJsonPath)) {
+            continue;
+        }
+        const packageName = readJson(tree, packageJsonPath).name;
+        if (packageName) {
+            infoByName.set(name, {
+                packageName,
+                packageJsonPath
+            });
+        }
+    }
+    return infoByName;
+};
+const buildLocalDepOutOfSyncMessage = (addedByManifest, localSpecifier)=>`Local project dependencies are out of sync. The following workspace dependencies will be declared:\n${Object.entries(addedByManifest).map(([manifest, names])=>`${manifest}:\n${names.map((name)=>`- ${name}: ${localSpecifier}`).join('\n')}`).join('\n\n')}`;
+export default tsSyncGeneratorGenerator;
+const readBaseTsConfigPaths = (tree)=>{
+    const baseConfigPath = [
+        'tsconfig.base.json',
+        'tsconfig.json'
+    ].find((path)=>tree.exists(path));
     if (!baseConfigPath) {
         return undefined;
     }
-    const baseConfigJson = (0, devkit_1.readJson)(tree, baseConfigPath);
+    const baseConfigJson = readJson(tree, baseConfigPath);
     return baseConfigJson?.compilerOptions?.paths ?? {};
 };
-const arePathArraysEqual = (first, second) => {
+const arePathArraysEqual = (first, second)=>{
     if (first.length !== second.length) {
         return false;
     }
-    return first.every((value, index) => value === second[index]);
+    return first.every((value, index)=>value === second[index]);
 };
 /**
  * Rebase a path from the workspace root to a project root.
  * e.g. "./packages/foo/src/index.ts" from project "packages/bar"
  *      becomes "../../packages/foo/src/index.ts"
- */
-const rebasePath = (pathValue, projectRoot) => {
+ */ const rebasePath = (pathValue, projectRoot)=>{
     // Strip leading ./ if present
-    const normalized = pathValue.startsWith('./')
-        ? pathValue.slice(2)
-        : pathValue;
-    const relPrefix = (0, path_1.relative)(projectRoot, '.') || '.';
-    return (0, devkit_1.joinPathFragments)(relPrefix, normalized);
+    const normalized = pathValue.startsWith('./') ? pathValue.slice(2) : pathValue;
+    const relPrefix = relative(projectRoot, '.') || '.';
+    return joinPathFragments(relPrefix, normalized);
 };
-const syncPathsWithBase = (tree, tsConfigPath, basePaths, projectRoot) => {
+const syncPathsWithBase = (tree, tsConfigPath, basePaths, projectRoot)=>{
     const changes = [];
-    const tsConfigJson = (0, devkit_1.readJson)(tree, tsConfigPath);
+    const tsConfigJson = readJson(tree, tsConfigPath);
     const paths = tsConfigJson?.compilerOptions?.paths;
     if (!paths) {
-        return { updated: false, changes };
+        return {
+            updated: false,
+            changes
+        };
     }
     const updatedAliases = {
-        ...(tsConfigJson.compilerOptions?.paths ?? {}),
+        ...tsConfigJson.compilerOptions?.paths ?? {}
     };
     let updated = false;
     // Add or update aliases that exist in the base config, rebasing paths
     // relative to the project root since baseUrl is no longer set
-    for (const [alias, baseValue] of Object.entries(basePaths)) {
-        const rebasedValue = baseValue.map((p) => rebasePath(p, projectRoot));
+    for (const [alias, baseValue] of Object.entries(basePaths)){
+        const rebasedValue = baseValue.map((p)=>rebasePath(p, projectRoot));
         const existingValue = updatedAliases[alias];
         if (!existingValue) {
-            changes.push({ alias, type: 'added' });
+            changes.push({
+                alias,
+                type: 'added'
+            });
             updated = true;
-        }
-        else if (!arePathArraysEqual(existingValue, rebasedValue)) {
-            changes.push({ alias, type: 'updated' });
+        } else if (!arePathArraysEqual(existingValue, rebasedValue)) {
+            changes.push({
+                alias,
+                type: 'updated'
+            });
             updated = true;
         }
         updatedAliases[alias] = rebasedValue;
     }
     if (updated) {
-        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => ({
-            ...json,
-            compilerOptions: {
-                ...json.compilerOptions,
-                paths: updatedAliases,
-            },
-        }));
+        updateJson(tree, tsConfigPath, (json)=>({
+                ...json,
+                compilerOptions: {
+                    ...json.compilerOptions,
+                    paths: updatedAliases
+                }
+            }));
     }
-    return { updated, changes };
+    return {
+        updated,
+        changes
+    };
 };
 /**
  * Build the message to display when the sync generator would make changes to the tree
- */
-const buildOutOfSyncMessage = (changesByConfig) => `TypeScript path aliases are out of sync with the base tsconfig. The following configs will be updated:\n${Object.entries(changesByConfig)
-    .map(([config, changes]) => `${config}:\n${changes
-    .slice()
-    .sort((left, right) => left.alias.localeCompare(right.alias))
-    .map(({ alias, type }) => `- ${alias} (${type})`)
-    .join('\n')}`)
-    .join('\n\n')}`;
+ */ const buildOutOfSyncMessage = (changesByConfig)=>`TypeScript path aliases are out of sync with the base tsconfig. The following configs will be updated:\n${Object.entries(changesByConfig).map(([config, changes])=>`${config}:\n${changes.slice().sort((left, right)=>left.alias.localeCompare(right.alias)).map(({ alias, type })=>`- ${alias} (${type})`).join('\n')}`).join('\n\n')}`;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/sync/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/sync/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/sync/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  createProjectGraphAsync,\n  getProjects,\n  joinPathFragments,\n  type ProjectGraph,\n  readJson,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport type { SyncGeneratorResult } from 'nx/src/utils/sync-generators';\nimport { relative } from 'path';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { getLocalDependencySpecifier } from '../../utils/dependencies.js';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../../utils/nx.js';\n\nexport const TS_SYNC_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const SYNC_GENERATOR_NAME = `${PackageJson.name}:${TS_SYNC_GENERATOR_INFO.id}`;\n\nexport const tsSyncGeneratorGenerator = async (\n  tree: Tree,\n): Promise<SyncGeneratorResult> => {\n  const basePaths = readBaseTsConfigPaths(tree);\n\n  if (!basePaths) {\n    return {};\n  }\n\n  const changesByConfigFile: Record<string, PathChange[]> = {};\n\n  for (const project of getProjects(tree).values()) {\n    for (const tsConfigFileName of [\n      'tsconfig.json',\n      'tsconfig.lib.json',\n      'tsconfig.app.json',\n    ]) {\n      const tsConfigPath = joinPathFragments(project.root, tsConfigFileName);\n      if (!tree.exists(tsConfigPath)) {\n        continue;\n      }\n\n      const { changes, updated } = syncPathsWithBase(\n        tree,\n        tsConfigPath,\n        basePaths,\n        project.root,\n      );\n\n      if (updated) {\n        changesByConfigFile[tsConfigPath] = changes;\n      }\n    }\n  }\n\n  const localSpecifier = getLocalDependencySpecifier(tree);\n  const localDepChanges = await syncLocalProjectDependencies(\n    tree,\n    localSpecifier,\n  );\n\n  const messages: string[] = [];\n  if (Object.keys(changesByConfigFile).length > 0) {\n    messages.push(buildOutOfSyncMessage(changesByConfigFile));\n  }\n  if (Object.keys(localDepChanges).length > 0) {\n    messages.push(\n      buildLocalDepOutOfSyncMessage(localDepChanges, localSpecifier),\n    );\n  }\n\n  if (messages.length === 0) {\n    return {};\n  }\n\n  return {\n    outOfSyncMessage: messages.join('\\n\\n'),\n  };\n};\n\n/**\n * Declare each project's local workspace dependencies in its own package.json\n * so `noUndeclaredDependencies` passes. Edges come from the Nx project graph\n * (the same import analysis `@nx/js:typescript-sync` uses). Returns the\n * packages added per project manifest.\n */\nconst syncLocalProjectDependencies = async (\n  tree: Tree,\n  localSpecifier: string,\n): Promise<Record<string, string[]>> => {\n  const projectGraph = await createProjectGraphAsync();\n\n  const projectInfoByName = collectProjectInfo(tree, projectGraph);\n\n  const addedByManifest: Record<string, string[]> = {};\n\n  for (const [projectName, info] of projectInfoByName) {\n    // Local workspace projects this one depends on (excludes external packages\n    // and implicit edges).\n    const dependencyNames = (projectGraph.dependencies[projectName] ?? [])\n      .filter(\n        (dep) =>\n          dep.type !== 'implicit' &&\n          projectInfoByName.has(dep.target) &&\n          dep.target !== projectName,\n      )\n      .map((dep) => projectInfoByName.get(dep.target)!.packageName);\n\n    if (dependencyNames.length === 0) {\n      continue;\n    }\n\n    const added: string[] = [];\n    updateJson(tree, info.packageJsonPath, (json) => {\n      const dependencies = { ...(json.dependencies ?? {}) };\n      const devDependencies = json.devDependencies ?? {};\n      for (const name of [...new Set(dependencyNames)].sort()) {\n        // Already declared in either list — leave as-is.\n        if (dependencies[name] || devDependencies[name]) {\n          continue;\n        }\n        dependencies[name] = localSpecifier;\n        added.push(name);\n      }\n      return added.length > 0 ? { ...json, dependencies } : json;\n    });\n\n    if (added.length > 0) {\n      addedByManifest[info.packageJsonPath] = added;\n    }\n  }\n\n  return addedByManifest;\n};\n\ninterface ProjectInfo {\n  packageName: string;\n  packageJsonPath: string;\n}\n\n/**\n * Index workspace projects with a named package.json by project name, so graph\n * edges (keyed by project name) resolve to the manifest to declare the dep in.\n */\nconst collectProjectInfo = (\n  tree: Tree,\n  projectGraph: ProjectGraph,\n): Map<string, ProjectInfo> => {\n  const infoByName = new Map<string, ProjectInfo>();\n  for (const [name, node] of Object.entries(projectGraph.nodes)) {\n    const root = node.data.root;\n    if (!root) {\n      continue;\n    }\n    const packageJsonPath = joinPathFragments(root, 'package.json');\n    if (!tree.exists(packageJsonPath)) {\n      continue;\n    }\n    const packageName = readJson<{ name?: string }>(tree, packageJsonPath).name;\n    if (packageName) {\n      infoByName.set(name, { packageName, packageJsonPath });\n    }\n  }\n  return infoByName;\n};\n\nconst buildLocalDepOutOfSyncMessage = (\n  addedByManifest: Record<string, string[]>,\n  localSpecifier: string,\n): string =>\n  `Local project dependencies are out of sync. The following workspace dependencies will be declared:\\n${Object.entries(\n    addedByManifest,\n  )\n    .map(\n      ([manifest, names]) =>\n        `${manifest}:\\n${names\n          .map((name) => `- ${name}: ${localSpecifier}`)\n          .join('\\n')}`,\n    )\n    .join('\\n\\n')}`;\n\nexport default tsSyncGeneratorGenerator;\n\nconst readBaseTsConfigPaths = (\n  tree: Tree,\n): Record<string, string[]> | undefined => {\n  const baseConfigPath = ['tsconfig.base.json', 'tsconfig.json'].find((path) =>\n    tree.exists(path),\n  );\n\n  if (!baseConfigPath) {\n    return undefined;\n  }\n\n  const baseConfigJson = readJson<Record<string, any>>(tree, baseConfigPath);\n  return baseConfigJson?.compilerOptions?.paths ?? {};\n};\n\ntype PathChangeType = 'added' | 'updated';\n\ntype PathChange = {\n  alias: string;\n  type: PathChangeType;\n};\n\nconst arePathArraysEqual = (first: string[], second: string[]): boolean => {\n  if (first.length !== second.length) {\n    return false;\n  }\n\n  return first.every((value, index) => value === second[index]);\n};\n\n/**\n * Rebase a path from the workspace root to a project root.\n * e.g. \"./packages/foo/src/index.ts\" from project \"packages/bar\"\n *      becomes \"../../packages/foo/src/index.ts\"\n */\nconst rebasePath = (pathValue: string, projectRoot: string): string => {\n  // Strip leading ./ if present\n  const normalized = pathValue.startsWith('./')\n    ? pathValue.slice(2)\n    : pathValue;\n  const relPrefix = relative(projectRoot, '.') || '.';\n  return joinPathFragments(relPrefix, normalized);\n};\n\nconst syncPathsWithBase = (\n  tree: Tree,\n  tsConfigPath: string,\n  basePaths: Record<string, string[]>,\n  projectRoot: string,\n): { updated: boolean; changes: PathChange[] } => {\n  const changes: PathChange[] = [];\n\n  const tsConfigJson = readJson(tree, tsConfigPath);\n  const paths = tsConfigJson?.compilerOptions?.paths;\n\n  if (!paths) {\n    return { updated: false, changes };\n  }\n\n  const updatedAliases: Record<string, string[]> = {\n    ...(tsConfigJson.compilerOptions?.paths ?? {}),\n  };\n  let updated = false;\n\n  // Add or update aliases that exist in the base config, rebasing paths\n  // relative to the project root since baseUrl is no longer set\n  for (const [alias, baseValue] of Object.entries(basePaths)) {\n    const rebasedValue = (baseValue as string[]).map((p) =>\n      rebasePath(p, projectRoot),\n    );\n    const existingValue = updatedAliases[alias];\n    if (!existingValue) {\n      changes.push({ alias, type: 'added' });\n      updated = true;\n    } else if (!arePathArraysEqual(existingValue, rebasedValue)) {\n      changes.push({ alias, type: 'updated' });\n      updated = true;\n    }\n\n    updatedAliases[alias] = rebasedValue;\n  }\n\n  if (updated) {\n    updateJson(tree, tsConfigPath, (json) => ({\n      ...json,\n      compilerOptions: {\n        ...json.compilerOptions,\n        paths: updatedAliases,\n      },\n    }));\n  }\n\n  return { updated, changes };\n};\n\n/**\n * Build the message to display when the sync generator would make changes to the tree\n */\nconst buildOutOfSyncMessage = (\n  changesByConfig: Record<string, PathChange[]>,\n): string =>\n  `TypeScript path aliases are out of sync with the base tsconfig. The following configs will be updated:\\n${Object.entries(\n    changesByConfig,\n  )\n    .map(\n      ([config, changes]) =>\n        `${config}:\\n${changes\n          .slice()\n          .sort((left, right) => left.alias.localeCompare(right.alias))\n          .map(({ alias, type }) => `- ${alias} (${type})`)\n          .join('\\n')}`,\n    )\n    .join('\\n\\n')}`;\n"],"names":["createProjectGraphAsync","getProjects","joinPathFragments","readJson","updateJson","relative","PackageJson","type","getLocalDependencySpecifier","getGeneratorInfo","TS_SYNC_GENERATOR_INFO","filename","SYNC_GENERATOR_NAME","name","id","tsSyncGeneratorGenerator","tree","basePaths","readBaseTsConfigPaths","changesByConfigFile","project","values","tsConfigFileName","tsConfigPath","root","exists","changes","updated","syncPathsWithBase","localSpecifier","localDepChanges","syncLocalProjectDependencies","messages","Object","keys","length","push","buildOutOfSyncMessage","buildLocalDepOutOfSyncMessage","outOfSyncMessage","join","projectGraph","projectInfoByName","collectProjectInfo","addedByManifest","projectName","info","dependencyNames","dependencies","filter","dep","has","target","map","get","packageName","added","packageJsonPath","json","devDependencies","Set","sort","infoByName","Map","node","entries","nodes","data","set","manifest","names","baseConfigPath","find","path","undefined","baseConfigJson","compilerOptions","paths","arePathArraysEqual","first","second","every","value","index","rebasePath","pathValue","projectRoot","normalized","startsWith","slice","relPrefix","tsConfigJson","updatedAliases","alias","baseValue","rebasedValue","p","existingValue","changesByConfig","config","left","right","localeCompare"],"mappings":"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"}

package/src/ts/website/app/generator.d.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { GeneratorCallback, Tree } from '@nx/devkit';
-import { type NxGeneratorInfo } from '../../../utils/nx';
+import { type NxGeneratorInfo } from '../../../utils/nx.js';
 import type { TsWebsiteGeneratorSchema } from './schema';
 export declare const TS_WEBSITE_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsWebsiteGenerator: (tree: Tree, schema: TsWebsiteGeneratorSchema) => Promise<GeneratorCallback>;

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

@@ -1,13 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsWebsiteGenerator = exports.TS_WEBSITE_GENERATOR_INFO = void 0;
-const nx_1 = require("../../../utils/nx");
-const generator_1 = require("../../react-website/app/generator");
-exports.TS_WEBSITE_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsWebsiteGenerator = async (tree, schema) => {
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { getGeneratorInfo } from "../../../utils/nx.js";
+import { tsReactWebsiteGenerator } from "../../react-website/app/generator.js";
+export const TS_WEBSITE_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsWebsiteGenerator = async (tree, schema)=>{
     const { framework: _framework, ...rest } = schema;
-    return (0, generator_1.tsReactWebsiteGenerator)(tree, rest);
+    return tsReactWebsiteGenerator(tree, rest);
 };
-exports.tsWebsiteGenerator = tsWebsiteGenerator;
-exports.default = exports.tsWebsiteGenerator;
+export default tsWebsiteGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/website/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/website/app/generator.ts"],"names":[],"mappings":";;;AAKA,0CAA2E;AAC3E,iEAA4E;AAG/D,QAAA,yBAAyB,GACpC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAU,EACV,MAAgC,EACJ,EAAE;IAC9B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IAClD,OAAO,IAAA,mCAAuB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B;AAEF,kBAAe,0BAAkB,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/website/app/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { GeneratorCallback, Tree } from '@nx/devkit';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../../../utils/nx.js';\nimport { tsReactWebsiteGenerator } from '../../react-website/app/generator.js';\nimport type { TsWebsiteGeneratorSchema } from './schema';\n\nexport const TS_WEBSITE_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsWebsiteGenerator = async (\n  tree: Tree,\n  schema: TsWebsiteGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { framework: _framework, ...rest } = schema;\n  return tsReactWebsiteGenerator(tree, rest);\n};\n\nexport default tsWebsiteGenerator;\n"],"names":["getGeneratorInfo","tsReactWebsiteGenerator","TS_WEBSITE_GENERATOR_INFO","filename","tsWebsiteGenerator","tree","schema","framework","_framework","rest"],"mappings":"AAAA;;;CAGC,GAED,SAASA,gBAAgB,QAA8B,uBAAuB;AAC9E,SAASC,uBAAuB,QAAQ,uCAAuC;AAG/E,OAAO,MAAMC,4BAA6CF,iBACxD,YAAYG,QAAQ,EACpB;AAEF,OAAO,MAAMC,qBAAqB,OAChCC,MACAC;IAEA,MAAM,EAAEC,WAAWC,UAAU,EAAE,GAAGC,MAAM,GAAGH;IAC3C,OAAOL,wBAAwBI,MAAMI;AACvC,EAAE;AAEF,eAAeL,mBAAmB"}

package/src/ts/website/app/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/website/app/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/website/app/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { IacOption } from '../../../utils/iac.js';\nimport { UxOption } from '../../react-website/app/generator.js';\n\nexport type WebsiteFramework = 'react';\nexport type WebsiteInfraOption = 'cloudfront-s3' | 'none';\n\nexport interface TsWebsiteGeneratorSchema {\n  name: string;\n  framework?: WebsiteFramework;\n  directory?: string;\n  subDirectory?: string;\n  tanstackRouter?: boolean;\n  tailwind?: boolean;\n  ux?: UxOption;\n  infra?: WebsiteInfraOption;\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAOD,WAWC"}

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

@@ -2,8 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { IacOption } from '../../../utils/iac';
-import { UxOption } from '../../react-website/app/generator';
+import { IacOption } from '../../../utils/iac.js';
+import { UxOption } from '../../react-website/app/generator.js';
 
 export type WebsiteFramework = 'react';
 export type WebsiteInfraOption = 'cloudfront-s3' | 'none';
@@ -13,10 +13,10 @@ export interface TsWebsiteGeneratorSchema {
   framework?: WebsiteFramework;
   directory?: string;
   subDirectory?: string;
-  skipInstall?: boolean;
   tanstackRouter?: boolean;
   tailwind?: boolean;
   ux?: UxOption;
   infra?: WebsiteInfraOption;
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/website/app/schema.json

@@ -48,7 +48,7 @@
       "description": "The preferred UX provider.",
       "enum": ["none", "cloudscape", "shadcn"],
       "x-priority": "important",
-      "default": "cloudscape",
+      "default": "shadcn",
       "x-prompt": {
         "message": "Which UX provider should we scaffold for this app?",
         "type": "list",
@@ -57,16 +57,16 @@
             "value": "none",
             "label": "None (plain React/Vite without a UI kit)"
           },
-          {
-            "value": "cloudscape",
-            "label": "Cloudscape (AWS-first components with ready-made layouts)"
-          },
           {
             "value": "shadcn",
             "label": "Shadcn (shared UI library under packages/common/shadcn)"
+          },
+          {
+            "value": "cloudscape",
+            "label": "Cloudscape (AWS-first components with ready-made layouts)"
           }
         ],
-        "default": "cloudscape"
+        "default": "shadcn"
       }
     },
     "tailwind": {
@@ -98,6 +98,11 @@
       "x-priority": "important",
       "default": "inherit",
       "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"],

package/src/ts/website/auth/generator.d.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Tree } from '@nx/devkit';
-import { type NxGeneratorInfo } from '../../../utils/nx';
+import { type NxGeneratorInfo } from '../../../utils/nx.js';
 import type { TsWebsiteAuthGeneratorSchema } from './schema';
 export declare const TS_WEBSITE_AUTH_GENERATOR_INFO: NxGeneratorInfo;
-export declare function tsWebsiteAuthGenerator(tree: Tree, schema: TsWebsiteAuthGeneratorSchema): Promise<() => void>;
+export declare function tsWebsiteAuthGenerator(tree: Tree, schema: TsWebsiteAuthGeneratorSchema): Promise<() => Promise<void>>;
 export default tsWebsiteAuthGenerator;