@nx/angular 22.7.0-beta.11 → 22.7.0-beta.13

package/package.json

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

package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js

@@ -8,7 +8,7 @@ function addPathMapping(tree, options) {
         const c = json.compilerOptions;
         c.paths = c.paths || {};
         c.paths[options.secondaryEntryPoint] = [
-            `${options.libraryProject.root}/${options.name}/src/index.ts`,
+            `./${options.libraryProject.root}/${options.name}/src/index.ts`,
         ];
         return json;
     });

package/src/generators/library-secondary-entry-point/lib/update-tsconfig-included-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig-included-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/update-tsconfig-included-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CA8BN"}
+{"version":3,"file":"update-tsconfig-included-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/update-tsconfig-included-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAE5D,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAwCN"}

package/src/generators/library-secondary-entry-point/lib/update-tsconfig-included-files.js

@@ -13,12 +13,25 @@ function updateTsConfigIncludedFiles(tree, options) {
         // ignore if the library has a custom tsconfig setup
         return;
     }
+    const entryPointPrefix = `${options.name}/`;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
         if (json.include?.length) {
-            json.include = json.include.map((path) => path.replace(/^(?:\.\/)?src\//, ''));
+            const newIncludes = [];
+            for (const pattern of json.include) {
+                if (pattern.includes('*')) {
+                    newIncludes.push(`${entryPointPrefix}${pattern}`);
+                }
+            }
+            json.include = [...json.include, ...newIncludes];
         }
         if (json.exclude?.length) {
-            json.exclude = json.exclude.map((path) => path.replace(/^(?:\.\/)?src\//, ''));
+            const newExcludes = [];
+            for (const pattern of json.exclude) {
+                if (pattern.includes('*')) {
+                    newExcludes.push(`${entryPointPrefix}${pattern}`);
+                }
+            }
+            json.exclude = [...json.exclude, ...newExcludes];
         }
         return json;
     });

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-eslint-lint.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,yBAA0B,SAAQ,eAAe;IAC5D,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,mBAAmB,CAAS;gBAGlC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,MAAM;IAYP,OAAO,IAAI,IAAI;YA8BV,yBAAyB;IA8DvC,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,kCAAkC;CAiB3C"}
+{"version":3,"file":"angular-eslint-lint.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,IAAI,EACL,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,yBAA0B,SAAQ,eAAe;IAC5D,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,mBAAmB,CAAS;gBAGlC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,MAAM;IAYP,OAAO,IAAI,IAAI;YA8BV,yBAAyB;IAuDvC,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,kCAAkC;CAiB3C"}

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularEslintLintMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
@@ -61,12 +60,6 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
                     this.logger.warn(`The lint file pattern "${pattern}" specified in the "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
                     return pattern;
                 });
-        if (existEsLintConfigPath) {
-            const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
-            if ((0, eslint_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
-                target.options.hasTypeAwareRules = true;
-            }
-        }
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
             ...this.projectConfig,
         });

package/src/generators/ng-add/utilities/workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,IAAI,EAAE,MAAM,YAAY,CAAC;AAqB5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAG1D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAgBlD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,IAAI,CAwDN;AA6BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAO9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAanD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CA6BlD;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,oBAAoB,EAAE,GAAG,GAAG,SAAS,EACrC,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAiBtD;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAStD;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAAE,GAC3B,0BAA0B,CA8B5B;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CA2BlE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAKlD;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAO9D"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,IAAI,EAAE,MAAM,YAAY,CAAC;AAqB5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAG1D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAgBlD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,IAAI,CAwDN;AA6BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAO9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAYnD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CA6BlD;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,oBAAoB,EAAE,GAAG,GAAG,SAAS,EACrC,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAiBtD;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAStD;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,eAAe,EAAE,GAC3B,0BAA0B,CA8B5B;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CA2BlE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAKlD;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAO9D"}

package/src/generators/ng-add/utilities/workspace.js

@@ -123,7 +123,6 @@ function updateWorkspaceConfigDefaults(tree) {
 function updateRootTsConfig(tree) {
     const tsconfig = (0, devkit_1.readJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree));
     tsconfig.compilerOptions.paths ??= {};
-    tsconfig.compilerOptions.baseUrl = '.';
     tsconfig.compilerOptions.rootDir = '.';
     tsconfig.exclude = Array.from(new Set([...(tsconfig.exclude ?? []), 'node_modules', 'tmp']));
     (0, devkit_1.writeJson)(tree, 'tsconfig.base.json', tsconfig);