@nx/angular 21.0.0-beta.1 → 21.0.0-beta.11

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -0,0 +1,329 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToRspack = convertToRspack;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+const create_config_1 = require("./lib/create-config");
+const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
+const update_tsconfig_1 = require("./lib/update-tsconfig");
+const validate_supported_executor_1 = require("./lib/validate-supported-executor");
+const posix_1 = require("path/posix");
+const path_1 = require("path");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const enquirer_1 = require("enquirer");
+const SUPPORTED_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:dev-server',
+    '@angular-devkit/build-angular:server',
+    '@nx/angular:webpack-browser',
+    '@nx/angular:webpack-server',
+    '@nx/angular:dev-server',
+    '@nx/angular:module-federation-dev-server',
+];
+const RENAMED_OPTIONS = {
+    main: 'browser',
+    ngswConfigPath: 'serviceWorker',
+};
+const DEFAULT_PORT = 4200;
+const REMOVED_OPTIONS = [
+    'buildOptimizer',
+    'buildTarget',
+    'browserTarget',
+    'publicHost',
+];
+function normalizeFromProjectRoot(tree, path, projectRoot) {
+    if (projectRoot === '.') {
+        if (!path.startsWith('./')) {
+            return `./${path}`;
+        }
+        else {
+            return path;
+        }
+    }
+    else if (path.startsWith(projectRoot)) {
+        return path.replace(projectRoot, '.');
+    }
+    else if (!path.startsWith('./')) {
+        if (tree.exists(path)) {
+            const pathWithWorkspaceRoot = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, path);
+            const projectRootWithWorkspaceRoot = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot);
+            return (0, path_1.relative)(projectRootWithWorkspaceRoot, pathWithWorkspaceRoot);
+        }
+        return `./${path}`;
+    }
+    return path;
+}
+const defaultNormalizer = (tree, path, root) => normalizeFromProjectRoot(tree, path, root);
+const PATH_NORMALIZER = {
+    index: (tree, path, root) => {
+        if (typeof path === 'string') {
+            return normalizeFromProjectRoot(tree, path, root);
+        }
+        return {
+            input: normalizeFromProjectRoot(tree, path.input, root),
+            output: path.output ?? 'index.html',
+        };
+    },
+    indexHtmlTransformer: defaultNormalizer,
+    main: defaultNormalizer,
+    server: defaultNormalizer,
+    tsConfig: defaultNormalizer,
+    outputPath: (tree, path, root) => {
+        const relativePathFromWorkspaceRoot = (0, path_1.relative)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, root), devkit_1.workspaceRoot);
+        return (0, devkit_1.joinPathFragments)(relativePathFromWorkspaceRoot, path);
+    },
+    proxyConfig: defaultNormalizer,
+    polyfills: (tree, paths, root) => {
+        const normalizedPaths = [];
+        const normalizeFn = (path) => {
+            try {
+                const resolvedPath = require.resolve(path, {
+                    paths: [(0, posix_1.join)(devkit_1.workspaceRoot, 'node_modules')],
+                });
+                normalizedPaths.push(path);
+            }
+            catch {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+        };
+        if (typeof paths === 'string') {
+            normalizeFn(paths);
+        }
+        else {
+            for (const path of paths) {
+                normalizeFn(path);
+            }
+        }
+        return normalizedPaths;
+    },
+    styles: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                    bundleName: path.bundleName,
+                    inject: path.inject ?? true,
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    scripts: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                    bundleName: path.bundleName,
+                    inject: path.inject ?? true,
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    assets: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    ...path,
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    fileReplacements: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            normalizedPaths.push({
+                replace: normalizeFromProjectRoot(tree, 'src' in path ? path.src : path.replace, root),
+                with: normalizeFromProjectRoot(tree, 'replaceWith' in path ? path.replaceWith : path.with, root),
+            });
+        }
+        return normalizedPaths;
+    },
+};
+function handleBuildTargetOptions(tree, options, newConfigurationOptions, root) {
+    let customWebpackConfigPath;
+    if (!options || Object.keys(options).length === 0) {
+        return customWebpackConfigPath;
+    }
+    if (options.customWebpackConfig) {
+        customWebpackConfigPath = options.customWebpackConfig.path;
+        delete options.customWebpackConfig;
+    }
+    if (options.outputs) {
+        // handled by the Rspack inference plugin
+        delete options.outputs;
+    }
+    for (const [key, value] of Object.entries(options)) {
+        let optionName = key;
+        let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
+        if (REMOVED_OPTIONS.includes(key)) {
+            continue;
+        }
+        if (key in RENAMED_OPTIONS) {
+            optionName = RENAMED_OPTIONS[key];
+        }
+        newConfigurationOptions[optionName] = optionValue;
+    }
+    if (typeof newConfigurationOptions.polyfills === 'string') {
+        newConfigurationOptions.polyfills = [newConfigurationOptions.polyfills];
+    }
+    let outputPath = newConfigurationOptions.outputPath;
+    if (typeof outputPath === 'string') {
+        if (!/\/browser\/?$/.test(outputPath)) {
+            console.warn(`The output location of the browser build has been updated from "${outputPath}" to ` +
+                `"${(0, posix_1.join)(outputPath, 'browser')}". ` +
+                'You might need to adjust your deployment pipeline or, as an alternative, ' +
+                'set outputPath.browser to "" in order to maintain the previous functionality.');
+        }
+        else {
+            outputPath = outputPath.replace(/\/browser\/?$/, '');
+        }
+        newConfigurationOptions['outputPath'] = {
+            base: outputPath,
+        };
+        if (typeof newConfigurationOptions.resourcesOutputPath === 'string') {
+            const media = newConfigurationOptions.resourcesOutputPath.replaceAll('/', '');
+            if (media && media !== 'media') {
+                newConfigurationOptions['outputPath'] = {
+                    base: outputPath,
+                    media,
+                };
+            }
+        }
+    }
+    return customWebpackConfigPath;
+}
+function handleDevServerTargetOptions(tree, options, newConfigurationOptions, root) {
+    for (const [key, value] of Object.entries(options)) {
+        let optionName = key;
+        let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
+        if (REMOVED_OPTIONS.includes(key)) {
+            continue;
+        }
+        if (key in RENAMED_OPTIONS) {
+            optionName = RENAMED_OPTIONS[key];
+        }
+        newConfigurationOptions[optionName] = optionValue;
+    }
+}
+async function getProjectToConvert(tree) {
+    const projects = new Set();
+    for (const executor of SUPPORTED_EXECUTORS) {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project) => {
+            projects.add(project);
+        });
+    }
+    const { project } = await (0, enquirer_1.prompt)({
+        type: 'select',
+        name: 'project',
+        message: 'Which project would you like to convert to rspack?',
+        choices: Array.from(projects),
+    });
+    return project;
+}
+async function convertToRspack(tree, schema) {
+    let { project: projectName } = schema;
+    if (!projectName) {
+        projectName = await getProjectToConvert(tree);
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    const tasks = [];
+    const createConfigOptions = {
+        root: project.root,
+    };
+    const configurationOptions = {};
+    const buildTargetNames = [];
+    const serveTargetNames = [];
+    let customWebpackConfigPath;
+    (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
+    let projectServePort = DEFAULT_PORT;
+    for (const [targetName, target] of Object.entries(project.targets)) {
+        if (target.executor === '@angular-devkit/build-angular:browser' ||
+            target.executor === '@nx/angular:webpack-browser') {
+            customWebpackConfigPath = handleBuildTargetOptions(tree, target.options, createConfigOptions, project.root);
+            if (target.configurations) {
+                for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                    configurationOptions[configurationName] = {};
+                    handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
+                }
+            }
+            buildTargetNames.push(targetName);
+        }
+        else if (target.executor === '@angular-devkit/build-angular:server' ||
+            target.executor === '@nx/angular:webpack-server') {
+            createConfigOptions.ssr ??= {};
+            createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
+            createConfigOptions.server = './src/main.server.ts';
+            buildTargetNames.push(targetName);
+        }
+        else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
+            target.executor === '@nx/angular:dev-server' ||
+            target.executor === '@nx/angular:module-federation-dev-server') {
+            createConfigOptions.devServer = {};
+            if (target.options) {
+                handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
+                if (target.options.port !== DEFAULT_PORT) {
+                    projectServePort = target.options.port;
+                }
+            }
+            if (target.configurations) {
+                for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                    configurationOptions[configurationName] ??= {};
+                    configurationOptions[configurationName].devServer ??= {};
+                    handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
+                }
+            }
+            serveTargetNames.push(targetName);
+        }
+    }
+    const customWebpackConfigInfo = customWebpackConfigPath
+        ? await (0, get_custom_webpack_config_1.getCustomWebpackConfig)(tree, project.root, customWebpackConfigPath)
+        : undefined;
+    (0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
+    (0, update_tsconfig_1.updateTsconfig)(tree, project.root);
+    for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
+        delete project.targets[targetName];
+    }
+    if (projectServePort !== DEFAULT_PORT) {
+        project.targets.serve ??= {};
+        project.targets.serve.options ??= {};
+        project.targets.serve.options.port = projectServePort;
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
+    await rspackInitGenerator(tree, {
+        addPlugin: true,
+    });
+    // This is needed to prevent a circular execution of the build target
+    const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (rootPkgJson.scripts?.build === 'nx build') {
+        delete rootPkgJson.scripts.build;
+        (0, devkit_1.writeJson)(tree, 'package.json', rootPkgJson);
+    }
+    if (!schema.skipInstall) {
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/angular-rspack': versions_1.angularRspackVersion,
+            'ts-node': versions_1.tsNodeVersion,
+        });
+        tasks.push(installTask);
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
+}
+exports.default = convertToRspack;

package/src/generators/convert-to-rspack/lib/create-config.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function createConfig(tree: Tree, opts: Record<string, any>, configurationOptions?: Record<string, Record<string, any>>, existingWebpackConfigPath?: string, isExistingWebpackConfigFunction?: boolean): void;

package/src/generators/convert-to-rspack/lib/create-config.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createConfig = createConfig;
+const devkit_1 = require("@nx/devkit");
+function createConfig(tree, opts, configurationOptions = {}, existingWebpackConfigPath, isExistingWebpackConfigFunction) {
+    const { root, ...createConfigOptions } = opts;
+    const hasConfigurations = Object.keys(configurationOptions).length > 0;
+    const expandedConfigurationOptions = hasConfigurations
+        ? Object.entries(configurationOptions)
+            .map(([configurationName, configurationOptions]) => {
+            return `
+      "${configurationName}": {
+        options: {
+          ${JSON.stringify(configurationOptions, undefined, 2).slice(1, -1)}
+        }
+      }`;
+        })
+            .join(',\n')
+        : '';
+    const createConfigContents = `createConfig({ 
+    options: {
+      root: __dirname,
+      ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}
+    }
+  }${hasConfigurations ? `, {${expandedConfigurationOptions}}` : ''});`;
+    const configContents = `
+  import { createConfig }from '@nx/angular-rspack';
+  ${existingWebpackConfigPath
+        ? `import baseWebpackConfig from '${existingWebpackConfigPath}';
+      ${isExistingWebpackConfigFunction
+            ? ''
+            : `import webpackMerge from 'webpack-merge';`}`
+        : ''}
+  
+  ${existingWebpackConfigPath
+        ? `export default async () => {
+        const baseConfig = await ${createConfigContents}
+        ${isExistingWebpackConfigFunction
+            ? `const oldConfig = await baseWebpackConfig;
+        const browserConfig = baseConfig[0];
+        return oldConfig(browserConfig);`
+            : 'return webpackMerge(baseConfig[0], baseWebpackConfig);'}};`
+        : `export default ${createConfigContents}`}`;
+    tree.write((0, devkit_1.joinPathFragments)(root, 'rspack.config.ts'), configContents);
+}

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+export declare function getCustomWebpackConfig(tree: Tree, projectRoot: string, pathToCustomWebpackConfig: string): Promise<{
+    isWebpackConfigFunction: boolean;
+    normalizedPathToCustomWebpackConfig: string;
+}>;
+export declare function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents: string): string;

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomWebpackConfig = getCustomWebpackConfig;
+exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
+const devkit_1 = require("@nx/devkit");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const path_1 = require("path");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const FILE_EXTENSION_REGEX = /\.[^.]+$/;
+async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConfig) {
+    const webpackConfigContents = tree.read(pathToCustomWebpackConfig, 'utf-8');
+    if (webpackConfigContents.includes('@nx/module-federation/angular') &&
+        webpackConfigContents.includes('withModuleFederation')) {
+        tree.write(pathToCustomWebpackConfig, convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents));
+        return {
+            isWebpackConfigFunction: false,
+            normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
+        };
+    }
+    const configFile = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
+    const webpackConfig = 'default' in configFile ? configFile.default : configFile;
+    return {
+        isWebpackConfigFunction: typeof webpackConfig === 'function',
+        normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
+    };
+}
+function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
+    let newWebpackConfigContents = webpackConfigContents;
+    let ast = tsquery_1.tsquery.ast(webpackConfigContents);
+    const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
+    if (withModuleFederationImportNodes.length > 0) {
+        const withModuleFederationImportNode = withModuleFederationImportNodes[0];
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
+        if (exportedWithModuleFederationNodes.length > 0) {
+            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
+            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
+    export default {
+      plugins: [
+        new NxModuleFederationPlugin({ config }, {
+          dts: false,
+        }),
+        new NxModuleFederationDevServerPlugin({ config }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    const withModuleFederationRequireNodes = (0, tsquery_1.tsquery)(ast, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
+    if (withModuleFederationRequireNodes.length > 0) {
+        const withModuleFederationRequireNode = withModuleFederationRequireNodes[0];
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
+        if (exportedWithModuleFederationNodes.length > 0) {
+            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
+            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
+    module.exports = {
+      plugins: [
+        new NxModuleFederationPlugin({ config }, {
+          dts: false,
+        }),
+        new NxModuleFederationDevServerPlugin({ config }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    return newWebpackConfigContents;
+}

package/src/generators/convert-to-rspack/lib/update-tsconfig.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updateTsconfig(tree: Tree, projectRoot: string): void;

package/src/generators/convert-to-rspack/lib/update-tsconfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsconfig = updateTsconfig;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+function updateTsconfig(tree, projectRoot) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
+    tsconfig['ts-node'] ??= {};
+    tsconfig['ts-node'].compilerOptions ??= {};
+    tsconfig['ts-node'].compilerOptions.module = 'CommonJS';
+    tsconfig['ts-node'].compilerOptions.moduleResolution = 'Node10';
+    if (tsconfig.compilerOptions?.customConditions) {
+        tsconfig['ts-node'].compilerOptions.customConditions = null;
+    }
+    else {
+        const rootTsconfigFile = (0, js_1.getRootTsConfigFileName)(tree);
+        if (rootTsconfigFile) {
+            const rootTsconfigJson = (0, devkit_1.readJson)(tree, rootTsconfigFile);
+            if (rootTsconfigJson.compilerOptions?.customConditions) {
+                tsconfig['ts-node'].compilerOptions.customConditions = null;
+            }
+        }
+    }
+    (0, devkit_1.writeJson)(tree, tsconfigPath, tsconfig);
+}

package/src/generators/convert-to-rspack/lib/validate-supported-executor.d.ts

@@ -0,0 +1,2 @@
+import { TargetConfiguration } from '@nx/devkit';
+export declare function validateSupportedBuildExecutor(targets: TargetConfiguration[]): void;

package/src/generators/convert-to-rspack/lib/validate-supported-executor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSupportedBuildExecutor = validateSupportedBuildExecutor;
+const SUPPORTED_BUILD_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@nx/angular:webpack-browser',
+];
+function validateSupportedBuildExecutor(targets) {
+    const executorsUsedByProject = targets.map((target) => target.executor);
+    if (!executorsUsedByProject.some((executor) => SUPPORTED_BUILD_EXECUTORS.includes(executor))) {
+        throw new Error('The project does not use a supported build executor. Please use one of the following executors: ' +
+            SUPPORTED_BUILD_EXECUTORS.join(', '));
+    }
+}

package/src/generators/convert-to-rspack/schema.d.ts

@@ -0,0 +1,5 @@
+export interface ConvertToRspackSchema {
+  project: string;
+  skipFormat?: boolean;
+  skipInstall?: boolean;
+}

package/src/generators/convert-to-rspack/schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "GeneratorNxApp",
+  "title": "Creates an Angular application.",
+  "description": "Creates an Angular application.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "project": {
+      "type": "string",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to convert to rspack.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependencies.",
+      "type": "boolean",
+      "default": false
+    }
+  }
+}

package/src/generators/host/host.js

@@ -39,7 +39,7 @@ async function host(tree, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',

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

@@ -20,7 +20,6 @@ export interface Schema {
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
-  standaloneConfig?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';

package/src/generators/host/schema.json

@@ -144,12 +144,6 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",

package/src/generators/library/lib/add-project.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { AngularProjectConfiguration } from '../../../utils/types';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): AngularProjectConfiguration;
+export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): Promise<AngularProjectConfiguration>;

package/src/generators/library/lib/add-project.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-function addProject(tree, libraryOptions) {
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const use_legacy_versioning_1 = require("nx/src/command-line/release/config/use-legacy-versioning");
+async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -34,6 +36,10 @@ function addProject(tree, libraryOptions) {
             },
             defaultConfiguration: 'production',
         };
+        if (libraryOptions.publishable) {
+            const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)((0, use_legacy_versioning_1.shouldUseLegacyVersioning)(nxJson.release), tree, libraryOptions.name, project);
+        }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;

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

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
     const options = {
         buildable: false,
-        linter: eslint_1.Linter.EsLint,
+        linter: 'eslint',
         publishable: false,
         simpleName: false,
         skipFormat: false,
@@ -22,7 +21,7 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -40,7 +39,7 @@ async function normalizeOptions(host, schema) {
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
-        linter: options.linter ?? eslint_1.Linter.EsLint,
+        linter: options.linter ?? 'eslint',
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
         prefix: options.prefix ?? 'lib',
         name: projectName,

package/src/generators/library/lib/normalized-schema.d.ts

@@ -12,7 +12,6 @@ export interface NormalizedSchema {
         buildable?: boolean;
         publishable?: boolean;
         importPath?: string;
-        standaloneConfig?: boolean;
         spec?: boolean;
         commonModule?: boolean;
         routing?: boolean;