nx 19.5.0-beta.3 → 19.5.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.5.0-beta.3",
+  "version": "19.5.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.5.0-beta.3"
+    "@nrwl/tao": "19.5.0-beta.4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.5.0-beta.3",
-    "@nx/nx-darwin-arm64": "19.5.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "19.5.0-beta.3",
-    "@nx/nx-linux-x64-musl": "19.5.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "19.5.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "19.5.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "19.5.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.5.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "19.5.0-beta.3",
-    "@nx/nx-freebsd-x64": "19.5.0-beta.3"
+    "@nx/nx-darwin-x64": "19.5.0-beta.4",
+    "@nx/nx-darwin-arm64": "19.5.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "19.5.0-beta.4",
+    "@nx/nx-linux-x64-musl": "19.5.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "19.5.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "19.5.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "19.5.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "19.5.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "19.5.0-beta.4",
+    "@nx/nx-freebsd-x64": "19.5.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/plugins/package-json.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const workspace_root_1 = require("../src/utils/workspace-root");
-const package_json_workspaces_1 = require("../src/plugins/package-json-workspaces");
+const package_json_1 = require("../src/plugins/package-json");
 const plugin = {
     name: 'nx-all-package-jsons-plugin',
     createNodes: [
         '*/**/package.json',
-        (f) => (0, package_json_workspaces_1.createNodeFromPackageJson)(f, workspace_root_1.workspaceRoot),
+        (f) => (0, package_json_1.createNodeFromPackageJson)(f, workspace_root_1.workspaceRoot),
     ],
 };
 module.exports = plugin;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsNxInfixCommand = exports.yargsRunCommand = void 0;
+const yargs_1 = require("yargs");
 const shared_options_1 = require("../yargs-utils/shared-options");
 const params_1 = require("../../utils/params");
 exports.yargsRunCommand = {
@@ -29,6 +30,11 @@ exports.yargsNxInfixCommand = {
     describe: 'Run a target for a project',
     handler: async (args) => {
         const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+            // Yargs parses <target> as 'undefined' if running just 'nx'
+            if (!args.target || args.target === 'undefined') {
+                (0, yargs_1.showHelp)();
+                process.exit(1);
+            }
             return (await Promise.resolve().then(() => require('./run-one'))).runOne(process.cwd(), (0, shared_options_1.withOverrides)(args, 0));
         });
         process.exit(exitCode);

package/src/generators/utils/project-configuration.js

@@ -9,7 +9,7 @@ exports.getProjects = getProjects;
 exports.getRelativeProjectJsonSchemaPath = getRelativeProjectJsonSchemaPath;
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
-const package_json_workspaces_1 = require("../../plugins/package-json-workspaces");
+const package_json_1 = require("../../plugins/package-json");
 const project_json_1 = require("../../plugins/project-json/build-nodes/project-json");
 const angular_json_1 = require("../../adapter/angular-json");
 const project_configuration_utils_1 = require("../../project-graph/utils/project-configuration-utils");
@@ -132,7 +132,7 @@ function readAndCombineAllProjectConfigurations(tree) {
     const patterns = [
         '**/project.json',
         'project.json',
-        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
+        ...(0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
     ];
     const globbedFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);
@@ -147,7 +147,7 @@ function readAndCombineAllProjectConfigurations(tree) {
         }
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
-            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, tree.root, projectFile, (0, nx_json_1.readNxJson)(tree));
+            const config = (0, package_json_1.buildProjectConfigurationFromPackageJson)(packageJson, tree.root, projectFile, (0, nx_json_1.readNxJson)(tree));
             if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators

package/src/plugins/{package-json-workspaces → package-json}/create-nodes.d.ts

@@ -1,8 +1,8 @@
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { PackageJson } from '../../utils/package-json';
-import { CreateNodes } from '../../project-graph/plugins';
-export declare const createNodes: CreateNodes;
+import { CreateNodesV2 } from '../../project-graph/plugins';
+export declare const createNodesV2: CreateNodesV2;
 export declare function buildPackageJsonWorkspacesMatcher(workspaceRoot: string, readJson: (string: any) => any): (p: string) => boolean;
 export declare function createNodeFromPackageJson(pkgJsonPath: string, workspaceRoot: string): {
     projects: {

package/src/plugins/{package-json-workspaces → package-json}/create-nodes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
+exports.createNodesV2 = void 0;
 exports.buildPackageJsonWorkspacesMatcher = buildPackageJsonWorkspacesMatcher;
 exports.createNodeFromPackageJson = createNodeFromPackageJson;
 exports.buildProjectConfigurationFromPackageJson = buildProjectConfigurationFromPackageJson;
@@ -16,18 +16,40 @@ const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const package_json_1 = require("../../utils/package-json");
 const path_1 = require("../../utils/path");
-exports.createNodes = [
-    (0, globs_1.combineGlobPatterns)('package.json', '**/package.json'),
-    (p, _, { workspaceRoot }) => {
-        const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, f));
-        const matcher = buildPackageJsonWorkspacesMatcher(workspaceRoot, readJson);
-        if (matcher(p)) {
-            return createNodeFromPackageJson(p, workspaceRoot);
-        }
-        // The given package.json is not part of the workspaces configuration.
-        return {};
+const plugins_1 = require("../../project-graph/plugins");
+const path_2 = require("path");
+exports.createNodesV2 = [
+    (0, globs_1.combineGlobPatterns)('package.json', '**/package.json', 'project.json', '**/project.json'),
+    (configFiles, _, context) => {
+        const { packageJsons, projectJsonRoots } = splitConfigFiles(configFiles);
+        const readJson = (f) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(context.workspaceRoot, f));
+        const isInPackageJsonWorkspaces = buildPackageJsonWorkspacesMatcher(context.workspaceRoot, readJson);
+        const isNextToProjectJson = (packageJsonPath) => {
+            return projectJsonRoots.has((0, node_path_1.dirname)(packageJsonPath));
+        };
+        return (0, plugins_1.createNodesFromFiles)((packageJsonPath, options, context) => {
+            if (!isInPackageJsonWorkspaces(packageJsonPath) &&
+                !isNextToProjectJson(packageJsonPath)) {
+                // Skip if package.json is not part of the package.json workspaces and not next to a project.json.
+                return null;
+            }
+            return createNodeFromPackageJson(packageJsonPath, context.workspaceRoot);
+        }, packageJsons, _, context);
     },
 ];
+function splitConfigFiles(configFiles) {
+    const packageJsons = [];
+    const projectJsonRoots = new Set();
+    for (const configFile of configFiles) {
+        if ((0, path_2.basename)(configFile) === 'package.json') {
+            packageJsons.push(configFile);
+        }
+        else {
+            projectJsonRoots.add((0, node_path_1.dirname)(configFile));
+        }
+    }
+    return { packageJsons, projectJsonRoots };
+}
 function buildPackageJsonWorkspacesMatcher(workspaceRoot, readJson) {
     const patterns = getGlobPatternsFromPackageManagerWorkspaces(workspaceRoot, readJson);
     const negativePatterns = patterns.filter((p) => p.startsWith('!'));

package/src/plugins/package-json/index.d.ts

@@ -0,0 +1,2 @@
+export * from './create-nodes';
+export declare const name = "nx/core/package-json";

package/src/plugins/{package-json-workspaces → package-json}/index.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.name = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./create-nodes"), exports);
-exports.name = 'nx/core/package-json-workspaces';
+exports.name = 'nx/core/package-json';

package/src/plugins/project-json/build-nodes/project-json.js

@@ -6,18 +6,21 @@ exports.readNameFromPackageJson = readNameFromPackageJson;
 const node_path_1 = require("node:path");
 const to_project_name_1 = require("../../../config/to-project-name");
 const fileutils_1 = require("../../../utils/fileutils");
+const plugins_1 = require("../../../project-graph/plugins");
 exports.ProjectJsonProjectsPlugin = {
     name: 'nx/core/project-json',
-    createNodes: [
+    createNodesV2: [
         '{project.json,**/project.json}',
-        (file, _, { workspaceRoot }) => {
-            const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, file));
-            const project = buildProjectFromProjectJson(json, file);
-            return {
-                projects: {
-                    [project.root]: project,
-                },
-            };
+        (configFiles, _, context) => {
+            return (0, plugins_1.createNodesFromFiles)((file) => {
+                const json = (0, fileutils_1.readJsonFile)((0, node_path_1.join)(context.workspaceRoot, file));
+                const project = buildProjectFromProjectJson(json, file);
+                return {
+                    projects: {
+                        [project.root]: project,
+                    },
+                };
+            }, configFiles, _, context);
         },
     ],
 };

package/src/project-graph/file-utils.js

@@ -18,7 +18,7 @@ const project_graph_1 = require("./project-graph");
 const angular_json_1 = require("../adapter/angular-json");
 const ignore_1 = require("../utils/ignore");
 const project_configuration_utils_1 = require("./utils/project-configuration-utils");
-const package_json_workspaces_1 = require("../plugins/package-json-workspaces");
+const package_json_1 = require("../plugins/package-json");
 const workspace_context_1 = require("../utils/workspace-context");
 const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
 class WholeFileChange {
@@ -150,7 +150,7 @@ function getProjectsSync(root, nxJson) {
     const patterns = [
         '**/project.json',
         'project.json',
-        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(root, fileutils_1.readJsonFile),
+        ...(0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(root, fileutils_1.readJsonFile),
     ];
     const projectFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(root, patterns);
     const rootMap = {};
@@ -162,7 +162,7 @@ function getProjectsSync(root, nxJson) {
         }
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, fileutils_1.readJsonFile)(projectFile);
-            const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, root, projectFile, nxJson);
+            const config = (0, package_json_1.buildProjectConfigurationFromPackageJson)(packageJson, root, projectFile, nxJson);
             if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators

package/src/project-graph/plugins/internal-api.js

@@ -101,9 +101,6 @@ async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
 async function normalizePlugins(plugins, root) {
     plugins ??= [];
     return [
-        // This plugin adds targets that we want to be able to overwrite
-        // in any user-land plugin, so it has to be first :).
-        (0, path_1.join)(__dirname, '../../plugins/project-json/build-nodes/package-json-next-to-project-json'),
         ...plugins,
         // Most of the nx core node plugins go on the end, s.t. it overwrites any other plugins
         ...(await getDefaultPlugins(root)),
@@ -115,7 +112,7 @@ async function getDefaultPlugins(root) {
         ...((0, angular_json_1.shouldMergeAngularProjects)(root, false)
             ? [(0, path_1.join)(__dirname, '../../adapter/angular-json')]
             : []),
-        (0, path_1.join)(__dirname, '../../plugins/package-json-workspaces'),
+        (0, path_1.join)(__dirname, '../../plugins/package-json'),
         (0, path_1.join)(__dirname, '../../plugins/project-json/build-nodes/project-json'),
     ];
 }

package/src/project-graph/plugins/loader.js

@@ -211,7 +211,9 @@ async function loadNxPluginAsync(pluginConfiguration, paths, root) {
 async function importPluginModule(pluginPath) {
     const m = await Promise.resolve(`${pluginPath}`).then(s => require(s));
     if (m.default &&
-        ('createNodes' in m.default || 'createDependencies' in m.default)) {
+        ('createNodes' in m.default ||
+            'createNodesV2' in m.default ||
+            'createDependencies' in m.default)) {
         return m.default;
     }
     return m;

package/src/project-graph/plugins/utils.js

@@ -48,7 +48,9 @@ async function createNodesFromFiles(createNodes, configFiles, options, context)
                 ...context,
                 configFiles,
             });
-            results.push([file, value]);
+            if (value) {
+                results.push([file, value]);
+            }
         }
         catch (e) {
             errors.push([file, e]);

package/src/utils/nx-plugin.deprecated.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultPluginsSync = getDefaultPluginsSync;
 const angular_json_1 = require("../adapter/angular-json");
 const project_json_1 = require("../plugins/project-json/build-nodes/project-json");
-const PackageJsonWorkspacesPlugin = require("../plugins/package-json-workspaces");
+const PackageJsonWorkspacesPlugin = require("../plugins/package-json");
 /**
  * @todo(@agentender) v20: Remove this fn when we remove readWorkspaceConfig
  */

package/src/plugins/package-json-workspaces/index.d.ts

@@ -1,2 +0,0 @@
-export * from './create-nodes';
-export declare const name = "nx/core/package-json-workspaces";

package/src/plugins/project-json/build-nodes/package-json-next-to-project-json.d.ts

@@ -1,3 +0,0 @@
-import { NxPluginV2 } from '../../../project-graph/plugins';
-export declare const PackageJsonProjectsNextToProjectJsonPlugin: NxPluginV2;
-export default PackageJsonProjectsNextToProjectJsonPlugin;

package/src/plugins/project-json/build-nodes/package-json-next-to-project-json.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackageJsonProjectsNextToProjectJsonPlugin = void 0;
-const path_1 = require("path");
-const fs_1 = require("fs");
-const fileutils_1 = require("../../../utils/fileutils");
-const package_json_1 = require("../../../utils/package-json");
-const package_json_workspaces_1 = require("../../package-json-workspaces");
-// TODO: Remove this one day, this should not need to be done.
-exports.PackageJsonProjectsNextToProjectJsonPlugin = {
-    // Its not a problem if plugins happen to have same name, and this
-    // will look least confusing in the source map.
-    name: 'nx/core/package-json',
-    createNodes: [
-        '{project.json,**/project.json}',
-        (file, _, { workspaceRoot }) => {
-            const project = createProjectFromPackageJsonNextToProjectJson(file, workspaceRoot);
-            return project
-                ? {
-                    projects: {
-                        [project.name]: project,
-                    },
-                }
-                : {};
-        },
-    ],
-};
-exports.default = exports.PackageJsonProjectsNextToProjectJsonPlugin;
-function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, workspaceRoot) {
-    const root = (0, path_1.dirname)(projectJsonPath);
-    const relativePackageJsonPath = (0, path_1.join)(root, 'package.json');
-    const packageJsonPath = (0, path_1.join)(workspaceRoot, relativePackageJsonPath);
-    const readJson = (f) => (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, f));
-    // Do not create projects for package.json files
-    // that are part of the package manager workspaces
-    // Those package.json files will be processed later on
-    const matcher = (0, package_json_workspaces_1.buildPackageJsonWorkspacesMatcher)(workspaceRoot, readJson);
-    if (!(0, fs_1.existsSync)(packageJsonPath) || matcher(relativePackageJsonPath)) {
-        return null;
-    }
-    try {
-        const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
-        let { nx, name } = packageJson;
-        return {
-            ...nx,
-            name,
-            root,
-            targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson),
-            metadata: (0, package_json_1.getMetadataFromPackageJson)(packageJson),
-            tags: (0, package_json_1.getTagsFromPackageJson)(packageJson),
-        };
-    }
-    catch (e) {
-        console.log(e);
-        return null;
-    }
-}