@ohos-ports/nx 19.8.4-beta.2 → 20.8.4-beta.1

package/src/command-line/add/add.js

@@ -5,7 +5,6 @@ exports.addHandler = addHandler;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const ora = require("ora");
-const angular_json_1 = require("../../adapter/angular-json");
 const nx_json_1 = require("../../config/nx-json");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
@@ -13,10 +12,11 @@ const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
 const handle_errors_1 = require("../../utils/handle-errors");
-const plugins_1 = require("../../utils/plugins");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
 const add_nx_scripts_1 = require("../init/implementation/dot-nx/add-nx-scripts");
+const semver_1 = require("semver");
+const configure_plugins_1 = require("../init/configure-plugins");
 function addHandler(options) {
     return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         output_1.output.addNewline();
@@ -33,9 +33,15 @@ async function installPackage(pkgName, version, nxJson) {
     const spinner = ora(`Installing ${pkgName}@${version}...`);
     spinner.start();
     if ((0, fs_1.existsSync)('package.json')) {
-        const pmc = (0, package_manager_1.getPackageManagerCommand)();
-        await new Promise((resolve) => (0, child_process_1.exec)(`${pmc.addDev} ${pkgName}@${version}`, {
-            windowsHide: true,
+        const pm = (0, package_manager_1.detectPackageManager)();
+        const pmv = (0, package_manager_1.getPackageManagerVersion)(pm);
+        const pmc = (0, package_manager_1.getPackageManagerCommand)(pm);
+        // if we explicitly specify latest in yarn berry, it won't resolve the version
+        const command = pm === 'yarn' && (0, semver_1.gte)(pmv, '2.0.0') && version === 'latest'
+            ? `${pmc.addDev} ${pkgName}`
+            : `${pmc.addDev} ${pkgName}@${version}`;
+        await new Promise((resolve) => (0, child_process_1.exec)(command, {
+            windowsHide: false,
         }, (error, stdout) => {
             if (error) {
                 spinner.fail();
@@ -72,63 +78,30 @@ async function installPackage(pkgName, version, nxJson) {
     spinner.succeed();
 }
 async function initializePlugin(pkgName, options, nxJson) {
-    const capabilities = await (0, plugins_1.getPluginCapabilities)(workspace_root_1.workspaceRoot, pkgName, {});
-    const generators = capabilities?.generators;
-    if (!generators) {
-        output_1.output.log({
-            title: `No generators found in ${pkgName}. Skipping initialization.`,
-        });
-        return;
-    }
-    const initGenerator = findInitGenerator(generators);
-    if (!initGenerator) {
-        output_1.output.log({
-            title: `No "init" generator found in ${pkgName}. Skipping initialization.`,
-        });
-        return;
+    let updatePackageScripts = false;
+    if (exports.coreNxPluginVersions.has(pkgName) &&
+        (options.updatePackageScripts ||
+            (options.updatePackageScripts === undefined &&
+                nxJson.useInferencePlugins !== false &&
+                process.env.NX_ADD_PLUGINS !== 'false'))) {
+        updatePackageScripts = true;
     }
     const spinner = ora(`Initializing ${pkgName}...`);
     spinner.start();
     try {
-        const args = [];
-        if (exports.coreNxPluginVersions.has(pkgName)) {
-            args.push(`--keepExistingVersions`);
-            if (options.updatePackageScripts ||
-                (options.updatePackageScripts === undefined &&
-                    nxJson.useInferencePlugins !== false &&
-                    process.env.NX_ADD_PLUGINS !== 'false')) {
-                args.push(`--updatePackageScripts`);
-            }
-        }
-        if (options.__overrides_unparsed__.length) {
-            args.push(...options.__overrides_unparsed__);
-        }
-        (0, child_process_2.runNxSync)(`g ${pkgName}:${initGenerator} ${args.join(' ')}`, {
-            stdio: [0, 1, 2],
-        });
+        await (0, configure_plugins_1.runPluginInitGenerator)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
     }
     catch (e) {
         spinner.fail();
         output_1.output.addNewline();
-        logger_1.logger.error(e);
         output_1.output.error({
-            title: `Failed to initialize ${pkgName}. Please check the error above for more details.`,
+            title: `Failed to initialize ${pkgName}`,
+            bodyLines: (0, configure_plugins_1.getFailedToInstallPluginErrorMessages)(e),
         });
         process.exit(1);
     }
     spinner.succeed();
 }
-function findInitGenerator(generators) {
-    if (generators['init']) {
-        return 'init';
-    }
-    const angularPluginInstalled = (0, angular_json_1.isAngularPluginInstalled)();
-    if (angularPluginInstalled && generators['ng-add']) {
-        return 'ng-add';
-    }
-    return Object.keys(generators).find((name) => generators[name].aliases?.includes('init') ||
-        (angularPluginInstalled && generators[name].aliases?.includes('ng-add')));
-}
 function parsePackageSpecifier(packageSpecifier) {
     const i = packageSpecifier.lastIndexOf('@');
     if (i <= 0) {

package/src/command-line/affected/affected.js

@@ -12,7 +12,6 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
 const configuration_1 = require("../../config/configuration");
-const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const graph_1 = require("../graph/graph");
 const all_file_data_1 = require("../../utils/all-file-data");
@@ -22,13 +21,14 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
 }) {
     perf_hooks_1.performance.mark('code-loading:end');
     perf_hooks_1.performance.measure('code-loading', 'init-local', 'code-loading:end');
-    (0, workspace_configuration_check_1.workspaceConfigurationCheck)();
     const nxJson = (0, configuration_1.readNxJson)();
     const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
         printWarnings: command !== 'print-affected' && !args.plain && args.graph !== 'stdout',
     }, nxJson);
     await (0, connect_to_nx_cloud_1.connectToNxCloudIfExplicitlyAsked)(nxArgs);
-    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
+    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({
+        exitOnError: true,
+    });
     const projects = await getAffectedGraphNodes(nxArgs, projectGraph);
     try {
         switch (command) {

package/src/command-line/connect/view-logs.js

@@ -43,7 +43,7 @@ async function viewLogs() {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, child_process_1.execSync)(`${pmc.exec} nx-cloud upload-and-show-run-details`, {
         stdio: [0, 1, 2],
-        windowsHide: true,
+        windowsHide: false,
     });
     if (!cloudUsed) {
         output_1.output.note({

package/src/command-line/examples.js

@@ -143,10 +143,6 @@ exports.examples = {
             command: 'graph --focus=todos-feature-main',
             description: 'Show the graph where every node is either an ancestor or a descendant of todos-feature-main',
         },
-        {
-            command: 'graph --include=project-one,project-two',
-            description: 'Include project-one and project-two in the project graph',
-        },
         {
             command: 'graph --exclude=project-one,project-two',
             description: 'Exclude project-one and project-two from the project graph',

package/src/command-line/exec/exec.js

@@ -34,7 +34,7 @@ async function nxExecCommand(args) {
                 NX_PROJECT_NAME: process.env.NX_TASK_TARGET_PROJECT,
                 NX_PROJECT_ROOT_PATH: projectGraph.nodes?.[process.env.NX_TASK_TARGET_PROJECT]?.data?.root,
             },
-            windowsHide: true,
+            windowsHide: false,
         });
     }
     else {
@@ -67,7 +67,7 @@ async function runScriptAsNxTarget(projectGraph, argv, nxArgs) {
             cwd: projectGraph.nodes?.[projectName]?.data?.root
                 ? (0, path_2.joinPathFragments)(workspace_root_1.workspaceRoot, projectGraph.nodes?.[projectName]?.data?.root)
                 : workspace_root_1.workspaceRoot,
-            windowsHide: true,
+            windowsHide: false,
         });
     });
 }
@@ -81,7 +81,7 @@ function runTargetOnProject(scriptDefinition, targetName, project, projectName,
     const command = `${pm.exec} nx run ${projectName}:\\\"${targetName}\\\" ${extraArgs.join(' ')}`;
     (0, child_process_1.execSync)(command, {
         stdio: 'inherit',
-        windowsHide: true,
+        windowsHide: false,
     });
 }
 function readScriptArgV(overrides) {

package/src/command-line/format/command-object.js

@@ -35,6 +35,15 @@ function withFormatOptions(yargs) {
         describe: 'Projects to format (comma/space delimited).',
         type: 'string',
         coerce: shared_options_1.parseCSV,
+    })
+        .option('sort-root-tsconfig-paths', {
+        describe: `Ensure the workspace's tsconfig compilerOptions.paths are sorted. Warning: This will cause comments in the tsconfig to be lost.`,
+        type: 'boolean',
+        /**
+         * TODO(v21): Stop sorting tsconfig paths by default, paths are now less common/important
+         * in Nx workspace setups, and the sorting causes comments to be lost.
+         */
+        default: true,
     })
         .option('all', {
         describe: 'Format all projects.',

package/src/command-line/format/format.js

@@ -34,12 +34,14 @@ async function format(command, args) {
     const patterns = (await getPatterns({ ...args, ...nxArgs })).map(
     // prettier removes one of the \
     // prettier-ignore
-    (p) => `"${p.replace(/\$/g, "\\\$")}"`);
+    (p) => `"${p.replace(/\$/g, '\\\$')}"`);
     // Chunkify the patterns array to prevent crashing the windows terminal
     const chunkList = (0, chunkify_1.chunkify)(patterns);
     switch (command) {
         case 'write':
-            sortTsConfig();
+            if (nxArgs.sortRootTsconfigPaths) {
+                sortTsConfig();
+            }
             addRootConfigFiles(chunkList, nxArgs);
             chunkList.forEach((chunk) => write(chunk));
             break;
@@ -108,7 +110,9 @@ async function getPatterns(args) {
     }
 }
 async function getPatternsFromApps(affectedFiles, allWorkspaceFiles, projectGraph) {
-    const graph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
+    const graph = await (0, project_graph_1.createProjectGraphAsync)({
+        exitOnError: true,
+    });
     const affectedGraph = await (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)(affectedFiles, allWorkspaceFiles));
     return getPatternsFromProjects(Object.keys(affectedGraph.nodes), projectGraph);
 }
@@ -144,12 +148,12 @@ function write(patterns) {
         const prettierPath = getPrettierPath();
         (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${regularPatterns.join(' ')}`, {
             stdio: [0, 1, 2],
-            windowsHide: true,
+            windowsHide: false,
         });
         if (swcrcPatterns.length > 0) {
             (0, node_child_process_1.execSync)(`node "${prettierPath}" --write --list-different ${swcrcPatterns.join(' ')} --parser json`, {
                 stdio: [0, 1, 2],
-                windowsHide: true,
+                windowsHide: false,
             });
         }
     }
@@ -160,7 +164,7 @@ async function check(patterns) {
     }
     const prettierPath = getPrettierPath();
     return new Promise((resolve) => {
-        (0, node_child_process_1.exec)(`node "${prettierPath}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8', windowsHide: true }, (error, stdout) => {
+        (0, node_child_process_1.exec)(`node "${prettierPath}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8', windowsHide: false }, (error, stdout) => {
             if (error) {
                 // The command failed so there are files with different formatting. Prettier writes them to stdout, newline separated.
                 resolve(stdout.trim().split('\n'));

package/src/command-line/generate/command-object.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsGenerateCommand = void 0;
-const path_1 = require("../../utils/path");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsGenerateCommand = {
     command: 'generate <generator> [_..]',
@@ -11,7 +10,7 @@ exports.yargsGenerateCommand = {
     handler: async (args) => {
         // Remove the command from the args
         args._ = args._.slice(1);
-        process.exit(await (await Promise.resolve().then(() => require('./generate'))).generate((0, path_1.getCwd)(), args));
+        process.exit(await (await Promise.resolve().then(() => require('./generate'))).generate(args));
     },
 };
 function withGenerateOptions(yargs) {

package/src/command-line/generate/generate.d.ts

@@ -16,6 +16,6 @@ export declare function parseGeneratorString(value: string): {
     generator: string;
 };
 export declare function printGenHelp(opts: GenerateOptions, schema: Schema, normalizedGeneratorName: string, aliases: string[]): void;
-export declare function generate(cwd: string, args: {
+export declare function generate(args: {
     [k: string]: any;
 }): Promise<number>;

package/src/command-line/generate/generate.js

@@ -19,6 +19,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const generator_utils_1 = require("./generator-utils");
+const path_2 = require("../../utils/path");
 function printChanges(fileChanges) {
     fileChanges.forEach((f) => {
         if (f.type === 'CREATE') {
@@ -206,7 +207,7 @@ function printGenHelp(opts, schema, normalizedGeneratorName, aliases) {
         aliases,
     });
 }
-async function generate(cwd, args) {
+async function generate(args) {
     return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxJsonConfiguration = (0, configuration_1.readNxJson)();
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
@@ -226,6 +227,7 @@ async function generate(cwd, args) {
             printGenHelp(opts, schema, normalizedGeneratorName, aliases);
             return 0;
         }
+        const cwd = (0, path_2.getCwd)();
         const combinedOpts = await (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), (0, path_1.relative)(workspace_root_1.workspaceRoot, cwd), args.verbose);
         if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot, projectsConfigurations.projects).isNxGenerator) {
             const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);

package/src/command-line/generate/generator-utils.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
 const plugins_1 = require("../../project-graph/plugins");
+const installation_directory_1 = require("../../utils/installation-directory");
 function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
         const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
@@ -13,14 +14,14 @@ function getGeneratorInformation(collectionName, generatorName, root, projects)
         const generatorConfig = generatorsJson.generators?.[normalizedGeneratorName] ||
             generatorsJson.schematics?.[normalizedGeneratorName];
         const isNgCompat = !generatorsJson.generators?.[normalizedGeneratorName];
-        const schemaPath = (0, schema_utils_1.resolveSchema)(generatorConfig.schema, generatorsDir);
+        const schemaPath = (0, schema_utils_1.resolveSchema)(generatorConfig.schema, generatorsDir, collectionName, projects);
         const schema = (0, fileutils_1.readJsonFile)(schemaPath);
         if (!schema.properties || typeof schema.properties !== 'object') {
             schema.properties = {};
         }
         generatorConfig.implementation =
             generatorConfig.implementation || generatorConfig.factory;
-        const implementationFactory = (0, schema_utils_1.getImplementationFactory)(generatorConfig.implementation, generatorsDir);
+        const implementationFactory = (0, schema_utils_1.getImplementationFactory)(generatorConfig.implementation, generatorsDir, collectionName, projects);
         const normalizedGeneratorConfiguration = {
             ...generatorConfig,
             aliases: generatorConfig.aliases ?? [],
@@ -37,18 +38,22 @@ function getGeneratorInformation(collectionName, generatorName, root, projects)
         };
     }
     catch (e) {
-        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${e.message}`);
+        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${process.env.NX_VERBOSE_LOGGING === 'true' ? e.stack : e.message}`);
     }
 }
 function readGeneratorsJson(collectionName, generator, root, projects) {
     let generatorsFilePath;
     if (collectionName.endsWith('.json')) {
         generatorsFilePath = require.resolve(collectionName, {
-            paths: root ? [root, __dirname] : [__dirname],
+            paths: root
+                ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+                : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname],
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root
+            ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+            : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);

package/src/command-line/graph/graph.js

@@ -579,7 +579,7 @@ async function createTaskGraphClientResponse(pruneExternal = false) {
     }
     const nxJson = (0, configuration_1.readNxJson)();
     perf_hooks_1.performance.mark('task graph generation:start');
-    const taskGraphs = getAllTaskGraphsForWorkspace(nxJson, graph);
+    const taskGraphs = getAllTaskGraphsForWorkspace(graph);
     perf_hooks_1.performance.mark('task graph generation:end');
     const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
     perf_hooks_1.performance.mark('task hash plan generation:start');
@@ -613,8 +613,7 @@ async function createExpandedTaskInputResponse(taskGraphClientResponse, depGraph
     perf_hooks_1.performance.measure('task input static generation', 'task input static generation:start', 'task input static generation:end');
     return response;
 }
-function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
-    const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
+function getAllTaskGraphsForWorkspace(projectGraph) {
     const taskGraphs = {};
     const taskGraphErrors = {};
     // TODO(cammisuli): improve performance here. Cache results or something.
@@ -624,7 +623,7 @@ function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
         targets.forEach((target) => {
             const taskId = createTaskId(projectName, target);
             try {
-                taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, [projectName], [target], undefined, {});
+                taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], undefined, {});
             }
             catch (err) {
                 taskGraphs[taskId] = {
@@ -639,7 +638,7 @@ function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
                 configurations.forEach((configuration) => {
                     const taskId = createTaskId(projectName, target, configuration);
                     try {
-                        taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, [projectName], [target], configuration, {});
+                        taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], configuration, {});
                     }
                     catch (err) {
                         taskGraphs[taskId] = {
@@ -771,9 +770,7 @@ async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
         graph: prunedGraph,
     };
     if (targets?.length) {
-        const nxJson = (0, configuration_1.readNxJson)();
-        const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
-        const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, defaultDependencyConfigs, projects, targets, undefined, {});
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, {}, projects, targets, undefined, {});
         const hasher = (0, create_task_hasher_1.createTaskHasher)(rawGraph, (0, configuration_1.readNxJson)());
         let tasks = Object.values(taskGraph.tasks);
         const hashes = await hasher.hashTasks(tasks, taskGraph);
@@ -801,6 +798,6 @@ function getHelpTextFromTarget(projectName, targetName) {
         throw new Error(`No help command found for ${projectName}:${targetName}`);
     return (0, node_child_process_1.execSync)(command, {
         cwd: target.options?.cwd ?? workspace_root_1.workspaceRoot,
-        windowsHide: true,
+        windowsHide: false,
     }).toString();
 }