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

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

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/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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 async function default_1(tree) {
     let usesModuleFederation = false;
-    (0, internal_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/remove-tailwind-config-from-ng-packagr-executors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-tailwind-config-from-ng-packagr-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,UAAyD,CAAC;AAEhF,yBAA+B,IAAI,EAAE,IAAI,iBA4FxC"}
+{"version":3,"file":"remove-tailwind-config-from-ng-packagr-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,UAAyD,CAAC;AAEhF,yBAA+B,IAAI,EAAE,IAAI,iBAgIxC"}

package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.js

@@ -39,11 +39,7 @@ async function default_1(tree) {
     if (!nxJson.targetDefaults) {
         return;
     }
-    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-        if (!exports.executors.includes(targetOrExecutor) &&
-            !exports.executors.includes(targetConfig.executor)) {
-            continue;
-        }
+    const cleanEntry = (targetConfig) => {
         if (targetConfig.options) {
             delete targetConfig.options.tailwindConfig;
             if (!Object.keys(targetConfig.options).length) {
@@ -59,14 +55,51 @@ async function default_1(tree) {
         if (!Object.keys(targetConfig.configurations ?? {}).length) {
             delete targetConfig.configurations;
         }
-        if (!Object.keys(targetConfig).length ||
-            (Object.keys(targetConfig).length === 1 &&
-                Object.keys(targetConfig)[0] === 'executor')) {
-            delete nxJson.targetDefaults[targetOrExecutor];
+        return {
+            empty: !Object.keys(targetConfig).length ||
+                (Object.keys(targetConfig).length === 1 &&
+                    Object.keys(targetConfig)[0] === 'executor'),
+        };
+    };
+    if (Array.isArray(nxJson.targetDefaults)) {
+        const remaining = [];
+        for (const entry of nxJson.targetDefaults) {
+            const matches = exports.executors.includes(entry.executor) || exports.executors.includes(entry.target);
+            if (!matches) {
+                remaining.push(entry);
+                continue;
+            }
+            const { empty } = cleanEntry(entry);
+            // Empty entries that only described executor/target wrappers are dropped.
+            const onlyKeys = Object.keys(entry).filter((k) => k !== 'target' &&
+                k !== 'executor' &&
+                k !== 'projects' &&
+                k !== 'plugin');
+            if (empty && onlyKeys.length === 0)
+                continue;
+            remaining.push(entry);
         }
-        if (!Object.keys(nxJson.targetDefaults).length) {
+        if (remaining.length === 0) {
             delete nxJson.targetDefaults;
         }
+        else {
+            nxJson.targetDefaults = remaining;
+        }
+    }
+    else {
+        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+            if (!exports.executors.includes(targetOrExecutor) &&
+                !exports.executors.includes(targetConfig.executor)) {
+                continue;
+            }
+            const { empty } = cleanEntry(targetConfig);
+            if (empty) {
+                delete nxJson.targetDefaults[targetOrExecutor];
+            }
+            if (!Object.keys(nxJson.targetDefaults).length) {
+                delete nxJson.targetDefaults;
+            }
+        }
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 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 project_graph_1 = require("nx/src/config/project-graph");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const version_utils_1 = require("../../generators/utils/version-utils");
@@ -23,7 +23,7 @@ async function default_1(tree) {
     if (!projects.length) {
         return;
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const tsqueryModule = require('@phenomnomnominal/tsquery');
     tsqueryAst = tsqueryModule.ast;
     tsqueryQuery = tsqueryModule.query;

package/src/migrations/update-21-5-0/utils/karma-config-analyzer.js

@@ -11,7 +11,7 @@ exports.analyzeKarmaConfig = analyzeKarmaConfig;
 /**
  * Adapts the private utility from Angular CLI to be used in the migration.
  */
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let ts;
 /**
  * Analyzes the content of a Karma configuration file to extract its settings.
@@ -21,7 +21,7 @@ let ts;
  */
 function analyzeKarmaConfig(content) {
     if (!ts) {
-        ts = (0, ensure_typescript_1.ensureTypescript)();
+        ts = (0, internal_1.ensureTypescript)();
     }
     const sourceFile = ts.createSourceFile('karma.conf.js', content, ts.ScriptTarget.Latest, true);
     const settings = new Map();

package/src/migrations/update-22-3-0/update-module-resolution.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 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 tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
 const targets_1 = require("../../utils/targets");
 const projects_1 = require("../utils/projects");
@@ -43,7 +43,7 @@ async function default_1(tree) {
     await (0, devkit_1.formatFiles)(tree);
 }
 function updateModuleAndModuleResolution(tree, tsConfigPath) {
-    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const ts = (0, internal_1.ensureTypescript)();
     // Read the resolved compiler options from the tsconfig
     const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
     // Check if both module and moduleResolution are already set correctly

package/src/migrations/update-22-3-0/update-ssr-webpack-config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 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 tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 const targets_1 = require("../../utils/targets");
@@ -52,7 +52,7 @@ async function default_1(tree) {
         return;
     }
     // Second pass: process each project
-    ts = (0, ensure_typescript_1.ensureTypescript)();
+    ts = (0, internal_1.ensureTypescript)();
     for (const { tsConfigPath, serverFiles } of projectFilesMap.values()) {
         const wasUpdated = updateTsConfigServer(tree, tsConfigPath);
         // Only update server files if tsconfig was actually modified

package/src/utils/nx-devkit/ast-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EACL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAItC,KAAK,aAAa,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;AAyDrE;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAmBT;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,EAAE,CAAC,IAAI,EAAE,CAgEX;AAkKD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,EAAE,CAAC,UAAU,CAyBf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CASf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CASf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CASf;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CAQf;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CAkCf;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,EAAE,CAAC,UAAU,CAkCf;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,GACrB,EAAE,CAAC,UAAU,CAmCf;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,eAAe,EAAE,MAAM,GACtB,MAAM,CAmBR;AAiBD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,KAAK,EAAE,MAAM,GACZ,EAAE,CAAC,UAAU,CASf;AAwDD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WA4BhE;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,QA2BtB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,QA2BtB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CAQf;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CASf;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CASf;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CAQf;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,EAAE,CAAC,UAAU,CAQf;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,GACV;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,EAAE,CAAC,UAAU,CAAC;IAC5B,2BAA2B,EAAE,MAAM,CAAC;IACpC,0BAA0B,EAAE,MAAM,CAAC;CACpC,CAgFA;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,WAoBf;AA4BD,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAiBvE"}