@nx/angular 23.0.0-beta.2 → 23.0.0-beta.21

package/src/generators/utils/add-vitest.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitestAngular = addVitestAngular;
 exports.addVitestAnalog = addVitestAnalog;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
@@ -49,40 +50,53 @@ async function addVitestAngular(tree, options) {
     project.targets ??= {};
     project.targets.test = { executor, options: { watch: false } };
     (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[executor] ??= {
-        cache: true,
-        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? ['default', '^production']
-            : ['default', '^default'],
-    };
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((entry) => entry.executor === executor &&
+        entry.target === undefined &&
+        entry.projects === undefined &&
+        entry.plugin === undefined);
+    if (!existing) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor,
+            cache: true,
+            inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
+                ? ['default', '^production']
+                : ['default', '^default'],
+        });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
     configureTypeScriptForVitest(tree, options.projectRoot);
     addVitestScreenshotsToGitIgnore(tree);
-    if (!options.skipPackageJson) {
-        const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
-        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
-            pkgVersions.angularDevkitVersion;
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@angular/build': angularDevkitVersion,
-            // @angular/build uses rolldown which injects @oxc-project/runtime
-            // helpers at transform time but doesn't declare it as a dependency
-            '@oxc-project/runtime': versions_1.oxcProjectRuntimeVersion,
-            jsdom: pkgVersions.jsdomVersion,
-            vitest: pkgVersions.vitestVersion,
-        }, undefined, true);
+    if (options.skipPackageJson) {
+        return () => { };
     }
+    const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
+    const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@angular/build': angularDevkitVersion,
+        jsdom: pkgVersions.jsdomVersion,
+        vitest: pkgVersions.vitestVersion,
+    }, undefined, true);
 }
 async function addVitestAnalog(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const tasks = [];
     if (!options.skipPackageJson) {
         const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
             (0, version_utils_1.versions)(tree).angularDevkitVersion;
         const devDependencies = {
             '@angular/build': angularDevkitVersion,
-            // @angular/build uses rolldown which injects @oxc-project/runtime
-            // helpers at transform time but doesn't declare it as a dependency
+            // `@analogjs/vite-plugin-angular` (wired in by `@nx/vitest`'s
+            // configurationGenerator for `uiFramework: 'angular'`) registers
+            // an `angularVitestPlugin` whose `transform` hook downlevels
+            // `@angular/*` fesm2022 modules via
+            // `vite.transformWithOxc({ target: 'es2016', … })` so Zone.js
+            // `fakeAsync` can intercept async/await. The lowered code emits
+            // external `@oxc-project/runtime/helpers/*` imports (oxc default
+            // `HelperMode = 'Runtime'`). Nothing in the upstream chain
+            // (analogjs, @angular/core, vite, rolldown) declares the runtime
+            // in a way that's resolvable from the consumer's workspace, so
+            // it must be added here.
             '@oxc-project/runtime': versions_1.oxcProjectRuntimeVersion,
         };
         // Add compatible vitest/jsdom versions BEFORE calling configurationGenerator
@@ -92,11 +106,11 @@ async function addVitestAnalog(tree, options) {
             devDependencies['vitest'] = pkgVersions.vitestVersion;
             devDependencies['jsdom'] = pkgVersions.jsdomVersion;
         }
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true));
     }
     (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
     const { configurationGenerator } = await Promise.resolve().then(() => __importStar(require('@nx/vitest/generators')));
-    await configurationGenerator(tree, {
+    tasks.push(await configurationGenerator(tree, {
         project: options.name,
         uiFramework: 'angular',
         testEnvironment: 'jsdom',
@@ -105,7 +119,8 @@ async function addVitestAnalog(tree, options) {
         skipFormat: options.skipFormat,
         skipPackageJson: options.skipPackageJson,
         zoneless: options.zoneless,
-    });
+    }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function validateVitestVersion(tree) {
     let installedVitestVersion = null;

package/src/generators/utils/app-components-info.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppComponentInfo = getAppComponentInfo;
 exports.getNxWelcomeComponentInfo = getNxWelcomeComponentInfo;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
 const version_utils_1 = require("./version-utils");
 function getAppComponentInfo(tree, componentFileSuffix, project) {
@@ -14,7 +14,7 @@ function getNxWelcomeComponentInfo(tree, componentFileSuffix, project) {
 }
 // TODO(leo): follow this up and improve it by using static analysis
 function getComponentInfo(tree, component, componentFileSuffix, project) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     let componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.component.ts`);
     if (!tree.exists(componentPath)) {
         componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.ts`);

package/src/generators/utils/find-module.js

@@ -4,7 +4,7 @@ exports.findModule = findModule;
 exports.addToNgModule = addToNgModule;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const js_1 = require("@nx/js");
 const insert_ngmodule_import_1 = require("./insert-ngmodule-import");
 let tsModule;
@@ -52,7 +52,7 @@ function addToNgModule(tree, path, modulePath, name, className, fileName, ngModu
 // // check if exported in the public api
 isFlat = true, isExported = false) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let relativePath = `${(0, devkit_1.joinPathFragments)(path.replace((0, path_1.dirname)(modulePath), ''), !isFlat ? name : '', `${fileName}`)}`;
     relativePath = relativePath.startsWith('/')

package/src/generators/utils/insert-ngmodule-import.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertNgModuleProperty = insertNgModuleProperty;
 exports.insertNgModuleImport = insertNgModuleImport;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function insertNgModuleProperty(tree, modulePath, name, property) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const contents = tree.read(modulePath).toString('utf-8');
     const sourceFile = tsModule.createSourceFile(modulePath, contents, tsModule.ScriptTarget.ESNext);
@@ -87,7 +87,7 @@ function insertNgModuleImport(tree, modulePath, importName) {
 }
 function findImport(sourceFile, importPath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const importStatements = sourceFile.statements.filter(tsModule.isImportDeclaration);
     return importStatements.find((statement) => statement.moduleSpecifier
@@ -97,7 +97,7 @@ function findImport(sourceFile, importPath) {
 }
 function getNamedImport(coreImport, importName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (!tsModule.isNamedImports(coreImport.importClause.namedBindings)) {
         throw new Error(`The import from ${coreImport.moduleSpecifier} does not have named imports.`);
@@ -110,7 +110,7 @@ function getNamedImport(coreImport, importName) {
 }
 function findDecoratedClass(sourceFile, ngModuleName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const classDeclarations = sourceFile.statements.filter(tsModule.isClassDeclaration);
     const { getDecorators } = getTsEsLintTypeUtils();
@@ -126,7 +126,7 @@ function findDecoratedClass(sourceFile, ngModuleName) {
 }
 function findPropertyAssignment(ngModuleOptions, propertyName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     return ngModuleOptions.properties.find((property) => tsModule.isPropertyAssignment(property) &&
         tsModule.isIdentifier(property.name) &&

package/src/generators/utils/storybook-ast/component-info.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentsInfo = getComponentsInfo;
 exports.getStandaloneComponentsInfo = getStandaloneComponentsInfo;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const module_info_1 = require("./module-info");
@@ -19,7 +19,7 @@ function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
             return undefined;
         }
         if (!tsModule) {
-            tsModule = (0, ensure_typescript_1.ensureTypescript)();
+            tsModule = (0, internal_1.ensureTypescript)();
         }
         const imports = file.statements.filter((statement) => statement.kind === tsModule.SyntaxKind.ImportDeclaration);
         const componentsInfo = moduleDeclarations.map((maybeComponentName) => tryGetComponentInfo(tree, entryPoint, file, imports, moduleFilePath, maybeComponentName));
@@ -56,7 +56,7 @@ function getStandaloneComponentsInfo(tree, entryPoint) {
 }
 function getStandaloneComponents(tree, filePath) {
     if (!tsqueryAst) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        (0, internal_1.ensureTypescript)();
         const tsqueryModule = require('@phenomnomnominal/tsquery');
         tsqueryAst = tsqueryModule.ast;
         tsqueryQuery = tsqueryModule.query;
@@ -70,7 +70,7 @@ function getStandaloneComponents(tree, filePath) {
 }
 function getComponentImportPath(componentName, imports) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const componentImportStatement = imports.find((statement) => {
         const namedImports = statement
@@ -98,7 +98,7 @@ function getComponentImportPath(componentName, imports) {
 function tryGetComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePath, symbolName) {
     try {
         if (!tsqueryQuery) {
-            (0, ensure_typescript_1.ensureTypescript)();
+            (0, internal_1.ensureTypescript)();
             const tsqueryModule = require('@phenomnomnominal/tsquery');
             tsqueryAst = tsqueryModule.ast;
             tsqueryQuery = tsqueryModule.query;

package/src/generators/utils/storybook-ast/module-info.js

@@ -6,7 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function getModuleDeclarations(file, moduleFilePath, projectName) {
     const ngModuleDecorator = getNgModuleDecorator(file, moduleFilePath);
@@ -36,7 +36,7 @@ function getModuleFilePaths(tree, entryPoint) {
     return moduleFilePaths;
 }
 function hasNgModule(tree, filePath) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const fileContent = tree.read(filePath, 'utf-8');
     const sourceFile = ast(fileContent);
@@ -45,7 +45,7 @@ function hasNgModule(tree, filePath) {
 }
 function getDeclaredComponentNodes(declarationsArray) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const cmps = declarationsArray
         .getChildren()
@@ -88,7 +88,7 @@ function flatten(arr) {
 }
 function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePath, projectName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let declarationArray = declarationsPropertyAssignment
         .getChildren()
@@ -113,7 +113,7 @@ function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePa
  */
 function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssignment) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let declarationsVariable = declarationsPropertyAssignment
         .getChildren()
@@ -137,7 +137,7 @@ function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssig
  */
 function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const propertyAccessExpression = declarationsPropertyAssignment
         .getChildren()
@@ -169,7 +169,7 @@ function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignme
 }
 function getClassDeclaration(className, file) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const classDeclaration = (0, js_1.findNodes)(file, tsModule.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
         .getChildren()
@@ -179,7 +179,7 @@ function getClassDeclaration(className, file) {
 }
 function getVariableDeclaration(variableName, file) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const variableDeclaration = (0, js_1.findNodes)(file, tsModule.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
         .getChildren()
@@ -189,7 +189,7 @@ function getVariableDeclaration(variableName, file) {
 }
 function getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const syntaxList = ngModuleDecorator.getChildren().find((node) => {
         return node.kind === tsModule.SyntaxKind.SyntaxList;

package/src/generators/utils/storybook-ast/storybook-inputs.js

@@ -6,11 +6,11 @@ exports.getArgType = getArgType;
 exports.getArgsDefaultValue = getArgsDefaultValue;
 const js_1 = require("@nx/js");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function getInputPropertyDeclarations(tree, path) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
     const decorators = (0, js_1.getSourceNodes)(file).filter((node) => node.kind === tsModule.SyntaxKind.Decorator);
@@ -20,7 +20,7 @@ function getInputPropertyDeclarations(tree, path) {
 }
 function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsDefaultValue, useDecoratorName = true) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const props = getInputPropertyDeclarations(tree, componentPath).map((node) => {
         const decoratorContent = (0, js_1.findNodes)((0, js_1.findNodes)(node, tsModule.SyntaxKind.Decorator).find((n) => n.getText().startsWith('@Input')), tsModule.SyntaxKind.StringLiteral);
@@ -41,7 +41,7 @@ function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsD
 }
 function getArgType(property) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (property.type) {
         const typeName = property.type.getText();

package/src/generators/utils/testing.js

@@ -7,7 +7,7 @@ exports.generateTestLibrary = generateTestLibrary;
 exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
 const devkit_1 = require("@nx/devkit");
 const testing_1 = require("@nx/devkit/testing");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const component_1 = require("../component/component");
@@ -226,7 +226,7 @@ export class StaticMemberDeclarationsModule {
 function generateModule(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (options.path === undefined) {
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+        const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
         const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
         options.path = `${sourceRoot}/${projectDirName}`;
     }

package/src/generators/utils/tsconfig-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefinedCompilerOption = getDefinedCompilerOption;
 exports.readCompilerOptionsFromTsConfig = readCompilerOptionsFromTsConfig;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
 /**
  * Gets the resolved value of a specific compiler option from the TypeScript configuration hierarchy.
@@ -17,7 +17,7 @@ function getDefinedCompilerOption(tree, tsConfigPath, optionName) {
     return compilerOptions[optionName];
 }
 function readCompilerOptionsFromTsConfig(tree, tsConfigPath) {
-    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const ts = (0, internal_1.ensureTypescript)();
     const tsSysFromTree = {
         ...ts.sys,
         readDirectory: () => [],

package/src/generators/utils/validations.js

@@ -4,7 +4,7 @@ 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");
+const internal_1 = require("@nx/js/internal");
 function validateProject(tree, projectName) {
     const projects = (0, devkit_1.getProjects)(tree);
     if (!projects.has(projectName)) {
@@ -22,7 +22,7 @@ function validateClassName(className) {
 }
 function assertNotUsingTsSolutionSetup(tree, generatorName) {
     if (process.env.NX_IGNORE_UNSUPPORTED_TS_SETUP === 'true' ||
-        !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+        !(0, internal_1.isUsingTsSolutionSetup)(tree)) {
         return;
     }
     const artifactString = generatorName === 'init'

package/src/generators/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE5E,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,KAAK,UAAU,EAChB,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAO1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,qBAAqB,CAAC;AAC5D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,gBAAgB,EACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IAAE,sBAAsB,EAAE,CAAC,CAAA;CAAE,GACrC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAoB3B;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAQ1D;AAID,KAAK,SAAS,CAAC,GAAG,SAAS,SAAS,GAAG,EAAE,EAAE,MAAM,IAAI,GAAG,SAAS,SAAS;IACxE,MAAM,IAAI;IACV,GAAG,MAAM,IAAI;CACd,GACG,IAAI,SAAS,MAAM,GACjB,CAAC,IAAI,CAAC,GACN,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GACpC,EAAE,CAAC;AACP,KAAK,eAAe,CAAC,IAAI,SAAS,gBAAgB,IAAI,OAAO,CAC3D,gBAAgB,EAChB,SAAS,CAAC,OAAO,iBAAiB,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAClD,CAAC;AACF,KAAK,oBAAoB,CAAC,IAAI,SAAS,gBAAgB,IACrD,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAG5E,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,iBAAiB,EACjB,KAAK,UAAU,EAChB,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAO1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,qBAAqB,CAAC;AAC5D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,gBAAgB,EACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE;IAAE,sBAAsB,EAAE,CAAC,CAAA;CAAE,GACrC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAoB3B;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAQ1D;AAID,KAAK,SAAS,CAAC,GAAG,SAAS,SAAS,GAAG,EAAE,EAAE,MAAM,IAAI,GAAG,SAAS,SAAS;IACxE,MAAM,IAAI;IACV,GAAG,MAAM,IAAI;CACd,GACG,IAAI,SAAS,MAAM,GACjB,CAAC,IAAI,CAAC,GACN,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GACpC,EAAE,CAAC;AACP,KAAK,eAAe,CAAC,IAAI,SAAS,gBAAgB,IAAI,OAAO,CAC3D,gBAAgB,EAChB,SAAS,CAAC,OAAO,iBAAiB,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAClD,CAAC;AACF,KAAK,oBAAoB,CAAC,IAAI,SAAS,gBAAgB,IACrD,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC"}

package/src/generators/utils/version-utils.js

@@ -9,6 +9,7 @@ exports.versions = versions;
 exports.getAngularRspackVersion = getAngularRspackVersion;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 const latestVersions = tslib_1.__importStar(require("../../utils/versions"));
@@ -17,13 +18,7 @@ function getInstalledAngularDevkitVersion(tree) {
     return ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular-devkit/build-angular') ?? (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/build'));
 }
 function getInstalledAngularVersion(tree) {
-    const installedAngularVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/core');
-    if (!installedAngularVersion ||
-        installedAngularVersion === 'latest' ||
-        installedAngularVersion === 'next') {
-        return (0, semver_1.clean)(versions_1.angularVersion) ?? (0, semver_1.coerce)(versions_1.angularVersion).version;
-    }
-    return ((0, semver_1.clean)(installedAngularVersion) ?? (0, semver_1.coerce)(installedAngularVersion).version);
+    return (0, internal_1.getDeclaredPackageVersion)(tree, '@angular/core', versions_1.angularVersion);
 }
 function getInstalledAngularMajorVersion(tree) {
     return (0, semver_1.major)(getInstalledAngularVersion(tree));

package/src/generators/web-worker/web-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-worker.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/web-worker/web-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAWvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,yBAAyB,GACpC,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"web-worker.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/web-worker/web-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAYvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,yBAAyB,GACpC,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/web-worker/web-worker.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webWorkerGenerator = webWorkerGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const lib_1 = require("./lib");
 const js_1 = require("@nx/js");
 async function webWorkerGenerator(tree, rawOptions) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
     const workerNames = (0, devkit_1.names)(options.name);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-depends-on-for-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,IAAI,EAAgB,MAAM,YAAY,CAAC;AAI9E,yBAA+B,IAAI,EAAE,IAAI,iBAqExC"}
+{"version":3,"file":"ensure-depends-on-for-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-19-6-1/ensure-depends-on-for-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,IAAI,EAAgB,MAAM,YAAY,CAAC;AAQ9E,yBAA+B,IAAI,EAAE,IAAI,iBAyExC"}

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function default_1(tree) {
     let usesModuleFederation = false;
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options) => {
         const webpackConfig = options.webpackConfig;
         if (!webpackConfig) {
             return;
@@ -18,34 +18,41 @@ async function default_1(tree) {
     if (!usesModuleFederation) {
         return;
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const nxMFDevRemotesEnvVar = 'NX_MF_DEV_REMOTES';
-    const inputs = [
+    const webpackExecutor = '@nx/angular:webpack-browser';
+    const defaultInputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
         { env: nxMFDevRemotesEnvVar },
     ];
-    if (!nxJson.targetDefaults ||
-        !nxJson.targetDefaults?.['@nx/angular:webpack-browser']) {
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['@nx/angular:webpack-browser'] = {
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === webpackExecutor &&
+        e.target === undefined &&
+        e.projects === undefined &&
+        e.plugin === undefined);
+    if (!existing) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: webpackExecutor,
             cache: true,
-            inputs,
+            inputs: defaultInputs,
             dependsOn: ['^build'],
-        };
+        });
     }
     else {
-        nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn ??= [];
-        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.includes('^build')) {
-            nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.push('^build');
-        }
-        nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs ??= [];
-        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
-            nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.push({
-                env: nxMFDevRemotesEnvVar,
-            });
+        const dependsOn = [...(existing.dependsOn ?? [])];
+        if (!dependsOn.includes('^build'))
+            dependsOn.push('^build');
+        const inputs = [...(existing.inputs ?? [])];
+        if (!inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
+            inputs.push({ env: nxMFDevRemotesEnvVar });
         }
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: webpackExecutor,
+            ...(existing.cache !== undefined ? { cache: existing.cache } : {}),
+            inputs,
+            dependsOn,
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 const preferStandaloneRule = '@angular-eslint/prefer-standalone';
 async function default_1(tree) {
@@ -11,20 +11,20 @@ async function default_1(tree) {
     ]);
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
             // the @angular-eslint/prefer-standalone rule is set in an override, skip
             continue;
         }
         const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
             Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
         const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
             // there is an override containing an Angular ESLint rule
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -32,9 +32,9 @@ async function default_1(tree) {
                 return o;
             });
         }
-        else if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+        else if ((0, internal_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
             // there is an override for just *.ts files
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -44,7 +44,7 @@ async function default_1(tree) {
         }
         else {
             // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, root, {
+            (0, internal_1.addOverrideToLintConfig)(tree, root, {
                 files: ['*.ts'],
                 rules: {
                     [preferStandaloneRule]: 'off',

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AASpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}
+{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAQpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateWithMfImport;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const versions_1 = require("../../utils/versions");
 const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/angular/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/angular/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/angular'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });