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

package/src/executors/delegate-build/delegate-build.impl.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delegateBuildExecutor = delegateBuildExecutor;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 async function* delegateBuildExecutor(options, context) {
-    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-    options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
+    const { target, dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+    options.tsConfig = (0, internal_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
     const { buildTarget, ...targetOptions } = options;
     const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context);
     yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);

package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngPackagrLiteExecutor = void 0;
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const package_impl_1 = require("../package/package.impl");
 const typescript_1 = require("../utilities/typescript");
@@ -10,7 +10,7 @@ async function initializeNgPackgrLite(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)();
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, internal_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }

package/src/executors/package/package.impl.d.ts

@@ -1,5 +1,5 @@
 import type { ExecutorContext } from '@nx/devkit';
-import { type DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type DependentBuildableProjectNode } from '@nx/js/internal';
 import type { NgPackagr } from 'ng-packagr';
 import type { BuildAngularLibraryExecutorOptions } from './schema';
 /**

package/src/executors/package/package.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM5C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AA4BnE;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,CACnB,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,eAAe,EACxB,mBAAmB,EAAE,6BAA6B,EAAE,KACjD,OAAO,CAAC,SAAS,CAAC,IAGrB,SAAS,kCAAkC,EAC3C,SAAS,eAAe;;aAgC3B;AAED,eAAO,MAAM,eAAe,YAnCf,kCAAkC,WAClC,eAAe;;YAkC6C,CAAC;AAE1E,eAAe,eAAe,CAAC"}
+{"version":3,"file":"package.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM5C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AA4BnE;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,CACnB,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,eAAe,EACxB,mBAAmB,EAAE,6BAA6B,EAAE,KACjD,OAAO,CAAC,SAAS,CAAC,IAGrB,SAAS,kCAAkC,EAC3C,SAAS,eAAe;;aAgC3B;AAED,eAAO,MAAM,eAAe,YAnCf,kCAAkC,WAClC,eAAe;;YAkC6C,CAAC;AAE1E,eAAe,eAAe,CAAC"}

package/src/executors/package/package.impl.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageExecutor = void 0;
 exports.createLibraryExecutor = createLibraryExecutor;
 const internal_1 = require("@nx/devkit/internal");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -13,7 +13,7 @@ async function initializeNgPackagr(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)();
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, internal_2.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }
@@ -27,7 +27,7 @@ async function initializeNgPackagr(options, context, projectDependencies) {
 function createLibraryExecutor(initializeNgPackagr) {
     return async function* (options, context) {
         options.project ??= (0, path_1.join)(context.projectsConfigurations.projects[context.projectName].root, 'ng-package.json');
-        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        const { dependencies } = (0, internal_2.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (options.watch) {
             return yield* (0, internal_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }

package/src/executors/utilities/buildable-libs.d.ts

@@ -1,5 +1,5 @@
 import { type ExecutorContext } from '@nx/devkit';
-import { type DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type DependentBuildableProjectNode } from '@nx/js/internal';
 export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: ExecutorContext): {
     tsConfigPath: string;
     dependencies: DependentBuildableProjectNode[];

package/src/executors/utilities/buildable-libs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,uCAAuC,CAAC;AAG/C,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,eAAe;;;EA0BzB"}
+{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,eAAe;;;EA0BzB"}

package/src/executors/utilities/buildable-libs.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTmpTsConfigForBuildableLibs = createTmpTsConfigForBuildableLibs;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 function createTmpTsConfigForBuildableLibs(tsConfigPath, context) {
     let dependencies;
-    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
+    const result = (0, internal_1.calculateProjectDependencies)(context.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
     dependencies = result.dependencies;
-    const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
+    const tmpTsConfigPath = (0, internal_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
     const tmpTsConfigPathWithoutWorkspaceRoot = tmpTsConfigPath.replace(context.root, '');
     return { tsConfigPath: tmpTsConfigPathWithoutWorkspaceRoot, dependencies };

package/src/executors/utilities/esbuild-extensions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugins = loadPlugins;
 exports.loadMiddleware = loadMiddleware;
 exports.loadIndexHtmlTransformer = loadIndexHtmlTransformer;
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const module_loader_1 = require("./module-loader");
 async function loadPlugins(plugins, tsConfig) {
     if (!plugins?.length) {

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAalC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}

package/src/generators/application/lib/add-e2e.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
@@ -65,12 +66,9 @@ async function addE2e(tree, options) {
 function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = portOverride ?? 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        (nxJson.targetDefaults?.['serve'].options?.port ||
-            nxJson.targetDefaults?.['serve'].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.['serve'].options?.port ||
-                nxJson.targetDefaults?.['serve'].options?.env?.PORT;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port || serveTargetOptions?.env?.PORT) {
+        e2ePort = serveTargetOptions.port || serveTargetOptions.env.PORT;
     }
     const pm = (0, devkit_1.getPackageManagerCommand)();
     return {

package/src/generators/application/lib/update-tsconfig-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsconfigFiles = updateTsconfigFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
@@ -51,7 +51,7 @@ function updateTsconfigFiles(tree, options) {
         // file. Calling getNeededCompilerOptionOverrides would compare the file
         // against itself and strip options like skipLibCheck that are already set.
         if (tsconfigPath !== rootTsConfigPath) {
-            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
+            json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         }
         return json;
     });
@@ -63,7 +63,7 @@ function updateTsconfigFiles(tree, options) {
                 module: 'commonjs',
                 moduleResolution: 'node10',
             };
-            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
             return json;
         });
     }

package/src/generators/component/lib/component.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportComponentInEntryPoint = exportComponentInEntryPoint;
 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 entry_point_1 = require("../../utils/entry-point");
 const path_1 = require("../../utils/path");
 const module_1 = require("./module");
@@ -45,7 +45,7 @@ function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
     if (!modulePath) {
         return false;
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
     const entryPointContent = tree.read(entryPoint, 'utf-8');

package/src/generators/convert-to-with-mf/lib/check-name-matches.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkOutputNameMatchesProjectName = checkOutputNameMatchesProjectName;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function checkOutputNameMatchesProjectName(sourceFile, projectName) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const OUTPUT_SELECTOR = 'PropertyAssignment:has(Identifier[name=output]) > ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=uniqueName]))';
     const UNIQUENAME_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=uniqueName]) > StringLiteral';

package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkSharedNpmPackagesMatchExpected = checkSharedNpmPackagesMatchExpected;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function checkSharedNpmPackagesMatchExpected(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const SHARE_HELPER_SELECTOR = 'PropertyAssignment:has(Identifier[name=shared]) > CallExpression:has(Identifier[name=share])';
     const SHARED_PACKAGE_CONFIG_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment > ObjectLiteralExpression';

package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isHostRemoteConfig = isHostRemoteConfig;
 exports.getRemotesFromHost = getRemotesFromHost;
 exports.getExposedModulesFromRemote = getExposedModulesFromRemote;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const REMOTES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=remotes]) > ObjectLiteralExpression';
 const EXPOSES_EXPRESSION_SELECTOR = 'PropertyAssignment:has(Identifier[name=exposes]) > ObjectLiteralExpression';
 const PROPERTY_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment';
 function isHostRemoteConfig(sourceFile) {
     let isHost = false;
     let isRemote = false;
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const remotesNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesNodes.length > 0) {
@@ -24,7 +24,7 @@ function isHostRemoteConfig(sourceFile) {
     return result;
 }
 function getRemotesFromHost(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const remotesObjectNodes = query(sourceFile, REMOTES_EXPRESSION_SELECTOR);
     if (remotesObjectNodes.length === 0) {
@@ -47,7 +47,7 @@ function getRemotesFromHost(sourceFile) {
     return remotes;
 }
 function getExposedModulesFromRemote(sourceFile) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { query } = require('@phenomnomnominal/tsquery');
     const exposesObjectNodes = query(sourceFile, EXPOSES_EXPRESSION_SELECTOR);
     if (exposesObjectNodes.length === 0) {

package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseASTOfWebpackConfig = parseASTOfWebpackConfig;
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 function parseASTOfWebpackConfig(tree, pathToWebpackConfig) {
     if (!tree.exists(pathToWebpackConfig)) {
         throw new Error(`Cannot migrate webpack config at \`${pathToWebpackConfig}\` as it does not exist. Please ensure this file exists and that the path to the file is correct.`);
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { tsquery } = require('@phenomnomnominal/tsquery');
     const source = tree.read(pathToWebpackConfig, 'utf-8');
     return tsquery.ast(source);

package/src/generators/federate-module/lib/add-path-to-exposes.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPathToExposes = addPathToExposes;
 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 addPathToExposes(tree, { projectPath, moduleName, modulePath }) {
     const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(projectPath, tree.exists((0, devkit_1.joinPathFragments)(projectPath, 'module-federation.config.ts'))
@@ -12,7 +12,7 @@ function addPathToExposes(tree, { projectPath, moduleName, modulePath }) {
 }
 function updateExposesProperty(tree, moduleFederationConfigPath, moduleName, modulePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const fileContent = tree.read(moduleFederationConfigPath, 'utf-8');
     const source = tsModule.createSourceFile(moduleFederationConfigPath, fileContent, tsModule.ScriptTarget.ES2015, true);
@@ -25,7 +25,7 @@ function updateExposesProperty(tree, moduleFederationConfigPath, moduleName, mod
 }
 function findExposes(sourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let exposesObject = null;
     const visit = (node) => {
@@ -45,14 +45,14 @@ function findExposes(sourceFile) {
 // Create a new property assignment
 function createObjectEntry(moduleName, modulePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     return tsModule.factory.createPropertyAssignment(tsModule.factory.createStringLiteral(`./${moduleName}`, true), tsModule.factory.createStringLiteral(modulePath, true));
 }
 // Update the exposes property in the AST
 function updateExposesPropertyinAST(source, exposesObject, newEntry) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const updatedExposes = tsModule.factory.updateObjectLiteralExpression(exposesObject, [...exposesObject.properties, newEntry]);
     const transform = (context) => {
@@ -69,7 +69,7 @@ function updateExposesPropertyinAST(source, exposesObject, newEntry) {
 // Write the updated AST to the file (module-federation.config.js)
 function writeToConfig(tree, filename, source, updatedSourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const printer = tsModule.createPrinter();
     const update = printer.printNode(tsModule.EmitHint.Unspecified, updatedSourceFile, source);

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

@@ -2,13 +2,13 @@
 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 versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
     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/library/lib/add-children.js

@@ -5,14 +5,14 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 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");
 let tsModule;
 function addChildren(tree, options) {
     if (!tree.exists(options.parent)) {
         throw new Error(`Cannot find '${options.parent}'`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const routeFileSource = tree.read(options.parent, 'utf-8');
     const constName = options.standalone

package/src/generators/library/lib/add-load-children.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLoadChildren = addLoadChildren;
 const devkit_1 = require("@nx/devkit");
 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");
 let tsModule;
 function addLoadChildren(tree, options) {
     if (!tree.exists(options.parent)) {
         throw new Error(`Cannot find '${options.parent}'`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const moduleSource = tree.read(options.parent, 'utf-8');
     const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);

package/src/generators/library/lib/add-project.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const internal_2 = require("@nx/js/internal");
 async function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
@@ -36,7 +36,7 @@ async function addProject(tree, libraryOptions) {
         };
         if (libraryOptions.publishable) {
             const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
+            await (0, internal_2.addReleaseConfigForNonTsSolution)(tree, libraryOptions.name, project);
         }
     }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);

package/src/generators/library/lib/create-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
@@ -51,7 +51,7 @@ function createFiles(tree, options, project) {
         }
     }
     if (!options.libraryOptions.routing) {
-        tree.delete((0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), `lib/lib.routes.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(project, tree), `lib/lib.routes.ts`));
     }
     if (!options.libraryOptions.buildable &&
         !options.libraryOptions.publishable) {

package/src/generators/library/lib/update-tsconfig-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfigFiles = updateTsConfigFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
@@ -59,7 +59,7 @@ function updateTsConfigFiles(tree, options) {
             ...json.compilerOptions,
             ...compilerOptions,
         };
-        json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
+        json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         if (options.strict) {
             json.angularCompilerOptions = {
                 ...json.angularCompilerOptions,
@@ -79,7 +79,7 @@ function updateTsConfigFiles(tree, options) {
                 module: 'commonjs',
                 moduleResolution: 'node10',
             };
-            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            json.compilerOptions = (0, internal_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
             return json;
         });
     }

package/src/generators/library/library.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
+const internal_2 = require("@nx/js/internal");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
@@ -68,7 +68,7 @@ async function libraryGenerator(tree, schema) {
     }
     const tasks = [() => (0, devkit_1.installPackagesTask)(tree)];
     if (libraryOptions.publishable) {
-        tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
+        tasks.push(await (0, internal_2.releaseTasks)(tree));
     }
     tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);

package/src/generators/move/lib/update-module-name.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleName = updateModuleName;
 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");
 /**
  * Updates the Angular module name (including the spec file and index.ts)
  *
@@ -41,7 +41,7 @@ function updateModuleName(tree, { oldProjectName, newProjectName }) {
             to: `${unscopedNewProjectName}-module`,
         },
     ];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const filesToRename = moduleFiles.flatMap((moduleFile) => [
         {
             from: `${sourceRoot}/lib/${moduleFile.from}.ts`,

package/src/generators/ng-add/migrators/migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/migrators/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,IAAI,EACL,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,8BAAsB,QAAQ;IAK1B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI;IAC7B,SAAS,CAAC,aAAa,EAAE,oBAAoB;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IANnC,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;gBAG1C,IAAI,EAAE,IAAI,EACnB,aAAa,EAAE,oBAAoB,EAC1B,MAAM,EAAE,MAAM;IAOnC,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAExC,QAAQ,CAAC,QAAQ,IAAI,gBAAgB;IAErC,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG;IAQzD,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IASvD,SAAS,CAAC,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAS7D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc,GAAG,IAAI;IAgB5E,SAAS,CAAC,oCAAoC,CAC5C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,EAAE;IASnB,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,UAAO,GAAG,IAAI;IAYxE,SAAS,CAAC,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAiBhE,SAAS,CAAC,kBAAkB,CAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,GAC5B,IAAI;IASP,OAAO,CAAC,wBAAwB;IAoBhC,OAAO,CAAC,iBAAiB;CAoB1B"}
+{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/migrators/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,8BAAsB,QAAQ;IAK1B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI;IAC7B,SAAS,CAAC,aAAa,EAAE,oBAAoB;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IANnC,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;gBAG1C,IAAI,EAAE,IAAI,EACnB,aAAa,EAAE,oBAAoB,EAC1B,MAAM,EAAE,MAAM;IAOnC,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAExC,QAAQ,CAAC,QAAQ,IAAI,gBAAgB;IAErC,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG;IAQzD,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IASvD,SAAS,CAAC,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAS7D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc,GAAG,IAAI;IAgB5E,SAAS,CAAC,oCAAoC,CAC5C,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,MAAM,EAAE;IASnB,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,UAAO,GAAG,IAAI;IAYxE,SAAS,CAAC,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;IAmBhE,SAAS,CAAC,kBAAkB,CAC1B,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,GAC5B,IAAI;IASP,OAAO,CAAC,wBAAwB;IAoBhC,OAAO,CAAC,iBAAiB;CAoB1B"}

package/src/generators/ng-add/migrators/migrator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Migrator = void 0;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 class Migrator {
     constructor(tree, projectConfig, logger) {
@@ -66,11 +67,15 @@ class Migrator {
         if (!targetNames.length) {
             return;
         }
-        const nxJson = (0, devkit_1.readNxJson)(this.tree);
-        nxJson.targetDefaults ??= {};
-        for (const target of targetNames) {
-            nxJson.targetDefaults[target] ??= {};
-            nxJson.targetDefaults[target].cache ??= true;
+        const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
+        for (const name of targetNames) {
+            const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+                target: name,
+            });
+            (0, internal_1.upsertTargetDefault)(this.tree, nxJson, {
+                target: name,
+                cache: existing?.cache ?? true,
+            });
         }
         (0, devkit_1.updateNxJson)(this.tree, nxJson);
     }

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -4,7 +4,7 @@ exports.E2eMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 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");
 const path_1 = require("path");
 const file_change_recorder_1 = require("../../../../utils/file-change-recorder");
 const versions_1 = require("../../../../utils/versions");
@@ -317,7 +317,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             : undefined;
     }
     updateCypressConfigFile(configFilePath) {
-        const { isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+        const { isPropertyAssignment } = (0, internal_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
         const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
         this.cypressPreset = nxE2EPreset(configFilePath);
@@ -353,7 +353,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!componentNode) {
             return;
         }
-        const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+        const { isObjectLiteralExpression, isPropertyAssignment } = (0, internal_1.ensureTypescript)();
         if (!isObjectLiteralExpression(componentNode.initializer)) {
             this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
                 `The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
@@ -367,7 +367,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         });
     }
     updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, { ...globalConfig }) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        (0, internal_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
         const e2eConfig = {};
         const presetSpreadAssignment = `...nxE2EPreset(__dirname),`;
@@ -384,7 +384,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
         }
         else {
-            const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+            const { isObjectLiteralExpression, isPropertyAssignment } = (0, internal_1.ensureTypescript)();
             if (!isObjectLiteralExpression(e2eNode.initializer)) {
                 this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
                     `The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
@@ -472,7 +472,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
     }
     isValidPathLikePropertyWithStringLiteralValue(node, properties) {
-        const { isPropertyAssignment, isStringLiteralLike, isTemplateExpression, SyntaxKind, } = (0, ensure_typescript_1.ensureTypescript)();
+        const { isPropertyAssignment, isStringLiteralLike, isTemplateExpression, SyntaxKind, } = (0, internal_1.ensureTypescript)();
         if (!isPropertyAssignment(node)) {
             // TODO(leo): handle more scenarios (spread assignments, etc)
             return false;

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

@@ -18,9 +18,9 @@ const eslint_1 = require("@nx/eslint");
 const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_1 = require("@nx/js/internal");
 const angular_json_1 = require("nx/src/adapter/angular-json");
-const versions_2 = require("../../../utils/versions");
+const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
 function validateWorkspace(tree) {
     const errors = [];
@@ -141,17 +141,17 @@ function updatePackageJson(tree) {
         packageJson.devDependencies = packageJson.devDependencies ?? {};
         packageJson.dependencies = packageJson.dependencies ?? {};
         if (!packageJson.devDependencies['@angular/cli']) {
-            packageJson.devDependencies['@angular/cli'] = versions_2.angularDevkitVersion;
+            packageJson.devDependencies['@angular/cli'] = versions_1.angularDevkitVersion;
         }
         if (!packageJson.devDependencies['@nx/workspace'] &&
             !packageJson.devDependencies['@nrwl/workspace']) {
-            packageJson.devDependencies['@nx/workspace'] = versions_2.nxVersion;
+            packageJson.devDependencies['@nx/workspace'] = versions_1.nxVersion;
         }
         if (!packageJson.devDependencies['nx']) {
-            packageJson.devDependencies['nx'] = versions_2.nxVersion;
+            packageJson.devDependencies['nx'] = versions_1.nxVersion;
         }
         if (!packageJson.devDependencies['prettier']) {
-            packageJson.devDependencies['prettier'] = versions_1.prettierVersion;
+            packageJson.devDependencies['prettier'] = internal_1.prettierVersion;
         }
         return packageJson;
     });