@frontmcp/nx 1.8.5 → 1.8.7

package/generators/lib/lib-project-files/tsconfig.spec.json__tmpl__

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "<%= offset %>dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",<% if (ignoreDeprecations) { %>
+    "ignoreDeprecations": "<%= ignoreDeprecations %>",<% } %>
+    "types": ["jest", "node"]
+  },
+  "include": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}

package/generators/lib/lib.js

@@ -8,7 +8,7 @@ async function libGenerator(tree, schema) {
     return libGeneratorInternal(tree, schema);
 }
 async function libGeneratorInternal(tree, schema) {
-    const options = (0, index_js_1.normalizeOptions)(schema);
+    const options = (0, index_js_1.normalizeOptions)(tree, schema);
     // Generate project config files (project.json, tsconfig, jest)
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'lib-project-files'), options.projectRoot, {
         ...options,

package/generators/lib/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/lib.ts"],"names":[],"mappings":";;AAWA,oCAEC;AAbD,uCAMoB;AACpB,+BAA4B;AAE5B,6CAAkD;AAE3C,KAAK,UAAU,YAAY,CAAC,IAAU,EAAE,MAA0B;IACvE,OAAO,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,IAAU,EACV,MAA0B;IAE1B,MAAM,OAAO,GAAG,IAAA,2BAAgB,EAAC,MAAM,CAAC,CAAC;IAEzC,+DAA+D;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,WAAW,EAAE;QAC7E,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sCAAsC;IACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;QACpD,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sDAAsD;IACtD,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACtC,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;YAC9D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;YACzF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,YAAY,CAAC","sourcesContent":["import {\n  type Tree,\n  formatFiles,\n  generateFiles,\n  updateJson,\n  type GeneratorCallback,\n} from '@nx/devkit';\nimport { join } from 'path';\nimport type { LibGeneratorSchema } from './schema.js';\nimport { normalizeOptions } from './lib/index.js';\n\nexport async function libGenerator(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void> {\n  return libGeneratorInternal(tree, schema);\n}\n\nasync function libGeneratorInternal(\n  tree: Tree,\n  schema: LibGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(schema);\n\n  // Generate project config files (project.json, tsconfig, jest)\n  generateFiles(tree, join(__dirname, 'lib-project-files'), options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Generate type-specific source files\n  const templateDir = join(__dirname, 'files', options.libType);\n  generateFiles(tree, templateDir, options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Add path mapping to tsconfig.base.json if it exists\n  if (tree.exists('tsconfig.base.json')) {\n    updateJson(tree, 'tsconfig.base.json', (json) => {\n      json.compilerOptions = json.compilerOptions ?? {};\n      json.compilerOptions.paths = json.compilerOptions.paths ?? {};\n      json.compilerOptions.paths[options.importPath] = [`${options.projectRoot}/src/index.ts`];\n      return json;\n    });\n  }\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default libGenerator;\n"]}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/lib.ts"],"names":[],"mappings":";;AAWA,oCAEC;AAbD,uCAMoB;AACpB,+BAA4B;AAE5B,6CAAkD;AAE3C,KAAK,UAAU,YAAY,CAAC,IAAU,EAAE,MAA0B;IACvE,OAAO,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,IAAU,EACV,MAA0B;IAE1B,MAAM,OAAO,GAAG,IAAA,2BAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,+DAA+D;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,WAAW,EAAE;QAC7E,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sCAAsC;IACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;QACpD,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sDAAsD;IACtD,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACtC,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;YAC9D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;YACzF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,YAAY,CAAC","sourcesContent":["import {\n  type Tree,\n  formatFiles,\n  generateFiles,\n  updateJson,\n  type GeneratorCallback,\n} from '@nx/devkit';\nimport { join } from 'path';\nimport type { LibGeneratorSchema } from './schema.js';\nimport { normalizeOptions } from './lib/index.js';\n\nexport async function libGenerator(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void> {\n  return libGeneratorInternal(tree, schema);\n}\n\nasync function libGeneratorInternal(\n  tree: Tree,\n  schema: LibGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(tree, schema);\n\n  // Generate project config files (project.json, tsconfig, jest)\n  generateFiles(tree, join(__dirname, 'lib-project-files'), options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Generate type-specific source files\n  const templateDir = join(__dirname, 'files', options.libType);\n  generateFiles(tree, templateDir, options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Add path mapping to tsconfig.base.json if it exists\n  if (tree.exists('tsconfig.base.json')) {\n    updateJson(tree, 'tsconfig.base.json', (json) => {\n      json.compilerOptions = json.compilerOptions ?? {};\n      json.compilerOptions.paths = json.compilerOptions.paths ?? {};\n      json.compilerOptions.paths[options.importPath] = [`${options.projectRoot}/src/index.ts`];\n      return json;\n    });\n  }\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default libGenerator;\n"]}

package/generators/plugin/files/__fileName__.plugin.ts__tmpl__

@@ -1,4 +1,4 @@
-import { Plugin, DynamicPlugin, type PluginRegistrationContext } from '@frontmcp/sdk';
+import { DynamicPlugin, Plugin, type ProviderType } from '@frontmcp/sdk';
 
 export interface <%= className %>PluginOptions {
   // TODO: define plugin options
@@ -9,11 +9,15 @@ export interface <%= className %>PluginOptions {
   description: 'TODO: describe what this plugin does',
 })
 export class <%= className %>Plugin extends DynamicPlugin<<%= className %>PluginOptions> {
-  async dynamicProviders() {
-    return [];
+  options: <%= className %>PluginOptions;
+
+  constructor(options: <%= className %>PluginOptions = {}) {
+    super();
+    this.options = options;
   }
 
-  async onRegister(ctx: PluginRegistrationContext): Promise<void> {
-    // TODO: register tools, resources, prompts, or context extensions
+  // Providers this plugin contributes to the container.
+  static override dynamicProviders(_options: <%= className %>PluginOptions): ProviderType[] {
+    return [];
   }
 }

package/generators/provider/files/__fileName__.provider.ts__tmpl__

@@ -1,15 +1,11 @@
-import { Provider } from '@frontmcp/sdk';
-
-export const <%= constantName %>_TOKEN = Symbol('<%= className %>Provider');
+import { Provider, ProviderScope } from '@frontmcp/sdk';
 
+// Register with `providers: [<%= className %>Provider]` on an @App or @FrontMcp,
+// then resolve it inside a tool with `this.get(<%= className %>Provider)`.
 @Provider({
-  token: <%= constantName %>_TOKEN,
-  scope: '<%= scope %>',
+  name: '<%= className %>Provider',
+  scope: ProviderScope.<%= scopeEnum %>,
 })
 export class <%= className %>Provider {
   // TODO: implement provider logic
-
-  static factory(): <%= className %>Provider {
-    return new <%= className %>Provider();
-  }
 }

package/generators/provider/provider.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, type GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { ProviderGeneratorSchema } from './schema.js';
 export declare function providerGenerator(tree: Tree, schema: ProviderGeneratorSchema): Promise<GeneratorCallback | void>;
 export default providerGenerator;

package/generators/provider/provider.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.providerGenerator = providerGenerator;
-const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
 const normalize_options_js_1 = require("../../utils/normalize-options.js");
 async function providerGenerator(tree, schema) {
     const options = (0, normalize_options_js_1.normalizePrimitiveOptions)(tree, schema, 'providers');
     const scope = schema.scope ?? 'singleton';
-    const constantName = (0, devkit_1.names)(schema.name).constantName;
+    const scopeEnum = scope === 'singleton' ? 'GLOBAL' : 'CONTEXT';
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), options.directory, {
         ...options,
         scope,
-        constantName,
+        scopeEnum,
         tmpl: '',
     });
     if (!schema.skipFormat) {

package/generators/provider/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/generators/provider/provider.ts"],"names":[],"mappings":";;AAKA,8CAkBC;AAvBD,uCAAkG;AAClG,+BAA4B;AAE5B,2EAA6E;AAEtE,KAAK,UAAU,iBAAiB,CACrC,IAAU,EACV,MAA+B;IAE/B,MAAM,OAAO,GAAG,IAAA,gDAAyB,EAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,WAAW,CAAC;IAC1C,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;IAErD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE;QAC/D,GAAG,OAAO;QACV,KAAK;QACL,YAAY;QACZ,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAC","sourcesContent":["import { type Tree, formatFiles, generateFiles, names, type GeneratorCallback } from '@nx/devkit';\nimport { join } from 'path';\nimport type { ProviderGeneratorSchema } from './schema.js';\nimport { normalizePrimitiveOptions } from '../../utils/normalize-options.js';\n\nexport async function providerGenerator(\n  tree: Tree,\n  schema: ProviderGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const options = normalizePrimitiveOptions(tree, schema, 'providers');\n  const scope = schema.scope ?? 'singleton';\n  const constantName = names(schema.name).constantName;\n\n  generateFiles(tree, join(__dirname, 'files'), options.directory, {\n    ...options,\n    scope,\n    constantName,\n    tmpl: '',\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default providerGenerator;\n"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/generators/provider/provider.ts"],"names":[],"mappings":";;AAOA,8CAkBC;AAzBD,+BAA4B;AAE5B,uCAA2F;AAE3F,2EAA6E;AAGtE,KAAK,UAAU,iBAAiB,CACrC,IAAU,EACV,MAA+B;IAE/B,MAAM,OAAO,GAAG,IAAA,gDAAyB,EAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,WAAW,CAAC;IAC1C,MAAM,SAAS,GAAG,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAE/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE;QAC/D,GAAG,OAAO;QACV,KAAK;QACL,SAAS;QACT,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAC","sourcesContent":["import { join } from 'path';\n\nimport { formatFiles, generateFiles, type GeneratorCallback, type Tree } from '@nx/devkit';\n\nimport { normalizePrimitiveOptions } from '../../utils/normalize-options.js';\nimport type { ProviderGeneratorSchema } from './schema.js';\n\nexport async function providerGenerator(\n  tree: Tree,\n  schema: ProviderGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const options = normalizePrimitiveOptions(tree, schema, 'providers');\n  const scope = schema.scope ?? 'singleton';\n  const scopeEnum = scope === 'singleton' ? 'GLOBAL' : 'CONTEXT';\n\n  generateFiles(tree, join(__dirname, 'files'), options.directory, {\n    ...options,\n    scope,\n    scopeEnum,\n    tmpl: '',\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default providerGenerator;\n"]}

package/generators/server/files/common/package.json__tmpl__

@@ -0,0 +1,5 @@
+{
+  "name": "<%= projectName %>",
+  "version": "0.0.1",
+  "private": true
+}

package/generators/server/files/common/project.json__tmpl__

@@ -1,17 +1,18 @@
 {
   "name": "<%= projectName %>",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "$schema": "<%= offset %>node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "<%= projectRoot %>/src",
   "projectType": "application",
   "tags": [<%- parsedTags.map(t => `"${t}"`).join(', ') %>],
   "targets": {
     "build": {
       "executor": "@frontmcp/nx:build",
+      "cache": true,
       "outputs": ["{projectRoot}/dist"],
       "options": {
         "entry": "{projectRoot}/src/main.ts",
         "outputPath": "{projectRoot}/dist",
-        "adapter": "<%= deploymentTarget %>"
+        "target": "<%= deploymentTarget %>"
       }
     },
     "deploy": {

package/generators/server/files/common/src/main.ts__tmpl__

@@ -1,9 +1,9 @@
 import 'reflect-metadata';
 import { FrontMcp } from '@frontmcp/sdk';
-<% appNames.forEach(function(appName) { %>import { <%= names(appName).className %>App } from '../../apps/<%= names(appName).fileName %>/<%= names(appName).fileName %>.app';
+<% appImports.forEach(function(app) { %>import { <%= app.className %> } from '<%= app.importPath %>';
 <% }); %>
 @FrontMcp({
   info: { name: '<%= className %> Server', version: '0.1.0' },
-  apps: [<%- appNames.map(a => names(a).className + 'App').join(', ') %>],
+  apps: [<%- appImports.map(a => a.className).join(', ') %>],
 })
 export default class Server {}

package/generators/server/files/common/tsconfig.json__tmpl__

@@ -1,14 +1,12 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "<%= offset %>tsconfig.base.json",
   "compilerOptions": {
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
+    "module": "commonjs",
+    "moduleResolution": "node10",<% if (ignoreDeprecations) { %>
+    "ignoreDeprecations": "<%= ignoreDeprecations %>",<% } %>
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
-  "files": [],
-  "include": [],
-  "references": [
-    { "path": "./tsconfig.lib.json" }
-  ]
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
 }

package/generators/server/files/common/tsconfig.lib.json__tmpl__

@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src",
     "declaration": true,
     "types": ["node"]
   },

package/generators/server/lib/normalize-options.d.ts

@@ -1,14 +1,22 @@
+import { type Tree } from '@nx/devkit';
 import type { ServerGeneratorSchema } from '../schema.js';
 export interface NormalizedServerOptions {
     name: string;
     projectName: string;
     projectRoot: string;
+    offset: string;
+    ignoreDeprecations: string;
     className: string;
     fileName: string;
     deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';
     appNames: string[];
+    /** Each composed app with the import specifier `main.ts` uses, relative to the server's `src/`. */
+    appImports: Array<{
+        className: string;
+        importPath: string;
+    }>;
     redis: 'docker' | 'existing' | 'none';
     parsedTags: string[];
     skipFormat: boolean;
 }
-export declare function normalizeOptions(schema: ServerGeneratorSchema): NormalizedServerOptions;
+export declare function normalizeOptions(tree: Tree, schema: ServerGeneratorSchema): NormalizedServerOptions;

package/generators/server/lib/normalize-options.js

@@ -2,21 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-function normalizeOptions(schema) {
+const path_1 = require("path");
+const project_paths_js_1 = require("../../../utils/project-paths.js");
+function normalizeOptions(tree, schema) {
     const { className, fileName } = (0, devkit_1.names)(schema.name);
-    const projectRoot = schema.directory ?? (0, devkit_1.joinPathFragments)('servers', fileName);
+    const { projectRoot, offset } = (0, project_paths_js_1.resolveProjectPaths)(schema.directory ?? (0, devkit_1.joinPathFragments)('servers', fileName));
     const parsedTags = schema.tags
         ? schema.tags.split(',').map((t) => t.trim())
         : ['scope:servers'];
     const appNames = schema.apps.split(',').map((a) => a.trim()).filter(Boolean);
+    const projects = (0, devkit_1.getProjects)(tree);
+    const appImports = appNames.map((appName) => {
+        const { className: appClass, fileName: appFile } = (0, devkit_1.names)(appName);
+        const appProject = projects.get(appName) ?? projects.get(appFile);
+        const appSourceRoot = appProject?.sourceRoot ?? (0, devkit_1.joinPathFragments)(appProject?.root ?? (0, devkit_1.joinPathFragments)('apps', appFile), 'src');
+        const importPath = path_1.posix.relative((0, devkit_1.joinPathFragments)(projectRoot, 'src'), (0, devkit_1.joinPathFragments)(appSourceRoot, `${appFile}.app`));
+        return { className: `${appClass}App`, importPath: importPath.startsWith('.') ? importPath : `./${importPath}` };
+    });
     return {
         name: schema.name,
         projectName: `server-${fileName}`,
         projectRoot,
+        offset,
+        ignoreDeprecations: (0, project_paths_js_1.getIgnoreDeprecations)(tree),
         className,
         fileName,
         deploymentTarget: schema.deploymentTarget ?? 'node',
         appNames,
+        appImports,
         redis: schema.redis ?? 'none',
         parsedTags,
         skipFormat: schema.skipFormat ?? false,

package/generators/server/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/server/lib/normalize-options.ts"],"names":[],"mappings":";;AAgBA,4CAqBC;AArCD,uCAAsD;AAgBtD,SAAgB,gBAAgB,CAAC,MAA6B;IAC5D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,UAAU,QAAQ,EAAE;QACjC,WAAW;QACX,SAAS;QACT,QAAQ;QACR,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,MAAM;QACnD,QAAQ;QACR,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM;QAC7B,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { names, joinPathFragments } from '@nx/devkit';\nimport type { ServerGeneratorSchema } from '../schema.js';\n\nexport interface NormalizedServerOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  className: string;\n  fileName: string;\n  deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';\n  appNames: string[];\n  redis: 'docker' | 'existing' | 'none';\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(schema: ServerGeneratorSchema): NormalizedServerOptions {\n  const { className, fileName } = names(schema.name);\n  const projectRoot = schema.directory ?? joinPathFragments('servers', fileName);\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:servers'];\n\n  const appNames = schema.apps.split(',').map((a) => a.trim()).filter(Boolean);\n\n  return {\n    name: schema.name,\n    projectName: `server-${fileName}`,\n    projectRoot,\n    className,\n    fileName,\n    deploymentTarget: schema.deploymentTarget ?? 'node',\n    appNames,\n    redis: schema.redis ?? 'none',\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/server/lib/normalize-options.ts"],"names":[],"mappings":";;AAsBA,4CAiCC;AAvDD,uCAA8E;AAC9E,+BAA6B;AAE7B,sEAA6F;AAmB7F,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA6B;IACxE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,UAAU,EAAE,UAAU,IAAI,IAAA,0BAAiB,EAAC,UAAU,EAAE,IAAI,IAAI,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACjI,MAAM,UAAU,GAAG,YAAK,CAAC,QAAQ,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,EAAE,IAAA,0BAAiB,EAAC,aAAa,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC;QAC7H,OAAO,EAAE,SAAS,EAAE,GAAG,QAAQ,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,EAAE,CAAC;IAClH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,UAAU,QAAQ,EAAE;QACjC,WAAW;QACX,MAAM;QACN,kBAAkB,EAAE,IAAA,wCAAqB,EAAC,IAAI,CAAC;QAC/C,SAAS;QACT,QAAQ;QACR,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,MAAM;QACnD,QAAQ;QACR,UAAU;QACV,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM;QAC7B,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, getProjects, joinPathFragments, names } from '@nx/devkit';\nimport { posix } from 'path';\nimport type { ServerGeneratorSchema } from '../schema.js';\nimport { getIgnoreDeprecations, resolveProjectPaths } from '../../../utils/project-paths.js';\n\nexport interface NormalizedServerOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  offset: string;\n  ignoreDeprecations: string;\n  className: string;\n  fileName: string;\n  deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';\n  appNames: string[];\n  /** Each composed app with the import specifier `main.ts` uses, relative to the server's `src/`. */\n  appImports: Array<{ className: string; importPath: string }>;\n  redis: 'docker' | 'existing' | 'none';\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: ServerGeneratorSchema): NormalizedServerOptions {\n  const { className, fileName } = names(schema.name);\n  const { projectRoot, offset } = resolveProjectPaths(schema.directory ?? joinPathFragments('servers', fileName));\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:servers'];\n\n  const appNames = schema.apps.split(',').map((a) => a.trim()).filter(Boolean);\n\n  const projects = getProjects(tree);\n  const appImports = appNames.map((appName) => {\n    const { className: appClass, fileName: appFile } = names(appName);\n    const appProject = projects.get(appName) ?? projects.get(appFile);\n    const appSourceRoot = appProject?.sourceRoot ?? joinPathFragments(appProject?.root ?? joinPathFragments('apps', appFile), 'src');\n    const importPath = posix.relative(joinPathFragments(projectRoot, 'src'), joinPathFragments(appSourceRoot, `${appFile}.app`));\n    return { className: `${appClass}App`, importPath: importPath.startsWith('.') ? importPath : `./${importPath}` };\n  });\n\n  return {\n    name: schema.name,\n    projectName: `server-${fileName}`,\n    projectRoot,\n    offset,\n    ignoreDeprecations: getIgnoreDeprecations(tree),\n    className,\n    fileName,\n    deploymentTarget: schema.deploymentTarget ?? 'node',\n    appNames,\n    appImports,\n    redis: schema.redis ?? 'none',\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}

package/generators/server/server.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, type GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { ServerGeneratorSchema } from './schema.js';
 export declare function serverGenerator(tree: Tree, schema: ServerGeneratorSchema): Promise<GeneratorCallback | void>;
 export default serverGenerator;

package/generators/server/server.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverGenerator = serverGenerator;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
 const index_js_1 = require("./lib/index.js");
 async function serverGenerator(tree, schema) {
     return serverGeneratorInternal(tree, schema);
 }
 async function serverGeneratorInternal(tree, schema) {
-    const options = (0, index_js_1.normalizeOptions)(schema);
+    const options = (0, index_js_1.normalizeOptions)(tree, schema);
     const templateVars = {
         ...options,
         names: devkit_1.names,

package/generators/server/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/generators/server/server.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Tree, formatFiles, generateFiles, names as nxNames, type GeneratorCallback } from '@nx/devkit';\nimport * as fs from 'fs';\nimport { join } from 'path';\nimport type { ServerGeneratorSchema } from './schema.js';\nimport { normalizeOptions } from './lib/index.js';\n\nexport async function serverGenerator(tree: Tree, schema: ServerGeneratorSchema): Promise<GeneratorCallback | void> {\n  return serverGeneratorInternal(tree, schema);\n}\n\nasync function serverGeneratorInternal(tree: Tree, schema: ServerGeneratorSchema): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(schema);\n\n  const templateVars = {\n    ...options,\n    names: nxNames,\n    tmpl: '',\n    dot: '.',\n  };\n\n  // Generate common files (main.ts, project.json, tsconfig)\n  generateFiles(tree, join(__dirname, 'files', 'common'), options.projectRoot, templateVars);\n\n  // Generate target-specific files\n  const targetDir = join(__dirname, 'files', options.deploymentTarget);\n  generateFiles(tree, targetDir, options.projectRoot, templateVars);\n\n  // Copy skills from catalog\n  const bundle = schema.skills ?? 'recommended';\n  if (bundle !== 'none') {\n    scaffoldCatalogSkills(tree, options.projectRoot, options.deploymentTarget, bundle);\n  }\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nfunction scaffoldCatalogSkills(tree: Tree, projectRoot: string, target: string, bundle: string): void {\n  // Load skills catalog via @frontmcp/skills package at runtime\n  let skills: {\n    loadManifest: () => {\n      skills: Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n    };\n    resolveSkillPath: (entry: { path: string }) => string;\n    getSkillsByTarget: (\n      s: Array<{ targets: string[] }>,\n      t: string,\n    ) => Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n    getSkillsByBundle: (\n      s: Array<{ bundle?: string[] }>,\n      b: string,\n    ) => Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n  };\n  try {\n    skills = require('@frontmcp/skills');\n  } catch {\n    return;\n  }\n\n  let manifest;\n  try {\n    manifest = skills.loadManifest();\n  } catch {\n    return;\n  }\n\n  const targetFiltered = skills.getSkillsByTarget(manifest.skills, target);\n  const matchingSkills = skills.getSkillsByBundle(targetFiltered, bundle);\n\n  for (const skill of matchingSkills) {\n    const sourceDir = skills.resolveSkillPath(skill);\n    const destDir = join(projectRoot, 'skills', skill.name);\n    copyDirToTree(tree, sourceDir, destDir);\n  }\n}\n\nfunction copyDirToTree(tree: Tree, sourceDir: string, destDir: string): void {\n  if (!fs.existsSync(sourceDir)) return;\n  const entries = fs.readdirSync(sourceDir, { withFileTypes: true });\n  for (const entry of entries) {\n    const srcPath = join(sourceDir, entry.name);\n    const destPath = join(destDir, entry.name);\n    if (entry.isDirectory()) {\n      copyDirToTree(tree, srcPath, destPath);\n    } else {\n      const content = fs.readFileSync(srcPath);\n      tree.write(destPath, content);\n    }\n  }\n}\n\nexport default serverGenerator;\n"]}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/generators/server/server.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport { join } from 'path';\n\nimport { formatFiles, generateFiles, names as nxNames, type GeneratorCallback, type Tree } from '@nx/devkit';\n\nimport { normalizeOptions } from './lib/index.js';\nimport type { ServerGeneratorSchema } from './schema.js';\n\nexport async function serverGenerator(tree: Tree, schema: ServerGeneratorSchema): Promise<GeneratorCallback | void> {\n  return serverGeneratorInternal(tree, schema);\n}\n\nasync function serverGeneratorInternal(tree: Tree, schema: ServerGeneratorSchema): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(tree, schema);\n\n  const templateVars = {\n    ...options,\n    names: nxNames,\n    tmpl: '',\n    dot: '.',\n  };\n\n  // Generate common files (main.ts, project.json, tsconfig)\n  generateFiles(tree, join(__dirname, 'files', 'common'), options.projectRoot, templateVars);\n\n  // Generate target-specific files\n  const targetDir = join(__dirname, 'files', options.deploymentTarget);\n  generateFiles(tree, targetDir, options.projectRoot, templateVars);\n\n  // Copy skills from catalog\n  const bundle = schema.skills ?? 'recommended';\n  if (bundle !== 'none') {\n    scaffoldCatalogSkills(tree, options.projectRoot, options.deploymentTarget, bundle);\n  }\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nfunction scaffoldCatalogSkills(tree: Tree, projectRoot: string, target: string, bundle: string): void {\n  // Load skills catalog via @frontmcp/skills package at runtime\n  let skills: {\n    loadManifest: () => {\n      skills: Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n    };\n    resolveSkillPath: (entry: { path: string }) => string;\n    getSkillsByTarget: (\n      s: Array<{ targets: string[] }>,\n      t: string,\n    ) => Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n    getSkillsByBundle: (\n      s: Array<{ bundle?: string[] }>,\n      b: string,\n    ) => Array<{ name: string; path: string; targets: string[]; hasResources: boolean; bundle?: string[] }>;\n  };\n  try {\n    skills = require('@frontmcp/skills');\n  } catch {\n    return;\n  }\n\n  let manifest;\n  try {\n    manifest = skills.loadManifest();\n  } catch {\n    return;\n  }\n\n  const targetFiltered = skills.getSkillsByTarget(manifest.skills, target);\n  const matchingSkills = skills.getSkillsByBundle(targetFiltered, bundle);\n\n  for (const skill of matchingSkills) {\n    const sourceDir = skills.resolveSkillPath(skill);\n    const destDir = join(projectRoot, 'skills', skill.name);\n    copyDirToTree(tree, sourceDir, destDir);\n  }\n}\n\nfunction copyDirToTree(tree: Tree, sourceDir: string, destDir: string): void {\n  if (!fs.existsSync(sourceDir)) return;\n  const entries = fs.readdirSync(sourceDir, { withFileTypes: true });\n  for (const entry of entries) {\n    const srcPath = join(sourceDir, entry.name);\n    const destPath = join(destDir, entry.name);\n    if (entry.isDirectory()) {\n      copyDirToTree(tree, srcPath, destPath);\n    } else {\n      const content = fs.readFileSync(srcPath);\n      tree.write(destPath, content);\n    }\n  }\n}\n\nexport default serverGenerator;\n"]}

package/generators/ui-component/files/__className__/__className__.tsx__tmpl__

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Box, Typography } from '@mui/material';
 
 export interface <%= className %>Props {

package/generators/ui-component/ui-component.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, type GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { UiComponentGeneratorSchema } from './schema.js';
 export declare function uiComponentGenerator(tree: Tree, schema: UiComponentGeneratorSchema): Promise<GeneratorCallback | void>;
 export default uiComponentGenerator;

package/generators/ui-component/ui-component.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uiComponentGenerator = uiComponentGenerator;
-const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
 const add_ui_entry_js_1 = require("../ui-shared/add-ui-entry.js");
+const ensure_ui_package_js_1 = require("../ui-shared/ensure-ui-package.js");
 const PACKAGE_ROOT = 'ui/components';
 const IMPORT_PATH = '@frontmcp/ui-components';
 async function uiComponentGenerator(tree, schema) {
@@ -12,6 +13,7 @@ async function uiComponentGenerator(tree, schema) {
         throw new Error('Generator name must not be blank');
     }
     const { className } = (0, devkit_1.names)(trimmedName);
+    const installTask = (0, ensure_ui_package_js_1.ensureUiPackage)(tree, { packageRoot: PACKAGE_ROOT, projectName: 'ui-components', kind: 'react' });
     // Generate component files from templates
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {
         className,
@@ -28,6 +30,7 @@ async function uiComponentGenerator(tree, schema) {
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    return installTask;
 }
 exports.default = uiComponentGenerator;
 //# sourceMappingURL=ui-component.js.map

package/generators/ui-component/ui-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"ui-component.js","sourceRoot":"","sources":["../../../../src/generators/ui-component/ui-component.ts"],"names":[],"mappings":";;AAQA,oDA6BC;AArCD,uCAAkG;AAClG,+BAA4B;AAE5B,kEAA0D;AAE1D,MAAM,YAAY,GAAG,eAAe,CAAC;AACrC,MAAM,WAAW,GAAG,yBAAyB,CAAC;AAEvC,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,MAAkC;IAElC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IAEzC,0CAA0C;IAC1C,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,YAAY,MAAM,EAAE;QACnE,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAA,4BAAU,EAAC,IAAI,EAAE;QACf,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC","sourcesContent":["import { type Tree, formatFiles, generateFiles, names, type GeneratorCallback } from '@nx/devkit';\nimport { join } from 'path';\nimport type { UiComponentGeneratorSchema } from './schema.js';\nimport { addUiEntry } from '../ui-shared/add-ui-entry.js';\n\nconst PACKAGE_ROOT = 'ui/components';\nconst IMPORT_PATH = '@frontmcp/ui-components';\n\nexport async function uiComponentGenerator(\n  tree: Tree,\n  schema: UiComponentGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const trimmedName = schema.name?.trim();\n  if (!trimmedName) {\n    throw new Error('Generator name must not be blank');\n  }\n\n  const { className } = names(trimmedName);\n\n  // Generate component files from templates\n  generateFiles(tree, join(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {\n    className,\n    name: schema.name,\n    description: schema.description ?? '',\n    tmpl: '',\n  });\n\n  // Add entry point to project.json, tsconfig.base.json, and barrel index.ts\n  addUiEntry(tree, {\n    packageRoot: PACKAGE_ROOT,\n    entryName: className,\n    importPath: IMPORT_PATH,\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default uiComponentGenerator;\n"]}
+{"version":3,"file":"ui-component.js","sourceRoot":"","sources":["../../../../src/generators/ui-component/ui-component.ts"],"names":[],"mappings":";;AAWA,oDAiCC;AA5CD,+BAA4B;AAE5B,uCAAkG;AAElG,kEAA0D;AAC1D,4EAAoE;AAGpE,MAAM,YAAY,GAAG,eAAe,CAAC;AACrC,MAAM,WAAW,GAAG,yBAAyB,CAAC;AAEvC,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,MAAkC;IAElC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,sCAAe,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtH,0CAA0C;IAC1C,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,YAAY,MAAM,EAAE;QACnE,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAA,4BAAU,EAAC,IAAI,EAAE;QACf,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,kBAAe,oBAAoB,CAAC","sourcesContent":["import { join } from 'path';\n\nimport { formatFiles, generateFiles, names, type GeneratorCallback, type Tree } from '@nx/devkit';\n\nimport { addUiEntry } from '../ui-shared/add-ui-entry.js';\nimport { ensureUiPackage } from '../ui-shared/ensure-ui-package.js';\nimport type { UiComponentGeneratorSchema } from './schema.js';\n\nconst PACKAGE_ROOT = 'ui/components';\nconst IMPORT_PATH = '@frontmcp/ui-components';\n\nexport async function uiComponentGenerator(\n  tree: Tree,\n  schema: UiComponentGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const trimmedName = schema.name?.trim();\n  if (!trimmedName) {\n    throw new Error('Generator name must not be blank');\n  }\n\n  const { className } = names(trimmedName);\n\n  const installTask = ensureUiPackage(tree, { packageRoot: PACKAGE_ROOT, projectName: 'ui-components', kind: 'react' });\n\n  // Generate component files from templates\n  generateFiles(tree, join(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {\n    className,\n    name: schema.name,\n    description: schema.description ?? '',\n    tmpl: '',\n  });\n\n  // Add entry point to project.json, tsconfig.base.json, and barrel index.ts\n  addUiEntry(tree, {\n    packageRoot: PACKAGE_ROOT,\n    entryName: className,\n    importPath: IMPORT_PATH,\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return installTask;\n}\n\nexport default uiComponentGenerator;\n"]}

package/generators/ui-page/ui-page.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, type GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { UiPageGeneratorSchema } from './schema.js';
 export declare function uiPageGenerator(tree: Tree, schema: UiPageGeneratorSchema): Promise<GeneratorCallback | void>;
 export default uiPageGenerator;

package/generators/ui-page/ui-page.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uiPageGenerator = uiPageGenerator;
-const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
 const add_ui_entry_js_1 = require("../ui-shared/add-ui-entry.js");
+const ensure_ui_package_js_1 = require("../ui-shared/ensure-ui-package.js");
 const PACKAGE_ROOT = 'ui/pages';
 const IMPORT_PATH = '@frontmcp/ui-pages';
 async function uiPageGenerator(tree, schema) {
@@ -12,6 +13,7 @@ async function uiPageGenerator(tree, schema) {
         throw new Error('Generator name must not be blank');
     }
     const { className } = (0, devkit_1.names)(trimmedName);
+    const installTask = (0, ensure_ui_package_js_1.ensureUiPackage)(tree, { packageRoot: PACKAGE_ROOT, projectName: 'ui-pages', kind: 'react' });
     // Generate page files from templates
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {
         className,
@@ -28,6 +30,7 @@ async function uiPageGenerator(tree, schema) {
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    return installTask;
 }
 exports.default = uiPageGenerator;
 //# sourceMappingURL=ui-page.js.map

package/generators/ui-page/ui-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"ui-page.js","sourceRoot":"","sources":["../../../../src/generators/ui-page/ui-page.ts"],"names":[],"mappings":";;AAQA,0CA0BC;AAlCD,uCAAkG;AAClG,+BAA4B;AAE5B,kEAA0D;AAE1D,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAElC,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,MAA6B;IAC7E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IAEzC,qCAAqC;IACrC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,YAAY,MAAM,EAAE;QACnE,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAA,4BAAU,EAAC,IAAI,EAAE;QACf,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,eAAe,CAAC","sourcesContent":["import { type Tree, formatFiles, generateFiles, names, type GeneratorCallback } from '@nx/devkit';\nimport { join } from 'path';\nimport type { UiPageGeneratorSchema } from './schema.js';\nimport { addUiEntry } from '../ui-shared/add-ui-entry.js';\n\nconst PACKAGE_ROOT = 'ui/pages';\nconst IMPORT_PATH = '@frontmcp/ui-pages';\n\nexport async function uiPageGenerator(tree: Tree, schema: UiPageGeneratorSchema): Promise<GeneratorCallback | void> {\n  const trimmedName = schema.name?.trim();\n  if (!trimmedName) {\n    throw new Error('Generator name must not be blank');\n  }\n\n  const { className } = names(trimmedName);\n\n  // Generate page files from templates\n  generateFiles(tree, join(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {\n    className,\n    name: schema.name,\n    description: schema.description ?? '',\n    tmpl: '',\n  });\n\n  // Add entry point to project.json, tsconfig.base.json, and barrel index.ts\n  addUiEntry(tree, {\n    packageRoot: PACKAGE_ROOT,\n    entryName: className,\n    importPath: IMPORT_PATH,\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default uiPageGenerator;\n"]}
+{"version":3,"file":"ui-page.js","sourceRoot":"","sources":["../../../../src/generators/ui-page/ui-page.ts"],"names":[],"mappings":";;AAWA,0CA8BC;AAzCD,+BAA4B;AAE5B,uCAAkG;AAElG,kEAA0D;AAC1D,4EAAoE;AAGpE,MAAM,YAAY,GAAG,UAAU,CAAC;AAChC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAElC,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,MAA6B;IAC7E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,sCAAe,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAEjH,qCAAqC;IACrC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,YAAY,MAAM,EAAE;QACnE,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;QACrC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAA,4BAAU,EAAC,IAAI,EAAE;QACf,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,kBAAe,eAAe,CAAC","sourcesContent":["import { join } from 'path';\n\nimport { formatFiles, generateFiles, names, type GeneratorCallback, type Tree } from '@nx/devkit';\n\nimport { addUiEntry } from '../ui-shared/add-ui-entry.js';\nimport { ensureUiPackage } from '../ui-shared/ensure-ui-package.js';\nimport type { UiPageGeneratorSchema } from './schema.js';\n\nconst PACKAGE_ROOT = 'ui/pages';\nconst IMPORT_PATH = '@frontmcp/ui-pages';\n\nexport async function uiPageGenerator(tree: Tree, schema: UiPageGeneratorSchema): Promise<GeneratorCallback | void> {\n  const trimmedName = schema.name?.trim();\n  if (!trimmedName) {\n    throw new Error('Generator name must not be blank');\n  }\n\n  const { className } = names(trimmedName);\n\n  const installTask = ensureUiPackage(tree, { packageRoot: PACKAGE_ROOT, projectName: 'ui-pages', kind: 'react' });\n\n  // Generate page files from templates\n  generateFiles(tree, join(__dirname, 'files'), `${PACKAGE_ROOT}/src`, {\n    className,\n    name: schema.name,\n    description: schema.description ?? '',\n    tmpl: '',\n  });\n\n  // Add entry point to project.json, tsconfig.base.json, and barrel index.ts\n  addUiEntry(tree, {\n    packageRoot: PACKAGE_ROOT,\n    entryName: className,\n    importPath: IMPORT_PATH,\n  });\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return installTask;\n}\n\nexport default uiPageGenerator;\n"]}

package/generators/ui-shared/add-ui-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-ui-entry.js","sourceRoot":"","sources":["../../../../src/generators/ui-shared/add-ui-entry.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Tree, updateJson } from '@nx/devkit';\n\nfunction escapeRegExp(str: string): string {\n  return str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n}\n\nexport interface AddUiEntryOptions {\n  /** The UI package root, e.g. 'ui/components' */\n  packageRoot: string;\n  /** The entry name, e.g. 'LoginForm' or 'admin-dashboard' */\n  entryName: string;\n  /** The npm scope name, e.g. '@frontmcp/ui-components' */\n  importPath: string;\n}\n\n/**\n * Adds an entry point to an existing UI package:\n * 1. Updates project.json `additionalEntryPoints` in both build-cjs and build-esm\n * 2. Updates tsconfig.base.json path aliases (wildcard already covers it, but explicit is fine)\n * 3. Adds re-export to the barrel index.ts\n */\nexport function addUiEntry(tree: Tree, options: AddUiEntryOptions): void {\n  const { packageRoot, entryName, importPath } = options;\n  const entryPath = `${packageRoot}/src/${entryName}/index.ts`;\n\n  // 1. Update project.json — add to additionalEntryPoints in build-cjs and build-esm\n  const projectJsonPath = `${packageRoot}/project.json`;\n  if (tree.exists(projectJsonPath)) {\n    updateJson(tree, projectJsonPath, (json) => {\n      for (const target of ['build-cjs', 'build-esm']) {\n        const opts = json.targets?.[target]?.options;\n        if (opts) {\n          opts.additionalEntryPoints = opts.additionalEntryPoints ?? [];\n          if (!opts.additionalEntryPoints.includes(entryPath)) {\n            opts.additionalEntryPoints.push(entryPath);\n          }\n        }\n      }\n      return json;\n    });\n  }\n\n  // 2. Update tsconfig.base.json — add explicit path alias\n  //    The wildcard alias already covers resolution, but adding an explicit\n  //    entry improves IDE completion and Nx dep graph accuracy.\n  if (tree.exists('tsconfig.base.json')) {\n    updateJson(tree, 'tsconfig.base.json', (json) => {\n      const paths = json.compilerOptions?.paths ?? {};\n      const aliasKey = `${importPath}/${entryName}`;\n      if (!paths[aliasKey]) {\n        paths[aliasKey] = [`${packageRoot}/src/${entryName}/index.ts`];\n      }\n      json.compilerOptions = json.compilerOptions ?? {};\n      json.compilerOptions.paths = paths;\n      return json;\n    });\n  }\n\n  // 3. Add re-export to barrel index.ts\n  const barrelPath = `${packageRoot}/src/index.ts`;\n  if (tree.exists(barrelPath)) {\n    const existing = tree.read(barrelPath, 'utf-8') ?? '';\n    const exportLine = `export * from './${entryName}';\\n`;\n    const duplicatePattern = new RegExp(`^export \\\\* from '\\\\./${escapeRegExp(entryName)}';?$`, 'm');\n    if (!duplicatePattern.test(existing)) {\n      const normalized = existing.endsWith('\\n') || existing === '' ? existing : existing + '\\n';\n      tree.write(barrelPath, normalized + exportLine);\n    }\n  }\n}\n"]}
+{"version":3,"file":"add-ui-entry.js","sourceRoot":"","sources":["../../../../src/generators/ui-shared/add-ui-entry.ts"],"names":[],"mappings":"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","sourcesContent":["import { updateJson, type Tree } from '@nx/devkit';\n\nfunction escapeRegExp(str: string): string {\n  return str.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n}\n\nexport interface AddUiEntryOptions {\n  /** The UI package root, e.g. 'ui/components' */\n  packageRoot: string;\n  /** The entry name, e.g. 'LoginForm' or 'admin-dashboard' */\n  entryName: string;\n  /** The npm scope name, e.g. '@frontmcp/ui-components' */\n  importPath: string;\n}\n\n/**\n * Adds an entry point to an existing UI package:\n * 1. Updates project.json `additionalEntryPoints` in both build-cjs and build-esm\n * 2. Updates tsconfig.base.json path aliases (wildcard already covers it, but explicit is fine)\n * 3. Adds re-export to the barrel index.ts\n */\nexport function addUiEntry(tree: Tree, options: AddUiEntryOptions): void {\n  const { packageRoot, entryName, importPath } = options;\n  const entryPath = `${packageRoot}/src/${entryName}/index.ts`;\n\n  // 1. Update project.json — add to additionalEntryPoints in build-cjs and build-esm\n  const projectJsonPath = `${packageRoot}/project.json`;\n  if (tree.exists(projectJsonPath)) {\n    updateJson(tree, projectJsonPath, (json) => {\n      for (const target of ['build-cjs', 'build-esm']) {\n        const opts = json.targets?.[target]?.options;\n        if (opts) {\n          opts.additionalEntryPoints = opts.additionalEntryPoints ?? [];\n          if (!opts.additionalEntryPoints.includes(entryPath)) {\n            opts.additionalEntryPoints.push(entryPath);\n          }\n        }\n      }\n      return json;\n    });\n  }\n\n  // 2. Update tsconfig.base.json — add explicit path alias\n  //    The wildcard alias already covers resolution, but adding an explicit\n  //    entry improves IDE completion and Nx dep graph accuracy.\n  if (tree.exists('tsconfig.base.json')) {\n    updateJson(tree, 'tsconfig.base.json', (json) => {\n      const paths = json.compilerOptions?.paths ?? {};\n      const aliasKey = `${importPath}/${entryName}`;\n      if (!paths[aliasKey]) {\n        paths[aliasKey] = [`${packageRoot}/src/${entryName}/index.ts`];\n      }\n      json.compilerOptions = json.compilerOptions ?? {};\n      json.compilerOptions.paths = paths;\n      return json;\n    });\n  }\n\n  // 3. Add re-export to barrel index.ts\n  const barrelPath = `${packageRoot}/src/index.ts`;\n  if (tree.exists(barrelPath)) {\n    const existing = tree.read(barrelPath, 'utf-8') ?? '';\n    const exportLine = `export * from './${entryName}';\\n`;\n    const duplicatePattern = new RegExp(`^export \\\\* from '\\\\./${escapeRegExp(entryName)}';?$`, 'm');\n    if (!duplicatePattern.test(existing)) {\n      const normalized = existing.endsWith('\\n') || existing === '' ? existing : existing + '\\n';\n      tree.write(barrelPath, normalized + exportLine);\n    }\n  }\n}\n"]}

package/generators/ui-shared/ensure-ui-package.d.ts

@@ -0,0 +1,17 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export interface EnsureUiPackageOptions {
+    /** e.g. 'ui/components' */
+    packageRoot: string;
+    /** Nx project name for a package that does not exist yet, e.g. 'ui-components' */
+    projectName: string;
+    /** 'react' packages render components and are tested in jsdom; 'shell' packages only build HTML strings. */
+    kind: 'react' | 'shell';
+}
+/**
+ * The UI generators emit `.tsx` files that import React and MUI (or the uipack
+ * shell builder), and a spec that renders them. Nothing else installs those, so
+ * the generators add them — and create the package folder when the workspace
+ * does not have one yet, instead of writing files into a folder that no Nx
+ * project owns.
+ */
+export declare function ensureUiPackage(tree: Tree, options: EnsureUiPackageOptions): GeneratorCallback;

package/generators/ui-shared/ensure-ui-package.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureUiPackage = ensureUiPackage;
+const devkit_1 = require("@nx/devkit");
+const add_dependencies_js_1 = require("../../utils/add-dependencies.js");
+const project_paths_js_1 = require("../../utils/project-paths.js");
+const versions_js_1 = require("../../utils/versions.js");
+const REACT_DEPENDENCIES = {
+    react: '^19.0.0',
+    'react-dom': '^19.0.0',
+    '@mui/material': '^7.0.0',
+    '@emotion/react': '^11.14.0',
+    '@emotion/styled': '^11.14.0',
+};
+const REACT_DEV_DEPENDENCIES = {
+    '@types/react': '^19.0.0',
+    '@types/react-dom': '^19.0.0',
+    '@testing-library/dom': '^10.4.0',
+    '@testing-library/react': '^16.0.0',
+    'jest-environment-jsdom': '^30.0.2',
+};
+function buildTargets(packageRoot) {
+    const common = {
+        main: `${packageRoot}/src/index.ts`,
+        tsConfig: `${packageRoot}/tsconfig.json`,
+        bundle: true,
+        thirdParty: false,
+        platform: 'node',
+        additionalEntryPoints: [],
+    };
+    return {
+        'build-cjs': {
+            executor: '@nx/esbuild:esbuild',
+            outputs: ['{options.outputPath}'],
+            options: { ...common, outputPath: `dist/${packageRoot}`, format: ['cjs'], declaration: true },
+        },
+        'build-esm': {
+            executor: '@nx/esbuild:esbuild',
+            dependsOn: ['build-cjs'],
+            outputs: ['{options.outputPath}'],
+            options: {
+                ...common,
+                outputPath: `dist/${packageRoot}/esm`,
+                format: ['esm'],
+                declaration: false,
+                esbuildOptions: { outExtension: { '.js': '.mjs' } },
+            },
+        },
+        build: {
+            executor: 'nx:noop',
+            dependsOn: ['build-cjs', 'build-esm'],
+        },
+    };
+}
+/**
+ * The UI generators emit `.tsx` files that import React and MUI (or the uipack
+ * shell builder), and a spec that renders them. Nothing else installs those, so
+ * the generators add them — and create the package folder when the workspace
+ * does not have one yet, instead of writing files into a folder that no Nx
+ * project owns.
+ */
+function ensureUiPackage(tree, options) {
+    const { packageRoot, projectName, kind } = options;
+    if (!tree.exists(`${packageRoot}/project.json`)) {
+        const offset = (0, devkit_1.offsetFromRoot)(packageRoot);
+        const ignoreDeprecations = (0, project_paths_js_1.getIgnoreDeprecations)(tree);
+        // `customConditions` (Nx solution workspaces set it) is only valid with a modern `moduleResolution`
+        // (TS5098), so a package that inherits it must inherit the base's `module`/`moduleResolution` too.
+        const inheritsModernResolution = Boolean(tree.exists('tsconfig.base.json') &&
+            (0, devkit_1.readJson)(tree, 'tsconfig.base.json').compilerOptions
+                ?.customConditions);
+        (0, devkit_1.writeJson)(tree, `${packageRoot}/project.json`, {
+            name: projectName,
+            $schema: `${offset}node_modules/nx/schemas/project-schema.json`,
+            sourceRoot: `${packageRoot}/src`,
+            projectType: 'library',
+            tags: [],
+            targets: buildTargets(packageRoot),
+        });
+        (0, devkit_1.writeJson)(tree, `${packageRoot}/tsconfig.json`, {
+            extends: `${offset}tsconfig.base.json`,
+            compilerOptions: {
+                ...(!inheritsModernResolution && { module: 'commonjs', moduleResolution: 'node10' }),
+                ...(!inheritsModernResolution && ignoreDeprecations && { ignoreDeprecations }),
+                ...(kind === 'react' && { jsx: 'react-jsx' }),
+                esModuleInterop: true,
+                strict: true,
+            },
+            include: ['src/**/*.ts', 'src/**/*.tsx'],
+            exclude: ['src/**/*.spec.ts', 'src/**/*.spec.tsx'],
+        });
+        tree.write(`${packageRoot}/jest.config.cjs`, `module.exports = {
+  displayName: '${projectName}',
+  testEnvironment: '${kind === 'react' ? 'jsdom' : 'node'}',
+  transform: {
+    '^.+\\\\.[tj]sx?$': ['@swc/jest', {
+      jsc: {
+        target: 'es2022',
+        parser: { syntax: 'typescript', tsx: true },
+        transform: { react: { runtime: 'automatic' } },
+      },
+      swcrc: false,
+    }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+};
+`);
+        if (!tree.exists(`${packageRoot}/src/index.ts`)) {
+            tree.write(`${packageRoot}/src/index.ts`, '');
+        }
+    }
+    const range = `~${(0, versions_js_1.getFrontmcpVersion)()}`;
+    const buildDevDependencies = { '@nx/esbuild': (0, versions_js_1.getNxVersion)(), esbuild: '^0.25.0' };
+    return kind === 'react'
+        ? (0, add_dependencies_js_1.addFrontmcpDependencies)(tree, REACT_DEPENDENCIES, { ...REACT_DEV_DEPENDENCIES, ...buildDevDependencies }, { keepExistingVersions: true })
+        : (0, add_dependencies_js_1.addFrontmcpDependencies)(tree, { '@frontmcp/uipack': range }, buildDevDependencies, {
+            keepExistingVersions: true,
+        });
+}
+//# sourceMappingURL=ensure-ui-package.js.map