@nx/angular 21.0.0-beta.4 → 21.0.0-beta.6

package/src/migrations/update-16-0-0/remove-karma-defaults.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = removeKarmaDefaults;
-const devkit_1 = require("@nx/devkit");
-const GENERATORS = ['application', 'library', 'host', 'remote'];
-const CANDIDATE_GENERATOR_COLLECTIONS = ['@nrwl/angular', '@nx/angular'];
-async function removeKarmaDefaults(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.generators) {
-        const updatedConfig = updateUnitTestRunner(nxJson.generators);
-        if (updatedConfig) {
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-    }
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, projectConfig] of projects) {
-        if (projectConfig.generators) {
-            const updatedProject = updateUnitTestRunner(projectConfig.generators);
-            if (updatedProject) {
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-            }
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}
-function updateUnitTestRunner(generatorsConfig) {
-    const generators = Object.entries(generatorsConfig);
-    let updatedConfig = false;
-    for (const [generatorName, generatorDefaults] of generators) {
-        if (CANDIDATE_GENERATOR_COLLECTIONS.includes(generatorName)) {
-            for (const possibleGenerator of GENERATORS) {
-                if (generatorDefaults[possibleGenerator] &&
-                    generatorDefaults[possibleGenerator]['unitTestRunner'] &&
-                    generatorDefaults[possibleGenerator]['unitTestRunner'] === 'karma') {
-                    generatorsConfig[generatorName][possibleGenerator]['unitTestRunner'] =
-                        undefined;
-                    updatedConfig = true;
-                }
-            }
-        }
-        if (!GENERATORS.map((v) => `@nrwl/angular:${v}`).includes(generatorName) &&
-            !GENERATORS.map((v) => `@nx/angular:${v}`).includes(generatorName)) {
-            continue;
-        }
-        if (generatorDefaults['unitTestRunner'] &&
-            generatorDefaults['unitTestRunner'] === 'karma') {
-            generatorsConfig[generatorName]['unitTestRunner'] = undefined;
-            updatedConfig = true;
-        }
-    }
-    return updatedConfig;
-}

package/src/migrations/update-16-0-0/remove-library-generator-simple-module-name-option.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export default function removeLibraryGeneratorSimpleModuleNameOption(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/remove-library-generator-simple-module-name-option.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = removeLibraryGeneratorSimpleModuleNameOption;
-const devkit_1 = require("@nx/devkit");
-async function removeLibraryGeneratorSimpleModuleNameOption(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    // update global config
-    const nxJsonUpdated = replaceSimpleModuleNameInConfig(nxJson);
-    if (nxJsonUpdated) {
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
-    // update project configs
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [name, project] of projects) {
-        const projectUpdated = replaceSimpleModuleNameInConfig(project);
-        if (projectUpdated) {
-            (0, devkit_1.updateProjectConfiguration)(tree, name, project);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}
-function replaceSimpleModuleNameInConfig(configObject) {
-    if (!configObject?.generators) {
-        return false;
-    }
-    let updated = false;
-    if (configObject.generators['@nrwl/angular']?.['library']?.simpleModuleName) {
-        configObject.generators['@nrwl/angular']['library'].simpleName ??=
-            configObject.generators['@nrwl/angular']['library'].simpleModuleName;
-        delete configObject.generators['@nrwl/angular']['library'].simpleModuleName;
-        updated = true;
-    }
-    else if (configObject.generators['@nrwl/angular:library']?.simpleModuleName) {
-        configObject.generators['@nrwl/angular:library'].simpleName ??=
-            configObject.generators['@nrwl/angular:library'].simpleModuleName;
-        delete configObject.generators['@nrwl/angular:library'].simpleModuleName;
-        updated = true;
-    }
-    return updated;
-}

package/src/migrations/update-16-0-0/remove-protractor-defaults.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export default function removeProtractorDefaults(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/remove-protractor-defaults.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = removeProtractorDefaults;
-const devkit_1 = require("@nx/devkit");
-const GENERATORS = ['application', 'host', 'remote'];
-const CANDIDATE_GENERATOR_COLLECTIONS = ['@nrwl/angular', '@nx/angular'];
-async function removeProtractorDefaults(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.generators) {
-        const updatedConfig = updateE2ETestRunner(nxJson.generators);
-        if (updatedConfig) {
-            (0, devkit_1.updateNxJson)(tree, nxJson);
-        }
-    }
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, projectConfig] of projects) {
-        if (projectConfig.generators) {
-            const updatedProject = updateE2ETestRunner(projectConfig.generators);
-            if (updatedProject) {
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-            }
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}
-function updateE2ETestRunner(generatorsConfig) {
-    const generators = Object.entries(generatorsConfig);
-    let updatedConfig = false;
-    for (const [generatorName, generatorDefaults] of generators) {
-        if (CANDIDATE_GENERATOR_COLLECTIONS.includes(generatorName)) {
-            for (const possibleGenerator of GENERATORS) {
-                if (generatorDefaults[possibleGenerator] &&
-                    generatorDefaults[possibleGenerator]['e2eTestRunner'] &&
-                    generatorDefaults[possibleGenerator]['e2eTestRunner'] === 'protractor') {
-                    generatorsConfig[generatorName][possibleGenerator]['e2eTestRunner'] =
-                        undefined;
-                    updatedConfig = true;
-                }
-            }
-        }
-        if (!GENERATORS.map((v) => `@nrwl/angular:${v}`).includes(generatorName) &&
-            !GENERATORS.map((v) => `@nx/angular:${v}`).includes(generatorName)) {
-            continue;
-        }
-        if (generatorDefaults['e2eTestRunner'] &&
-            generatorDefaults['e2eTestRunner'] === 'protractor') {
-            generatorsConfig[generatorName]['e2eTestRunner'] = undefined;
-            updatedConfig = true;
-        }
-    }
-    return updatedConfig;
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/angular', '@nx/angular');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export default function extractStandaloneConfig(tree: Tree): Promise<void>;

package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.js

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = extractStandaloneConfig;
-const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const path_1 = require("path");
-const projects_1 = require("../utils/projects");
-let tsModule;
-let tsquery;
-function getBootstrapCallFileInfo(tree, project, mainFilePath) {
-    const IMPORT_BOOTSTRAP_FILE = 'CallExpression:has(ImportKeyword) > StringLiteral';
-    let bootstrapCallFilePath = mainFilePath;
-    let bootstrapCallFileContents = tree.read(bootstrapCallFilePath, 'utf-8');
-    const ast = tsquery.ast(bootstrapCallFileContents);
-    const importBootstrapNodes = tsquery(ast, IMPORT_BOOTSTRAP_FILE, {
-        visitAllChildren: true,
-    });
-    if (importBootstrapNodes.length > 0 &&
-        importBootstrapNodes[0].getText().includes('./bootstrap')) {
-        bootstrapCallFilePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.ts');
-        bootstrapCallFileContents = tree.read(bootstrapCallFilePath, 'utf-8');
-    }
-    return { bootstrapCallFilePath, bootstrapCallFileContents };
-}
-function getImportTokenMap(bootstrapCallFileContentsAst) {
-    const importTokenMap = new Map();
-    const importedTokensNodes = tsquery(bootstrapCallFileContentsAst, 'ImportDeclaration > ImportClause', { visitAllChildren: true });
-    for (const node of importedTokensNodes) {
-        importTokenMap.set(node.getText(), node.parent.getText());
-    }
-    return importTokenMap;
-}
-function getImportsRequiredForAppConfig(importTokenMap, appConfigNode, oldSourceFilePath, newSourceFilePath) {
-    const identifiers = tsquery.query(appConfigNode, 'Identifier:not(PropertyAssignment > Identifier)', { visitAllChildren: true });
-    const appConfigImports = new Set();
-    const originalImportsToRemove = new Set();
-    for (const identifier of identifiers) {
-        for (const key of importTokenMap.keys()) {
-            if (!key.includes(identifier.getText())) {
-                continue;
-            }
-            let importText = importTokenMap.get(key);
-            originalImportsToRemove.add(importText);
-            if (oldSourceFilePath === newSourceFilePath ||
-                oldSourceFilePath.split('/').length ===
-                    newSourceFilePath.split('/').length) {
-                appConfigImports.add(importText);
-                continue;
-            }
-            const importPath = tsquery
-                .query(importText, 'StringLiteral', {
-                visitAllChildren: true,
-            })[0]
-                .getText()
-                .replace(/'/g, '')
-                .replace(/"/g, '');
-            if (importPath.startsWith('.')) {
-                const resolvedImportPath = (0, path_1.resolve)((0, path_1.dirname)(oldSourceFilePath), importPath);
-                const newRelativeImportPath = (0, path_1.relative)((0, path_1.dirname)(newSourceFilePath), resolvedImportPath);
-                importText = importText.replace(importPath, newRelativeImportPath.startsWith('.')
-                    ? newRelativeImportPath
-                    : `./${newRelativeImportPath}`);
-            }
-            appConfigImports.add(importText);
-        }
-    }
-    return {
-        appConfigImports: Array.from(appConfigImports),
-        importsToRemoveFromSource: Array.from(originalImportsToRemove),
-    };
-}
-function getAppConfigFileContents(importsRequiredForAppConfig, appConfigText) {
-    const buildAppConfigFileContents = (importStatements, appConfig) => `import { ApplicationConfig } from '@angular/core';${importStatements.join('\n')}
-        export const appConfig: ApplicationConfig = ${appConfig}`;
-    const appConfigFileContents = buildAppConfigFileContents(importsRequiredForAppConfig, appConfigText);
-    return appConfigFileContents;
-}
-function getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsRequiredForAppConfig) {
-    let newBootstrapCallFileContents = `import { appConfig } from './app/app.config';
-${bootstrapCallFileContents.slice(0, appConfigNode.getStart())}appConfig${bootstrapCallFileContents.slice(appConfigNode.getEnd())}`;
-    for (const importStatement of importsRequiredForAppConfig) {
-        newBootstrapCallFileContents = newBootstrapCallFileContents.replace(importStatement, '');
-    }
-    return newBootstrapCallFileContents;
-}
-async function extractStandaloneConfig(tree) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    if (!tsquery) {
-        tsquery = require('@phenomnomnominal/tsquery').tsquery;
-    }
-    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
-        'npm:@angular/core',
-    ]);
-    const BOOTSTRAP_APPLICATION_CALL_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
-    const BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) > ObjectLiteralExpression';
-    for (const { project } of projects) {
-        if (project.projectType !== 'application') {
-            continue;
-        }
-        if (project.targets?.build?.options?.main === undefined) {
-            continue;
-        }
-        const { bootstrapCallFilePath, bootstrapCallFileContents } = getBootstrapCallFileInfo(tree, project, project.targets.build.options.main);
-        const bootstrapCallFileContentsAst = tsquery.ast(bootstrapCallFileContents);
-        const nodes = tsquery(bootstrapCallFileContentsAst, BOOTSTRAP_APPLICATION_CALL_SELECTOR, { visitAllChildren: true });
-        if (nodes.length === 0) {
-            continue;
-        }
-        const importTokenMap = getImportTokenMap(bootstrapCallFileContentsAst);
-        const bootstrapCallNode = nodes[0];
-        const appConfigNodes = tsquery(bootstrapCallNode, BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR, { visitAllChildren: true });
-        if (appConfigNodes.length === 0) {
-            continue;
-        }
-        const appConfigNode = appConfigNodes[0];
-        const appConfigText = appConfigNode.getText();
-        const appConfigFilePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
-        const { appConfigImports, importsToRemoveFromSource } = getImportsRequiredForAppConfig(importTokenMap, appConfigNode, bootstrapCallFilePath, appConfigFilePath);
-        const appConfigFileContents = getAppConfigFileContents(appConfigImports, appConfigText);
-        tree.write(appConfigFilePath, appConfigFileContents);
-        let newBootstrapCallFileContents = getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsToRemoveFromSource);
-        tree.write(bootstrapCallFilePath, newBootstrapCallFileContents);
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-1-0/remove-ngcc-invocation.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-async function default_1(tree) {
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-        if (!json.scripts?.postinstall?.includes('ngcc ')) {
-            return json;
-        }
-        json.scripts.postinstall = json.scripts.postinstall
-            // special case when ngcc is at the start so we remove the && as well
-            .replace(/^(ngcc.*?&& *)(.*)/, '$2')
-            // everything else
-            .replace(/(.*?)((&& *)?ngcc.*?)((?=&)|$)(.*)/, '$1$5')
-            .trim();
-        if (json.scripts.postinstall === '') {
-            json.scripts.postinstall = undefined;
-        }
-        return json;
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-1-0/remove-render-module-platform-server-exports.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-1-0/remove-render-module-platform-server-exports.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const ts = tslib_1.__importStar(require("typescript"));
-const file_change_recorder_1 = require("../../utils/file-change-recorder");
-async function default_1(tree) {
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {
-        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
-            const content = tree.read(path, 'utf8');
-            if (content.includes('@angular/platform-server') &&
-                content.includes('renderModule')) {
-                const source = ts.createSourceFile(path, content.toString().replace(/^\uFEFF/, ''), ts.ScriptTarget.Latest, true);
-                let recorder;
-                let printer;
-                ts.forEachChild(source, function analyze(node) {
-                    if (!(ts.isExportDeclaration(node) &&
-                        node.moduleSpecifier &&
-                        ts.isStringLiteral(node.moduleSpecifier) &&
-                        node.moduleSpecifier.text === '@angular/platform-server' &&
-                        node.exportClause &&
-                        ts.isNamedExports(node.exportClause))) {
-                        // Not a @angular/platform-server named export.
-                        return;
-                    }
-                    const exportClause = node.exportClause;
-                    const newElements = [];
-                    for (const element of exportClause.elements) {
-                        if (element.name.text !== 'renderModule') {
-                            newElements.push(element);
-                        }
-                    }
-                    if (newElements.length === exportClause.elements.length) {
-                        // No changes
-                        return;
-                    }
-                    recorder ??= new file_change_recorder_1.FileChangeRecorder(tree, path);
-                    if (newElements.length) {
-                        // Update named exports as there are leftovers.
-                        const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
-                        printer ??= ts.createPrinter();
-                        const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, source);
-                        const index = exportClause.getStart();
-                        const length = exportClause.getWidth();
-                        recorder.remove(index, index + length);
-                        recorder.insertLeft(index, fix);
-                    }
-                    else {
-                        // Delete export as no exports remain.
-                        recorder.remove(node.getStart(), node.getStart() + node.getWidth());
-                    }
-                    ts.forEachChild(node, analyze);
-                });
-                if (recorder) {
-                    recorder.applyChanges();
-                }
-            }
-        }
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-1-0/update-angular-cli.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare const angularCliVersion = "~16.0.0";
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-1-0/update-angular-cli.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularCliVersion = void 0;
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~16.0.0';
-async function default_1(tree) {
-    let shouldFormat = false;
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-        if (json.devDependencies?.['@angular/cli']) {
-            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
-            shouldFormat = true;
-        }
-        else if (json.dependencies?.['@angular/cli']) {
-            json.dependencies['@angular/cli'] = exports.angularCliVersion;
-            shouldFormat = true;
-        }
-        return json;
-    });
-    if (shouldFormat) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
-}

package/src/migrations/update-16-1-0/update-server-executor-config.d.ts

@@ -1,2 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-1-0/update-server-executor-config.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const executors = [
-    '@angular-devkit/build-angular:server',
-    '@nx/angular:server',
-    '@nrwl/angular:server',
-];
-async function default_1(tree) {
-    executors.forEach((executor) => {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            const configToUpdate = configurationName
-                ? projectConfiguration.targets[targetName].configurations[configurationName]
-                : projectConfiguration.targets[targetName].options;
-            if (configToUpdate?.buildOptimizer === undefined &&
-                configToUpdate?.optimization !== undefined) {
-                configToUpdate.buildOptimizer = !!configToUpdate.optimization;
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        });
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}