@nrwl/workspace 13.4.4-beta.2 → 13.4.5-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +5 -6
- package/src/command-line/reset.d.ts +1 -1
- package/src/command-line/reset.js +8 -12
- package/src/command-line/reset.js.map +1 -1
- package/src/core/file-utils.js +12 -8
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher.d.ts +2 -2
- package/src/core/hasher/file-hasher.js +22 -14
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-hasher.d.ts +6 -24
- package/src/core/hasher/git-hasher.js +90 -147
- package/src/core/hasher/git-hasher.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.d.ts +0 -1
- package/src/core/nx-deps/nx-deps-cache.js +6 -8
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +2 -0
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +3 -0
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +34 -32
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +20 -1
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/daemon/tmp-dir.d.ts +0 -4
- package/src/core/project-graph/daemon/tmp-dir.js +2 -9
- package/src/core/project-graph/daemon/tmp-dir.js.map +1 -1
- package/src/core/project-graph/project-graph.js +5 -2
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +1 -1
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/tasks-runner/cache.js +31 -40
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/utilities/cache-directory.d.ts +1 -2
- package/src/utilities/cache-directory.js +3 -3
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utilities/is_ci.d.ts +1 -0
- package/src/utilities/is_ci.js +20 -0
- package/src/utilities/is_ci.js.map +1 -0
- package/src/utilities/output.js +2 -1
- package/src/utilities/output.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/core/hasher/spawn-process.d.ts +0 -6
- package/src/core/hasher/spawn-process.js +0 -27
- package/src/core/hasher/spawn-process.js.map +0 -1
@@ -1,20 +1,18 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.extractCachedFileData = exports.shouldRecomputeWholeGraph = exports.writeCache = exports.createCache = exports.readCache = exports.ensureCacheDirectory = exports.nxDepsPath =
|
3
|
+
exports.extractCachedFileData = exports.shouldRecomputeWholeGraph = exports.writeCache = exports.createCache = exports.readCache = exports.ensureCacheDirectory = exports.nxDepsPath = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
const path_1 = require("path");
|
6
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
7
6
|
const fs_1 = require("fs");
|
8
7
|
const fs_extra_1 = require("fs-extra");
|
9
8
|
const fileutils_1 = require("../../utilities/fileutils");
|
10
9
|
const perf_hooks_1 = require("perf_hooks");
|
11
10
|
const cache_directory_1 = require("../../utilities/cache-directory");
|
12
|
-
exports.
|
13
|
-
exports.nxDepsPath = (0, path_1.join)(exports.nxDepsDir, 'nxdeps.json');
|
11
|
+
exports.nxDepsPath = (0, path_1.join)(cache_directory_1.cacheDir, 'nxdeps.json');
|
14
12
|
function ensureCacheDirectory() {
|
15
13
|
try {
|
16
|
-
if (!(0, fs_1.existsSync)(
|
17
|
-
(0, fs_extra_1.ensureDirSync)(
|
14
|
+
if (!(0, fs_1.existsSync)(cache_directory_1.cacheDir)) {
|
15
|
+
(0, fs_extra_1.ensureDirSync)(cache_directory_1.cacheDir);
|
18
16
|
}
|
19
17
|
}
|
20
18
|
catch (e) {
|
@@ -28,8 +26,8 @@ function ensureCacheDirectory() {
|
|
28
26
|
* In this case, we're creating the directory. If the operation failed, we ensure that the directory
|
29
27
|
* exists before continuing (or raise an exception).
|
30
28
|
*/
|
31
|
-
if (!(0, fileutils_1.directoryExists)(
|
32
|
-
throw new Error(`Failed to create directory: ${
|
29
|
+
if (!(0, fileutils_1.directoryExists)(cache_directory_1.cacheDir)) {
|
30
|
+
throw new Error(`Failed to create directory: ${cache_directory_1.cacheDir}`);
|
33
31
|
}
|
34
32
|
}
|
35
33
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":";;;AAUA,yCAA2D;AAC3D,+BAA4B;AAC5B,
|
1
|
+
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":"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"}
|
@@ -16,8 +16,10 @@ const fs_1 = require("fs");
|
|
16
16
|
const os = require("os");
|
17
17
|
const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
|
18
18
|
const nx_plugin_1 = require("@nrwl/tao/src/shared/nx-plugin");
|
19
|
+
const file_hasher_1 = require("../hasher/file-hasher");
|
19
20
|
function buildProjectGraph() {
|
20
21
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
22
|
+
yield file_hasher_1.defaultFileHasher.ensureInitialized();
|
21
23
|
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
22
24
|
const { projectFileMap, allWorkspaceFiles } = (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
23
25
|
const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2DAA2D;AAC3D,+BAA4B;AAC5B,2CAAyC;AACzC,4EAAuE;AACvE,8CAIuB;AACvB,4DAAuD;AACvD,4DAOkC;AAClC,6DAAwE;AACxE,+CAGuB;AACvB,2BAAgC;AAChC,yBAAyB;AACzB,0JAAiJ;AACjJ,8DAA+D;
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const child_process_1 = require("child_process");
|
7
7
|
const fs_1 = require("fs");
|
8
|
+
const fs_extra_1 = require("fs-extra");
|
8
9
|
const net_1 = require("net");
|
9
10
|
const perf_hooks_1 = require("perf_hooks");
|
10
11
|
const cache_1 = require("../cache");
|
@@ -13,6 +14,8 @@ const tmp_dir_1 = require("../tmp-dir");
|
|
13
14
|
function startInBackground() {
|
14
15
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
15
16
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
17
|
+
(0, fs_extra_1.ensureDirSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE);
|
18
|
+
(0, fs_extra_1.ensureFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE);
|
16
19
|
try {
|
17
20
|
const out = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
18
21
|
const err = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,yCAAoD;AACpD,iDAA+D;AAC/D,2BAA4C;AAC5C,6BAA8B;AAC9B,2CAAyC;AACzC,oCAGkB;AAClB,kDAAwE;AACxE,
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
@@ -74,40 +74,42 @@ function computeWorkspaceConfigHash(workspaceJson) {
|
|
74
74
|
return new hashing_impl_1.HashingImpl().hashArray([JSON.stringify(workspaceJson)]);
|
75
75
|
}
|
76
76
|
function processCollectedUpdatedAndDeletedFiles() {
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
storedWorkspaceConfigHash
|
90
|
-
|
77
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
78
|
+
try {
|
79
|
+
perf_hooks_1.performance.mark('hash-watched-changes-start');
|
80
|
+
const updatedFiles = (yield (0, git_hasher_1.getGitHashForFiles)([...collectedUpdatedFiles.values()], app_root_1.appRootPath)).hashes;
|
81
|
+
const deletedFiles = [...collectedDeletedFiles.values()];
|
82
|
+
perf_hooks_1.performance.mark('hash-watched-changes-end');
|
83
|
+
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
84
|
+
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
85
|
+
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
86
|
+
const workspaceConfigHash = computeWorkspaceConfigHash(workspaceJson);
|
87
|
+
logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
88
|
+
// when workspace config changes we cannot incrementally update project file map
|
89
|
+
if (workspaceConfigHash !== storedWorkspaceConfigHash) {
|
90
|
+
storedWorkspaceConfigHash = workspaceConfigHash;
|
91
|
+
projectFileMapWithFiles = (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
92
|
+
}
|
93
|
+
else {
|
94
|
+
projectFileMapWithFiles = projectFileMapWithFiles
|
95
|
+
? (0, file_utils_1.updateProjectFileMap)(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
96
|
+
: (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
97
|
+
}
|
98
|
+
collectedUpdatedFiles.clear();
|
99
|
+
collectedDeletedFiles.clear();
|
91
100
|
}
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
101
|
+
catch (e) {
|
102
|
+
// this is expected
|
103
|
+
// for instance, workspace.json can be incorrect etc
|
104
|
+
// we are resetting internal state to start from scratch next time a file changes
|
105
|
+
// given the user the opportunity to fix the error
|
106
|
+
// if Nx requests the project graph prior to the error being fixed,
|
107
|
+
// the error will be propagated
|
108
|
+
logger_1.serverLogger.log(`Error detected when recomputing project file map: ${e.message}`);
|
109
|
+
resetInternalState();
|
110
|
+
return e;
|
96
111
|
}
|
97
|
-
|
98
|
-
collectedDeletedFiles.clear();
|
99
|
-
}
|
100
|
-
catch (e) {
|
101
|
-
// this is expected
|
102
|
-
// for instance, workspace.json can be incorrect etc
|
103
|
-
// we are resetting internal state to start from scratch next time a file changes
|
104
|
-
// given the user the opportunity to fix the error
|
105
|
-
// if Nx requests the project graph prior to the error being fixed,
|
106
|
-
// the error will be propagated
|
107
|
-
logger_1.serverLogger.log(`Error detected when recomputing project file map: ${e.message}`);
|
108
|
-
resetInternalState();
|
109
|
-
return e;
|
110
|
-
}
|
112
|
+
});
|
111
113
|
}
|
112
114
|
function processFilesAndCreateAndSerializeProjectGraph() {
|
113
115
|
const err = processCollectedUpdatedAndDeletedFiles();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":";;;;AACA,2DAA2D;AAC3D,2CAAyC;AACzC,oDAI6B;AAC7B,6DAAgE;AAChE,2DAAgE;AAChE,qCAAwC;AACxC,mEAAiF;AAEjF,kEAIwC;AACxC,+DAA6D;AAC7D,+DAA2D;AAE3D,IAAI,mCAGF,CAAC;AACH,IAAI,uBAES,CAAC;AACd,IAAI,wBAAuD,CAAC;AAE5D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,IAAI,yBAA6C,CAAC;AAClD,IAAI,UAAU,GAAG,GAAG,CAAC;AACrB,IAAI,kBAAkB,CAAC;AAEvB,SAAsB,sCAAsC;;QAC1D,IAAI;YACF,oEAAoE;YACpE,IAAI,kBAAkB,EAAE;gBACtB,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBACjC,kBAAkB,GAAG,SAAS,CAAC;aAChC;YAED,sBAAsB;YACtB,UAAU,GAAG,GAAG,CAAC;YACjB,iCAAiC,EAAE,CAAC;YACpC,IAAI,qBAAqB,CAAC,IAAI,IAAI,CAAC,IAAI,qBAAqB,CAAC,IAAI,IAAI,CAAC,EAAE;gBACtE,IAAI,CAAC,mCAAmC,EAAE;oBACxC,mCAAmC;wBACjC,6CAA6C,EAAE,CAAC;iBACnD;aACF;iBAAM;gBACL,mCAAmC;oBACjC,6CAA6C,EAAE,CAAC;aACnD;YACD,OAAO,MAAM,mCAAmC,CAAC;SAClD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC;SACnD;IACH,CAAC;CAAA;AAxBD,wFAwBC;AAED,SAAgB,yBAAyB,CACvC,YAAsB,EACtB,YAAsB;IAEtB,KAAK,IAAI,CAAC,IAAI,YAAY,EAAE;QAC1B,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,KAAK,IAAI,CAAC,IAAI,YAAY,EAAE;QAC1B,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,IAAI,CAAC,kBAAkB,EAAE;QACvB,kBAAkB,GAAG,UAAU,CAAC,GAAG,EAAE;YACnC,kBAAkB,GAAG,SAAS,CAAC;YAC/B,IAAI,UAAU,GAAG,IAAI,EAAE;gBACrB,UAAU,GAAG,UAAU,GAAG,CAAC,CAAC;aAC7B;YACD,mCAAmC;gBACjC,6CAA6C,EAAE,CAAC;QACpD,CAAC,EAAE,UAAU,CAAC,CAAC;KAChB;AACH,CAAC;AAxBD,8DAwBC;AAED,SAAS,0BAA0B,CAAC,aAAkB;IACpD,OAAO,IAAI,0BAAW,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,
|
1
|
+
{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"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"}
|
@@ -15,6 +15,7 @@ const fs_1 = require("fs");
|
|
15
15
|
const path_1 = require("path");
|
16
16
|
const socket_utils_1 = require("../socket-utils");
|
17
17
|
const shutdown_utils_1 = require("@nrwl/workspace/src/core/project-graph/daemon/server/shutdown-utils");
|
18
|
+
const ignore_1 = require("ignore");
|
18
19
|
/**
|
19
20
|
* This configures the files and directories which we always want to ignore as part of file watching
|
20
21
|
* and which we know the location of statically (meaning irrespective of user configuration files).
|
@@ -51,6 +52,18 @@ function getIgnoredGlobsFromFile(file) {
|
|
51
52
|
return [];
|
52
53
|
}
|
53
54
|
}
|
55
|
+
function configureIgnoreObject() {
|
56
|
+
const ig = (0, ignore_1.default)();
|
57
|
+
try {
|
58
|
+
ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.gitignore`, 'utf-8'));
|
59
|
+
}
|
60
|
+
catch (_a) { }
|
61
|
+
try {
|
62
|
+
ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.nxignore`, 'utf-8'));
|
63
|
+
}
|
64
|
+
catch (_b) { }
|
65
|
+
return ig;
|
66
|
+
}
|
54
67
|
function subscribeToWorkspaceChanges(server, cb) {
|
55
68
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
56
69
|
/**
|
@@ -59,6 +72,7 @@ function subscribeToWorkspaceChanges(server, cb) {
|
|
59
72
|
* executed by packages which do not have its necessary native binaries available.
|
60
73
|
*/
|
61
74
|
const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
|
75
|
+
const ignoreObj = configureIgnoreObject();
|
62
76
|
const subscription = yield watcher.subscribe(app_root_1.appRootPath, (err, events) => {
|
63
77
|
// Let the consumer handle any errors
|
64
78
|
if (err) {
|
@@ -86,7 +100,12 @@ function subscribeToWorkspaceChanges(server, cb) {
|
|
86
100
|
watcherSubscription: subscription,
|
87
101
|
});
|
88
102
|
}
|
89
|
-
|
103
|
+
const nonIgnoredEvents = workspaceRelativeEvents
|
104
|
+
.filter(({ path }) => !!path)
|
105
|
+
.filter(({ path }) => !ignoreObj.ignores(path));
|
106
|
+
if (nonIgnoredEvents && nonIgnoredEvents.length > 0) {
|
107
|
+
cb(null, nonIgnoredEvents);
|
108
|
+
}
|
90
109
|
}, {
|
91
110
|
ignore: getIgnoredGlobs(),
|
92
111
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,yCAA6C;AAC7C,2DAA2D;AAE3D,2BAAkC;AAClC,+BAAsC;AACtC,kDAAsD;
|
1
|
+
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,3 @@
|
|
1
|
-
/**
|
2
|
-
* E.g. on a mac the value for this will be something like:
|
3
|
-
* /var/folders/zk/9ff5snsj71j2r07qht44w_nr0000gn/T/nx-daemon/{{subDirForCurrentWorkspace}}
|
4
|
-
*/
|
5
1
|
export declare const DAEMON_DIR_FOR_CURRENT_WORKSPACE: string;
|
6
2
|
export declare const DAEMON_OUTPUT_LOG_FILE: string;
|
7
3
|
export declare const DAEMON_SOCKET_PATH: string;
|
@@ -8,10 +8,9 @@ exports.DAEMON_SOCKET_PATH = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR
|
|
8
8
|
*/
|
9
9
|
const devkit_1 = require("@nrwl/devkit");
|
10
10
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
11
|
-
const fs_extra_1 = require("fs-extra");
|
12
|
-
const os_1 = require("os");
|
13
11
|
const path_1 = require("path");
|
14
12
|
const crypto_1 = require("crypto");
|
13
|
+
const cache_directory_1 = require("../../../utilities/cache-directory");
|
15
14
|
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
|
16
15
|
function escapeRegExp(string) {
|
17
16
|
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
@@ -45,14 +44,8 @@ const subDirForCurrentWorkspace = (0, crypto_1.createHash)('sha1')
|
|
45
44
|
.update(createUniqueNameForCurrentWorkspace())
|
46
45
|
.digest('hex')
|
47
46
|
.slice(0, 32);
|
48
|
-
|
49
|
-
* E.g. on a mac the value for this will be something like:
|
50
|
-
* /var/folders/zk/9ff5snsj71j2r07qht44w_nr0000gn/T/nx-daemon/{{subDirForCurrentWorkspace}}
|
51
|
-
*/
|
52
|
-
exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-daemon', subDirForCurrentWorkspace);
|
53
|
-
(0, fs_extra_1.ensureDirSync)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE);
|
47
|
+
exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.cacheDir, 'nx-daemon', subDirForCurrentWorkspace);
|
54
48
|
exports.DAEMON_OUTPUT_LOG_FILE = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server.log');
|
55
|
-
(0, fs_extra_1.ensureFileSync)(exports.DAEMON_OUTPUT_LOG_FILE);
|
56
49
|
exports.DAEMON_SOCKET_PATH = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE,
|
57
50
|
// As per notes above on socket/named pipe length limitations, we keep this intentionally short
|
58
51
|
'd.sock');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/tmp-dir.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,yCAA6C;AAC7C,2DAA2D;AAC3D
|
1
|
+
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/tmp-dir.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,yCAA6C;AAC7C,2DAA2D;AAC3D,+BAA4B;AAC5B,mCAAoC;AACpC,wEAA8D;AAE9D,6FAA6F;AAC7F,SAAS,YAAY,CAAC,MAAM;IAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,oCAAoC;AAC5F,CAAC;AAED;;;;GAIG;AACH,SAAS,mCAAmC;IAC1C,IAAI,UAAU,GAAG,IAAA,sBAAa,EAAC,sBAAW,CAAC,CAAC,OAAO;IACjD,0EAA0E;IAC1E,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EAClC,GAAG,CACJ,CAAC;IACF,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACzB,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,yBAAyB,GAAG,IAAA,mBAAU,EAAC,MAAM,CAAC;KACjD,MAAM,CAAC,mCAAmC,EAAE,CAAC;KAC7C,MAAM,CAAC,KAAK,CAAC;KACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAEH,QAAA,gCAAgC,GAAG,IAAA,WAAI,EAClD,0BAAQ,EACR,WAAW,EACX,yBAAyB,CAC1B,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"}
|
@@ -7,6 +7,7 @@ const nx_deps_cache_1 = require("../nx-deps/nx-deps-cache");
|
|
7
7
|
const build_project_graph_1 = require("./build-project-graph");
|
8
8
|
const file_utils_1 = require("../file-utils");
|
9
9
|
const output_1 = require("../../utilities/output");
|
10
|
+
const is_ci_1 = require("../../utilities/is_ci");
|
10
11
|
/**
|
11
12
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
12
13
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
@@ -52,14 +53,16 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
52
53
|
// option=true,env=false => no daemon
|
53
54
|
// option=false,env=undefined => no daemon
|
54
55
|
// option=false,env=false => no daemon
|
55
|
-
// option=true,env=undefined => daemon
|
56
|
+
// option=true,env=undefined,ci => no daemon
|
57
|
+
// option=true,env=undefined,!ci => daemon
|
56
58
|
// option=true,env=true => daemon
|
57
59
|
// option=false,env=true => daemon
|
58
60
|
try {
|
59
61
|
if ((useDaemonProcessOption === undefined && env === undefined) ||
|
60
62
|
(useDaemonProcessOption === true && env === 'false') ||
|
61
63
|
(useDaemonProcessOption === false && env === undefined) ||
|
62
|
-
(useDaemonProcessOption === false && env === 'false')
|
64
|
+
(useDaemonProcessOption === false && env === 'false') ||
|
65
|
+
(useDaemonProcessOption === true && env === undefined && (0, is_ci_1.isCI)())) {
|
63
66
|
return projectGraphAdapter('5.0', projectGraphVersion, yield (0, build_project_graph_1.buildProjectGraph)());
|
64
67
|
}
|
65
68
|
else {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAC1D,4DAAwE;AACxE,+DAA0D;AAC1D,8CAA8D;AAC9D,mDAAgD;
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAC1D,4DAAwE;AACxE,+DAA0D;AAC1D,8CAA8D;AAC9D,mDAAgD;AAChD,iDAA6C;AAE7C;;;GAGG;AACH,SAAgB,sBAAsB,CACpC,mBAAmB,GAAG,KAAK;IAE3B,MAAM,iBAAiB,GAA8B,IAAA,yBAAS,GAAE,CAAC;IACjE,MAAM,oBAAoB,GACxB,IAAA,8BAAiB,GAAE,KAAK,cAAc;QACpC,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;OAIb;QACD,CAAC,CAAC,EAAE,CAAC;IACT,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;;;;;;;;QAQxB,oBAAoB;KACvB,CAAC,CAAC;KACJ;IACD,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,KAAK,EAAE,iBAAiB,CAAC,KAAK;QAC9B,aAAa,EAAE,iBAAiB,CAAC,aAAa;QAC9C,YAAY,EAAE,iBAAiB,CAAC,YAAY;KAC7C,CAAC;IAEF,OAAO,mBAAmB,CACxB,YAAY,CAAC,OAAO,EACpB,mBAAmB,EACnB,YAAY,CACb,CAAC;AACJ,CAAC;AApCD,wDAoCC;AAED,SAAsB,uBAAuB,CAC3C,mBAAmB,GAAG,KAAK;;;QAE3B,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,sBAAsB,GAC1B,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,0CAAE,gBAAgB,CAAC;QACpE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAElC,wBAAwB;QACxB,8CAA8C;QAC9C,qCAAqC;QACrC,0CAA0C;QAC1C,sCAAsC;QACtC,4CAA4C;QAE5C,0CAA0C;QAC1C,iCAAiC;QACjC,kCAAkC;QAClC,IAAI;YACF,IACE,CAAC,sBAAsB,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,CAAC;gBAC3D,CAAC,sBAAsB,KAAK,IAAI,IAAI,GAAG,KAAK,OAAO,CAAC;gBACpD,CAAC,sBAAsB,KAAK,KAAK,IAAI,GAAG,KAAK,SAAS,CAAC;gBACvD,CAAC,sBAAsB,KAAK,KAAK,IAAI,GAAG,KAAK,OAAO,CAAC;gBACrD,CAAC,sBAAsB,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,IAAA,YAAI,GAAE,CAAC,EAChE;gBACA,OAAO,mBAAmB,CACxB,KAAK,EACL,mBAAmB,EACnB,MAAM,IAAA,uCAAiB,GAAE,CAC1B,CAAC;aACH;iBAAM;gBACL,MAAM,YAAY,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;gBACvD,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC,EAAE;oBAC7C,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC;iBACxC;gBACD,OAAO,mBAAmB,CACxB,KAAK,EACL,mBAAmB,EACnB,MAAM,YAAY,CAAC,yBAAyB,EAAE,CAC/C,CAAC;aACH;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpC,eAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;gBACf,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aAC1B,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;;CACF;AAlDD,0DAkDC;AAED;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CACjC,aAAqB,EACrB,aAAqB,EACrB,YAA0B;IAE1B,IAAI,aAAa,KAAK,aAAa,EAAE;QACnC,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,aAAa,KAAK,KAAK,IAAI,aAAa,KAAK,KAAK,EAAE;QACtD,OAAO,sBAAsB,CAAC,YAAY,CAAC,CAAC;KAC7C;IACD,MAAM,IAAI,KAAK,CACb,8CAA8C,aAAa,aAAa,aAAa;;;;;KAKpF,CACF,CAAC;AACJ,CAAC;AAnBD,kDAmBC;AAED;;;;GAIG;AACH,SAAS,sBAAsB,CAAC,YAA0B;IACxD,MAAM,EAAE,aAAa,KAAc,YAAY,EAArB,IAAI,uBAAK,YAAY,EAAzC,iBAA0B,CAAe,CAAC;IAChD,uCACK,IAAI,KACP,KAAK,kCACA,YAAY,CAAC,KAAK,GAClB,aAAa,GAElB,YAAY,kCACP,YAAY,CAAC,YAAY,GACzB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,iCAAM,GAAG,KAAE,CAAC,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,IAAG,EAC9C,EAAE,CACH,GAEH,OAAO,EAAE,KAAK,IACd;AACJ,CAAC"}
|
@@ -145,7 +145,7 @@ function createProcess(command, readyWhen, color, cwd) {
|
|
145
145
|
function createSyncProcess(command, color, cwd) {
|
146
146
|
(0, child_process_1.execSync)(command, {
|
147
147
|
env: processEnv(color),
|
148
|
-
stdio: [
|
148
|
+
stdio: ['inherit', 'inherit', 'inherit'],
|
149
149
|
maxBuffer: exports.LARGE_BUFFER,
|
150
150
|
cwd,
|
151
151
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/executors/run-commands/run-commands.impl.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/executors/run-commands/run-commands.impl.ts"],"names":[],"mappings":"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"}
|
@@ -73,11 +73,9 @@ class Cache {
|
|
73
73
|
const src = (0, path_1.join)(this.root, f);
|
74
74
|
if (yield existsAsync(src)) {
|
75
75
|
const cached = (0, path_1.join)(td, 'outputs', f);
|
76
|
-
|
77
|
-
const isFile = (yield lstatAsync(src)).isFile();
|
78
|
-
const directory = isFile ? (0, path_1.resolve)(cached, '..') : cached;
|
76
|
+
const directory = (0, path_1.resolve)(cached, '..');
|
79
77
|
yield (0, fs_extra_1.ensureDir)(directory);
|
80
|
-
yield this.copy(src,
|
78
|
+
yield this.copy(src, directory);
|
81
79
|
}
|
82
80
|
})));
|
83
81
|
// we need this file to account for partial writes to the cache folder.
|
@@ -104,13 +102,11 @@ class Cache {
|
|
104
102
|
yield Promise.all(outputs.map((f) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
105
103
|
const cached = (0, path_1.join)(cachedResult.outputsPath, f);
|
106
104
|
if (yield existsAsync(cached)) {
|
107
|
-
const isFile = (yield lstatAsync(cached)).isFile();
|
108
105
|
const src = (0, path_1.join)(this.root, f);
|
109
106
|
yield this.remove(src);
|
110
|
-
|
111
|
-
const directory = isFile ? (0, path_1.resolve)(src, '..') : src;
|
107
|
+
const directory = (0, path_1.resolve)(src, '..');
|
112
108
|
yield (0, fs_extra_1.ensureDir)(directory);
|
113
|
-
yield this.copy(cached,
|
109
|
+
yield this.copy(cached, directory);
|
114
110
|
}
|
115
111
|
})));
|
116
112
|
yield this.recordOutputsHash(outputs, hash);
|
@@ -137,39 +133,35 @@ class Cache {
|
|
137
133
|
(yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
|
138
134
|
});
|
139
135
|
}
|
140
|
-
copy(src,
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
}
|
154
|
-
});
|
136
|
+
copy(src, directory) {
|
137
|
+
if (this.useFsExtraToCopyAndRemove) {
|
138
|
+
return (0, fs_extra_1.copy)(src, directory);
|
139
|
+
}
|
140
|
+
return new Promise((res, rej) => {
|
141
|
+
(0, child_process_1.exec)(`cp -a "${src}" "${directory}"`, (error) => {
|
142
|
+
if (!error) {
|
143
|
+
res(null);
|
144
|
+
}
|
145
|
+
else {
|
146
|
+
this.useFsExtraToCopyAndRemove = true;
|
147
|
+
(0, fs_extra_1.copy)(src, directory).then(res, rej);
|
148
|
+
}
|
155
149
|
});
|
156
150
|
});
|
157
151
|
}
|
158
152
|
remove(folder) {
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
}
|
172
|
-
});
|
153
|
+
if (this.useFsExtraToCopyAndRemove) {
|
154
|
+
return (0, fs_extra_1.remove)(folder);
|
155
|
+
}
|
156
|
+
return new Promise((res, rej) => {
|
157
|
+
(0, child_process_1.exec)(`rm -rf "${folder}"`, (error) => {
|
158
|
+
if (!error) {
|
159
|
+
res(null);
|
160
|
+
}
|
161
|
+
else {
|
162
|
+
this.useFsExtraToCopyAndRemove = true;
|
163
|
+
(0, fs_extra_1.remove)(folder).then(res, rej);
|
164
|
+
}
|
173
165
|
});
|
174
166
|
});
|
175
167
|
}
|
@@ -253,9 +245,8 @@ class Cache {
|
|
253
245
|
});
|
254
246
|
}
|
255
247
|
createCacheDir() {
|
256
|
-
|
257
|
-
|
258
|
-
return dir;
|
248
|
+
(0, fs_extra_1.ensureDirSync)(cache_directory_1.cacheDir);
|
249
|
+
return cache_directory_1.cacheDir;
|
259
250
|
}
|
260
251
|
createTerminalOutputsDir() {
|
261
252
|
const path = (0, path_1.join)(this.cachePath, 'terminalOutputs');
|