npm - nx - Versions diffs - 15.4.1 → 15.4.3-beta.1 - Mend

nx 15.4.1 → 15.4.3-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

package/CHANGELOG.md +1 -1
package/bin/init-local.d.ts +1 -0
package/bin/init-local.js +47 -12
package/bin/init-local.js.map +1 -1
package/package.json +5 -4
package/schemas/nx-schema.json +20 -6
package/src/command-line/nx-commands.js +13 -19
package/src/command-line/nx-commands.js.map +1 -1
package/src/command-line/run-many.js +15 -24
package/src/command-line/run-many.js.map +1 -1
package/src/command-line/run-one.js +4 -4
package/src/command-line/run-one.js.map +1 -1
package/src/command-line/workspace-integrity-checks.d.ts +1 -3
package/src/config/nx-json.d.ts +2 -6
package/src/config/workspaces.d.ts +8 -3
package/src/config/workspaces.js +78 -15
package/src/config/workspaces.js.map +1 -1
package/src/core/graph/main.js +1 -1
package/src/nx-init/add-nx-to-npm-repo.d.ts +2 -1
package/src/nx-init/add-nx-to-npm-repo.js +15 -4
package/src/nx-init/add-nx-to-npm-repo.js.map +1 -1
package/src/nx-init/utils.d.ts +2 -1
package/src/nx-init/utils.js +1 -2
package/src/nx-init/utils.js.map +1 -1
package/src/project-graph/build-nodes/workspace-projects.d.ts +2 -0
package/src/project-graph/build-nodes/workspace-projects.js +32 -25
package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
package/src/project-graph/build-project-graph.js.map +1 -1
package/src/utils/assert-workspace-validity.js +12 -9
package/src/utils/assert-workspace-validity.js.map +1 -1
package/src/utils/find-matching-projects.d.ts +9 -0
package/src/utils/find-matching-projects.js +43 -0
package/src/utils/find-matching-projects.js.map +1 -0
package/src/utils/split-target.d.ts +3 -1
package/src/utils/split-target.js +24 -2
package/src/utils/split-target.js.map +1 -1
package/src/utils/strip-source-code.js +18 -0
package/src/utils/strip-source-code.js.map +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-## [15.4.1](https://github.com/nrwl/nx/compare/15.4.0...15.4.1) (2022-12-23)
+## [15.4.3-beta.1](https://github.com/nrwl/nx/compare/15.4.2...15.4.3-beta.1) (2022-12-30)
 **Note:** Version bump only for package nx

package/bin/init-local.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
 import { WorkspaceTypeAndRoot } from '../src/utils/find-workspace-root';
 export declare function initLocal(workspace: WorkspaceTypeAndRoot): void;
+export declare function rewriteTargetsAndProjects(args: string[]): string[];

package/bin/init-local.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initLocal = void 0;
+exports.rewriteTargetsAndProjects = exports.initLocal = void 0;
 const package_manager_1 = require("../src/utils/package-manager");
 const perf_hooks_1 = require("perf_hooks");
 const child_process_1 = require("child_process");
@@ -20,10 +20,18 @@ function initLocal(workspace) {
             return;
         }
         if (isKnownCommand()) {
-            nx_commands_1.commandsObject.argv;
+            const newArgs = rewriteTargetsAndProjects(process.argv);
+            const help = newArgs.indexOf('--help');
+            const split = newArgs.indexOf('--');
+            if (help > -1 && (split === -1 || split > help)) {
+                nx_commands_1.commandsObject.showHelp();
+            }
+            else {
+                nx_commands_1.commandsObject.parse(newArgs);
+            }
         }
         else {
-            const newArgs = rewritePositionalArguments();
+            const newArgs = rewritePositionalArguments(process.argv);
             nx_commands_1.commandsObject.parse(newArgs);
         }
     }
@@ -33,19 +41,46 @@ function initLocal(workspace) {
     }
 }
 exports.initLocal = initLocal;
-function rewritePositionalArguments() {
-    if (!process.argv[3] || process.argv[3].startsWith('-')) {
-        return [
-            'run',
-            `${wrapIntoQuotesIfNeeded(process.argv[2])}`,
-            ...process.argv.slice(3),
-        ];
+function rewriteTargetsAndProjects(args) {
+    const newArgs = [args[2]];
+    let i = 3;
+    while (i < args.length) {
+        if (args[i] === '--') {
+            return [...newArgs, ...args.slice(i)];
+        }
+        else if (args[i] === '-p' ||
+            args[i] === '--projects' ||
+            args[i] === '--exclude' ||
+            args[i] === '--files' ||
+            args[i] === '-t' ||
+            args[i] === '--target' ||
+            args[i] === '--targets') {
+            newArgs.push(args[i]);
+            i++;
+            const items = [];
+            while (i < args.length && !args[i].startsWith('-')) {
+                items.push(args[i]);
+                i++;
+            }
+            newArgs.push(items.join(','));
+        }
+        else {
+            newArgs.push(args[i]);
+            ++i;
+        }
+    }
+    return newArgs;
+}
+exports.rewriteTargetsAndProjects = rewriteTargetsAndProjects;
+function rewritePositionalArguments(args) {
+    if (!args[3] || args[3].startsWith('-')) {
+        return ['run', `${wrapIntoQuotesIfNeeded(args[2])}`, ...args.slice(3)];
     }
     else {
         return [
             'run',
-            `${process.argv[3]}:${wrapIntoQuotesIfNeeded(process.argv[2])}`,
-            ...process.argv.slice(4),
+            `${args[3]}:${wrapIntoQuotesIfNeeded(args[2])}`,
+            ...args.slice(4),
         ];
     }
 }

package/bin/init-local.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":";;;AAAA,kEAAwE;AAExE,2CAAyC;AACzC,iDAAyC;AAEzC,iEAAiE;AAGjE;;;;GAIG;AACH,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;AAEhC,SAAgB,SAAS,CAAC,SAA+B;IACvD,IAAI;QACF,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAErC,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,0BAA0B,EAAE,EAAE;YAC3D,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO;SACR;QAED,IAAI,cAAc,EAAE,EAAE;YACpB,~~4BAAc~~,CAAC,IAAI,CAAC;~~SACrB~~;aAAM;YACL,MAAM,OAAO,GAAG,0BAA0B,~~EAAE~~,CAAC;~~YAC7C~~,4BAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;~~AApBD~~,~~8BAoBC~~;AAED,~~SAAS~~,~~0BAA0B~~;~~IACjC~~,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,~~GAAG~~,CAAC,~~EAAE~~;~~QACvD~~,OAAO;~~YACL~~,~~KAAK~~;~~YACL~~,GAAG,~~sBAAsB~~,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;~~YAC5C~~,~~GAAG~~,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;~~SACzB~~,CAAC;~~KACH~~;~~SAAM~~;~~QACL~~,OAAO;~~YACL~~,~~KAAK~~;~~YACL~~,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,~~sBAAsB~~,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/D,GAAG,~~OAAO,CAAC,~~IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;~~SACzB~~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"}
1	+ {"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "15.4.1",
+  "version": "15.4.3-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,8 +32,8 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/cli": "15.4.1",
-    "@nrwl/tao": "15.4.1",
+    "@nrwl/cli": "15.4.3-beta.1",
+    "@nrwl/tao": "15.4.3-beta.1",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -104,6 +104,7 @@
       "@nrwl/rollup",
       "@nrwl/storybook",
       "@nrwl/tao",
+      "@nrwl/vite",
       "@nrwl/web",
       "@nrwl/webpack",
       "@nrwl/workspace",
@@ -120,5 +121,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "b0ae071a344e309e402873aa37a96584e76d1021"
+  "gitHead": "c783ac5e9a001b95c58ad88dbd5cecd6a610078a"
 }

package/schemas/nx-schema.json CHANGED Viewed

@@ -209,6 +209,26 @@
       "type": "object",
       "description": "Target defaults",
       "properties": {
+        "executor": {
+          "description": "The function that Nx will invoke when you run this target",
+          "type": "string"
+        },
+        "options": {
+          "type": "object"
+        },
+        "outputs": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "configurations": {
+          "type": "object",
+          "description": "provides extra sets of values that will be merged into the options map",
+          "additionalProperties": {
+            "type": "object"
+          }
+        },
         "inputs": {
           "$ref": "#/definitions/inputs"
         },
@@ -243,12 +263,6 @@
               }
             ]
           }
-        },
-        "outputs": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
         }
       },
       "additionalProperties": false

package/src/command-line/nx-commands.js CHANGED Viewed

@@ -293,8 +293,8 @@ function withFormatOptions(yargs) {
         type: 'boolean',
     })
         .option('projects', {
-        describe: 'Projects to format (comma delimited)',
-        type: 'array',
+        describe: 'Projects to format (comma/space delimited)',
+        type: 'string',
         coerce: parseCSV,
     })
         .conflicts({
@@ -332,9 +332,9 @@ function withPlainOption(yargs) {
 function withExcludeOption(yargs) {
     return yargs.option('exclude', {
         describe: 'Exclude certain projects from being processed',
-        type: 'array',
+        type: 'string',
         coerce: parseCSV,
-        default: [],
+        default: '',
     });
 }
 function withRunOptions(yargs) {
@@ -394,8 +394,8 @@ function withAffectedOptions(yargs) {
         'populate--': true,
     })
         .option('files', {
-        describe: 'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas',
-        type: 'array',
+        describe: 'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas or spaces',
+        type: 'string',
         requiresArg: true,
         coerce: parseCSV,
     })
@@ -443,11 +443,10 @@ function withRunManyOptions(yargs) {
         'populate--': true,
     })
         .option('projects', {
-        type: 'array',
-        string: true,
+        type: 'string',
         alias: 'p',
         coerce: parseCSV,
-        describe: 'Projects to run. (comma delimited project names and/or patterns)',
+        describe: 'Projects to run. (comma/space delimited project names and/or patterns)',
     })
         .option('all', {
         describe: '[deprecated] Run the target on all projects in the workspace',
@@ -467,7 +466,7 @@ function withDepGraphOptions(yargs) {
     })
         .option('exclude', {
         describe: 'List of projects delimited by commas to exclude from the project graph.',
-        type: 'array',
+        type: 'string',
         coerce: parseCSV,
     })
         .option('groupByFolder', {
@@ -510,7 +509,7 @@ function withOutputStyleOption(yargs, choices = ['dynamic', 'static', 'stream',
 function withTargetAndConfigurationOption(yargs, demandOption = true) {
     return withConfiguration(yargs).option('targets', {
         describe: 'Tasks to run for affected projects',
-        type: 'array',
+        type: 'string',
         alias: ['target', 't'],
         requiresArg: true,
         coerce: parseCSV,
@@ -739,11 +738,10 @@ function withWatchOptions(yargs) {
         'populate--': true,
     })
         .option('projects', {
-        type: 'array',
-        string: true,
+        type: 'string',
         alias: 'p',
         coerce: parseCSV,
-        description: 'Projects to watch (comma delimited).',
+        description: 'Projects to watch (comma/space delimited).',
     })
         .option('all', {
         type: 'boolean',
@@ -788,11 +786,7 @@ function parseCSV(args) {
     if (!args) {
         return args;
     }
-    return args
-        .map((arg) => arg.split(','))
-        .reduce((acc, value) => {
-        return [...acc, ...value];
-    }, []);
+    return args.split(',');
 }
 function linkToNxDevAndExamples(yargs, command) {
     (examples_1.examples[command] || []).forEach((t) => {

package/src/command-line/nx-commands.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nx-commands.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"nx-commands.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"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"}

package/src/command-line/run-many.js CHANGED Viewed

@@ -7,10 +7,10 @@ const command_line_utils_1 = require("../utils/command-line-utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const connect_1 = require("./connect");
 const perf_hooks_1 = require("perf_hooks");
-const minimatch = require("minimatch");
 const project_graph_1 = require("../project-graph/project-graph");
 const configuration_1 = require("../config/configuration");
 const output_1 = require("../utils/output");
+const find_matching_projects_1 = require("../utils/find-matching-projects");
 function runMany(args, extraTargetDependencies = {}, extraOptions = { excludeTaskDependencies: false, loadDotEnvFiles: true }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         perf_hooks_1.performance.mark('command-execution-begins');
@@ -30,7 +30,6 @@ function projectsToRun(nxArgs, projectGraph) {
     var _a;
     const selectedProjects = new Map();
     const validProjects = runnableForTarget(projectGraph.nodes, nxArgs.targets);
-    const validProjectNames = Array.from(validProjects.keys());
     const invalidProjects = [];
     // --all is default now, if --projects is provided, it'll override the --all
     if (nxArgs.all && nxArgs.projects.length === 0) {
@@ -39,22 +38,15 @@ function projectsToRun(nxArgs, projectGraph) {
         }
     }
     else {
-        for (const nameOrGlob of nxArgs.projects) {
-            if (validProjects.has(nameOrGlob)) {
-                selectedProjects.set(nameOrGlob, projectGraph.nodes[nameOrGlob]);
-                continue;
+        const allProjectNames = Object.keys(projectGraph.nodes);
+        const matchingProjects = (0, find_matching_projects_1.findMatchingProjects)(nxArgs.projects, allProjectNames, new Set(allProjectNames));
+        for (const project of matchingProjects) {
+            if (!validProjects.has(project)) {
+                invalidProjects.push(project);
             }
-            else if (projectGraph.nodes[nameOrGlob]) {
-                invalidProjects.push(nameOrGlob);
-                continue;
+            else {
+                selectedProjects.set(project, projectGraph.nodes[project]);
             }
-            const matchedProjectNames = minimatch.match(validProjectNames, nameOrGlob);
-            if (matchedProjectNames.length === 0) {
-                throw new Error(`No projects matching: ${nameOrGlob}`);
-            }
-            matchedProjectNames.forEach((matchedProjectName) => {
-                selectedProjects.set(matchedProjectName, projectGraph.nodes[matchedProjectName]);
-            });
         }
         if (invalidProjects.length > 0) {
             output_1.output.warn({
@@ -63,16 +55,15 @@ function projectsToRun(nxArgs, projectGraph) {
             });
         }
     }
-    for (const nameOrGlob of (_a = nxArgs.exclude) !== null && _a !== void 0 ? _a : []) {
-        const project = selectedProjects.has(nameOrGlob);
+    if (selectedProjects.size === 0) {
+        throw new Error(`No projects found for project patterns`);
+    }
+    const excludedProjects = (0, find_matching_projects_1.findMatchingProjects)((_a = nxArgs.exclude) !== null && _a !== void 0 ? _a : [], Array.from(selectedProjects.keys()), new Set(selectedProjects.keys()));
+    for (const excludedProject of excludedProjects) {
+        const project = selectedProjects.has(excludedProject);
         if (project) {
-            selectedProjects.delete(nameOrGlob);
-            continue;
+            selectedProjects.delete(excludedProject);
         }
-        const matchedProjects = minimatch.match(Array.from(selectedProjects.keys()), nameOrGlob);
-        matchedProjects.forEach((matchedProjectName) => {
-            selectedProjects.delete(matchedProjectName);
-        });
     }
     return Array.from(selectedProjects.values());
 }

package/src/command-line/run-many.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":";;;;AAAA,6DAAyD;AAEzD,oEAA8E;AAC9E,sEAAgE;AAChE,uCAA8D;AAC9D,2CAAyC;~~AACzC~~,~~uCAAuC;AAEvC,~~kEAAyE;AAEzE,2DAAqD;AACrD,4CAAyC;~~AAEzC~~,SAAsB,OAAO,CAC3B,IAA0B,EAC1B,0BAGI,EAAE,EACN,eAAe,EAAE,uBAAuB,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAGrE;;QAED,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,IAAI,EACJ,UAAU,EACV,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB,MAAM,CACP,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC;SACzC;QAED,MAAM,IAAA,2CAAiC,EAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,MAAM,IAAA,wBAAU,EACd,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,EACvB,YAAY,CACb,CAAC;IACJ,CAAC;CAAA;AAtCD,0BAsCC;AAED,SAAgB,aAAa,CAC3B,MAAc,EACd,YAA0B;;IAE1B,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAmC,CAAC;IACpE,MAAM,aAAa,GAAG,iBAAiB,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,~~iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,MAAM,~~eAAe,GAAa,EAAE,CAAC;IAErC,4EAA4E;IAC5E,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE;YACvC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;SACpE;KACF;SAAM;QACL,~~KAAK,~~MAAM,~~UAAU~~,~~IAAI~~,MAAM,CAAC,~~QAAQ,EAAE;YACxC,~~IAAI,~~aAAa,~~CAAC,~~GAAG~~,CAAC,~~UAAU~~,CAAC,~~EAAE~~;~~gBACjC~~,gBAAgB,~~CAAC,~~GAAG,~~CAAC~~,~~UAAU~~,~~EAAE~~,~~YAAY~~,CAAC,~~KAAK~~,~~CAAC~~,~~UAAU~~,~~CAAC~~,~~CAAC,CAAC;gBACjE,SAAS;aACV;iBAAM,~~IAAI,~~YAAY~~,CAAC,~~KAAK,CAAC,UAAU,CAAC,EAAE;gBACzC,~~eAAe,CAAC,~~IAAI~~,CAAC~~,UAAU,CAAC,CAAC~~;~~gBACjC~~,~~SAAS;aACV;YAED~~,MAAM,~~mBAAmB~~,~~GAAG~~,~~SAAS~~,~~CAAC,KAAK,CACzC,iBAAiB,EACjB,UAAU,CACX,CAAC~~;~~YAEF~~,IAAI,~~mBAAmB,~~CAAC,~~MAAM~~,~~KAAK,~~CAAC,~~EAAE;gBACpC~~,~~MAAM~~,~~IAAI~~,~~KAAK,~~CAAC,~~yBAAyB,UAAU,~~EAAE,~~CAAC~~,CAAC~~;aACxD;YAED~~,~~mBAAmB~~,CAAC,OAAO,CAAC,CAAC~~,kBAAkB,EAAE,EAAE~~;~~gBACjD~~,gBAAgB,CAAC,GAAG,~~CAClB~~,~~kBAAkB~~,~~EAClB~~,YAAY,CAAC,KAAK,CAAC,~~kBAAkB~~,CAAC,~~CACvC,~~CAAC~~;YACJ~~,CAAC~~,CAAC,CAAC~~;~~SACJ~~;QAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9B,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,gDAAgD,MAAM,CAAC,MAAM,GAAG;gBACvE,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;aACtD,CAAC,CAAC;SACJ;KACF;IAED,~~KAAK~~,~~MAAM~~,~~UAAU~~,IAAI,~~MAAA~~,~~MAAM,~~CAAC,~~OAAO,mCAAI,~~EAAE~~,EAAE~~;~~QAC7C~~,MAAM,~~OAAO~~,~~GAAG~~,~~gBAAgB,~~CAAC,~~GAAG~~,CAAC,~~UAAU,~~CAAC~~,CAAC~~;~~QACjD~~,~~IAAI~~,~~OAAO,EAAE;YACX,~~gBAAgB,~~CAAC~~,~~MAAM~~,~~CAAC~~,~~UAAU~~,~~CAAC~~,~~CAAC;YACpC,SAAS;SACV;QAED,~~MAAM,~~eAAe~~,~~GAAG~~,~~SAAS~~,~~CAAC~~,~~KAAK~~,~~CACrC,~~KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,EACnC,~~UAAU~~,~~CACX~~,CAAC~~;QAEF~~,~~eAAe~~,CAAC,~~OAAO~~,CAAC,CAAC,~~kBAAkB~~,~~EAAE~~,EAAE;~~YAC7C~~,gBAAgB,CAAC,~~MAAM~~,CAAC,~~kBAAkB~~,CAAC,CAAC;~~QAC9C~~,CAAC,CAAC,CAAC;~~KACJ~~;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/C,CAAC;~~AAnED~~,~~sCAmEC~~;AAED,SAAS,iBAAiB,CACxB,QAAiD,EACjD,OAAiB;IAEjB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,IAAI,WAAW,IAAI,QAAQ,EAAE;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,sCAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE;YAC/D,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SAC3B;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":"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"}

package/src/command-line/run-one.js CHANGED Viewed

@@ -17,7 +17,7 @@ function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = { exclud
         perf_hooks_1.performance.measure('code-loading', 'init-local', 'command-execution-begins');
         const nxJson = (0, configuration_1.readNxJson)();
         const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-        const opts = parseRunOneOptions(cwd, args, Object.assign(Object.assign({}, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph)), nxJson));
+        const opts = parseRunOneOptions(cwd, args, projectGraph, nxJson);
         const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(Object.assign(Object.assign({}, opts.parsedArgs), { configuration: opts.configuration, targets: [opts.target] }), 'run-one', { printWarnings: true }, nxJson);
         if (nxArgs.verbose) {
             process.env.NX_VERBOSE_LOGGING = 'true';
@@ -52,14 +52,14 @@ const targetAliases = {
     s: 'serve',
     t: 'test',
 };
-function parseRunOneOptions(cwd, parsedArgs, workspaceConfiguration) {
-    const defaultProjectName = calculateDefaultProjectName(cwd, workspace_root_1.workspaceRoot, workspaceConfiguration);
+function parseRunOneOptions(cwd, parsedArgs, projectGraph, nxJson) {
+    const defaultProjectName = calculateDefaultProjectName(cwd, workspace_root_1.workspaceRoot, Object.assign(Object.assign({}, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph)), nxJson));
     let project;
     let target;
     let configuration;
     if (parsedArgs['project:target:configuration'].indexOf(':') > -1) {
         // run case
-        [project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs['project:target:configuration']);
+        [project, target, configuration] = (0, split_target_1.splitTarget)(parsedArgs['project:target:configuration'], projectGraph);
         // this is to account for "nx npmsript:dev"
         if (project && !target && defaultProjectName) {
             target = project;

package/src/command-line/run-one.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":";;;;AAAA,6DAAyD;AACzD,oEAA8E;AAC9E,uCAA8D;AAC9D,2CAAyC;AACzC,kEAGwC;AAGxC,4DAAwD;AACxD,wDAAoD;AACpD,4CAAyC;~~AAKzC~~,2DAAqD;AAErD,SAAsB,MAAM,CAC1B,GAAW,EACX,IAA0B,EAC1B,0BAGI,EAAE,EACN,eAAe,EAAE,uBAAuB,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAGrE;;QAED,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,wBAAW,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,0BAA0B,CAAC,CAAC;QAE9E,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1E,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,EAAE,IAAI,~~kCACpC~~,~~IAAA,yDAAyC,EAAC,~~YAAY,~~CAAC~~,~~GACvD,~~MAAM,~~EACT~~,CAAC;~~QAEH~~,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,kCAEtD,IAAI,CAAC,UAAU,KAClB,aAAa,EAAE,IAAI,CAAC,aAAa,EACjC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAExB,SAAS,EACT,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB,MAAM,CACP,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC;SACzC;QACD,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,MAAM,CACJ,2CAAa,OAAO,EAAC,CACtB,CAAC,GAAG,CAAC,GAAG,EAAE,8BAAa,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,MAAM,IAAA,2CAAiC,EAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7D,MAAM,IAAA,wBAAU,EACd,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,uBAAuB,EACvB,YAAY,CACb,CAAC;IACJ,CAAC;CAAA;~~AAzDD~~,~~wBAyDC~~;AAED,SAAS,WAAW,CAAC,YAA0B,EAAE,OAAe;IAC9D,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QAChC,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,wBAAwB,OAAO,GAAG;SAC1C,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IACD,IAAI,QAAQ,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,IAAI,WAAW,GAAG;QAChB,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;KACvC,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,aAAa,GAAG;IACpB,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;CACV,CAAC;AAEF,SAAS,kBAAkB,CACzB,GAAW,EACX,UAAgC,EAChC,~~sBAAoE~~;~~IAEpE~~,MAAM,kBAAkB,GAAG,2BAA2B,~~CACpD~~,GAAG,~~EACH~~,8BAAa,~~EACb~~,~~sBAAsB~~,~~CACvB~~,CAAC;~~IAEF~~,IAAI,OAAO,CAAC;IACZ,IAAI,MAAM,CAAC;IACX,IAAI,aAAa,CAAC;IAElB,IAAI,UAAU,CAAC,8BAA8B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;QAChE,WAAW;QACX,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,IAAA,0BAAW,EAC5C,UAAU,CAAC,8BAA8B,CAAC,~~CAC3C~~,CAAC;QACF,2CAA2C;QAC3C,IAAI,OAAO,IAAI,CAAC,MAAM,IAAI,kBAAkB,EAAE;YAC5C,MAAM,GAAG,OAAO,CAAC;YACjB,OAAO,GAAG,kBAAkB,CAAC;SAC9B;KACF;SAAM;QACL,MAAM,GAAG,UAAU,CAAC,8BAA8B,CAAC,CAAC;KACrD;IACD,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;KAC9B;IACD,IAAI,CAAC,OAAO,IAAI,kBAAkB,EAAE;QAClC,OAAO,GAAG,kBAAkB,CAAC;KAC9B;IACD,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IACD,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;KAChC;IACD,IAAI,UAAU,CAAC,aAAa,EAAE;QAC5B,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;KAC1C;SAAM,IAAI,UAAU,CAAC,IAAI,EAAE;QAC1B,aAAa,GAAG,YAAY,CAAC;KAC9B;IAED,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;IAC3D,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,UAAU,CAAC,8BAA8B,CAAC,CAAC;IAClD,OAAO,UAAU,CAAC,eAAe,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;IAE7B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,2BAA2B,CACzC,GAAW,EACX,IAAY,EACZ,sBAAoE;;IAEpE,IAAI,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7E,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACvC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,WAAW,CAAC;IAChB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE;QACJ,MAAM,WAAW,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,OAAO,CACL,WAAW,IAAI,WAAW;YAC1B,CAAC,WAAW,IAAI,EAAE,IAAI,WAAW,IAAI,GAAG,CAAC;YACzC,WAAW,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,CAC1C,CAAC;IACJ,CAAC,CACF,CAAC;IACF,IAAI,eAAe;QAAE,OAAO,eAAe,CAAC;IAC5C,OAAO,CACL,CAAA,MAAC,sBAAsB,CAAC,GAAsC,0CAC1D,kBAAkB,KAAI,sBAAsB,CAAC,cAAc,CAChE,CAAC;AACJ,CAAC;AAzBD,kEAyBC"}
1	+ {"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":"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"}

package/src/command-line/workspace-integrity-checks.d.ts CHANGED Viewed

@@ -81,9 +81,7 @@ export declare class WorkspaceIntegrityChecks {
                 version: string;
             })[];
         };
-        executors: string; /**
-         * TODO(JamesHenry): Add support for error documentation
-         */
+        executors: string;
         builders: string;
         publishConfig: {
             access: string;

package/src/config/nx-json.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { PackageManager } from '../utils/package-manager';
-import { InputDefinition, TargetDependencyConfig } from './workspace-json-project-json';
+import { InputDefinition, TargetConfiguration, TargetDependencyConfig } from './workspace-json-project-json';
 export declare type ImplicitDependencyEntry<T = '*' | string[]> = {
     [key: string]: T | ImplicitJsonSubsetDependency<T>;
 };
@@ -12,11 +12,7 @@ export interface NxAffectedConfig {
      */
     defaultBase?: string;
 }
-export declare type TargetDefaults = Record<string, {
-    outputs?: string[];
-    dependsOn?: (TargetDependencyConfig | string)[];
-    inputs?: (InputDefinition | string)[];
-}>;
+export declare type TargetDefaults = Record<string, Partial<TargetConfiguration>>;
 export declare type TargetDependencies = Record<string, (TargetDependencyConfig | string)[]>;
 /**
  * Nx.json configuration

package/src/config/workspaces.d.ts CHANGED Viewed

@@ -1,8 +1,10 @@
 import { Ignore } from 'ignore';
-import type { NxJsonConfiguration } from './nx-json';
-import { ProjectConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
+import type { NxJsonConfiguration, TargetDefaults } from './nx-json';
+import { ProjectConfiguration, ProjectsConfigurations, TargetConfiguration } from './workspace-json-project-json';
 import { ExecutorConfig, Generator } from './misc-interfaces';
-export declare function workspaceConfigName(root: string): 'angular.json' | 'workspace.json' | null;
+export declare function workspaceConfigName(root: string, opts?: {
+    includeProjectsFromAngularJson: any;
+}): 'angular.json' | 'workspace.json' | null;
 export declare class Workspaces {
     private root;
     private cachedWorkspaceConfig;
@@ -11,6 +13,7 @@ export declare class Workspaces {
     calculateDefaultProjectName(cwd: string, wc: ProjectsConfigurations & NxJsonConfiguration): string;
     readWorkspaceConfiguration(opts?: {
         _ignorePluginInference?: boolean;
+        _includeProjectsFromAngularJson?: boolean;
     }): ProjectsConfigurations & NxJsonConfiguration;
     private mergeWorkspaceJsonAndGlobProjects;
     private mergeTargetDefaultsIntoProjectDescriptions;
@@ -62,4 +65,6 @@ export declare function inferProjectFromNonStandardFile(file: string, nxJson: Nx
 };
 export declare function buildWorkspaceConfigurationFromGlobs(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 readJson?: <T extends Object>(string: any) => T): ProjectsConfigurations;
+export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
+export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;