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

package/src/generators/ngrx-feature-store/lib/add-exports-barrel.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addExportsToBarrel = addExportsToBarrel;
 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 js_1 = require("@nx/js");
 let tsModule;
 function addExportsToBarrel(tree, options) {
@@ -11,7 +11,7 @@ function addExportsToBarrel(tree, options) {
         return;
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const indexSourceText = tree.read(indexFilePath, 'utf-8');
     let sourceFile = tsModule.createSourceFile(indexFilePath, indexSourceText, tsModule.ScriptTarget.Latest, true);

package/src/generators/ngrx-feature-store/lib/add-imports.js

@@ -4,7 +4,7 @@ exports.addImportsToModule = addImportsToModule;
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-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");
 let tsModule;
 function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideStoreForFeature, storeForFeature) {
@@ -45,7 +45,7 @@ function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile,
 }
 function addImportsToModule(tree, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const parentPath = options.parent;
     const sourceText = tree.read(parentPath, 'utf-8');

package/src/generators/ngrx-root-store/lib/add-imports.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addImportsToModule = addImportsToModule;
 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");
 const js_1 = require("@nx/js");
 let tsModule;
 function addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot) {
@@ -58,7 +58,7 @@ function addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addI
 }
 function addImportsToModule(tree, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const parentPath = options.parent;
     const sourceText = tree.read(parentPath, 'utf-8');

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -5,7 +5,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
@@ -17,7 +17,7 @@ function normalizeOptions(tree, options) {
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project, tree);
     const appConfigPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.config.ts');
     let appMainPath = project.targets.build.options.main ?? project.targets.build.options.browser;
     if (!appMainPath) {

package/src/generators/remote/lib/update-ssr-setup.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSsrSetup = updateSsrSetup;
 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 path_1 = require("path");
 const semver_1 = require("semver");
 const versions_1 = require("../../../utils/versions");
@@ -11,7 +11,7 @@ const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, zoneless, skipPackageJson, }) {
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     tree.rename((0, devkit_1.joinPathFragments)(sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(sourceRoot, 'bootstrap.server.ts'));
     const pathToServerEntry = (0, devkit_1.joinPathFragments)(sourceRoot, 'server.ts');
     tree.write(pathToServerEntry, `import('./main.server');`);

package/src/generators/remote/remote.js

@@ -4,7 +4,7 @@ exports.remote = remote;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_2 = require("@nx/js/internal");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
@@ -73,7 +73,7 @@ async function remote(tree, schema) {
     const installTasks = [appInstallTask];
     if (!options.skipPackageJson) {
         const installSwcHelpersTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@swc/helpers': versions_1.swcHelpersVersion,
+            '@swc/helpers': internal_2.swcHelpersVersion,
         });
         installTasks.push(installSwcHelpersTask);
     }

package/src/generators/scam/lib/convert-component-to-scam.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertComponentToScam = convertComponentToScam;
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function convertComponentToScam(tree, options) {
     if (!tree.exists(options.filePath)) {
         throw new Error(`Couldn't find component at path ${options.filePath} to add SCAM setup.`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (options.inlineScam) {
         const currentComponentContents = tree.read(options.filePath, 'utf-8');

package/src/generators/scam-directive/lib/convert-directive-to-scam.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertDirectiveToScam = convertDirectiveToScam;
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function convertDirectiveToScam(tree, options) {
     if (!tree.exists(options.filePath)) {
         throw new Error(`Couldn't find directive at path ${options.filePath} to add SCAM setup.`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (options.inlineScam) {
         const currentDirectiveContents = tree.read(options.filePath, 'utf-8');

package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPipeToScam = convertPipeToScam;
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function convertPipeToScam(tree, options) {
     if (!tree.exists(options.filePath)) {
         throw new Error(`Couldn't find pipe at path ${options.filePath} to add SCAM setup.`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (options.inlineScam) {
         const currentPipeContents = tree.read(options.filePath, 'utf-8');

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;
 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 addCypressOnErrorWorkaround(tree, schema) {
     if (!schema.e2eProjectName) {
         return;
@@ -44,7 +44,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     }
     return true;
   });`;
-    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
+    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
     const commandsContent = tree.exists(pathToCommandsFile)
         ? tree.read(pathToCommandsFile, 'utf-8')
         : '';

package/src/generators/setup-mf/lib/add-remote-to-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AASpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,WAOtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA4BpE"}
+{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,WAOtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA4BpE"}

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -4,8 +4,7 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
 exports.addRemoteToHost = addRemoteToHost;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 let tsModule;
 function checkIsCommaNeeded(mfRemoteText) {
@@ -26,7 +25,7 @@ function addRemoteToHost(tree, options) {
             addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
         }
         else if (hostFederationType === 'dynamic') {
-            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, ts_solution_setup_1.getProjectSourceRoot)(hostProject, tree));
+            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, internal_1.getProjectSourceRoot)(hostProject, tree));
         }
         addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
@@ -40,7 +39,7 @@ function getDynamicManifestFile(tree, project) {
     // at the old path.
     return [
         (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json'),
-        (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
+        (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
     ].find((path) => tree.exists(path));
 }
 function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
@@ -73,10 +72,10 @@ function addRemoteToDynamicHost(tree, options, pathToMfManifest, hostSourceRoot)
 }
 function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(hostAppConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(hostAppConfig, tree);
     const pathToHostRootRouting = `${sourceRoot}/app/app.routes.ts`;
     if (!tree.exists(pathToHostRootRouting)) {
         return;

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;
 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 removeDeadCodeFromRemote(tree, options) {
     const projectName = options.appName;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const { appComponentInfo, nxWelcomeComponentInfo, entryModuleFileName } = options;
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
         const pathToComponentStyle = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);

package/src/generators/setup-ssr/lib/add-hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}
+{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHydration = addHydration;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 let tsModule;
 let tsquery;
 function addHydration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
     let pathToClientConfigFile;

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServerFile = addServerFile;
 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 path_1 = require("path");
 const zoneless_1 = require("../../../utils/zoneless");
 const version_utils_1 = require("../../utils/version-utils");
@@ -27,7 +27,7 @@ function addServerFile(tree, options) {
                 (options.serverRouting ? '' : '-common-engine')
             : 'server-builder', 'server');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const zoneless = (0, zoneless_1.isZonelessApp)(project);
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,

package/src/generators/setup-ssr/lib/generate-files.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 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 path_1 = require("path");
 const semver_1 = require("semver");
 const app_components_info_1 = require("../../utils/app-components-info");
@@ -29,7 +29,7 @@ function generateSSRFiles(tree, options) {
             ? 'application-builder'
             : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
         ? ((0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version)

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 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 tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const version_utils_1 = require("../../utils/version-utils");
@@ -75,7 +75,7 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         });
         // read the parsed compiler options from tsconfig.server.json
         const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsconfigServerPath);
-        const ts = (0, ensure_typescript_1.ensureTypescript)();
+        const ts = (0, internal_1.ensureTypescript)();
         if (compilerOptions.module === ts.ModuleKind.Preserve &&
             compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
             return;

package/src/generators/setup-ssr/lib/update-project-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAmFpC"}
+{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAoFpC"}

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
 exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 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/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -28,7 +29,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             }
         }
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project, tree);
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
@@ -55,7 +56,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
             configurations[key] = getServerOptions(options);
         }
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
@@ -103,16 +104,27 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
         defaultConfiguration: 'production',
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
         nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('server');
     }
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults.server ??= {};
-    nxJson.targetDefaults.server.cache ??= true;
+    const existing = findServerDefault(nxJson.targetDefaults);
+    if (!existing || existing.cache === undefined) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'server', cache: true });
+    }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
+function findServerDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'server' &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td['server'];
+}
 function getServerOptions(options = {}) {
     return {
         buildOptimizer: options?.buildOptimizer,

package/src/generators/utils/add-mf-env-to-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAEjE,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,QA4BvD"}
+{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAMjE,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,QAsCvD"}

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -2,29 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 function addMfEnvToTargetDefaultInputs(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const webpackExecutor = '@nx/angular:webpack-browser';
     const mfEnvVar = 'NX_MF_DEV_REMOTES';
-    const inputs = [
+    const defaultInputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
     ];
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[webpackExecutor] ??= {};
-    nxJson.targetDefaults[webpackExecutor].inputs ??= inputs;
-    nxJson.targetDefaults[webpackExecutor].dependsOn ??= ['^build'];
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === webpackExecutor &&
+        e.target === undefined &&
+        e.projects === undefined &&
+        e.plugin === undefined);
+    const inputs = [...(existing?.inputs ?? defaultInputs)];
     let mfEnvVarExists = false;
-    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+    for (const input of inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {
             mfEnvVarExists = true;
             break;
         }
     }
     if (!mfEnvVarExists) {
-        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+        inputs.push({ env: mfEnvVar });
     }
-    nxJson.targetDefaults[webpackExecutor].cache = true;
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+        executor: webpackExecutor,
+        cache: true,
+        inputs,
+        dependsOn: existing?.dependsOn ?? ['^build'],
+    });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/src/generators/utils/add-vitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAUpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAsCf"}
+{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAcpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuDf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAsCf"}

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,15 +50,21 @@ 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) {

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) &&