@nx/react 21.4.0-beta.5 → 21.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "21.4.0-beta.5",
+  "version": "21.4.0-beta.7",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -38,19 +38,19 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.4.0-beta.5",
-    "@nx/js": "21.4.0-beta.5",
-    "@nx/eslint": "21.4.0-beta.5",
-    "@nx/web": "21.4.0-beta.5",
-    "@nx/vite": "21.4.0-beta.5",
-    "@nx/module-federation": "21.4.0-beta.5",
-    "@nx/rollup": "21.4.0-beta.5",
+    "@nx/devkit": "21.4.0-beta.7",
+    "@nx/js": "21.4.0-beta.7",
+    "@nx/eslint": "21.4.0-beta.7",
+    "@nx/web": "21.4.0-beta.7",
+    "@nx/vite": "21.4.0-beta.7",
+    "@nx/module-federation": "21.4.0-beta.7",
+    "@nx/rollup": "21.4.0-beta.7",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.5"
+    "nx": "21.4.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAmCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA8L5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAoCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAmM5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -36,11 +36,12 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
+    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
-        addTsPlugin: schema.useTsSolution,
+        addTsPlugin,
         formatter: schema.formatter,
         platform: 'web',
     });

package/src/generators/host/host.js

@@ -8,7 +8,7 @@ const normalize_options_1 = require("../application/lib/normalize-options");
 const remote_1 = require("../remote/remote");
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const add_module_federation_files_1 = require("./lib/add-module-federation-files");
-const normalize_remote_1 = require("./lib/normalize-remote");
+const normalize_remote_1 = require("../../utils/normalize-remote");
 const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAgCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0RxE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAiCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA4RxE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -34,8 +34,10 @@ async function libraryGenerator(host, schema) {
 }
 async function libraryGeneratorInternal(host, schema) {
     const tasks = [];
+    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
+        addTsPlugin,
         skipFormat: true,
     });
     tasks.push(jsInitTask);

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

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAmBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAMzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAsElC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqJ/D;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAoBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAMzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAsElC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAmJ/D;AAED,eAAe,eAAe,CAAC"}

package/src/generators/remote/remote.js

@@ -9,6 +9,7 @@ const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
+const normalize_remote_1 = require("../../utils/normalize-remote");
 const maybe_js_1 = require("../../utils/maybe-js");
 const versions_1 = require("../../utils/versions");
 const application_1 = require("../application/application");
@@ -57,9 +58,11 @@ function addModuleFederationFiles(host, options) {
 }
 async function remoteGenerator(host, schema) {
     const tasks = [];
+    const name = await (0, normalize_remote_1.normalizeRemoteName)(host, schema.name, schema);
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, {
             ...schema,
+            name,
             useProjectJson: true,
         })),
         // when js is set to true, we want to use the js configuration
@@ -81,13 +84,9 @@ async function remoteGenerator(host, schema) {
         }
     }
     await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
-    const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
-    if (!remoteNameRegex.test(options.projectName)) {
-        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.projectName}. 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 isValidRemote = (0, js_1.isValidVariable)(options.projectName);
+    if (!isValidRemote.isValid) {
+        throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
     }
     const initAppTask = await (0, application_1.default)(host, {
         ...options,

package/src/generators/remote/schema.json

@@ -19,7 +19,7 @@
     "name": {
       "type": "string",
       "description": "The name of the Producer (remote) application to generate the Module Federation configuration",
-      "pattern": "^[a-zA-Z_$][a-zA-Z_$0-9]*$",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
     "dynamic": {

package/src/utils/normalize-remote.d.ts

@@ -0,0 +1,9 @@
+import { Tree } from '@nx/devkit';
+export declare function normalizeRemoteName(tree: Tree, remote: string, options: {
+    directory: string;
+}): Promise<string>;
+export declare function normalizeRemoteDirectory(remote: string, options: {
+    directory: string;
+    appProjectRoot: string;
+}): string;
+//# sourceMappingURL=normalize-remote.d.ts.map

package/src/utils/normalize-remote.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-remote.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/normalize-remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAGrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,mBAY/B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,UAgBvD"}

package/src/generators/host/lib/normalize-remote.d.ts

@@ -1,5 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { NormalizedSchema } from '../schema';
-export declare function normalizeRemoteName(tree: Tree, remote: string, options: NormalizedSchema): Promise<string>;
-export declare function normalizeRemoteDirectory(remote: string, options: NormalizedSchema): string;
-//# sourceMappingURL=normalize-remote.d.ts.map

package/src/generators/host/lib/normalize-remote.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"normalize-remote.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/normalize-remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,mBAY1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,UAgB1B"}