@nx/angular 20.0.0-beta.5 → 20.0.0-beta.7

package/src/generators/pipe/schema.json

@@ -7,34 +7,19 @@
   "additionalProperties": false,
   "description": "Creates an Angular pipe.",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The path at which to create the pipe file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the pipe file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the pipe in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?"
     },
     "skipTests": {
       "type": "boolean",
@@ -67,5 +52,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/remote/remote.js

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const versions_1 = require("@nx/js/src/utils/versions");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const lib_1 = require("./lib");
-const versions_1 = require("@nx/js/src/utils/versions");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
+const lib_1 = require("./lib");
 async function remote(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'remote');
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    const { projectName: remoteProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,

package/src/generators/remote/schema.d.ts

@@ -1,10 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   host?: string;
   port?: number;
   setParserOptionsProject?: boolean;
@@ -13,8 +13,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/remote/schema.json

@@ -12,14 +12,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name to give to the remote Angular app.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name to give to the remote Angular app.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "host": {
       "type": "string",
@@ -31,15 +37,6 @@
       "type": "number",
       "description": "The port on which this app should be served."
     },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
-    },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -174,5 +171,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/scam/lib/normalize-options.js

@@ -7,8 +7,7 @@ async function normalizeOptions(tree, options) {
     options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam/scam.js

@@ -13,8 +13,6 @@ async function scamGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertComponentToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

package/src/generators/scam/schema.d.ts

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -21,6 +20,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   projectName: string;
   fileName: string;

package/src/generators/scam/schema.json

@@ -6,41 +6,26 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam my-sample --directory=my-lib/src/lib/my-sample",
+      "command": "nx g @nx/angular:scam my-lib/src/lib/my-sample/my-sample",
       "description": "Generate a `MySampleComponent` component in the `my-lib` library."
     }
   ],
   "description": "Creates a new Angular SCAM.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "The path at which to create the SCAM file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?"
+      "x-prompt": "What is the path of the new SCAM?"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the SCAM files. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the SCAM in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?"
     },
     "displayBlock": {
       "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -132,5 +117,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/scam-directive/lib/normalize-options.js

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam-directive/scam-directive.js

@@ -13,8 +13,6 @@ async function scamDirectiveGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertDirectiveToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

package/src/generators/scam-directive/schema.d.ts

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   prefix?: string;
@@ -13,6 +12,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   export: boolean;
   fileName: string;

package/src/generators/scam-directive/schema.json

@@ -13,13 +13,18 @@
   "description": "Creates a new, generic Angular directive definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the directive.",
+      "description": "The path at which to create the SCAM Directive files, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "What is the path of the new directive?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the directive.",
       "x-prompt": "What name would you like to use for the directive?",
       "x-priority": "important"
     },
@@ -92,5 +97,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/scam-pipe/lib/normalize-options.js

@@ -6,8 +6,7 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        path: options.path,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam-pipe/scam-pipe.js

@@ -13,8 +13,6 @@ async function scamPipeGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertPipeToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

package/src/generators/scam-pipe/schema.d.ts

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   export?: boolean;
@@ -11,6 +10,7 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   export: boolean;
   fileName: string;

package/src/generators/scam-pipe/schema.json

@@ -6,43 +6,28 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam-pipe --project=my-lib --flat=false my-transformation",
+      "command": "nx g @nx/angular:scam-pipe mylib/src/lib/my-transformation/my-transformation",
       "description": "Generates a `MyTransformationPipe` in a `my-transformation` folder in the `my-lib` project"
     }
   ],
   "description": "Creates a new, generic Angular pipe definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The path at which to create the pipe file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?",
-      "x-priority": "important"
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir", "path"],
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "skipTests": {
       "type": "boolean",
       "description": "Do not create `spec.ts` test files for the new pipe.",
@@ -73,5 +58,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/utils/testing.js

@@ -17,22 +17,20 @@ const remote_1 = require("../remote/remote");
 async function generateTestApplication(tree, options) {
     tree.write('.gitignore', '');
     await (0, application_1.applicationGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
 async function generateTestHostApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, host_1.host)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, host_1.host)(tree, { ...options });
 }
 async function generateTestRemoteApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, remote_1.remote)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, remote_1.remote)(tree, { ...options });
 }
 async function generateTestLibrary(tree, options) {
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
@@ -40,19 +38,18 @@ async function createStorybookTestWorkspaceForLib(libName) {
     let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        name: libName,
+        directory: libName,
         buildable: false,
         linter: eslint_1.Linter.EsLint,
         publishable: false,
         simpleName: false,
         skipFormat: true,
         unitTestRunner: test_runners_1.UnitTestRunner.Jest,
-        projectNameAndRootFormat: 'as-provided',
         standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-button',
-        directory: `${libName}/src/lib/test-button`,
+        path: `${libName}/src/lib/test-button/test-button`,
         standalone: false,
         skipFormat: true,
     });
@@ -82,7 +79,7 @@ export class TestButtonComponent {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'barrel-button',
-        directory: `${libName}/src/lib/barrel/barrel-button`,
+        path: `${libName}/src/lib/barrel/barrel-button/barrel-button`,
         module: 'barrel',
         standalone: false,
         skipFormat: true,
@@ -104,14 +101,14 @@ export class BarrelModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-button',
-        directory: `${libName}/src/lib/variable-declare/variable-declare-button`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-button/variable-declare-button`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-view',
-        directory: `${libName}/src/lib/variable-declare/variable-declare-view`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-view/variable-declare-view`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
@@ -139,21 +136,21 @@ export class VariableDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-button',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button/variable-spread-declare-button`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-view',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view/variable-spread-declare-view`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-anotherview',
-        directory: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview/variable-spread-declare-anotherview`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
@@ -181,14 +178,14 @@ export class VariableSpreadDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp1',
-        directory: `${libName}/src/lib/static-member-declarations/cmp1`,
+        path: `${libName}/src/lib/static-member-declarations/cmp1/cmp1`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp2',
-        directory: `${libName}/src/lib/static-member-declarations/cmp2`,
+        path: `${libName}/src/lib/static-member-declarations/cmp2/cmp2`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
@@ -215,13 +212,13 @@ export class StaticMemberDeclarationsModule {
     await (0, component_1.componentGenerator)(tree, {
         name: 'nested-button',
         module: 'nested',
-        directory: `${libName}/src/lib/nested/nested-button`,
+        path: `${libName}/src/lib/nested/nested-button/nested-button`,
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-other',
-        directory: `${libName}/src/lib/test-other`,
+        path: `${libName}/src/lib/test-other/test-other`,
         standalone: false,
         skipFormat: true,
     });

package/src/utils/mf/with-module-federation-ssr.js

@@ -31,7 +31,7 @@ async function withModuleFederationForSSR(options, configOverride) {
             plugins: [
                 ...(config.plugins ?? []),
                 new (require('@module-federation/enhanced').ModuleFederationPlugin)({
-                    name: options.name,
+                    name: options.name.replace(/-/g, '_'),
                     filename: 'remoteEntry.js',
                     exposes: options.exposes,
                     remotes: mappedRemotes,

package/src/utils/mf/with-module-federation.js

@@ -34,7 +34,7 @@ async function withModuleFederation(options, configOverride) {
             plugins: [
                 ...(config.plugins ?? []),
                 new webpack_1.ModuleFederationPlugin({
-                    name: options.name,
+                    name: options.name.replace(/-/g, '_'),
                     filename: 'remoteEntry.mjs',
                     exposes: options.exposes,
                     remotes: mappedRemotes,

package/src/utils/versions.d.ts

@@ -13,7 +13,7 @@ export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "~2.5.0";
-export declare const moduleFederationEnhancedVersion = "~0.6.0";
+export declare const moduleFederationEnhancedVersion = "0.6.6";
 export declare const angularEslintVersion = "^18.3.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -16,7 +16,7 @@ exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '~2.5.0';
-exports.moduleFederationEnhancedVersion = '~0.6.0';
+exports.moduleFederationEnhancedVersion = '0.6.6';
 exports.angularEslintVersion = '^18.3.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';