nx 14.1.9 → 14.2.0-beta.2
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.
- package/CHANGELOG.md +1 -1
- package/bin/{init.d.ts → compute-project-graph.d.ts} +0 -0
- package/bin/{init.js → compute-project-graph.js} +1 -1
- package/bin/compute-project-graph.js.map +1 -0
- package/bin/nx.js +9 -1
- package/bin/nx.js.map +1 -1
- package/bin/run-executor.js +15 -2
- package/bin/run-executor.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +18 -8
- package/presets/core.json +13 -8
- package/presets/npm.json +13 -7
- package/src/adapter/compat.js +4 -4
- package/src/adapter/compat.js.map +1 -1
- package/src/adapter/ngcli-adapter.d.ts +4 -4
- package/src/adapter/ngcli-adapter.js +3 -0
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/affected.js +8 -2
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/connect-to-nx-cloud.js +3 -3
- package/src/command-line/connect-to-nx-cloud.js.map +1 -1
- package/src/command-line/dep-graph.js +7 -7
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.d.ts +2 -2
- package/src/command-line/format.js +4 -3
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.js +137 -45
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/init.d.ts +1 -0
- package/src/command-line/init.js +39 -0
- package/src/command-line/init.js.map +1 -0
- package/src/command-line/lint.js +2 -2
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/list.js +2 -2
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/migrate.js +9 -0
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +60 -9
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +10 -10
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/read-environment.js +3 -3
- package/src/command-line/read-environment.js.map +1 -1
- package/src/command-line/report.js +3 -3
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +4 -6
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/run.d.ts +2 -2
- package/src/command-line/run.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -2
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/configuration.d.ts +11 -0
- package/src/config/configuration.js +26 -0
- package/src/config/configuration.js.map +1 -0
- package/src/config/misc-interfaces.d.ts +3 -3
- package/src/config/workspace-json-project-json.d.ts +8 -4
- package/src/config/workspaces.d.ts +11 -7
- package/src/config/workspaces.js +29 -23
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/daemon/client/client.js +3 -3
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +3 -3
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/daemon/server/server.js +7 -7
- package/src/daemon/server/server.js.map +1 -1
- package/src/daemon/server/shutdown-utils.js +2 -2
- package/src/daemon/server/shutdown-utils.js.map +1 -1
- package/src/daemon/server/watcher.js +10 -10
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/generators/utils/project-configuration.d.ts +3 -3
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/file-hasher-base.js +4 -4
- package/src/hasher/file-hasher-base.js.map +1 -1
- package/src/hasher/file-hasher.js +2 -2
- package/src/hasher/file-hasher.js.map +1 -1
- package/src/hasher/git-based-file-hasher.js +5 -5
- package/src/hasher/git-based-file-hasher.js.map +1 -1
- package/src/hasher/hasher.js +4 -4
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/node-based-file-hasher.js +6 -6
- package/src/hasher/node-based-file-hasher.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-default-collection.d.ts +2 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js +19 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -0
- package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +2 -1
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/build-nodes/npm-packages.js +2 -2
- package/src/project-graph/build-nodes/npm-packages.js.map +1 -1
- package/src/project-graph/build-nodes/workspace-projects.js +2 -2
- package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +2 -2
- package/src/project-graph/build-project-graph.js +5 -5
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -17
- package/src/project-graph/file-utils.js +8 -48
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/nx-deps-cache.d.ts +2 -2
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/project-graph/project-graph.js +2 -1
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +6 -6
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/cache.js +2 -2
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/create-task-graph.d.ts +21 -0
- package/src/tasks-runner/create-task-graph.js +138 -0
- package/src/tasks-runner/create-task-graph.js.map +1 -0
- package/src/tasks-runner/default-tasks-runner.js +2 -5
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +10 -4
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +0 -12
- package/src/tasks-runner/run-command.js +30 -193
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-utils.d.ts +3 -0
- package/src/tasks-runner/task-graph-utils.js +56 -0
- package/src/tasks-runner/task-graph-utils.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +3 -1
- package/src/tasks-runner/task-orchestrator.js +23 -11
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner-v2.d.ts +2 -0
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +4 -1
- package/src/tasks-runner/tasks-schedule.js +0 -4
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.js +2 -2
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/add-command-prefix.d.ts +5 -0
- package/src/utils/add-command-prefix.js +59 -0
- package/src/utils/add-command-prefix.js.map +1 -0
- package/src/utils/cache-directory.js +2 -2
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +6 -8
- package/src/utils/command-line-utils.js +9 -13
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/find-workspace-root.js +9 -7
- package/src/utils/find-workspace-root.js.map +1 -1
- package/src/utils/nx-plugin.js +10 -10
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/output.d.ts +1 -1
- package/src/utils/output.js +2 -2
- package/src/utils/output.js.map +1 -1
- package/src/utils/params.d.ts +2 -2
- package/src/utils/params.js.map +1 -1
- package/src/utils/plugins/models.d.ts +3 -14
- package/src/utils/plugins/plugin-capabilities.js +2 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
- package/src/utils/register.d.ts +8 -1
- package/src/utils/register.js +81 -10
- package/src/utils/register.js.map +1 -1
- package/src/utils/target-project-locator.js +2 -2
- package/src/utils/target-project-locator.js.map +1 -1
- package/src/utils/typescript.js +5 -5
- package/src/utils/typescript.js.map +1 -1
- package/src/utils/versions.d.ts +6 -4
- package/src/utils/versions.js +7 -5
- package/src/utils/versions.js.map +1 -1
- package/src/utils/{app-root.d.ts → workspace-root.d.ts} +5 -4
- package/src/utils/workspace-root.js +41 -0
- package/src/utils/workspace-root.js.map +1 -0
- package/bin/init.js.map +0 -1
- package/src/tasks-runner/task-graph-creator.d.ts +0 -13
- package/src/tasks-runner/task-graph-creator.js +0 -71
- package/src/tasks-runner/task-graph-creator.js.map +0 -1
- package/src/utils/app-root.js +0 -39
- package/src/utils/app-root.js.map +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NodeBasedFileHasher = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
6
6
|
const perf_hooks_1 = require("perf_hooks");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const fs_1 = require("fs");
|
|
@@ -19,7 +19,7 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
19
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
perf_hooks_1.performance.mark('init hashing:start');
|
|
21
21
|
this.clear();
|
|
22
|
-
this.allFilesInDir(
|
|
22
|
+
this.allFilesInDir(workspace_root_1.workspaceRoot, true);
|
|
23
23
|
perf_hooks_1.performance.mark('init hashing:end');
|
|
24
24
|
perf_hooks_1.performance.measure('init hashing', 'init hashing:start', 'init hashing:end');
|
|
25
25
|
});
|
|
@@ -34,14 +34,14 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
allFilesInDir(absoluteDirName, recurse = true) {
|
|
37
|
-
const relDirName = (0, path_1.relative)(
|
|
37
|
+
const relDirName = (0, path_1.relative)(workspace_root_1.workspaceRoot, absoluteDirName);
|
|
38
38
|
if (relDirName && this.ignoredGlobs.ignores(relDirName)) {
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
41
|
try {
|
|
42
42
|
(0, fs_1.readdirSync)(absoluteDirName).forEach((c) => {
|
|
43
43
|
const absoluteChild = (0, path_1.join)(absoluteDirName, c);
|
|
44
|
-
const relChild = (0, path_1.relative)(
|
|
44
|
+
const relChild = (0, path_1.relative)(workspace_root_1.workspaceRoot, absoluteChild);
|
|
45
45
|
if (this.ignoredGlobs.ignores(relChild)) {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
@@ -63,8 +63,8 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
63
63
|
exports.NodeBasedFileHasher = NodeBasedFileHasher;
|
|
64
64
|
function getIgnoredGlobs() {
|
|
65
65
|
const ig = (0, ignore_1.default)();
|
|
66
|
-
ig.add(readFileIfExisting(`${
|
|
67
|
-
ig.add(readFileIfExisting(`${
|
|
66
|
+
ig.add(readFileIfExisting(`${workspace_root_1.workspaceRoot}/.gitignore`));
|
|
67
|
+
ig.add(readFileIfExisting(`${workspace_root_1.workspaceRoot}/.nxignore`));
|
|
68
68
|
ig.add((0, strip_indents_1.stripIndents) `
|
|
69
69
|
node_modules
|
|
70
70
|
tmp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,0DAAsD;AACtD,mCAA4B;AAC5B,wCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAqDnC,CAAC;IAnDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,8BAAa,EAAE,IAAI,CAAC,CAAC;YAExC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,eAAe,CAAC,CAAC;QAC5D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,aAAa,CAAC,CAAC;gBACxD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAA,oBAAa,EAAC,QAAQ,CAAC,EACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;qBACH;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;AAtDD,kDAsDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,aAAa,CAAC,CAAC,CAAC;IAC1D,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,YAAY,CAAC,CAAC,CAAC;IACzD,EAAE,CAAC,GAAG,CAAC,IAAA,4BAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
5
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
6
|
+
function default_1(tree) {
|
|
7
|
+
var _a;
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const workspaceConfiguration = (0, project_configuration_1.readWorkspaceConfiguration)(tree);
|
|
10
|
+
(_a = workspaceConfiguration.cli) === null || _a === void 0 ? true : delete _a.defaultCollection;
|
|
11
|
+
if (Object.keys(workspaceConfiguration.cli).length === 0) {
|
|
12
|
+
delete workspaceConfiguration.cli;
|
|
13
|
+
}
|
|
14
|
+
(0, project_configuration_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
15
|
+
yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
exports.default = default_1;
|
|
19
|
+
//# sourceMappingURL=remove-default-collection.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-default-collection.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/remove-default-collection.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAE5I,mBAA+B,IAAU;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,kDAA0B,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAA,sBAAsB,CAAC,GAAG,+CAAE,iBAAiB,CAAC;QACrD,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACxD,OAAO,sBAAsB,CAAC,GAAG,CAAC;SACnC;QAED,IAAA,oDAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAE3D,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;;CACvD;AAXD,4BAWC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FileChange } from '../file-utils';
|
|
2
2
|
import { NxJsonConfiguration } from '../../config/nx-json';
|
|
3
3
|
import { ProjectGraph } from '../../config/project-graph';
|
|
4
|
-
import {
|
|
5
|
-
export declare function filterAffected(graph: ProjectGraph, touchedFiles: FileChange[], workspaceJson?:
|
|
4
|
+
import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
|
|
5
|
+
export declare function filterAffected(graph: ProjectGraph, touchedFiles: FileChange[], workspaceJson?: ProjectsConfigurations, nxJson?: NxJsonConfiguration, packageJson?: any): ProjectGraph;
|
|
@@ -9,7 +9,8 @@ const normalize_nx_json_1 = require("../normalize-nx-json");
|
|
|
9
9
|
const workspace_json_changes_1 = require("./locators/workspace-json-changes");
|
|
10
10
|
const tsconfig_json_changes_1 = require("./locators/tsconfig-json-changes");
|
|
11
11
|
const operators_1 = require("../operators");
|
|
12
|
-
|
|
12
|
+
const configuration_1 = require("../../config/configuration");
|
|
13
|
+
function filterAffected(graph, touchedFiles, workspaceJson = (0, configuration_1.readAllWorkspaceConfiguration)(), nxJson = (0, configuration_1.readNxJson)(), packageJson = (0, file_utils_1.readPackageJson)()) {
|
|
13
14
|
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(workspaceJson.projects));
|
|
14
15
|
// Additional affected logic should be in this array.
|
|
15
16
|
const touchedProjectLocators = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"affected-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/affected/affected-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildNpmPackageNodes = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
-
const
|
|
5
|
+
const workspace_root_1 = require("nx/src/utils/workspace-root");
|
|
6
6
|
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
7
7
|
function buildNpmPackageNodes(builder) {
|
|
8
|
-
const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(
|
|
8
|
+
const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'));
|
|
9
9
|
const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
|
|
10
10
|
Object.keys(deps).forEach((d) => {
|
|
11
11
|
builder.addExternalNode({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/npm-packages.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/npm-packages.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,gEAA4D;AAC5D,sDAAsD;AAGtD,SAAgB,oBAAoB,CAAC,OAA4B;IAC/D,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,8BAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACtE,MAAM,IAAI,mCACL,WAAW,CAAC,YAAY,GACxB,WAAW,CAAC,eAAe,CAC/B,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,OAAO,CAAC,eAAe,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,OAAO,CAAC,EAAE;YAChB,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAChB,WAAW,EAAE,CAAC;aACf;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildWorkspaceProjectNodes = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
|
-
const
|
|
6
|
+
const workspace_root_1 = require("nx/src/utils/workspace-root");
|
|
7
7
|
const nx_plugin_1 = require("nx/src/utils/nx-plugin");
|
|
8
8
|
const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
|
|
9
9
|
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
@@ -11,7 +11,7 @@ function buildWorkspaceProjectNodes(ctx, builder) {
|
|
|
11
11
|
const toAdd = [];
|
|
12
12
|
Object.keys(ctx.workspace.projects).forEach((key) => {
|
|
13
13
|
const p = ctx.workspace.projects[key];
|
|
14
|
-
const projectRoot = (0, path_1.join)(
|
|
14
|
+
const projectRoot = (0, path_1.join)(workspace_root_1.workspaceRoot, p.root);
|
|
15
15
|
if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
|
|
16
16
|
p.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, p.targets);
|
|
17
17
|
const { nx } = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2BAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { FileData } from './file-utils';
|
|
2
2
|
import { ProjectGraphCache } from './nx-deps-cache';
|
|
3
3
|
import { ProjectFileMap, ProjectGraph } from '../config/project-graph';
|
|
4
|
-
import {
|
|
4
|
+
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
5
5
|
export declare function buildProjectGraph(): Promise<ProjectGraph<any>>;
|
|
6
|
-
export declare function buildProjectGraphUsingProjectFileMap(workspaceJson:
|
|
6
|
+
export declare function buildProjectGraphUsingProjectFileMap(workspaceJson: ProjectsConfigurations, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], cache: ProjectGraphCache | null, shouldWriteCache: boolean): Promise<{
|
|
7
7
|
projectGraph: ProjectGraph;
|
|
8
8
|
projectGraphCache: ProjectGraphCache;
|
|
9
9
|
}>;
|
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildProjectGraphUsingProjectFileMap = exports.buildProjectGraph = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const perf_hooks_1 = require("perf_hooks");
|
|
8
8
|
const assert_workspace_validity_1 = require("../utils/assert-workspace-validity");
|
|
9
|
-
const file_utils_1 = require("./file-utils");
|
|
10
9
|
const normalize_nx_json_1 = require("./normalize-nx-json");
|
|
11
10
|
const nx_deps_cache_1 = require("./nx-deps-cache");
|
|
12
11
|
const build_dependencies_1 = require("./build-dependencies");
|
|
@@ -20,9 +19,10 @@ const typescript_1 = require("../utils/typescript");
|
|
|
20
19
|
const fileutils_1 = require("../utils/fileutils");
|
|
21
20
|
const logger_1 = require("../utils/logger");
|
|
22
21
|
const project_graph_builder_1 = require("./project-graph-builder");
|
|
22
|
+
const configuration_1 = require("../config/configuration");
|
|
23
23
|
function buildProjectGraph() {
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const workspaceJson = (0,
|
|
25
|
+
const workspaceJson = (0, configuration_1.readAllWorkspaceConfiguration)();
|
|
26
26
|
const { projectFileMap, allWorkspaceFiles } = (0, file_map_utils_1.createProjectFileMap)(workspaceJson, file_hasher_1.defaultFileHasher.allFileData());
|
|
27
27
|
const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
|
|
28
28
|
let cache = cacheEnabled ? (0, nx_deps_cache_1.readCache)() : null;
|
|
@@ -32,7 +32,7 @@ function buildProjectGraph() {
|
|
|
32
32
|
exports.buildProjectGraph = buildProjectGraph;
|
|
33
33
|
function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, cache, shouldWriteCache) {
|
|
34
34
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
const nxJson = (0,
|
|
35
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
36
36
|
const projectGraphVersion = '5.0';
|
|
37
37
|
(0, assert_workspace_validity_1.assertWorkspaceValidity)(workspaceJson, nxJson);
|
|
38
38
|
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(workspaceJson.projects));
|
|
@@ -65,7 +65,7 @@ function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, all
|
|
|
65
65
|
}
|
|
66
66
|
exports.buildProjectGraphUsingProjectFileMap = buildProjectGraphUsingProjectFileMap;
|
|
67
67
|
function readCombinedDeps() {
|
|
68
|
-
const json = (0, fileutils_1.readJsonFile)((0, path_1.join)(
|
|
68
|
+
const json = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'));
|
|
69
69
|
return Object.assign(Object.assign({}, json.dependencies), json.devDependencies);
|
|
70
70
|
}
|
|
71
71
|
function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraphVersion) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import type { NxArgs } from '../utils/command-line-utils';
|
|
2
2
|
import { FileData } from '../config/project-graph';
|
|
3
|
-
import { NxJsonConfiguration } from '../config/nx-json';
|
|
4
|
-
import { WorkspaceJsonConfiguration } from '../config/workspace-json-project-json';
|
|
5
3
|
export interface Change {
|
|
6
4
|
type: string;
|
|
7
5
|
}
|
|
@@ -15,25 +13,11 @@ export declare function isWholeFileChange(change: Change): change is WholeFileCh
|
|
|
15
13
|
export declare function readFileIfExisting(path: string): string;
|
|
16
14
|
export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: import("ignore").Ignore): FileChange[];
|
|
17
15
|
export declare const TEN_MEGABYTES: number;
|
|
18
|
-
export declare function readWorkspaceJson(): WorkspaceJsonConfiguration;
|
|
19
16
|
export declare function readWorkspaceConfig(opts: {
|
|
20
17
|
format: 'angularCli' | 'nx';
|
|
21
18
|
path?: string;
|
|
22
19
|
}): any;
|
|
23
|
-
export declare function workspaceFileName(): "
|
|
20
|
+
export declare function workspaceFileName(): "angular.json" | "workspace.json";
|
|
24
21
|
export declare function defaultFileRead(filePath: string): string | null;
|
|
25
22
|
export declare function readPackageJson(): any;
|
|
26
|
-
/**
|
|
27
|
-
* Returns the contents of nx.json.
|
|
28
|
-
*
|
|
29
|
-
* If nx.json extends another config file, it will be inlined here.
|
|
30
|
-
*/
|
|
31
|
-
export declare function readNxJson(path?: string): NxJsonConfiguration;
|
|
32
|
-
/**
|
|
33
|
-
* Returns information about where apps and libs will be created.
|
|
34
|
-
*/
|
|
35
|
-
export declare function workspaceLayout(): {
|
|
36
|
-
appsDir: string;
|
|
37
|
-
libsDir: string;
|
|
38
|
-
};
|
|
39
23
|
export { FileData };
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
|
|
4
4
|
const workspaces_1 = require("../config/workspaces");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const
|
|
8
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
9
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
10
|
const json_diff_1 = require("../utils/json-diff");
|
|
11
11
|
const ignore_1 = require("ignore");
|
|
@@ -26,8 +26,8 @@ function readFileIfExisting(path) {
|
|
|
26
26
|
exports.readFileIfExisting = readFileIfExisting;
|
|
27
27
|
function getIgnoredGlobs() {
|
|
28
28
|
const ig = (0, ignore_1.default)();
|
|
29
|
-
ig.add(readFileIfExisting(`${
|
|
30
|
-
ig.add(readFileIfExisting(`${
|
|
29
|
+
ig.add(readFileIfExisting(`${workspace_root_1.workspaceRoot}/.gitignore`));
|
|
30
|
+
ig.add(readFileIfExisting(`${workspace_root_1.workspaceRoot}/.nxignore`));
|
|
31
31
|
return ig;
|
|
32
32
|
}
|
|
33
33
|
function calculateFileChanges(files, allWorkspaceFiles, nxArgs, readFileAtRevision = defaultReadFileAtRevision, ignore = getIgnoredGlobs()) {
|
|
@@ -68,7 +68,7 @@ exports.calculateFileChanges = calculateFileChanges;
|
|
|
68
68
|
exports.TEN_MEGABYTES = 1024 * 10000;
|
|
69
69
|
function defaultReadFileAtRevision(file, revision) {
|
|
70
70
|
try {
|
|
71
|
-
const fileFullPath = `${
|
|
71
|
+
const fileFullPath = `${workspace_root_1.workspaceRoot}${path_1.sep}${file}`;
|
|
72
72
|
const gitRepositoryPath = (0, child_process_1.execSync)('git rev-parse --show-toplevel')
|
|
73
73
|
.toString()
|
|
74
74
|
.trim();
|
|
@@ -87,13 +87,6 @@ function defaultReadFileAtRevision(file, revision) {
|
|
|
87
87
|
return '';
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
function readWorkspaceJson() {
|
|
91
|
-
return readWorkspaceConfig({
|
|
92
|
-
format: 'nx',
|
|
93
|
-
path: app_root_1.workspaceRoot,
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
exports.readWorkspaceJson = readWorkspaceJson;
|
|
97
90
|
function readWorkspaceConfig(opts) {
|
|
98
91
|
const ws = new workspaces_1.Workspaces(opts.path || process.cwd());
|
|
99
92
|
const json = ws.readWorkspaceConfiguration();
|
|
@@ -107,7 +100,7 @@ function readWorkspaceConfig(opts) {
|
|
|
107
100
|
}
|
|
108
101
|
exports.readWorkspaceConfig = readWorkspaceConfig;
|
|
109
102
|
function workspaceFileName() {
|
|
110
|
-
if ((0, fileutils_1.fileExists)(`${
|
|
103
|
+
if ((0, fileutils_1.fileExists)(`${workspace_root_1.workspaceRoot}/angular.json`)) {
|
|
111
104
|
return 'angular.json';
|
|
112
105
|
}
|
|
113
106
|
else {
|
|
@@ -116,44 +109,11 @@ function workspaceFileName() {
|
|
|
116
109
|
}
|
|
117
110
|
exports.workspaceFileName = workspaceFileName;
|
|
118
111
|
function defaultFileRead(filePath) {
|
|
119
|
-
return (0, fs_1.readFileSync)((0, path_1.join)(
|
|
112
|
+
return (0, fs_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, filePath), 'utf-8');
|
|
120
113
|
}
|
|
121
114
|
exports.defaultFileRead = defaultFileRead;
|
|
122
115
|
function readPackageJson() {
|
|
123
|
-
return (0, fileutils_2.readJsonFile)(`${
|
|
116
|
+
return (0, fileutils_2.readJsonFile)(`${workspace_root_1.workspaceRoot}/package.json`);
|
|
124
117
|
}
|
|
125
118
|
exports.readPackageJson = readPackageJson;
|
|
126
|
-
/**
|
|
127
|
-
* Returns the contents of nx.json.
|
|
128
|
-
*
|
|
129
|
-
* If nx.json extends another config file, it will be inlined here.
|
|
130
|
-
*/
|
|
131
|
-
function readNxJson(path = `${app_root_1.workspaceRoot}/nx.json`) {
|
|
132
|
-
let config = (0, fileutils_2.readJsonFile)(path);
|
|
133
|
-
if (config.extends) {
|
|
134
|
-
config = Object.assign(Object.assign({}, resolveNxJsonExtends(config.extends)), config);
|
|
135
|
-
}
|
|
136
|
-
return config;
|
|
137
|
-
}
|
|
138
|
-
exports.readNxJson = readNxJson;
|
|
139
|
-
function resolveNxJsonExtends(extendedNxJsonPath) {
|
|
140
|
-
try {
|
|
141
|
-
return (0, fileutils_2.readJsonFile)(require.resolve(extendedNxJsonPath));
|
|
142
|
-
}
|
|
143
|
-
catch (e) {
|
|
144
|
-
throw new Error(`Unable to resolve nx.json extends. Error: ${e.message}`);
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
/**
|
|
148
|
-
* Returns information about where apps and libs will be created.
|
|
149
|
-
*/
|
|
150
|
-
function workspaceLayout() {
|
|
151
|
-
var _a, _b, _c, _d;
|
|
152
|
-
const nxJson = readNxJson();
|
|
153
|
-
return {
|
|
154
|
-
appsDir: (_b = (_a = nxJson.workspaceLayout) === null || _a === void 0 ? void 0 : _a.appsDir) !== null && _b !== void 0 ? _b : 'apps',
|
|
155
|
-
libsDir: (_d = (_c = nxJson.workspaceLayout) === null || _c === void 0 ? void 0 : _c.libsDir) !== null && _d !== void 0 ? _d : 'libs',
|
|
156
|
-
};
|
|
157
|
-
}
|
|
158
|
-
exports.workspaceLayout = workspaceLayout;
|
|
159
119
|
//# sourceMappingURL=file-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":";;;AAAA,qDAAqE;AACrE,iDAAyC;AACzC,2BAA8C;AAC9C,+BAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FileData, ProjectFileMap, ProjectGraph, ProjectGraphDependency, ProjectGraphExternalNode, ProjectGraphNode } from '../config/project-graph';
|
|
2
2
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
3
|
-
import {
|
|
3
|
+
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
4
4
|
export interface ProjectGraphCache {
|
|
5
5
|
version: string;
|
|
6
6
|
deps: Record<string, string>;
|
|
@@ -24,7 +24,7 @@ export declare function createCache(nxJson: NxJsonConfiguration<'*' | string[]>,
|
|
|
24
24
|
};
|
|
25
25
|
}): ProjectGraphCache;
|
|
26
26
|
export declare function writeCache(cache: ProjectGraphCache): void;
|
|
27
|
-
export declare function shouldRecomputeWholeGraph(cache: ProjectGraphCache, packageJsonDeps: Record<string, string>, workspaceJson:
|
|
27
|
+
export declare function shouldRecomputeWholeGraph(cache: ProjectGraphCache, packageJsonDeps: Record<string, string>, workspaceJson: ProjectsConfigurations, nxJson: NxJsonConfiguration, tsConfig: {
|
|
28
28
|
compilerOptions: {
|
|
29
29
|
paths: {
|
|
30
30
|
[k: string]: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,uCAAyC;AACzC,+BAA4B;AAC5B,2CAAyC;AACzC,8DAAoD;AACpD,kDAAiE;AASjE,kDAAiE;AAiBpD,QAAA,UAAU,GAAG,IAAA,WAAI,EAAC,0BAAQ,EAAE,aAAa,CAAC,CAAC;AAExD,SAAgB,oBAAoB;IAClC,IAAI;QACF,IAAI,CAAC,IAAA,eAAU,EAAC,0BAAQ,CAAC,EAAE;YACzB,IAAA,wBAAa,EAAC,0BAAQ,CAAC,CAAC;SACzB;KACF;IAAC,OAAO,CAAC,EAAE;QACV;;;;;;;;;WASG;QACH,IAAI,CAAC,IAAA,2BAAe,EAAC,0BAAQ,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,+BAA+B,0BAAQ,EAAE,CAAC,CAAC;SAC5D;KACF;AACH,CAAC;AApBD,oDAoBC;AAED,SAAgB,SAAS;IACvB,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrC,oBAAoB,EAAE,CAAC;IAEvB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI;QACF,IAAI,IAAA,sBAAU,EAAC,kBAAU,CAAC,EAAE;YAC1B,IAAI,GAAG,IAAA,wBAAY,EAAC,kBAAU,CAAC,CAAC;SACjC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,kBAAkB,kBAAU,4CAA4C,CACzE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;IAED,wBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnC,wBAAW,CAAC,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACxE,OAAO,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC;AACtB,CAAC;AAnBD,8BAmBC;AAED,SAAgB,WAAW,CACzB,MAA2C,EAC3C,eAAuC,EACvC,YAA0B,EAC1B,QAAgE;;IAEhE,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;KAC5B,CAAC,CAAC,CAAC;IACJ,MAAM,QAAQ,GAAsB;QAClC,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,KAAK;QACtC,IAAI,EAAE,eAAe;QACrB,2FAA2F;QAC3F,YAAY,EAAE,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,0CAAE,KAAK,KAAI,EAAE;QACpD,aAAa;QACb,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,aAAa,EAAE,YAAY,CAAC,aAAa;QACzC,YAAY,EAAE,YAAY,CAAC,YAAY;KACxC,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AArBD,kCAqBC;AAED,SAAgB,UAAU,CAAC,KAAwB;IACjD,wBAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtC,IAAA,yBAAa,EAAC,kBAAU,EAAE,KAAK,CAAC,CAAC;IACjC,wBAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpC,wBAAW,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;AAC7E,CAAC;AALD,gCAKC;AAED,SAAgB,yBAAyB,CACvC,KAAwB,EACxB,eAAuC,EACvC,
|
|
1
|
+
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const file_hasher_1 = require("../hasher/file-hasher");
|
|
|
11
11
|
const tmp_dir_1 = require("../daemon/tmp-dir");
|
|
12
12
|
const fs_1 = require("fs");
|
|
13
13
|
const strip_indents_1 = require("../utils/strip-indents");
|
|
14
|
+
const configuration_1 = require("../config/configuration");
|
|
14
15
|
/**
|
|
15
16
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
|
16
17
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
|
@@ -75,7 +76,7 @@ function buildProjectGraphWithoutDaemon() {
|
|
|
75
76
|
function createProjectGraphAsync() {
|
|
76
77
|
var _a, _b, _c;
|
|
77
78
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
78
|
-
const nxJson = (0,
|
|
79
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
79
80
|
const useDaemonProcessOption = (_c = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.useDaemonProcess;
|
|
80
81
|
const env = process.env.NX_DAEMON;
|
|
81
82
|
// env takes precedence
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,mDAA+D;AAC/D,+DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,28 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const batch_messages_1 = require("./batch-messages");
|
|
5
5
|
const workspaces_1 = require("../../config/workspaces");
|
|
6
|
-
const
|
|
6
|
+
const workspace_root_1 = require("../../utils/workspace-root");
|
|
7
7
|
const params_1 = require("../../utils/params");
|
|
8
|
+
const configuration_1 = require("nx/src/config/configuration");
|
|
8
9
|
function getBatchExecutor(executorName) {
|
|
9
|
-
const workspace = new workspaces_1.Workspaces(
|
|
10
|
+
const workspace = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
10
11
|
const [nodeModule, exportName] = executorName.split(':');
|
|
11
12
|
return workspace.readExecutor(nodeModule, exportName);
|
|
12
13
|
}
|
|
13
14
|
function runTasks(executorName, taskGraph) {
|
|
14
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
16
|
const input = {};
|
|
16
|
-
const
|
|
17
|
-
const workspaceConfig = workspace.readWorkspaceConfiguration();
|
|
17
|
+
const workspaceConfig = (0, configuration_1.readAllWorkspaceConfiguration)();
|
|
18
18
|
const batchExecutor = getBatchExecutor(executorName);
|
|
19
19
|
const tasks = Object.values(taskGraph.tasks);
|
|
20
20
|
const context = {
|
|
21
|
-
root:
|
|
21
|
+
root: workspace_root_1.workspaceRoot,
|
|
22
22
|
cwd: process.cwd(),
|
|
23
23
|
workspace: workspaceConfig,
|
|
24
24
|
isVerbose: false,
|
|
25
25
|
};
|
|
26
26
|
for (const task of tasks) {
|
|
27
|
-
const projectConfiguration =
|
|
27
|
+
const projectConfiguration = workspaceConfig.projects[task.target.project];
|
|
28
28
|
const targetConfiguration = projectConfiguration.targets[task.target.target];
|
|
29
29
|
input[task.id] = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration, targetConfiguration, batchExecutor.schema, null, process.cwd());
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-batch.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/batch/run-batch.ts"],"names":[],"mappings":";;;AAAA,qDAI0B;AAC1B,wDAAqD;AACrD
|
|
1
|
+
{"version":3,"file":"run-batch.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/batch/run-batch.ts"],"names":[],"mappings":";;;AAAA,qDAI0B;AAC1B,wDAAqD;AACrD,+DAA2D;AAC3D,+CAA+D;AAG/D,+DAA4E;AAE5E,SAAS,gBAAgB,CAAC,YAAoB;IAC5C,MAAM,SAAS,GAAG,IAAI,uBAAU,CAAC,8BAAa,CAAC,CAAC;IAChD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzD,OAAO,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACxD,CAAC;AAED,SAAe,QAAQ,CAAC,YAAoB,EAAE,SAAoB;;QAChE,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,eAAe,GAAG,IAAA,6CAA6B,GAAE,CAAC;QAExD,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAoB;YAC/B,IAAI,EAAE,8BAAa;YACnB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,SAAS,EAAE,eAAe;YAC1B,SAAS,EAAE,KAAK;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,oBAAoB,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,mBAAmB,GACvB,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAA,kCAAyB,EACxC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,mBAAmB,EACnB,aAAa,CAAC,MAAM,EACpB,IAAI,EACJ,OAAO,CAAC,GAAG,EAAE,CACd,CAAC;SACH;QAED,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,0BAA0B,EAAE,CAC9D,SAAS,EACT,KAAK,EACL,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAClB,OAAO,CACR,CAAC;YAEF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,YAAY,8BAA8B,OAAO,EAAE,CAAC,CAAC;aAC1E;YAED,OAAO,OAAO,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAO,OAAqB,EAAE,EAAE;IACpD,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,iCAAgB,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YACxE,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,iCAAgB,CAAC,QAAQ;gBAC/B,OAAO;aACgB,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;AACH,CAAC,CAAA,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Cache = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
@@ -11,7 +11,7 @@ const os_1 = require("os");
|
|
|
11
11
|
class Cache {
|
|
12
12
|
constructor(options) {
|
|
13
13
|
this.options = options;
|
|
14
|
-
this.root =
|
|
14
|
+
this.root = workspace_root_1.workspaceRoot;
|
|
15
15
|
this.cachePath = this.createCacheDir();
|
|
16
16
|
this.terminalOutputsDir = this.createTerminalOutputsDir();
|
|
17
17
|
this.latestOutputsHashesDir = this.ensureLatestOutputsHashesDir();
|