@nx/angular 0.0.0-pr-29860-74361a9 → 0.0.0-pr-29464-c4b160c

package/generators.json

@@ -38,11 +38,6 @@
       "schema": "./src/generators/convert-to-application-executor/schema.json",
       "description": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder."
     },
-    "convert-to-rspack": {
-      "factory": "./src/generators/convert-to-rspack/convert-to-rspack",
-      "schema": "./src/generators/convert-to-rspack/schema.json",
-      "description": "Converts Angular Webpack projects to use Rspack."
-    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-29860-74361a9",
+  "version": "0.0.0-pr-29464-c4b160c",
   "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": {
@@ -71,14 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "0.0.0-pr-29860-74361a9",
-    "@nx/js": "0.0.0-pr-29860-74361a9",
-    "@nx/eslint": "0.0.0-pr-29860-74361a9",
-    "@nx/webpack": "0.0.0-pr-29860-74361a9",
-    "@nx/rspack": "0.0.0-pr-29860-74361a9",
-    "@nx/module-federation": "0.0.0-pr-29860-74361a9",
-    "@nx/web": "0.0.0-pr-29860-74361a9",
-    "@nx/workspace": "0.0.0-pr-29860-74361a9",
+    "@nx/devkit": "0.0.0-pr-29464-c4b160c",
+    "@nx/js": "0.0.0-pr-29464-c4b160c",
+    "@nx/eslint": "0.0.0-pr-29464-c4b160c",
+    "@nx/webpack": "0.0.0-pr-29464-c4b160c",
+    "@nx/module-federation": "0.0.0-pr-29464-c4b160c",
+    "@nx/web": "0.0.0-pr-29464-c4b160c",
+    "@nx/workspace": "0.0.0-pr-29464-c4b160c",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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,8 @@ 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");
+async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -34,6 +35,9 @@ function addProject(tree, libraryOptions) {
             },
             defaultConfiguration: 'production',
         };
+        if (libraryOptions.publishable) {
+            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
+        }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;

package/src/generators/library/library.js

@@ -25,6 +25,7 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const test_runners_1 = require("../../utils/test-runners");
 const add_vitest_1 = require("../utils/add-vitest");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 async function libraryGenerator(tree, schema) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
     // Do some validation checks
@@ -49,7 +50,7 @@ async function libraryGenerator(tree, schema) {
     if (!libraryOptions.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     }
-    const project = (0, add_project_1.addProject)(tree, libraryOptions);
+    const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
     (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
@@ -76,6 +77,9 @@ async function libraryGenerator(tree, schema) {
             'ng-packagr': pkgVersions.ngPackagrVersion,
         }, undefined, true);
         (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
+        if (libraryOptions.publishable) {
+            await (0, add_release_config_1.releaseTasks)(tree);
+        }
     }
     (0, js_1.addTsConfigPath)(tree, libraryOptions.importPath, [
         (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, './src', 'index.ts'),

package/src/utils/backward-compatible-versions.js

@@ -6,7 +6,6 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~17.3.0',
         angularDevkitVersion: '~17.3.0',
         ngPackagrVersion: '~17.3.0',
-        ngRspackVersion: '~19.0.0-alpha.26',
         ngrxVersion: '~17.0.0',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',
@@ -34,7 +33,6 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~18.2.0',
         angularDevkitVersion: '~18.2.0',
         ngPackagrVersion: '~18.2.0',
-        ngRspackVersion: '~19.0.0-alpha.26',
         ngrxVersion: '~18.0.2',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',

package/src/utils/versions.d.ts

@@ -2,7 +2,6 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~19.1.0";
 export declare const angularDevkitVersion = "~19.1.0";
 export declare const ngPackagrVersion = "~19.1.0";
-export declare const ngRspackVersion = "~19.0.0-alpha.26";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";

package/src/utils/versions.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~19.1.0';
 exports.angularDevkitVersion = '~19.1.0';
 exports.ngPackagrVersion = '~19.1.0';
-exports.ngRspackVersion = '~19.0.0-alpha.26';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';

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

@@ -1,4 +0,0 @@
-import { type Tree, GeneratorCallback } from '@nx/devkit';
-import type { ConvertToRspackSchema } from './schema';
-export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
-export default convertToRspack;

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

@@ -1,72 +0,0 @@
-"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");
-async function convertToRspack(tree, schema) {
-    const { project: projectName } = schema;
-    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const tasks = [];
-    const createConfigOptions = {
-        root: project.root,
-    };
-    const buildAndServeTargetNames = [];
-    let customWebpackConfigPath;
-    for (const [targetName, target] of Object.entries(project.targets)) {
-        if (target.executor === '@angular-devkit/build-angular:browser' ||
-            target.executor === '@nx/angular:webpack-browser') {
-            createConfigOptions.browser = target.options.main;
-            createConfigOptions.index = target.options.index;
-            createConfigOptions.assets = target.options.assets.map((asset) => {
-                if (typeof asset === 'string') {
-                    return asset;
-                }
-                return asset.input;
-            });
-            createConfigOptions.styles = target.options.styles;
-            createConfigOptions.scripts = target.options.scripts;
-            createConfigOptions.polyfills = target.options.polyfills;
-            createConfigOptions.tsconfigPath = target.options.tsConfig;
-            createConfigOptions.jit =
-                target.options.aot === undefined ? false : !target.options.aot;
-            createConfigOptions.inlineStylesExtension =
-                target.options.inlineStyleLanguage === undefined
-                    ? 'css'
-                    : target.options.inlineStyleLanguage;
-            if (target.options.customWebpackConfig) {
-                customWebpackConfigPath = target.options.customWebpackConfig.path;
-            }
-            // TODO: Add more options that can be correctly mapped
-            buildAndServeTargetNames.push(targetName);
-        }
-        else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
-            target.executor === '@nx/angular:dev-server') {
-            buildAndServeTargetNames.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, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
-    for (const targetName of buildAndServeTargetNames) {
-        delete project.targets[targetName];
-    }
-    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-    const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
-    await rspackInitGenerator(tree, {
-        addPlugin: true,
-    });
-    if (!schema.skipInstall) {
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@ng-rspack/build': versions_1.ngRspackVersion,
-        });
-        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

@@ -1,17 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export interface CreateConfigOptions {
-    root: string;
-    index: string;
-    browser: string;
-    server?: string;
-    ssrEntry?: string;
-    polyfills: string[];
-    tsconfigPath: string;
-    assets: string[];
-    styles: string[];
-    scripts: string[];
-    jit?: boolean;
-    inlineStylesExtension?: string;
-    fileReplacements?: string[];
-}
-export declare function createConfig(tree: Tree, opts: Partial<CreateConfigOptions>, existingWebpackConfigPath?: string, isExistingWebpackConfigFunction?: boolean): void;

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

@@ -1,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfig = createConfig;
-const devkit_1 = require("@nx/devkit");
-function createConfig(tree, opts, existingWebpackConfigPath, isExistingWebpackConfigFunction) {
-    const configContents = `const { createConfig } = require('@ng-rspack/build');
-  ${existingWebpackConfigPath
-        ? `const baseWebpackConfig = require('${existingWebpackConfigPath}');
-      ${isExistingWebpackConfigFunction
-            ? ''
-            : `const webpackMerge = require('webpack-merge');`}`
-        : ''}
-  
-  ${existingWebpackConfigPath ? 'const baseConfig' : 'module.exports'} = createConfig({
-    root: __dirname,
-    index: '${normalizeFromProjectRoot(opts.index, opts.root)}',
-    browser: '${normalizeFromProjectRoot(opts.browser, opts.root)}',
-    ${opts.server
-        ? `server: '${normalizeFromProjectRoot(opts.server, opts.root)}',`
-        : ''}
-    ${opts.ssrEntry
-        ? `ssrEntry: '${normalizeFromProjectRoot(opts.ssrEntry, opts.root)}',`
-        : ''}
-    tsconfigPath: '${normalizeFromProjectRoot(opts.tsconfigPath, opts.root)}',
-    polyfills: ${JSON.stringify(opts.polyfills)},
-    assets: ${JSON.stringify(opts.assets.map((a) => normalizeFromProjectRoot(a, opts.root)))},
-    styles: ${JSON.stringify(opts.styles.map((s) => normalizeFromProjectRoot(s, opts.root)))},
-    scripts: ${JSON.stringify(opts.scripts.map((s) => normalizeFromProjectRoot(s, opts.root)))},
-    jit: ${opts.jit},
-    ${opts.inlineStylesExtension
-        ? `inlineStylesExtension: '${opts.inlineStylesExtension}'`
-        : ''},
-    fileReplacements: ${JSON.stringify(opts.fileReplacements ?? [])},
-    hasServer: ${opts.server || opts.ssrEntry ? true : false},
-    skipTypeChecking: false,
-  });
-  ${existingWebpackConfigPath
-        ? `
-    module.exports = ${isExistingWebpackConfigFunction
-            ? 'baseWebpackConfig(baseConfig)'
-            : 'webpackMerge(baseConfig, baseWebpackConfig)'}
-  `
-        : ''}
-  `;
-    tree.write((0, devkit_1.joinPathFragments)(opts.root, 'rspack.config.ts'), configContents);
-}
-function normalizeFromProjectRoot(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('./')) {
-        return `./${path}`;
-    }
-    return path;
-}

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

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

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

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCustomWebpackConfig = getCustomWebpackConfig;
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const path_1 = require("path");
-const FILE_EXTENSION_REGEX = /\.[^.]+$/;
-async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConfig) {
-    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, '')}`,
-    };
-}

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

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

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

@@ -1,32 +0,0 @@
-{
-  "$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-prompt": "Which project do you want to convert to rspack?",
-      "x-dropdown": "projects",
-      "x-priority": "important"
-    },
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false
-    },
-    "skipInstall": {
-      "description": "Skip installing dependencies.",
-      "type": "boolean",
-      "default": false
-    }
-  }
-}