@nx/angular 0.0.0-pr-28229-afe192c → 0.0.0-pr-28453-54fa63c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-28229-afe192c",
+  "version": "0.0.0-pr-28453-54fa63c",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,13 +79,13 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "0.6.6",
-    "@nx/devkit": "0.0.0-pr-28229-afe192c",
-    "@nx/js": "0.0.0-pr-28229-afe192c",
-    "@nx/eslint": "0.0.0-pr-28229-afe192c",
-    "@nx/webpack": "0.0.0-pr-28229-afe192c",
-    "@nx/web": "0.0.0-pr-28229-afe192c",
-    "@nx/workspace": "0.0.0-pr-28229-afe192c",
+    "@module-federation/enhanced": "0.6.9",
+    "@nx/devkit": "0.0.0-pr-28453-54fa63c",
+    "@nx/js": "0.0.0-pr-28453-54fa63c",
+    "@nx/eslint": "0.0.0-pr-28453-54fa63c",
+    "@nx/webpack": "0.0.0-pr-28453-54fa63c",
+    "@nx/web": "0.0.0-pr-28453-54fa63c",
+    "@nx/workspace": "0.0.0-pr-28453-54fa63c",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/dev-server/dev-server.impl.js

@@ -16,15 +16,19 @@ const patch_builder_context_1 = require("../../executors/utilities/patch-builder
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
+const configuration_1 = require("nx/src/config/configuration");
 function executeDevServerBuilder(rawOptions, context) {
     (0, lib_1.validateOptions)(rawOptions);
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
+    const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, {
         cwd: context.currentDirectory,
-        projectGraph: (0, devkit_1.readCachedProjectGraph)(),
+        projectGraph,
         projectName: context.target.project,
+        projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
         root: context.workspaceRoot,
+        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
         isVerbose: false,
     });
     const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
 const devkit_1 = require("@nx/devkit");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const versions_1 = require("@nx/eslint/src/utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 const buildable_project_1 = require("./buildable-project");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 function addAngularEsLintDependencies(tree, projectName) {
     const compatVersions = (0, version_utils_1.versions)(tree);
     const angularEslintVersionToInstall = compatVersions.angularEslintVersion;
-    const devDependencies = (0, flat_config_1.useFlatConfig)(tree)
+    const usesEslintFlatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    const devDependencies = usesEslintFlatConfig
         ? {
             'angular-eslint': angularEslintVersionToInstall,
         }
@@ -18,8 +20,9 @@ function addAngularEsLintDependencies(tree, projectName) {
             '@angular-eslint/template-parser': angularEslintVersionToInstall,
         };
     if ('typescriptEslintVersion' in compatVersions) {
-        devDependencies['@typescript-eslint/utils'] =
-            compatVersions.typescriptEslintVersion;
+        devDependencies['@typescript-eslint/utils'] = usesEslintFlatConfig
+            ? versions_1.eslint9__typescriptESLintVersion
+            : compatVersions.typescriptEslintVersion;
     }
     if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {
         const jsoncEslintParserVersionToInstall = (0, version_utils_1.versions)(tree).jsoncEslintParserVersion;

package/src/generators/application/application.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 const devkit_1 = require("@nx/devkit");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = require("../init/init");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const lib_1 = require("./lib");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {

package/src/generators/host/host.js

@@ -4,14 +4,16 @@ exports.host = host;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
 const remote_1 = tslib_1.__importDefault(require("../remote/remote"));
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-const js_1 = require("@nx/js");
+const lib_1 = require("./lib");
 async function host(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'host');
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);

package/src/generators/init/init.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const version_utils_1 = require("../utils/version-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
+const version_utils_1 = require("../utils/version-utils");
 async function angularInitGenerator(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'init');
     ignoreAngularCacheDirectory(tree);
     const installTask = installAngularDevkitCoreIfMissing(tree, options);
     // For Angular inference plugin, we only want it during import since our

package/src/generators/library/library.js

@@ -22,7 +22,9 @@ const add_jest_1 = require("../utils/add-jest");
 const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function libraryGenerator(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
     // Do some validation checks
     if (!schema.routing && schema.lazy) {
         throw new Error(`To use "--lazy" option, "--routing" must also be set.`);

package/src/generators/ngrx-root-store/lib/add-imports.js

@@ -87,14 +87,14 @@ function addImportsToModule(tree, options) {
         sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
         sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
     }
-    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     sourceFile = addRootEffectsImport(tree, isParentStandalone, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot);
+    if (options.addDevTools) {
+        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
+    }
+    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     // this is just a heuristic
     const hasRouter = sourceText.indexOf('RouterModule') > -1;
     if (hasRouter && !isParentStandalone) {
         sourceFile = addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRouterModule);
     }
-    if (options.addDevTools) {
-        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
-    }
 }

package/src/generators/remote/remote.js

@@ -3,13 +3,15 @@ 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);
@@ -22,6 +24,14 @@ async function remote(tree, schema) {
         projectType: 'application',
         directory: options.directory,
     });
+    const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
+    const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
+    if (!remoteNameRegex.test(remoteProjectName)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${remoteProjectName}. Remote project names must:
+       - Start with a letter, dollar sign ($) or underscore (_)
+       - Followed by any valid character (letters, digits, underscores, or dollar signs)
+      The regular expression used is ${REMOTE_NAME_REGEX}.`);
+    }
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -86,8 +86,8 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
         ? 'remoteRoutes'
         : 'RemoteEntryModule';
     const routeToAdd = hostFederationType === 'dynamic'
-        ? `loadRemoteModule('${options.appName}', './${routePathName}')`
-        : `import('${options.appName}/${routePathName}')`;
+        ? `loadRemoteModule('${options.appName.replace(/-/g, '_')}', './${routePathName}')`
+        : `import('${options.appName.replace(/-/g, '_')}/${routePathName}')`;
     (0, route_utils_1.addRoute)(tree, pathToHostRootRouting, `{
     path: '${options.appName}',
     loadChildren: () => ${routeToAdd}.then(m => m.${exportedRemote})

package/src/generators/setup-mf/lib/setup-tspath-for-remote.js

@@ -9,7 +9,7 @@ function setupTspathForRemote(tree, options) {
         ? `./src/app/remote-entry/entry.routes.ts`
         : `./src/app/remote-entry/entry.module.ts`;
     const exportName = options.standalone ? 'Routes' : 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${options.appName}/${exportName}`, [
+    (0, js_1.addTsConfigPath)(tree, `${options.appName.replace(/-/g, '_')}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),
     ]);
 }

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.6";
+export declare const moduleFederationEnhancedVersion = "0.6.9";
 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.6';
+exports.moduleFederationEnhancedVersion = '0.6.9';
 exports.angularEslintVersion = '^18.3.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';