@nx/angular 21.6.4 → 21.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.6.4",
+  "version": "21.6.6",
   "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": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.6.4",
-    "@nx/eslint": "21.6.4",
-    "@nx/js": "21.6.4",
-    "@nx/module-federation": "21.6.4",
-    "@nx/rspack": "21.6.4",
-    "@nx/web": "21.6.4",
-    "@nx/webpack": "21.6.4",
-    "@nx/workspace": "21.6.4",
+    "@nx/devkit": "21.6.6",
+    "@nx/eslint": "21.6.6",
+    "@nx/js": "21.6.6",
+    "@nx/module-federation": "21.6.6",
+    "@nx/rspack": "21.6.6",
+    "@nx/web": "21.6.6",
+    "@nx/webpack": "21.6.6",
+    "@nx/workspace": "21.6.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/executors/utilities/typescript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/typescript.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgCH;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,gBASzB"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/typescript.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAoCH;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,gBASzB"}

package/src/executors/utilities/typescript.js

@@ -13,14 +13,17 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const ts = tslib_1.__importStar(require("typescript"));
 const module_loader_1 = require("./module-loader");
+const ng_packagr_version_1 = require("./ng-packagr/ng-packagr-version");
 async function readDefaultTsConfig(fileName) {
+    const ngPackagrVersion = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
     // these options are mandatory
     const extraOptions = {
         target: ts.ScriptTarget.ES2022,
+        composite: false,
         // sourcemaps
-        sourceMap: false,
+        sourceMap: ngPackagrVersion.major < 20 ? false : true,
         inlineSources: true,
-        inlineSourceMap: true,
+        inlineSourceMap: ngPackagrVersion.major < 20 ? true : false,
         outDir: '',
         declaration: true,
         // ng compiler

package/src/generators/application/application.js

@@ -4,16 +4,16 @@ 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 convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 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 validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function applicationGenerator(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'application');
+    (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'application');
     const isRspack = schema.bundler === 'rspack';
     if (isRspack) {
         schema.bundler = 'webpack';

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

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAiIpD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAiIpD;AAED,eAAe,IAAI,CAAC"}

package/src/generators/host/host.js

@@ -5,17 +5,17 @@ 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 convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
 const remote_1 = tslib_1.__importDefault(require("../remote/remote"));
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-const lib_1 = require("./lib");
 const assert_mf_utils_1 = require("../utils/assert-mf-utils");
-const convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
+const validations_1 = require("../utils/validations");
+const lib_1 = require("./lib");
 async function host(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'host');
+    (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'host');
     // TODO: Replace with Rspack when confidence is high enough
     schema.bundler ??= 'webpack';
     const isRspack = schema.bundler === 'rspack';

package/src/generators/init/init.js

@@ -3,11 +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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
+const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 async function angularInitGenerator(tree, options) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'init');
+    (0, validations_1.assertNotUsingTsSolutionSetup)(tree, '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

@@ -6,7 +6,6 @@ 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 add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
@@ -15,6 +14,7 @@ const add_jest_1 = require("../utils/add-jest");
 const add_vitest_1 = require("../utils/add-vitest");
 const dependencies_1 = require("../utils/dependencies");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
+const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
 const add_module_1 = require("./lib/add-module");
 const add_project_1 = require("./lib/add-project");
@@ -25,7 +25,7 @@ const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
 const update_tsconfig_files_1 = require("./lib/update-tsconfig-files");
 async function libraryGenerator(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'library');
+    (0, validations_1.assertNotUsingTsSolutionSetup)(tree, '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/remote/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}

package/src/generators/remote/remote.js

@@ -4,17 +4,17 @@ exports.remote = remote;
 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 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 convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-const lib_1 = require("./lib");
 const assert_mf_utils_1 = require("../utils/assert-mf-utils");
-const convert_to_rspack_1 = tslib_1.__importDefault(require("../convert-to-rspack/convert-to-rspack"));
+const validations_1 = require("../utils/validations");
+const lib_1 = require("./lib");
 async function remote(tree, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'angular', 'remote');
+    (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'remote');
     // TODO: Replace with Rspack when confidence is high enough
     schema.bundler ??= 'webpack';
     const isRspack = schema.bundler === 'rspack';

package/src/generators/utils/validations.d.ts

@@ -1,4 +1,5 @@
-import type { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare function validateProject(tree: Tree, projectName: string): void;
 export declare function validateClassName(className: string): void;
+export declare function assertNotUsingTsSolutionSetup(tree: Tree, generatorName: string): void;
 //# sourceMappingURL=validations.d.ts.map

package/src/generators/utils/validations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/validations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAQrE;AASD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAIzD"}
+{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/validations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAG5D,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAQrE;AASD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAIzD;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,MAAM,GACpB,IAAI,CAuBN"}

package/src/generators/utils/validations.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateProject = validateProject;
 exports.validateClassName = validateClassName;
+exports.assertNotUsingTsSolutionSetup = assertNotUsingTsSolutionSetup;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function validateProject(tree, projectName) {
     const projects = (0, devkit_1.getProjects)(tree);
     if (!projects.has(projectName)) {
@@ -18,3 +20,20 @@ function validateClassName(className) {
         throw new Error(`Class name "${className}" is invalid.`);
     }
 }
+function assertNotUsingTsSolutionSetup(tree, generatorName) {
+    if (process.env.NX_IGNORE_UNSUPPORTED_TS_SETUP === 'true' ||
+        !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+        return;
+    }
+    const artifactString = generatorName === 'init'
+        ? `"@nx/angular" plugin`
+        : `"@nx/angular:${generatorName}" generator`;
+    devkit_1.output.error({
+        title: `The ${artifactString} doesn't support the existing TypeScript setup`,
+        bodyLines: [
+            `The Angular framework doesn't support a TypeScript setup with project references. See https://github.com/angular/angular/issues/37276 for more details.`,
+            `You can ignore this error, at your own risk, by setting the "NX_IGNORE_UNSUPPORTED_TS_SETUP" environment variable to "true".`,
+        ],
+    });
+    throw new Error(`The ${artifactString} doesn't support the existing TypeScript setup. See the error above.`);
+}