@nx/rspack 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,30 +1,6 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/rspack with @nx/rspack",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
-    "16.1.3": {
-      "version": "16.1.3-beta.0",
-      "packages": {
-        "@rspack/core": {
-          "version": "~0.1.12",
-          "alwaysAddToPackageJson": false
-        },
-        "@rspack/dev-server": {
-          "version": "~0.1.12",
-          "alwaysAddToPackageJson": false
-        },
-        "@rspack/plugin-minify": {
-          "version": "~0.1.12",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "18.1.0": {
       "version": "18.1.0-beta.0",
       "packages": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,9 +24,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.0.0-beta.4",
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/eslint": "20.0.0-beta.4",
+    "@nx/js": "20.0.0-beta.6",
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/eslint": "20.0.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
@@ -36,8 +36,7 @@
     "@rspack/core": "^1.0.4",
     "@rspack/plugin-react-refresh": "^1.0.0",
     "@rspack/plugin-minify": "^0.7.5",
-    "chalk": "~4.1.0",
-    "@nrwl/rspack": "20.0.0-beta.4"
+    "chalk": "~4.1.0"
   },
   "peerDependencies": {
     "@module-federation/enhanced": "~0.6.0",

package/src/generators/application/application.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const package_json_1 = require("nx/package.json");
 const configuration_1 = tslib_1.__importDefault(require("../configuration/configuration"));
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const normalize_options_1 = require("./lib/normalize-options");
 async function default_1(tree, _options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'rspack', 'application');
     const tasks = [];
     const initTask = await (0, init_1.default)(tree, {
         ..._options,
@@ -16,7 +18,7 @@ async function default_1(tree, _options) {
         addPlugin: false,
     });
     tasks.push(initTask);
-    const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
+    const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
     options.style ??= 'css';
     if (options.framework === 'nest') {
         const { applicationGenerator: nestAppGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', package_json_1.version);

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,5 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { ApplicationGeneratorSchema, NormalizedSchema } from '../schema';
-export declare function normalizeDirectory(options: ApplicationGeneratorSchema): string;
-export declare function normalizeProjectName(options: ApplicationGeneratorSchema): string;
-export declare function normalizeOptions(host: Tree, options: ApplicationGeneratorSchema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: ApplicationGeneratorSchema): Promise<NormalizedSchema>;

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

@@ -1,32 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDirectory = normalizeDirectory;
-exports.normalizeProjectName = normalizeProjectName;
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-function normalizeDirectory(options) {
-    const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    return projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-}
-function normalizeProjectName(options) {
-    return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
-}
-function normalizeOptions(host, options) {
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+async function normalizeOptions(host, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        ...options,
+        projectType: 'application',
+    });
     // --monorepo takes precedence over --rootProject
     // This won't be needed once we add --bundler=rspack to the @nx/react:app preset
     const rootProject = !options.monorepo && options.rootProject;
-    const appDirectory = normalizeDirectory(options);
-    const appProjectName = normalizeProjectName(options);
     const e2eProjectName = options.rootProject
         ? 'e2e'
-        : `${(0, devkit_1.names)(options.name).fileName}-e2e`;
-    const { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory ?? (0, devkit_1.getWorkspaceLayout)(host).appsDir;
-    const appProjectRoot = rootProject
-        ? '.'
-        : (0, devkit_1.normalizePath)(`${appsDir}/${appDirectory}`);
+        : `${(0, devkit_1.names)(appProjectName).fileName}-e2e`;
     const normalized = {
         ...options,
         rootProject,

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

@@ -1,10 +1,10 @@
 export interface ApplicationGeneratorSchema {
-  name: string;
+  directory: string;
+  name?: string;
   framework?: Framework;
   style: 'css' | 'scss' | 'less' | 'styl';
   unitTestRunner?: 'none' | 'jest';
   e2eTestRunner?: 'none' | 'cypress';
-  directory?: string;
   tags?: string;
   rootProject?: boolean;
   monorepo?: boolean;

package/src/generators/application/schema.json

@@ -6,21 +6,24 @@
   "description": "React + Rspack application generator.",
   "examples": [
     {
-      "command": "nx g app myapp --directory=myorg",
+      "command": "nx g app myorg/myapp",
       "description": "Generate `apps/myorg/myapp` and `apps/myorg/myapp-e2e`"
     }
   ],
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
       "type": "string",
+      "description": "The directory to nest the app under.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z].*$",
-      "x-priority": "important"
+      "x-prompt": "What directory would you like to use for the application?"
+    },
+    "name": {
+      "description": "The name of the application.",
+      "type": "string",
+      "pattern": "^[a-zA-Z].*$"
     },
     "framework": {
       "type": "string",
@@ -75,10 +78,6 @@
       "enum": ["none", "cypress"],
       "default": "cypress"
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory to nest the app under."
-    },
     "tags": {
       "type": "string",
       "description": "Add tags to the application (used for linting).",
@@ -94,5 +93,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/configuration/configuration.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const generator_utils_1 = require("../../utils/generator-utils");
 const create_ts_config_1 = require("../application/lib/create-ts-config");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 async function configurationGenerator(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'rspack', 'configuration');
     const task = await (0, init_1.default)(tree, {
         ...options,
         // TODO: Crystalize the default rspack.config.js file.

package/src/generators/init/init.js

@@ -5,9 +5,11 @@ exports.rspackInitGenerator = rspackInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../../plugin");
 const versions_1 = require("../../utils/versions");
 async function rspackInitGenerator(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'rspack', 'init');
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/preset/preset.js

@@ -7,6 +7,7 @@ const application_1 = tslib_1.__importDefault(require("../application/applicatio
 async function default_1(tree, options) {
     const appTask = (0, application_1.default)(tree, {
         ...options,
+        directory: '.',
         // Since `--style` is not passed down to custom preset, we're using individual flags for now.
         style: options.sass
             ? 'scss'

package/src/utils/module-federation/remotes.js

@@ -15,7 +15,8 @@ function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt);
+            const remoteName = normalizeRemoteName(remote[0]);
+            mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt);
         }
         else if (typeof remote === 'string') {
             mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl);
@@ -25,7 +26,8 @@ function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl) {
 }
 // Helper function to deal with remotes that are arrays
 function handleArrayRemote(remote, remoteEntryExt) {
-    const [remoteName, remoteLocation] = remote;
+    let [remoteName, remoteLocation] = remote;
+    remoteName = normalizeRemoteName(remoteName);
     const remoteLocationExt = (0, path_1.extname)(remoteLocation);
     // If remote location already has .js or .mjs extension
     if (['.js', '.mjs'].includes(remoteLocationExt)) {
@@ -61,7 +63,8 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            const [remoteName, remoteLocation] = remote;
+            let [remoteName, remoteLocation] = remote;
+            remoteName = normalizeRemoteName(remoteName);
             const remoteLocationExt = (0, path_1.extname)(remoteLocation);
             mappedRemotes[remoteName] = `${remoteName}@${['.js', '.mjs'].includes(remoteLocationExt)
                 ? remoteLocation
@@ -70,8 +73,12 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
                     : remoteLocation}/remoteEntry.${remoteEntryExt}`}`;
         }
         else if (typeof remote === 'string') {
-            mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+            const remoteName = normalizeRemoteName(remote);
+            mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
         }
     }
     return mappedRemotes;
 }
+function normalizeRemoteName(remote) {
+    return remote.replace(/-/g, '_');
+}

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

@@ -20,7 +20,7 @@ async function withModuleFederationForSSR(options, configOverride) {
         config.plugins.push(
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         new (require('@module-federation/enhanced/rspack').ModuleFederationPlugin)({
-            name: options.name,
+            name: options.name.replace(/-/g, '_'),
             filename: 'remoteEntry.js',
             exposes: options.exposes,
             remotes: mappedRemotes,

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

@@ -33,7 +33,7 @@ async function withModuleFederation(options, configOverride) {
             config.optimization.runtimeChunk = 'single';
         }
         config.plugins.push(new rspack_1.ModuleFederationPlugin({
-            name: options.name,
+            name: options.name.replace(/-/g, '_'),
             filename: 'remoteEntry.js',
             exposes: options.exposes,
             remotes: mappedRemotes,

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/rspack', '@nx/rspack');
-    await (0, devkit_1.formatFiles)(tree);
-}