nx 14.2.3 → 14.3.0-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.
- package/.eslintrc.json +12 -0
- package/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/src/command-line/affected.d.ts +3 -3
- package/src/command-line/affected.js +7 -7
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/dep-graph.js +7 -19
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/migrate.js +4 -0
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +22 -9
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/reset.js +3 -0
- package/src/command-line/reset.js.map +1 -1
- package/src/command-line/run-many.d.ts +3 -3
- package/src/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/config/workspaces.d.ts +3 -3
- package/src/config/workspaces.js +8 -20
- package/src/config/workspaces.js.map +1 -1
- package/src/daemon/server/watcher.d.ts +7 -0
- package/src/daemon/server/watcher.js +7 -45
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/daemon/tmp-dir.js +1 -1
- package/src/daemon/tmp-dir.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.d.ts +2 -0
- package/src/executors/run-commands/run-commands.impl.js +7 -11
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/executors/run-commands/schema.json +11 -1
- package/src/executors/run-script/run-script.impl.d.ts +1 -0
- package/src/executors/run-script/run-script.impl.js +1 -7
- package/src/executors/run-script/run-script.impl.js.map +1 -1
- package/src/executors/run-script/schema.json +11 -1
- package/src/hasher/git-based-file-hasher.js +4 -15
- package/src/hasher/git-based-file-hasher.js.map +1 -1
- package/src/hasher/hasher.js +7 -1
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/node-based-file-hasher.js +8 -13
- package/src/hasher/node-based-file-hasher.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -1
- package/src/project-graph/file-utils.js +5 -12
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/nx-deps-cache.js +5 -5
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/tasks-runner/create-task-graph.js +2 -2
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +4 -3
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +3 -2
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/formatting-utils.d.ts +1 -0
- package/src/tasks-runner/life-cycles/formatting-utils.js +10 -0
- package/src/tasks-runner/life-cycles/formatting-utils.js.map +1 -0
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +3 -2
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.js +5 -3
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +1 -1
- package/src/tasks-runner/utils.js +40 -39
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/cache-directory.d.ts +1 -0
- package/src/utils/cache-directory.js +3 -1
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +6 -1
- package/src/utils/command-line-utils.js +61 -15
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/ignore.d.ts +39 -0
- package/src/utils/ignore.js +110 -0
- package/src/utils/ignore.js.map +1 -0
- package/src/utils/params.d.ts +3 -1
- package/src/utils/params.js +23 -4
- package/src/utils/params.js.map +1 -1
|
@@ -10,11 +10,11 @@ const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
|
|
|
10
10
|
const perf_hooks_1 = require("perf_hooks");
|
|
11
11
|
const project_graph_1 = require("../project-graph/project-graph");
|
|
12
12
|
const read_environment_1 = require("./read-environment");
|
|
13
|
-
function runMany(
|
|
13
|
+
function runMany(args, extraTargetDependencies = {}) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
15
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
16
16
|
const env = (0, read_environment_1.readEnvironment)();
|
|
17
|
-
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(
|
|
17
|
+
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: true }, env.nxJson);
|
|
18
18
|
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
19
19
|
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
20
20
|
const projects = projectsToRun(nxArgs, projectGraph);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":";;;;AACA,6DAAyD;AAEzD,oEAA8E;AAC9E,sEAAgE;AAChE,4CAAyC;AACzC,+DAAkE;AAClE,2CAAyC;AAEzC,kEAAyE;AACzE,yDAAqD;AAGrD,SAAsB,OAAO,CAC3B,
|
|
1
|
+
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":";;;;AACA,6DAAyD;AAEzD,oEAA8E;AAC9E,sEAAgE;AAChE,4CAAyC;AACzC,+DAAkE;AAClE,2CAAyC;AAEzC,kEAAyE;AACzE,yDAAqD;AAGrD,SAAsB,OAAO,CAC3B,IAA0B,EAC1B,0BAGI,EAAE;;QAEN,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAA,kCAAe,GAAE,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,IAAI,EACJ,UAAU,EACV,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB,GAAG,CAAC,MAAM,CACX,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,MAAM,IAAA,wBAAU,EACd,QAAQ,EACR,YAAY,EACZ,GAAG,EACH,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,CACxB,CAAC;IACJ,CAAC;CAAA;AA9BD,0BA8BC;AAED,SAAS,aAAa,CACpB,MAAc,EACd,YAA0B;;IAE1B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,GAAG,iBAAiB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAC9D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3C,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC;KACZ;IACD,uBAAuB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACpD,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CACrD,CAAC;IACF,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,CACpE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAAc,EACd,WAAsC;IAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CACpD,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAC5D;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAmC,EACnC,MAAc,EACd,MAAM,GAAG,KAAK;IAEd,MAAM,WAAW,GAAG,EAA+B,CAAC;IACpD,MAAM,QAAQ,GAAG,EAA+B,CAAC;IAEjD,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE;QAC5B,IAAI,IAAA,sCAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,EAAE;YACrC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;aAAM;YACL,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3B;KACF;IAED,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE;QAChC,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,gDAAgD,MAAM,GAAG;YAChE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;SACjD,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Ignore } from 'ignore';
|
|
2
|
+
import { ExecutorConfig, Generator } from './misc-interfaces';
|
|
2
3
|
import type { NxJsonConfiguration } from './nx-json';
|
|
3
4
|
import { ProjectConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
|
|
4
|
-
import { ExecutorConfig, Generator } from './misc-interfaces';
|
|
5
5
|
export declare function workspaceConfigName(root: string): "angular.json" | "workspace.json";
|
|
6
6
|
export declare class Workspaces {
|
|
7
7
|
private root;
|
|
@@ -43,8 +43,8 @@ export declare function resolveNewFormatWithInlineProjects(w: any, root?: string
|
|
|
43
43
|
* Todo: Should refactor, not duplicate.
|
|
44
44
|
*/
|
|
45
45
|
export declare function toProjectName(fileName: string, nxJson: NxJsonConfiguration): string;
|
|
46
|
-
export declare function globForProjectFiles(root:
|
|
47
|
-
export declare function deduplicateProjectFiles(files: string[],
|
|
46
|
+
export declare function globForProjectFiles(root: string, nxJson?: NxJsonConfiguration, ignorePluginInference?: boolean): string[];
|
|
47
|
+
export declare function deduplicateProjectFiles(files: string[], ignore?: Ignore): string[];
|
|
48
48
|
export declare function inferProjectFromNonStandardFile(file: string, nxJson: NxJsonConfiguration): ProjectConfiguration & {
|
|
49
49
|
name: string;
|
|
50
50
|
};
|
package/src/config/workspaces.js
CHANGED
|
@@ -4,15 +4,15 @@ exports.renamePropertyWithStableKeys = exports.buildWorkspaceConfigurationFromGl
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fast_glob_1 = require("fast-glob");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
|
-
const ignore_1 = require("ignore");
|
|
8
7
|
const path = require("path");
|
|
9
8
|
const path_1 = require("path");
|
|
10
9
|
const perf_hooks_1 = require("perf_hooks");
|
|
11
|
-
const workspace_root_1 = require("../utils/workspace-root");
|
|
12
10
|
const fileutils_1 = require("../utils/fileutils");
|
|
11
|
+
const ignore_1 = require("../utils/ignore");
|
|
13
12
|
const logger_1 = require("../utils/logger");
|
|
14
13
|
const nx_plugin_1 = require("../utils/nx-plugin");
|
|
15
|
-
const object_sort_1 = require("
|
|
14
|
+
const object_sort_1 = require("../utils/object-sort");
|
|
15
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
16
16
|
function workspaceConfigName(root) {
|
|
17
17
|
if ((0, fs_1.existsSync)(path.join(root, 'angular.json'))) {
|
|
18
18
|
return 'angular.json';
|
|
@@ -410,38 +410,26 @@ function globForProjectFiles(root, nxJson, ignorePluginInference = false) {
|
|
|
410
410
|
(0, path_1.join)(root, 'dist'),
|
|
411
411
|
(0, path_1.join)(root, '.git'),
|
|
412
412
|
];
|
|
413
|
-
|
|
414
|
-
* TODO: This utility has been implemented multiple times across the Nx codebase,
|
|
415
|
-
* discuss whether it should be moved to a shared location.
|
|
416
|
-
*/
|
|
417
|
-
const ig = (0, ignore_1.default)();
|
|
418
|
-
try {
|
|
419
|
-
ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
|
|
420
|
-
}
|
|
421
|
-
catch (_a) { }
|
|
422
|
-
try {
|
|
423
|
-
ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
|
|
424
|
-
}
|
|
425
|
-
catch (_b) { }
|
|
413
|
+
const ignore = (0, ignore_1.createIgnore)(root);
|
|
426
414
|
const globResults = (0, fast_glob_1.sync)(combinedProjectGlobPattern, {
|
|
427
415
|
ignore: ALWAYS_IGNORE,
|
|
428
416
|
absolute: false,
|
|
429
417
|
cwd: root,
|
|
430
418
|
});
|
|
431
|
-
projectGlobCache = deduplicateProjectFiles(globResults,
|
|
419
|
+
projectGlobCache = deduplicateProjectFiles(globResults, ignore);
|
|
432
420
|
perf_hooks_1.performance.mark('finish-glob-for-projects');
|
|
433
421
|
perf_hooks_1.performance.measure('glob-for-project-files', 'start-glob-for-projects', 'finish-glob-for-projects');
|
|
434
422
|
return projectGlobCache;
|
|
435
423
|
}
|
|
436
424
|
exports.globForProjectFiles = globForProjectFiles;
|
|
437
|
-
function deduplicateProjectFiles(files,
|
|
425
|
+
function deduplicateProjectFiles(files, ignore) {
|
|
438
426
|
const filtered = new Map();
|
|
439
427
|
files.forEach((file) => {
|
|
440
428
|
const projectFolder = (0, path_1.dirname)(file);
|
|
441
429
|
const projectFile = (0, path_1.basename)(file);
|
|
442
|
-
if ((
|
|
430
|
+
if ((ignore === null || ignore === void 0 ? void 0 : ignore.ignores(file)) || // file is in .gitignore or .nxignore
|
|
443
431
|
file === 'package.json' || // file is workspace root package json
|
|
444
|
-
// project.json or
|
|
432
|
+
// project.json or equivalent inferred project file has been found
|
|
445
433
|
(filtered.has(projectFolder) && projectFile !== 'project.json')) {
|
|
446
434
|
return;
|
|
447
435
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../../../packages/nx/src/config/workspaces.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../../../packages/nx/src/config/workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/**
|
|
3
|
+
* In addition to its native performance, another great advantage of `@parcel/watcher` is that it will
|
|
4
|
+
* automatically take advantage of Facebook's watchman tool (https://facebook.github.io/watchman/) if
|
|
5
|
+
* the user has it installed (but not require it if they don't).
|
|
6
|
+
*
|
|
7
|
+
* See https://github.com/parcel-bundler/watcher for more details.
|
|
8
|
+
*/
|
|
2
9
|
import type { AsyncSubscription, Event } from '@parcel/watcher';
|
|
3
10
|
import { Server } from 'net';
|
|
4
11
|
export declare type WatcherSubscription = AsyncSubscription;
|
|
@@ -2,20 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertChangeEventsToLogMessage = exports.subscribeToWorkspaceChanges = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
/**
|
|
6
|
-
* In addition to its native performance, another great advantage of `@parcel/watcher` is that it will
|
|
7
|
-
* automatically take advantage of Facebook's watchman tool (https://facebook.github.io/watchman/) if
|
|
8
|
-
* the user has it installed (but not require it if they don't).
|
|
9
|
-
*
|
|
10
|
-
* See https://github.com/parcel-bundler/watcher for more details.
|
|
11
|
-
*/
|
|
12
|
-
const workspace_root_1 = require("../../utils/workspace-root");
|
|
13
|
-
const fs_1 = require("fs");
|
|
14
5
|
const path_1 = require("path");
|
|
6
|
+
const ignore_1 = require("../../utils/ignore");
|
|
7
|
+
const path_2 = require("../../utils/path");
|
|
8
|
+
const workspace_root_1 = require("../../utils/workspace-root");
|
|
15
9
|
const socket_utils_1 = require("../socket-utils");
|
|
16
10
|
const shutdown_utils_1 = require("./shutdown-utils");
|
|
17
|
-
const ignore_1 = require("ignore");
|
|
18
|
-
const path_2 = require("../../utils/path");
|
|
19
11
|
/**
|
|
20
12
|
* This configures the files and directories which we always want to ignore as part of file watching
|
|
21
13
|
* and which we know the location of statically (meaning irrespective of user configuration files).
|
|
@@ -33,37 +25,6 @@ const ALWAYS_IGNORE = [
|
|
|
33
25
|
(0, path_1.join)(workspace_root_1.workspaceRoot, '.git'),
|
|
34
26
|
socket_utils_1.FULL_OS_SOCKET_PATH,
|
|
35
27
|
];
|
|
36
|
-
function getIgnoredGlobs() {
|
|
37
|
-
return [
|
|
38
|
-
...ALWAYS_IGNORE,
|
|
39
|
-
...getIgnoredGlobsFromFile((0, path_1.join)(workspace_root_1.workspaceRoot, '.nxignore')),
|
|
40
|
-
...getIgnoredGlobsFromFile((0, path_1.join)(workspace_root_1.workspaceRoot, '.gitignore')),
|
|
41
|
-
];
|
|
42
|
-
}
|
|
43
|
-
function getIgnoredGlobsFromFile(file) {
|
|
44
|
-
try {
|
|
45
|
-
return (0, fs_1.readFileSync)(file, 'utf-8')
|
|
46
|
-
.split('\n')
|
|
47
|
-
.map((i) => i.trim())
|
|
48
|
-
.filter((i) => !!i && !i.startsWith('#'))
|
|
49
|
-
.map((i) => (i.startsWith('/') ? (0, path_1.join)(workspace_root_1.workspaceRoot, i) : i));
|
|
50
|
-
}
|
|
51
|
-
catch (e) {
|
|
52
|
-
return [];
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
function configureIgnoreObject() {
|
|
56
|
-
const ig = (0, ignore_1.default)();
|
|
57
|
-
try {
|
|
58
|
-
ig.add((0, fs_1.readFileSync)(`${workspace_root_1.workspaceRoot}/.gitignore`, 'utf-8'));
|
|
59
|
-
}
|
|
60
|
-
catch (_a) { }
|
|
61
|
-
try {
|
|
62
|
-
ig.add((0, fs_1.readFileSync)(`${workspace_root_1.workspaceRoot}/.nxignore`, 'utf-8'));
|
|
63
|
-
}
|
|
64
|
-
catch (_b) { }
|
|
65
|
-
return ig;
|
|
66
|
-
}
|
|
67
28
|
function subscribeToWorkspaceChanges(server, cb) {
|
|
68
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
69
30
|
/**
|
|
@@ -72,7 +33,8 @@ function subscribeToWorkspaceChanges(server, cb) {
|
|
|
72
33
|
* executed by packages which do not have its necessary native binaries available.
|
|
73
34
|
*/
|
|
74
35
|
const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
|
|
75
|
-
const
|
|
36
|
+
const ignorePatterns = (0, ignore_1.readWorkspaceIgnorePatterns)();
|
|
37
|
+
const ignore = (0, ignore_1.createIgnoreFromPatterns)(ignorePatterns);
|
|
76
38
|
const subscription = yield watcher.subscribe(workspace_root_1.workspaceRoot, (err, events) => {
|
|
77
39
|
// Let the consumer handle any errors
|
|
78
40
|
if (err) {
|
|
@@ -102,12 +64,12 @@ function subscribeToWorkspaceChanges(server, cb) {
|
|
|
102
64
|
}
|
|
103
65
|
const nonIgnoredEvents = workspaceRelativeEvents
|
|
104
66
|
.filter(({ path }) => !!path)
|
|
105
|
-
.filter(({ path }) => !
|
|
67
|
+
.filter(({ path }) => !ignore.ignores(path));
|
|
106
68
|
if (nonIgnoredEvents && nonIgnoredEvents.length > 0) {
|
|
107
69
|
cb(null, nonIgnoredEvents);
|
|
108
70
|
}
|
|
109
71
|
}, {
|
|
110
|
-
ignore:
|
|
72
|
+
ignore: [...ALWAYS_IGNORE, ...ignorePatterns],
|
|
111
73
|
});
|
|
112
74
|
return subscription;
|
|
113
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/watcher.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
|
package/src/daemon/tmp-dir.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.isDaemonDisabled = exports.markDaemonAsDisabled = exports.writeDaemonLog
|
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const cache_directory_1 = require("../utils/cache-directory");
|
|
12
|
-
exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.
|
|
12
|
+
exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'd');
|
|
13
13
|
exports.DAEMON_OUTPUT_LOG_FILE = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'daemon.log');
|
|
14
14
|
exports.DAEMON_SOCKET_PATH = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE,
|
|
15
15
|
// As per notes above on socket/named pipe length limitations, we keep this intentionally short
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/tmp-dir.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,2BAA6C;AAC7C,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/tmp-dir.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,2BAA6C;AAC7C,+BAA4B;AAC5B,8DAAsE;AAEzD,QAAA,gCAAgC,GAAG,IAAA,WAAI,EAClD,4CAA0B,EAC1B,GAAG,CACJ,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,WAAI,EACxC,wCAAgC,EAChC,YAAY,CACb,CAAC;AAEW,QAAA,kBAAkB,GAAG,IAAA,WAAI,EACpC,wCAAgC;AAChC,+FAA+F;AAC/F,QAAQ,CACT,CAAC;AAEF,SAAgB,eAAe,CAAC,KAAc;IAC5C,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,wCAAgC,EAAE,kBAAkB,CAAC,CAAC;IACxE,IAAA,kBAAa,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3B,OAAO,IAAI,CAAC;AACd,CAAC;AAJD,0CAIC;AAED,SAAgB,oBAAoB;IAClC,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,wCAAgC,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;AAC5E,CAAC;AAFD,oDAEC;AAED,SAAgB,gBAAgB;IAC9B,IAAI;QACF,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,wCAAgC,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAPD,4CAOC"}
|
|
@@ -24,6 +24,7 @@ export interface RunCommandsOptions extends Json {
|
|
|
24
24
|
args?: string;
|
|
25
25
|
envFile?: string;
|
|
26
26
|
outputPath?: string;
|
|
27
|
+
__unparsed__: string[];
|
|
27
28
|
}
|
|
28
29
|
export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
|
|
29
30
|
commands: {
|
|
@@ -37,3 +38,4 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
|
|
|
37
38
|
export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
|
|
38
39
|
success: boolean;
|
|
39
40
|
}>;
|
|
41
|
+
export declare function interpolateArgsIntoCommand(command: string, opts: NormalizedRunCommandsOptions, forwardAllArgs: boolean): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LARGE_BUFFER = void 0;
|
|
3
|
+
exports.interpolateArgsIntoCommand = exports.LARGE_BUFFER = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const path = require("path");
|
|
@@ -103,7 +103,7 @@ function normalizeOptions(options) {
|
|
|
103
103
|
}
|
|
104
104
|
options.commands.forEach((c) => {
|
|
105
105
|
var _a;
|
|
106
|
-
c.command =
|
|
106
|
+
c.command = interpolateArgsIntoCommand(c.command, options, (_a = c.forwardAllArgs) !== null && _a !== void 0 ? _a : true);
|
|
107
107
|
});
|
|
108
108
|
return options;
|
|
109
109
|
}
|
|
@@ -184,23 +184,19 @@ function processEnv(color) {
|
|
|
184
184
|
}
|
|
185
185
|
return env;
|
|
186
186
|
}
|
|
187
|
-
function
|
|
187
|
+
function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
|
|
188
188
|
if (command.indexOf('{args.') > -1) {
|
|
189
189
|
const regex = /{args\.([^}]+)}/g;
|
|
190
|
-
return command.replace(regex, (_, group) =>
|
|
190
|
+
return command.replace(regex, (_, group) => opts.parsedArgs[group]);
|
|
191
191
|
}
|
|
192
|
-
else if (
|
|
193
|
-
|
|
194
|
-
.map((a) => typeof args[a] === 'string' && args[a].includes(' ')
|
|
195
|
-
? `--${a}="${args[a].replace(/"/g, '"')}"`
|
|
196
|
-
: `--${a}=${args[a]}`)
|
|
197
|
-
.join(' ');
|
|
198
|
-
return `${command} ${stringifiedArgs}`;
|
|
192
|
+
else if (forwardAllArgs) {
|
|
193
|
+
return `${command}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
|
|
199
194
|
}
|
|
200
195
|
else {
|
|
201
196
|
return command;
|
|
202
197
|
}
|
|
203
198
|
}
|
|
199
|
+
exports.interpolateArgsIntoCommand = interpolateArgsIntoCommand;
|
|
204
200
|
function parseArgs(options) {
|
|
205
201
|
const args = options.args;
|
|
206
202
|
if (!args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/run-commands/run-commands.impl.ts"],"names":[],"mappings":";;;;AAAA,iDAA+C;AAC/C,6BAA6B;AAC7B,4CAA4C;AAC5C,+CAAqD;AAErD,+BAA+B;AAElB,QAAA,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC;AAE3C,SAAe,WAAW,CAAC,IAAa;;QACtC,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,CAAC,2CAAa,QAAQ,EAAC,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YACzD,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,MAAM,MAAM,CAAC,KAAK,CAAC;aACpB;SACF;aAAM;YACL,IAAI;gBACF,CAAC,2CAAa,QAAQ,EAAC,CAAC,CAAC,MAAM,EAAE,CAAC;aACnC;YAAC,WAAM,GAAE;SACX;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/run-commands/run-commands.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,9 +124,19 @@
|
|
|
124
124
|
"cwd": {
|
|
125
125
|
"type": "string",
|
|
126
126
|
"description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
|
|
127
|
+
},
|
|
128
|
+
"__unparsed__": {
|
|
129
|
+
"hidden": true,
|
|
130
|
+
"type": "array",
|
|
131
|
+
"items": {
|
|
132
|
+
"type": "string"
|
|
133
|
+
},
|
|
134
|
+
"$default": {
|
|
135
|
+
"$source": "unparsed"
|
|
136
|
+
}
|
|
127
137
|
}
|
|
128
138
|
},
|
|
129
139
|
"additionalProperties": true,
|
|
130
|
-
"required": [],
|
|
140
|
+
"required": ["__unparsed__"],
|
|
131
141
|
"examplesFile": "../../../docs/run-commands-examples.md"
|
|
132
142
|
}
|
|
@@ -7,14 +7,8 @@ const path = require("path");
|
|
|
7
7
|
function default_1(options, context) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
const pm = (0, package_manager_1.getPackageManagerCommand)();
|
|
10
|
-
const script = options.script;
|
|
11
|
-
delete options.script;
|
|
12
|
-
const args = [];
|
|
13
|
-
Object.keys(options).forEach((r) => {
|
|
14
|
-
args.push(`--${r}=${options[r]}`);
|
|
15
|
-
});
|
|
16
10
|
try {
|
|
17
|
-
(0, child_process_1.execSync)(pm.run(script,
|
|
11
|
+
(0, child_process_1.execSync)(pm.run(options.script, options.__unparsed__.join(' ')), {
|
|
18
12
|
stdio: ['inherit', 'inherit', 'inherit'],
|
|
19
13
|
cwd: path.join(context.root, context.workspace.projects[context.projectName].root),
|
|
20
14
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-script.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/run-script/run-script.impl.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,iEAAuE;AAEvE,6BAA6B;
|
|
1
|
+
{"version":3,"file":"run-script.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/run-script/run-script.impl.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,iEAAuE;AAEvE,6BAA6B;AAO7B,mBACE,OAAyB,EACzB,OAAwB;;QAExB,MAAM,EAAE,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACtC,IAAI;YACF,IAAA,wBAAQ,EAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC/D,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;gBACxC,GAAG,EAAE,IAAI,CAAC,IAAI,CACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CACrD;aACF,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;IACH,CAAC;CAAA;AAjBD,4BAiBC"}
|
|
@@ -8,9 +8,19 @@
|
|
|
8
8
|
"script": {
|
|
9
9
|
"type": "string",
|
|
10
10
|
"description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
|
|
11
|
+
},
|
|
12
|
+
"__unparsed__": {
|
|
13
|
+
"hidden": true,
|
|
14
|
+
"type": "array",
|
|
15
|
+
"items": {
|
|
16
|
+
"type": "string"
|
|
17
|
+
},
|
|
18
|
+
"$default": {
|
|
19
|
+
"$source": "unparsed"
|
|
20
|
+
}
|
|
11
21
|
}
|
|
12
22
|
},
|
|
13
23
|
"additionalProperties": true,
|
|
14
|
-
"required": ["script"],
|
|
24
|
+
"required": ["script", "__unparsed__"],
|
|
15
25
|
"examplesFile": "../../../docs/run-script-examples.md"
|
|
16
26
|
}
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GitBasedFileHasher = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const workspace_root_1 = require("../utils/workspace-root");
|
|
6
5
|
const perf_hooks_1 = require("perf_hooks");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
6
|
+
const ignore_1 = require("../utils/ignore");
|
|
7
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
8
|
const file_hasher_base_1 = require("./file-hasher-base");
|
|
10
|
-
const
|
|
9
|
+
const git_hasher_1 = require("./git-hasher");
|
|
11
10
|
class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
12
11
|
/**
|
|
13
12
|
* For the project graph daemon server use-case we can potentially skip expensive work
|
|
@@ -19,7 +18,7 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
19
18
|
perf_hooks_1.performance.mark('init hashing:start');
|
|
20
19
|
this.clear();
|
|
21
20
|
const gitResult = yield (0, git_hasher_1.getFileHashes)(workspace_root_1.workspaceRoot);
|
|
22
|
-
const ignore =
|
|
21
|
+
const ignore = (0, ignore_1.createNxIgnore)();
|
|
23
22
|
gitResult.allFiles.forEach((hash, filename) => {
|
|
24
23
|
if (!ignore.ignores(filename)) {
|
|
25
24
|
this.fileHashes.set(filename, hash);
|
|
@@ -37,14 +36,4 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
38
|
exports.GitBasedFileHasher = GitBasedFileHasher;
|
|
40
|
-
function getIgnoredGlobs() {
|
|
41
|
-
if ((0, fs_1.existsSync)(`${workspace_root_1.workspaceRoot}/.nxignore`)) {
|
|
42
|
-
const ig = (0, ignore_1.default)();
|
|
43
|
-
ig.add((0, fs_1.readFileSync)(`${workspace_root_1.workspaceRoot}/.nxignore`, 'utf-8'));
|
|
44
|
-
return ig;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
return { ignores: (file) => false };
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
39
|
//# sourceMappingURL=git-based-file-hasher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,4CAAiD;AACjD,4DAAwD;AACxD,yDAAoD;AACpD,6CAAiE;AAEjE,MAAa,kBAAmB,SAAQ,iCAAc;IACpD;;;;OAIG;IACG,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAa,EAAC,8BAAa,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,IAAA,uBAAc,GAAE,CAAC;YAChC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,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,OAAO,CAAC,MAAM,IAAA,+BAAkB,EAAC,KAAK,EAAE,8BAAa,CAAC,CAAC,CAAC,MAAM,CAAC;QACjE,CAAC;KAAA;CACF;AA7BD,gDA6BC"}
|
package/src/hasher/hasher.js
CHANGED
|
@@ -59,11 +59,17 @@ class Hasher {
|
|
|
59
59
|
}
|
|
60
60
|
hashCommand(task) {
|
|
61
61
|
var _a, _b, _c;
|
|
62
|
+
const overrides = Object.assign({}, task.overrides);
|
|
63
|
+
delete overrides['__overrides_unparsed__'];
|
|
64
|
+
const sortedOverrides = {};
|
|
65
|
+
for (let k of Object.keys(overrides).sort()) {
|
|
66
|
+
sortedOverrides[k] = overrides[k];
|
|
67
|
+
}
|
|
62
68
|
return this.hashing.hashArray([
|
|
63
69
|
(_a = task.target.project) !== null && _a !== void 0 ? _a : '',
|
|
64
70
|
(_b = task.target.target) !== null && _b !== void 0 ? _b : '',
|
|
65
71
|
(_c = task.target.configuration) !== null && _c !== void 0 ? _c : '',
|
|
66
|
-
JSON.stringify(
|
|
72
|
+
JSON.stringify(sortedOverrides),
|
|
67
73
|
]);
|
|
68
74
|
}
|
|
69
75
|
hashContext() {
|