nx 14.4.0-beta.5 → 14.4.0-beta.8
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/package.json +4 -4
- package/presets/core.json +0 -8
- package/src/command-line/affected.js +0 -4
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/init.js +2 -2
- package/src/command-line/init.js.map +1 -1
- package/src/generators/utils/project-configuration.js +1 -1
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/hasher.js +38 -21
- package/src/hasher/hasher.js.map +1 -1
- package/src/project-graph/affected/affected-project-graph-models.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +2 -4
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/affected/locators/implicit-json-changes.js +9 -4
- package/src/project-graph/affected/locators/implicit-json-changes.js.map +1 -1
- package/src/project-graph/affected/locators/npm-packages.js +2 -2
- package/src/project-graph/affected/locators/npm-packages.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-projects.d.ts +3 -0
- package/src/project-graph/affected/locators/workspace-projects.js +55 -7
- package/src/project-graph/affected/locators/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.js +15 -9
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/tasks-runner/create-task-graph.js +6 -1
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.js +0 -5
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +1 -1
- package/src/tasks-runner/run-command.js +51 -62
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/utils.js +6 -9
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +0 -1
- package/src/utils/command-line-utils.js +0 -1
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/params.js +13 -7
- package/src/utils/params.js.map +1 -1
- package/src/project-graph/normalize-nx-json.d.ts +0 -8
- package/src/project-graph/normalize-nx-json.js +0 -32
- package/src/project-graph/normalize-nx-json.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.4.0-beta.
|
|
6
|
+
# [14.4.0-beta.8](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.8) (2022-07-01)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.4.0-beta.
|
|
3
|
+
"version": "14.4.0-beta.8",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.4.0-beta.
|
|
35
|
-
"@nrwl/tao": "14.4.0-beta.
|
|
34
|
+
"@nrwl/cli": "14.4.0-beta.8",
|
|
35
|
+
"@nrwl/tao": "14.4.0-beta.8",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"executors": "./executors.json",
|
|
107
107
|
"main": "./bin/nx.js",
|
|
108
108
|
"typings": "./bin/nx.d.ts",
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "35bb15908ed7029ce6a33917465114d6513fd999"
|
|
110
110
|
}
|
package/presets/core.json
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
{
|
|
2
|
-
"implicitDependencies": {
|
|
3
|
-
"package.json": "*"
|
|
4
|
-
},
|
|
5
2
|
"tasksRunnerOptions": {
|
|
6
3
|
"default": {
|
|
7
4
|
"runner": "nx/tasks-runners/default",
|
|
@@ -9,10 +6,5 @@
|
|
|
9
6
|
"cacheableOperations": []
|
|
10
7
|
}
|
|
11
8
|
}
|
|
12
|
-
},
|
|
13
|
-
"pluginsConfig": {
|
|
14
|
-
"@nrwl/js": {
|
|
15
|
-
"analyzeSourceFiles": false
|
|
16
|
-
}
|
|
17
9
|
}
|
|
18
10
|
}
|
|
@@ -11,7 +11,6 @@ const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
|
|
|
11
11
|
const command_line_utils_1 = require("../utils/command-line-utils");
|
|
12
12
|
const perf_hooks_1 = require("perf_hooks");
|
|
13
13
|
const project_graph_1 = require("../project-graph/project-graph");
|
|
14
|
-
const operators_1 = require("../project-graph/operators");
|
|
15
14
|
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
16
15
|
const affected_project_graph_1 = require("../project-graph/affected/affected-project-graph");
|
|
17
16
|
const configuration_1 = require("../config/configuration");
|
|
@@ -96,9 +95,6 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
96
95
|
let affectedGraph = nxArgs.all
|
|
97
96
|
? projectGraph
|
|
98
97
|
: (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, projectGraph.allWorkspaceFiles, nxArgs));
|
|
99
|
-
if (!nxArgs.all && nxArgs.withDeps) {
|
|
100
|
-
affectedGraph = (0, operators_1.withDeps)(projectGraph, Object.values(affectedGraph.nodes));
|
|
101
|
-
}
|
|
102
98
|
if (nxArgs.exclude) {
|
|
103
99
|
const excludedProjects = new Set(nxArgs.exclude);
|
|
104
100
|
return Object.entries(affectedGraph.nodes)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":";;;;AACA,4DAAmE;AACnE,6DAAyD;AACzD,4CAAyC;AACzC,2CAA4C;AAC5C,qDAAiD;AACjD,+DAAkE;AAElE,oEAGqC;AACrC,2CAAyC;AACzC,kEAAyE;
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":";;;;AACA,4DAAmE;AACnE,6DAAyD;AACzD,4CAAyC;AACzC,2CAA4C;AAC5C,qDAAiD;AACjD,+DAAkE;AAElE,oEAGqC;AACrC,2CAAyC;AACzC,kEAAyE;AAEzE,sEAAgE;AAChE,6FAAkF;AAElF,2DAAqD;AAErD,SAAsB,QAAQ,CAC5B,OAAkE,EAClE,IAA0B,EAC1B,0BAGI,EAAE;;QAEN,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;YACE,aAAa,EAAE,OAAO,KAAK,gBAAgB,IAAI,CAAC,IAAI,CAAC,KAAK;SAC3D,EACD,MAAM,CACP,CAAC;QAEF,MAAM,IAAA,+CAAyB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,IAAI;YACF,QAAQ,OAAO,EAAE;gBACf,KAAK,MAAM;oBACT,MAAM,IAAI,GAAG,QAAQ;yBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;yBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACtB,IAAI,IAAI,CAAC,KAAK,EAAE;wBACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC7B;yBAAM;wBACL,IAAI,IAAI,CAAC,MAAM,EAAE;4BACf,eAAM,CAAC,IAAI,CAAC;gCACV,KAAK,EACH,gHAAgH;6BACnH,CAAC,CAAC;4BACH,eAAM,CAAC,GAAG,CAAC;gCACT,KAAK,EAAE,gBAAgB;gCACvB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;6BAC1D,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBAER,KAAK,MAAM;oBACT,MAAM,IAAI,GAAG,QAAQ;yBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;yBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACtB,IAAI,IAAI,CAAC,KAAK,EAAE;wBACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC7B;yBAAM;wBACL,IAAI,IAAI,CAAC,MAAM,EAAE;4BACf,eAAM,CAAC,IAAI,CAAC;gCACV,KAAK,EACH,gHAAgH;6BACnH,CAAC,CAAC;4BACH,eAAM,CAAC,GAAG,CAAC;gCACT,KAAK,EAAE,gBAAgB;gCACvB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;6BAC1D,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBAER,KAAK,OAAO;oBACV,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACjD,MAAM,IAAA,yBAAa,EAAC,IAAW,EAAE,YAAY,CAAC,CAAC;oBAC/C,MAAM;gBAER,KAAK,gBAAgB;oBACnB,IAAI,MAAM,CAAC,MAAM,EAAE;wBACjB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;wBACnE,MAAM,IAAA,8BAAa,EACjB,kBAAkB,EAClB,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,CACV,CAAC;qBACH;yBAAM;wBACL,MAAM,IAAA,8BAAa,EACjB,EAAE,EACF,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,CACV,CAAC;qBACH;oBACD,MAAM;gBAER,KAAK,UAAU,CAAC,CAAC;oBACf,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACnE,MAAM,IAAA,wBAAU,EACd,kBAAkB,EAClB,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,CACxB,CAAC;oBACF,MAAM;iBACP;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhHD,4BAgHC;AAED,SAAS,aAAa,CACpB,MAAc,EACd,YAA0B;IAE1B,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG;QAC5B,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAA,uCAAc,EACZ,YAAY,EACZ,IAAA,iCAAoB,EAClB,IAAA,+BAAU,EAAC,MAAM,CAAC,CAAC,KAAK,EACxB,YAAY,CAAC,iBAAiB,EAC9B,MAAM,CACP,CACF,CAAC;IAEN,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;aACvC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;KAClC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAA8B,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAmC,EACnC,MAAc;IAEd,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sCAAgB,EAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,UAAU,CAAC,CAAM,EAAE,OAAiB;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC9B,IAAI,OAAO,IAAI,CAAC,CAAC,KAAK,EAAE;QACtB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,eAAM,CAAC,KAAK,CAAC;QACX,KAAK,EAAE,sDAAsD;QAC7D,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
|
package/src/command-line/init.js
CHANGED
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initHandler = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const fileutils_1 = require("../utils/fileutils");
|
|
6
7
|
const output_1 = require("../utils/output");
|
|
7
8
|
const package_manager_1 = require("../utils/package-manager");
|
|
8
|
-
const fileutils_1 = require("../utils/fileutils");
|
|
9
9
|
function initHandler() {
|
|
10
10
|
const nxIsInstalled = !!(0, child_process_1.execSync)((0, package_manager_1.getPackageManagerCommand)().list)
|
|
11
11
|
.toString()
|
|
12
12
|
.split('\n')
|
|
13
|
-
.find((line) => line.
|
|
13
|
+
.find((line) => line.search(/\s?nx(\s|@)\d+.\d+.\d+(-\w+.\d+)?/) > -1);
|
|
14
14
|
if (nxIsInstalled) {
|
|
15
15
|
output_1.output.log({
|
|
16
16
|
title: 'Nx is already installed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,4CAAyC;AACzC,8DAAoE;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,kDAA6E;AAC7E,4CAAyC;AACzC,8DAAoE;AAEpE,SAAgB,WAAW;IACzB,MAAM,aAAa,GAAG,CAAC,CAAC,IAAA,wBAAQ,EAAC,IAAA,0CAAwB,GAAE,CAAC,IAAI,CAAC;SAC9D,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,mCAAmC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEzE,IAAI,aAAa,EAAE;QACjB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;KACJ;SAAM;QACL,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,IAAA,wBAAQ,EAAC,GAAG,IAAA,0CAAwB,GAAE,CAAC,MAAM,YAAY,EAAE;YACzD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,uBAAuB;SAC/B,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,IAAA,sBAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,yBAAa,EACX,SAAS,EACT,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAClE,CAAC;QAEF,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,0BAA0B;SAClC,CAAC,CAAC;KACJ;AACH,CAAC;AAhCD,kCAgCC"}
|
|
@@ -205,7 +205,7 @@ function setProjectConfiguration(tree, projectName, projectConfiguration, mode,
|
|
|
205
205
|
addProjectToWorkspaceJson(tree, projectName, projectConfiguration, mode, standalone);
|
|
206
206
|
}
|
|
207
207
|
function getRelativeProjectJsonSchemaPath(tree, project) {
|
|
208
|
-
return (0, path_1.relative)((0, path_1.join)(tree.root, project.root), (0, path_1.join)(tree.root, 'node_modules/nx/schemas/project-schema.json'));
|
|
208
|
+
return (0, path_2.normalizePath)((0, path_1.relative)((0, path_1.join)(tree.root, project.root), (0, path_1.join)(tree.root, 'node_modules/nx/schemas/project-schema.json')));
|
|
209
209
|
}
|
|
210
210
|
exports.getRelativeProjectJsonSchemaPath = getRelativeProjectJsonSchemaPath;
|
|
211
211
|
function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone = false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":"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"}
|
package/src/hasher/hasher.js
CHANGED
|
@@ -4,13 +4,10 @@ exports.expandNamedInput = exports.splitInputsIntoSelfAndDependencies = exports.
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const minimatch = require("minimatch");
|
|
7
|
-
const fs_1 = require("fs");
|
|
8
7
|
const typescript_1 = require("../utils/typescript");
|
|
9
8
|
const hashing_impl_1 = require("./hashing-impl");
|
|
10
9
|
const fileutils_1 = require("../utils/fileutils");
|
|
11
10
|
const path_1 = require("../utils/path");
|
|
12
|
-
const workspace_root_1 = require("../utils/workspace-root");
|
|
13
|
-
const path_2 = require("path");
|
|
14
11
|
/**
|
|
15
12
|
* The default hasher used by executors.
|
|
16
13
|
*/
|
|
@@ -127,7 +124,7 @@ Hasher.version = '3.0';
|
|
|
127
124
|
const DEFAULT_INPUTS = [
|
|
128
125
|
{
|
|
129
126
|
projects: 'self',
|
|
130
|
-
fileset: '
|
|
127
|
+
fileset: '{projectRoot}/**/*',
|
|
131
128
|
},
|
|
132
129
|
{
|
|
133
130
|
projects: 'dependencies',
|
|
@@ -199,17 +196,18 @@ class TaskHasher {
|
|
|
199
196
|
});
|
|
200
197
|
}
|
|
201
198
|
inputs(task, projectNode) {
|
|
199
|
+
const namedInputs = Object.assign(Object.assign({ default: [{ fileset: '{projectRoot}/**/*' }] }, this.nxJson.namedInputs), projectNode.data.namedInputs);
|
|
202
200
|
if (task.target.target === '$input') {
|
|
203
201
|
return {
|
|
204
202
|
depsInputs: [{ input: task.target.configuration }],
|
|
205
|
-
selfInputs: expandNamedInput(task.target.configuration,
|
|
203
|
+
selfInputs: expandNamedInput(task.target.configuration, namedInputs),
|
|
206
204
|
};
|
|
207
205
|
}
|
|
208
206
|
else {
|
|
209
207
|
const targetData = projectNode.data.targets[task.target.target];
|
|
210
208
|
const targetDefaults = (this.nxJson.targetDefaults || {})[task.target.target];
|
|
211
209
|
// task from TaskGraph can be added here
|
|
212
|
-
return splitInputsIntoSelfAndDependencies(targetData.inputs || (targetDefaults === null || targetDefaults === void 0 ? void 0 : targetDefaults.inputs) || DEFAULT_INPUTS,
|
|
210
|
+
return splitInputsIntoSelfAndDependencies(targetData.inputs || (targetDefaults === null || targetDefaults === void 0 ? void 0 : targetDefaults.inputs) || DEFAULT_INPUTS, namedInputs);
|
|
213
211
|
}
|
|
214
212
|
}
|
|
215
213
|
hashExternalDependency(task) {
|
|
@@ -246,17 +244,37 @@ class TaskHasher {
|
|
|
246
244
|
const filesets = inputs
|
|
247
245
|
.filter((r) => !!r['fileset'])
|
|
248
246
|
.map((r) => r['fileset']);
|
|
249
|
-
const projectFilesets =
|
|
250
|
-
const
|
|
247
|
+
const projectFilesets = [];
|
|
248
|
+
const workspaceFilesets = [];
|
|
249
|
+
let invalidFileset = null;
|
|
250
|
+
for (let f of filesets) {
|
|
251
|
+
if (f.startsWith('{projectRoot}/') || f.startsWith('!{projectRoot}/')) {
|
|
252
|
+
projectFilesets.push(f);
|
|
253
|
+
}
|
|
254
|
+
else if (f.startsWith('{workspaceRoot}/') ||
|
|
255
|
+
f.startsWith('!{workspaceRoot}/')) {
|
|
256
|
+
workspaceFilesets.push(f);
|
|
257
|
+
}
|
|
258
|
+
else {
|
|
259
|
+
invalidFileset = f;
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
if (invalidFileset) {
|
|
263
|
+
throw new Error([
|
|
264
|
+
`"${invalidFileset}" is an invalid fileset.`,
|
|
265
|
+
'All filesets have to start with either {workspaceRoot} or {projectRoot}.',
|
|
266
|
+
'For instance: "!{projectRoot}/**/*.spec.ts" or "{workspaceRoot}/package.json".',
|
|
267
|
+
`If "${invalidFileset}" is a named input, make sure it is defined in, for instance, nx.json.`,
|
|
268
|
+
].join('\n'));
|
|
269
|
+
}
|
|
270
|
+
const notFilesets = inputs.filter((r) => !r['fileset']);
|
|
251
271
|
return Promise.all([
|
|
252
272
|
this.hashTaskFileset(task, projectFilesets),
|
|
253
273
|
...[
|
|
254
|
-
...
|
|
274
|
+
...workspaceFilesets,
|
|
255
275
|
...this.legacyFilesetInputs.map((r) => r.fileset),
|
|
256
276
|
].map((fileset) => this.hashRootFileset(fileset)),
|
|
257
|
-
...[...
|
|
258
|
-
.filter((r) => !r['fileset'])
|
|
259
|
-
.map((r) => r['runtime'] ? this.hashRuntime(r['runtime']) : this.hashEnv(r['env'])),
|
|
277
|
+
...[...notFilesets, ...this.legacyRuntimeInputs].map((r) => r['runtime'] ? this.hashRuntime(r['runtime']) : this.hashEnv(r['env'])),
|
|
260
278
|
]);
|
|
261
279
|
});
|
|
262
280
|
}
|
|
@@ -271,12 +289,13 @@ class TaskHasher {
|
|
|
271
289
|
this.projectGraph.allWorkspaceFiles
|
|
272
290
|
.filter((f) => minimatch(f.file, withoutWorkspaceRoot))
|
|
273
291
|
.forEach((f) => {
|
|
274
|
-
parts.push(
|
|
292
|
+
parts.push(f.hash);
|
|
275
293
|
});
|
|
276
294
|
}
|
|
277
295
|
else {
|
|
278
|
-
|
|
279
|
-
|
|
296
|
+
const matchingFile = this.projectGraph.allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
|
|
297
|
+
if (matchingFile) {
|
|
298
|
+
parts.push(matchingFile.hash);
|
|
280
299
|
}
|
|
281
300
|
}
|
|
282
301
|
const value = this.hashing.hashArray(parts);
|
|
@@ -295,7 +314,8 @@ class TaskHasher {
|
|
|
295
314
|
if (!this.filesetHashes[mapKey]) {
|
|
296
315
|
this.filesetHashes[mapKey] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
297
316
|
const p = this.projectGraph.nodes[task.target.project];
|
|
298
|
-
const
|
|
317
|
+
const filesetWithExpandedProjectRoot = filesetPatterns.map((f) => f.replace('{projectRoot}', p.data.root));
|
|
318
|
+
const filteredFiles = this.filterFiles(p.data.root, p.data.files, filesetWithExpandedProjectRoot);
|
|
299
319
|
const fileNames = filteredFiles.map((f) => f.file);
|
|
300
320
|
const values = filteredFiles.map((f) => f.hash);
|
|
301
321
|
let tsConfig;
|
|
@@ -347,9 +367,8 @@ class TaskHasher {
|
|
|
347
367
|
};
|
|
348
368
|
});
|
|
349
369
|
}
|
|
350
|
-
filterFiles(files, patterns) {
|
|
351
|
-
|
|
352
|
-
if (patterns.length === 0)
|
|
370
|
+
filterFiles(projectRoot, files, patterns) {
|
|
371
|
+
if (patterns.indexOf(`${projectRoot}/**/*`) > -1)
|
|
353
372
|
return files;
|
|
354
373
|
return files.filter((f) => !!patterns.find((pattern) => minimatch(f.file, pattern)));
|
|
355
374
|
}
|
|
@@ -426,8 +445,6 @@ function expandSelfInputs(inputs, namedInputs) {
|
|
|
426
445
|
return expanded;
|
|
427
446
|
}
|
|
428
447
|
function expandNamedInput(input, namedInputs) {
|
|
429
|
-
if (input === 'default')
|
|
430
|
-
return [{ fileset: 'default' }];
|
|
431
448
|
namedInputs || (namedInputs = {});
|
|
432
449
|
if (!namedInputs[input])
|
|
433
450
|
throw new Error(`Input '${input}' is not defined`);
|
package/src/hasher/hasher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@ import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-grap
|
|
|
4
4
|
import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
|
|
5
5
|
export interface AffectedProjectGraphContext {
|
|
6
6
|
projectGraphNodes: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>;
|
|
7
|
-
nxJson: NxJsonConfiguration<
|
|
7
|
+
nxJson: NxJsonConfiguration<any>;
|
|
8
8
|
touchedProjects: string[];
|
|
9
9
|
}
|
|
10
10
|
export interface TouchedProjectLocator<T extends Change = Change> {
|
|
11
|
-
(fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<
|
|
11
|
+
(fileChanges: FileChange<T>[], projectGraphNodes?: Record<string, ProjectGraphProjectNode<ProjectConfiguration>>, nxJson?: NxJsonConfiguration<any>, packageJson?: any, projectGraph?: ProjectGraph): string[];
|
|
12
12
|
}
|
|
@@ -5,13 +5,11 @@ const file_utils_1 = require("../file-utils");
|
|
|
5
5
|
const workspace_projects_1 = require("./locators/workspace-projects");
|
|
6
6
|
const npm_packages_1 = require("./locators/npm-packages");
|
|
7
7
|
const implicit_json_changes_1 = require("./locators/implicit-json-changes");
|
|
8
|
-
const normalize_nx_json_1 = require("../normalize-nx-json");
|
|
9
8
|
const workspace_json_changes_1 = require("./locators/workspace-json-changes");
|
|
10
9
|
const tsconfig_json_changes_1 = require("./locators/tsconfig-json-changes");
|
|
11
10
|
const operators_1 = require("../operators");
|
|
12
11
|
const configuration_1 = require("../../config/configuration");
|
|
13
12
|
function filterAffected(graph, touchedFiles, nxJson = (0, configuration_1.readNxJson)(), packageJson = (0, file_utils_1.readPackageJson)()) {
|
|
14
|
-
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(graph.nodes));
|
|
15
13
|
// Additional affected logic should be in this array.
|
|
16
14
|
const touchedProjectLocators = [
|
|
17
15
|
workspace_projects_1.getTouchedProjects,
|
|
@@ -22,11 +20,11 @@ function filterAffected(graph, touchedFiles, nxJson = (0, configuration_1.readNx
|
|
|
22
20
|
tsconfig_json_changes_1.getTouchedProjectsFromTsConfig,
|
|
23
21
|
];
|
|
24
22
|
const touchedProjects = touchedProjectLocators.reduce((acc, f) => {
|
|
25
|
-
return acc.concat(f(touchedFiles, graph.nodes,
|
|
23
|
+
return acc.concat(f(touchedFiles, graph.nodes, nxJson, packageJson, graph));
|
|
26
24
|
}, []);
|
|
27
25
|
return filterAffectedProjects(graph, {
|
|
28
26
|
projectGraphNodes: graph.nodes,
|
|
29
|
-
nxJson
|
|
27
|
+
nxJson,
|
|
30
28
|
touchedProjects,
|
|
31
29
|
});
|
|
32
30
|
}
|
|
@@ -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,8CAA4D;AAC5D,sEAGuC;AACvC,0DAAgE;AAChE,4EAA6F;AAK7F,
|
|
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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"}
|
|
@@ -4,18 +4,19 @@ exports.getImplicitlyTouchedProjectsByJsonChanges = void 0;
|
|
|
4
4
|
const flat_1 = require("flat");
|
|
5
5
|
const minimatch = require("minimatch");
|
|
6
6
|
const json_diff_1 = require("../../../utils/json-diff");
|
|
7
|
-
const getImplicitlyTouchedProjectsByJsonChanges = (touchedFiles,
|
|
7
|
+
const getImplicitlyTouchedProjectsByJsonChanges = (touchedFiles, projects, nxJson) => {
|
|
8
8
|
const { implicitDependencies } = nxJson;
|
|
9
9
|
if (!implicitDependencies) {
|
|
10
10
|
return [];
|
|
11
11
|
}
|
|
12
12
|
const touched = new Set();
|
|
13
|
+
const allProjectNames = Object.keys(projects);
|
|
13
14
|
for (const f of touchedFiles) {
|
|
14
15
|
if (f.file.endsWith('.json') && implicitDependencies[f.file]) {
|
|
15
16
|
const changes = f.getChanges();
|
|
16
17
|
for (const c of changes) {
|
|
17
18
|
if ((0, json_diff_1.isJsonChange)(c)) {
|
|
18
|
-
const projects = getTouchedProjects(c.path, implicitDependencies[f.file]) || [];
|
|
19
|
+
const projects = getTouchedProjects(c.path, implicitDependencies[f.file], allProjectNames) || [];
|
|
19
20
|
projects.forEach((p) => touched.add(p));
|
|
20
21
|
}
|
|
21
22
|
else {
|
|
@@ -38,7 +39,7 @@ function getTouchedProjectsByJsonFile(implicitDependencies, file) {
|
|
|
38
39
|
});
|
|
39
40
|
return projects;
|
|
40
41
|
}
|
|
41
|
-
function getTouchedProjects(path, implicitDependencyConfig) {
|
|
42
|
+
function getTouchedProjects(path, implicitDependencyConfig, allProjects) {
|
|
42
43
|
const flatConfig = (0, flat_1.flatten)(implicitDependencyConfig, {
|
|
43
44
|
safe: true,
|
|
44
45
|
});
|
|
@@ -46,7 +47,11 @@ function getTouchedProjects(path, implicitDependencyConfig) {
|
|
|
46
47
|
for (const key in flatConfig) {
|
|
47
48
|
if (minimatch(flatPath, key)) {
|
|
48
49
|
const value = flatConfig[key];
|
|
49
|
-
|
|
50
|
+
if (value === '*')
|
|
51
|
+
return allProjects;
|
|
52
|
+
if (Array.isArray(value))
|
|
53
|
+
return value;
|
|
54
|
+
return [];
|
|
50
55
|
}
|
|
51
56
|
}
|
|
52
57
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"implicit-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/implicit-json-changes.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAuC;AAEvC,wDAIkC;AAI3B,MAAM,yCAAyC,GAElD,CAAC,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"implicit-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/implicit-json-changes.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAuC;AAEvC,wDAIkC;AAI3B,MAAM,yCAAyC,GAElD,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAY,EAAE;IAC/C,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC;IAExC,IAAI,CAAC,oBAAoB,EAAE;QACzB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;QAC5B,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;YAC/B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;gBACvB,IAAI,IAAA,wBAAY,EAAC,CAAC,CAAC,EAAE;oBACnB,MAAM,QAAQ,GACZ,kBAAkB,CAChB,CAAC,CAAC,IAAI,EACN,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,EAC5B,eAAe,CAChB,IAAI,EAAE,CAAC;oBACV,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC;qBAAM;oBACL,MAAM,QAAQ,GAAG,4BAA4B,CAC3C,oBAAoB,EACpB,CAAC,CAAC,IAAI,CACP,CAAC;oBACF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC;aACF;SACF;KACF;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC,CAAC;AApCW,QAAA,yCAAyC,6CAoCpD;AAEF,SAAS,4BAA4B,CACnC,oBAAuD,EACvD,IAAY;IAEZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAA,wBAAY,EAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;SACzB;QACD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAc,EACd,wBAA6B,EAC7B,WAAqB;IAErB,MAAM,UAAU,GAAG,IAAA,cAAO,EAAW,wBAAwB,EAAE;QAC7D,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC5B,IAAI,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;YAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,GAAG;gBAAE,OAAO,WAAW,CAAC;YACtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,OAAO,EAAE,CAAC;SACX;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTouchedNpmPackages = void 0;
|
|
4
4
|
const file_utils_1 = require("../../file-utils");
|
|
5
5
|
const json_diff_1 = require("../../../utils/json-diff");
|
|
6
|
-
const getTouchedNpmPackages = (touchedFiles,
|
|
6
|
+
const getTouchedNpmPackages = (touchedFiles, _, nxJson, packageJson, projectGraph) => {
|
|
7
7
|
const packageJsonChange = touchedFiles.find((f) => f.file === 'package.json');
|
|
8
8
|
if (!packageJsonChange)
|
|
9
9
|
return [];
|
|
@@ -16,7 +16,7 @@ const getTouchedNpmPackages = (touchedFiles, workspaceJson, nxJson, packageJson,
|
|
|
16
16
|
c.path.length === 2) {
|
|
17
17
|
// A package was deleted so mark all workspace projects as touched.
|
|
18
18
|
if (c.type === json_diff_1.DiffType.Deleted) {
|
|
19
|
-
touched = Object.keys(
|
|
19
|
+
touched = Object.keys(projectGraph.nodes);
|
|
20
20
|
break;
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/npm-packages.ts"],"names":[],"mappings":";;;AAAA,iDAAsE;AACtE,wDAA8E;AAGvE,MAAM,qBAAqB,GAE9B,
|
|
1
|
+
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/npm-packages.ts"],"names":[],"mappings":";;;AAAA,iDAAsE;AACtE,wDAA8E;AAGvE,MAAM,qBAAqB,GAE9B,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAY,EAAE;IACnE,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAC9E,IAAI,CAAC,iBAAiB;QAAE,OAAO,EAAE,CAAC;IAElC,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC;IAE/C,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAE9D,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,IACE,IAAA,wBAAY,EAAC,CAAC,CAAC;YACf,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,iBAAiB,CAAC;YACjE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EACnB;YACA,mEAAmE;YACnE,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAQ,CAAC,OAAO,EAAE;gBAC/B,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM;aACP;iBAAM;gBACL,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC5C,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC9B,4GAA4G;gBAC5G,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;oBAC7C,MAAM,wBAAwB,GAAG,WAAW,CAAC,IAAI,CAC/C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACzD,CAAC;oBACF,IAAI,wBAAwB,EAAE;wBAC5B,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;qBAC7C;iBACF;aACF;SACF;aAAM,IAAI,IAAA,8BAAiB,EAAC,CAAC,CAAC,EAAE;YAC/B,2DAA2D;YAC3D,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM;SACP;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AA5CW,QAAA,qBAAqB,yBA4ChC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import { TouchedProjectLocator } from '../affected-project-graph-models';
|
|
2
|
+
import { NxJsonConfiguration } from '../../../config/nx-json';
|
|
3
|
+
import { ProjectGraphProjectNode } from '../../../config/project-graph';
|
|
2
4
|
export declare const getTouchedProjects: TouchedProjectLocator;
|
|
3
5
|
export declare const getImplicitlyTouchedProjects: TouchedProjectLocator;
|
|
6
|
+
export declare function extractGlobalFilesFromInputs(nxJson: NxJsonConfiguration, projectGraphNodes: Record<string, ProjectGraphProjectNode>): any[];
|