nx 19.1.0-beta.0 → 19.1.0-beta.1

package/src/daemon/server/server.js

@@ -198,7 +198,7 @@ const handleWorkspaceChanges = async (err, changeEvents) => {
             });
             return;
         }
-        if (err || !changeEvents || !changeEvents.length) {
+        if (err) {
             let error = typeof err === 'string' ? new Error(err) : err;
             logger_1.serverLogger.watcherLog('Unexpected workspace watcher error', error.message);
             console.error(error);

package/src/generators/utils/json.js

@@ -30,7 +30,8 @@ exports.readJson = readJson;
  * @param options Optional JSON Serialize Options
  */
 function writeJson(tree, path, value, options) {
-    tree.write(path, (0, json_1.serializeJson)(value, options));
+    const serialized = (0, json_1.serializeJson)(value, options);
+    tree.write(path, `${serialized}\n`);
 }
 exports.writeJson = writeJson;
 /**

package/src/plugins/js/lock-file/npm-parser.js

@@ -175,7 +175,16 @@ function findTarget(sourcePath, keyMap, targetName, versionRange) {
     const searchPath = `${sourcePath}node_modules/${targetName}`;
     if (keyMap.has(searchPath)) {
         const child = keyMap.get(searchPath);
-        if (child.data.version === versionRange ||
+        // if the version is alias to another package we need to parse the versions to compare
+        if (child.data.version.startsWith('npm:') &&
+            versionRange.startsWith('npm:')) {
+            const nodeVersion = child.data.version.slice(child.data.version.indexOf('@', 5) + 1);
+            const depVersion = versionRange.slice(versionRange.indexOf('@', 5) + 1);
+            if (nodeVersion === depVersion || (0, semver_1.satisfies)(nodeVersion, depVersion)) {
+                return child;
+            }
+        }
+        else if (child.data.version === versionRange ||
             (0, semver_1.satisfies)(child.data.version, versionRange)) {
             return child;
         }

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -16,7 +16,7 @@ function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
     if ((0, fs_1.existsSync)(fullPath)) {
         const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        const { load } = require('@zkochan/js-yaml');
+        const { load } = require('js-yaml');
         return load(content)?.hoistedDependencies ?? {};
     }
     else {
@@ -32,7 +32,7 @@ exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
  * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L91
  */
 function parseAndNormalizePnpmLockfile(content) {
-    const { load } = require('@zkochan/js-yaml');
+    const { load } = require('js-yaml');
     const lockFileData = load(content);
     return revertFromInlineSpecifiersFormatIfNecessary(convertFromLockfileFileMutable(lockFileData));
 }
@@ -77,7 +77,7 @@ function stringifyToPnpmYaml(lockfile) {
     const adaptedLockfile = isLockfileV6
         ? convertToInlineSpecifiersFormat(lockfile)
         : lockfile;
-    const { dump } = require('@zkochan/js-yaml');
+    const { dump } = require('js-yaml');
     return dump(sortLockfileKeys(normalizeLockfile(adaptedLockfile, isLockfileV6)), LOCKFILE_YAML_FORMAT);
 }
 exports.stringifyToPnpmYaml = stringifyToPnpmYaml;

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -13,6 +13,11 @@ export default TargetDefaultsPlugin;
  */
 export declare function getTargetInfo(target: string, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
     command: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     executor?: undefined;
     options?: undefined;
 } | {
@@ -22,6 +27,11 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         commands?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
@@ -30,9 +40,19 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
     options?: undefined;
 } | {
@@ -42,9 +62,20 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         commands?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
+} | {
+    executor: string;
+    command?: undefined;
+    metadata?: undefined;
+    options?: undefined;
 } | {
     command?: undefined;
+    metadata?: undefined;
     executor?: undefined;
     options?: undefined;
 };

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -111,9 +111,14 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
         ...packageJsonTarget?.options,
         ...projectJsonTarget?.options,
     };
+    const metadata = {
+        ...packageJsonTarget?.metadata,
+        ...projectJsonTarget?.metadata,
+    };
     if (projectJsonTarget?.command) {
         return {
             command: projectJsonTarget?.command,
+            metadata,
         };
     }
     if (executor === 'nx:run-commands') {
@@ -123,6 +128,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     command: targetOptions?.command,
                 },
+                metadata,
             };
         }
         else if (targetOptions?.commands) {
@@ -131,10 +137,12 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     commands: targetOptions.commands,
                 },
+                metadata,
             };
         }
         return {
             executor: 'nx:run-commands',
+            metadata,
         };
     }
     if (executor === 'nx:run-script') {
@@ -143,6 +151,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
             options: {
                 script: targetOptions?.script ?? target,
             },
+            metadata,
         };
     }
     if (executor) {

package/src/utils/find-matching-projects.js

@@ -22,15 +22,6 @@ function findMatchingProjects(patterns = [], projects) {
     }
     const projectNames = Object.keys(projects);
     const matchedProjects = new Set();
-    // If the first pattern is an exclude pattern,
-    // we add a wildcard pattern at the first to select
-    // all projects, except the ones that match the exclude pattern.
-    // e.g. ['!tag:someTag', 'project2'] will match all projects except
-    // the ones with the tag 'someTag', and also match the project 'project2',
-    // regardless of its tags.
-    if (isExcludePattern(patterns[0])) {
-        patterns.unshift('*');
-    }
     for (const stringPattern of patterns) {
         if (!stringPattern.length) {
             continue;
@@ -148,11 +139,8 @@ function addMatchingProjectsByTag(projectNames, projects, pattern, matchedProjec
         }
     }
 }
-function isExcludePattern(pattern) {
-    return pattern.startsWith('!');
-}
 function parseStringPattern(pattern, projects) {
-    const isExclude = isExcludePattern(pattern);
+    const isExclude = pattern.startsWith('!');
     // Support for things like: `!{type}:value`
     if (isExclude) {
         pattern = pattern.substring(1);

package/src/utils/json.js

@@ -57,6 +57,6 @@ function formatParseError(input, parseError) {
  * @returns the formatted JSON representation of the object
  */
 function serializeJson(input, options) {
-    return JSON.stringify(input, null, options?.spaces ?? 2) + '\n';
+    return JSON.stringify(input, null, options?.spaces ?? 2);
 }
 exports.serializeJson = serializeJson;

package/src/utils/package-json.d.ts

@@ -65,7 +65,7 @@ export declare function normalizePackageGroup(packageGroup: PackageGroup): Array
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
     packageGroup?: ArrayPackageGroup;
 };
-export declare function buildTargetFromScript(script: string): TargetConfiguration;
+export declare function buildTargetFromScript(script: string, scripts?: Record<string, string>): TargetConfiguration;
 export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.

package/src/utils/package-json.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
+const package_manager_1 = require("./package-manager");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
@@ -38,12 +39,17 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script) {
+function buildTargetFromScript(script, scripts = {}) {
+    const packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)();
     return {
         executor: 'nx:run-script',
         options: {
             script,
         },
+        metadata: {
+            scriptContent: scripts[script],
+            runCommand: packageManagerCommand.run(script),
+        },
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
@@ -53,7 +59,7 @@ function readTargetsFromPackageJson(packageJson) {
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     //
     for (const script of includedScripts) {
-        res[script] = buildTargetFromScript(script);
+        res[script] = buildTargetFromScript(script, scripts);
     }
     for (const targetName in nx?.targets) {
         res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);

package/src/utils/package-manager.d.ts

@@ -10,7 +10,7 @@ export interface PackageManagerCommands {
     exec: string;
     dlx: string;
     list: string;
-    run: (script: string, args: string) => string;
+    run: (script: string, args?: string) => string;
     getRegistryUrl: string;
 }
 /**

package/src/utils/package-manager.js

@@ -74,7 +74,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'yarn remove',
                 exec: 'yarn',
                 dlx: useBerry ? 'yarn dlx' : 'yarn',
-                run: (script, args) => `yarn ${script} ${args}`,
+                run: (script, args) => `yarn ${script}${args ? ` ${args}` : ''}`,
                 list: useBerry ? 'yarn info --name-only' : 'yarn list',
                 getRegistryUrl: useBerry
                     ? 'yarn config get npmRegistryServer'
@@ -95,9 +95,11 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'pnpm rm',
                 exec: modernPnpm ? 'pnpm exec' : 'pnpx',
                 dlx: modernPnpm ? 'pnpm dlx' : 'pnpx',
-                run: (script, args) => includeDoubleDashBeforeArgs
-                    ? `pnpm run ${script} -- ${args}`
-                    : `pnpm run ${script} ${args}`,
+                run: (script, args) => `pnpm run ${script}${args
+                    ? includeDoubleDashBeforeArgs
+                        ? ' -- ' + args
+                        : ` ${args}`
+                    : ''}`,
                 list: 'pnpm ls --depth 100',
                 getRegistryUrl: 'pnpm config get registry',
             };
@@ -114,7 +116,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'npm rm',
                 exec: 'npx',
                 dlx: 'npx',
-                run: (script, args) => `npm run ${script} -- ${args}`,
+                run: (script, args) => `npm run ${script}${args ? ' -- ' + args : ''}`,
                 list: 'npm ls',
                 getRegistryUrl: 'npm config get registry',
             };
@@ -254,11 +256,20 @@ async function resolvePackageVersionUsingRegistry(packageName, version) {
         if (!result) {
             throw new Error(`Unable to resolve version ${packageName}@${version}.`);
         }
-        // get the last line of the output, strip the package version and quotes
-        const resolvedVersion = result
-            .split('\n')
-            .pop()
-            .split(' ')
+        const lines = result.split('\n');
+        if (lines.length === 1) {
+            return lines[0];
+        }
+        /**
+         * The output contains multiple lines ordered by release date, so the last
+         * version might not be the last one in the list. We need to sort it. Each
+         * line looks like:
+         *
+         * <package>@<version> '<version>'
+         */
+        const resolvedVersion = lines
+            .map((line) => line.split(' ')[1])
+            .sort()
             .pop()
             .replace(/'/g, '');
         return resolvedVersion;

package/src/utils/plugins/plugin-capabilities.js

@@ -114,7 +114,7 @@ async function listPluginCapabilities(pluginName, projects) {
     if (hasBuilders) {
         bodyLines.push(chalk.bold(chalk.green('EXECUTORS/BUILDERS')));
         bodyLines.push('');
-        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${plugin.executors[name].description}`));
+        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${resolveExecutorDescription(plugin.executors[name], projects)}`));
     }
     if (hasProjectGraphExtension) {
         bodyLines.push(`✔️  Project Graph Extension`);
@@ -128,3 +128,26 @@ async function listPluginCapabilities(pluginName, projects) {
     });
 }
 exports.listPluginCapabilities = listPluginCapabilities;
+function resolveExecutorDescription(executorJsonEntry, projects) {
+    try {
+        if (typeof executorJsonEntry === 'string') {
+            // it points to another executor, resolve it
+            const [pkgName, executor] = executorJsonEntry.split(':');
+            const collection = loadExecutorsCollection(workspace_root_1.workspaceRoot, pkgName, projects);
+            return resolveExecutorDescription(collection[executor], projects);
+        }
+        return executorJsonEntry.description;
+    }
+    catch {
+        return 'No description available';
+    }
+}
+function loadExecutorsCollection(workspaceRoot, pluginName, projects) {
+    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+    return {
+        ...tryGetCollection(packageJsonPath, packageJson.builders, 'builders'),
+        ...tryGetCollection(packageJsonPath, packageJson.executors, 'builders'),
+        ...tryGetCollection(packageJsonPath, packageJson.builders, 'executors'),
+        ...tryGetCollection(packageJsonPath, packageJson.executors, 'executors'),
+    };
+}