@nrwl/workspace 13.4.5 → 13.5.0-beta.2
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +3 -144
- package/package.json +5 -7
- package/src/command-line/affected.js +5 -5
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/daemon.js +7 -3
- package/src/command-line/daemon.js.map +1 -1
- package/src/command-line/dep-graph.js +13 -10
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.js +13 -14
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/nx-commands.js +1 -1
- package/src/command-line/nx-commands.js.map +1 -1
- 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/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +2 -2
- package/src/command-line/run-one.js.map +1 -1
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js +8 -10
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +89 -7
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/main.esm.js.LICENSE.txt +0 -36
- package/src/core/dep-graph/styles.css +3 -1
- package/src/core/file-map-utils.d.ts +10 -0
- package/src/core/file-map-utils.js +80 -0
- package/src/core/file-map-utils.js.map +1 -0
- package/src/core/file-utils.d.ts +4 -16
- package/src/core/file-utils.js +17 -203
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher-base.d.ts +12 -0
- package/src/core/hasher/file-hasher-base.js +66 -0
- package/src/core/hasher/file-hasher-base.js.map +1 -0
- package/src/core/hasher/file-hasher.d.ts +2 -24
- package/src/core/hasher/file-hasher.js +12 -86
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-based-file-hasher.d.ts +10 -0
- package/src/core/hasher/git-based-file-hasher.js +50 -0
- package/src/core/hasher/git-based-file-hasher.js.map +1 -0
- package/src/core/hasher/git-hasher.d.ts +6 -24
- package/src/core/hasher/git-hasher.js +89 -147
- package/src/core/hasher/git-hasher.js.map +1 -1
- package/src/core/hasher/hasher.js +1 -0
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.d.ts +7 -0
- package/src/core/hasher/node-based-file-hasher.js +78 -0
- package/src/core/hasher/node-based-file-hasher.js.map +1 -0
- package/src/core/nx-deps/nx-deps-cache.d.ts +0 -1
- package/src/core/nx-deps/nx-deps-cache.js +7 -9
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +2 -2
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +2 -2
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -0
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.d.ts +2 -2
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js +1 -0
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/typescript-import-locator.d.ts +2 -1
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js +5 -1
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +5 -3
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +8 -3
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +0 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +71 -61
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +3 -1
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/start.js +5 -2
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/stop.js +5 -2
- package/src/core/project-graph/daemon/server/stop.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 -45
- package/src/core/project-graph/daemon/tmp-dir.js.map +1 -1
- package/src/core/project-graph/operators.d.ts +0 -1
- package/src/core/project-graph/operators.js +1 -7
- package/src/core/project-graph/operators.js.map +1 -1
- package/src/core/project-graph/project-graph.js +2 -0
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/core/target-project-locator.d.ts +2 -2
- package/src/core/target-project-locator.js +37 -23
- package/src/core/target-project-locator.js.map +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +3 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/schema.d.ts +1 -0
- package/src/generators/convert-to-nx-project/schema.json +5 -0
- package/src/generators/init/files/prettier/__dot__prettierignore +1 -0
- package/src/generators/init/init.js +5 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +1 -0
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/workspace/files/__workspaceFile__.json__tmpl__ +0 -5
- package/src/generators/workspace/files/package.json__tmpl__ +1 -1
- package/src/tasks-runner/cache.d.ts +2 -1
- package/src/tasks-runner/cache.js +10 -7
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +6 -6
- 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.d.ts +22 -0
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +334 -0
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/{empty-terminal-output-life-cycle.d.ts → life-cycles/empty-terminal-output-life-cycle.d.ts} +2 -2
- package/src/tasks-runner/{empty-terminal-output-life-cycle.js → life-cycles/empty-terminal-output-life-cycle.js} +3 -3
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/{neo-output → life-cycles}/pretty-time.d.ts +0 -0
- package/src/tasks-runner/{neo-output → life-cycles}/pretty-time.js +0 -0
- package/src/tasks-runner/life-cycles/pretty-time.js.map +1 -0
- package/src/tasks-runner/{run-many-terminal-output-life-cycle.d.ts → life-cycles/static-run-many-terminal-output-life-cycle.d.ts} +12 -4
- package/src/tasks-runner/{run-many-terminal-output-life-cycle.js → life-cycles/static-run-many-terminal-output-life-cycle.js} +28 -15
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/{run-one-terminal-output-life-cycle.d.ts → life-cycles/static-run-one-terminal-output-life-cycle.d.ts} +12 -4
- package/src/tasks-runner/{run-one-terminal-output-life-cycle.js → life-cycles/static-run-one-terminal-output-life-cycle.js} +26 -14
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/{task-timings-life-cycle.d.ts → life-cycles/task-profiling-life-cycle.d.ts} +4 -5
- package/src/tasks-runner/{task-timings-life-cycle.js → life-cycles/task-profiling-life-cycle.js} +10 -29
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js.map +1 -0
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.d.ts +13 -0
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.js +33 -0
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.js.map +1 -0
- package/src/tasks-runner/run-command.js +18 -13
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +18 -7
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner-v2.js +3 -1
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +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.js +1 -0
- package/src/utilities/is_ci.js.map +1 -1
- package/src/utilities/output.d.ts +13 -5
- package/src/utilities/output.js +55 -34
- package/src/utilities/output.js.map +1 -1
- package/src/utilities/perf-logging.js +4 -3
- package/src/utilities/perf-logging.js.map +1 -1
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/graph-utils.js +2 -1
- package/src/utils/graph-utils.js.map +1 -1
- package/src/utils/perf-logging.js +1 -1
- package/src/utils/perf-logging.js.map +1 -1
- package/src/utils/rules/visit-not-ignored-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.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
- package/src/tasks-runner/empty-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/neo-output/pretty-time.js.map +0 -1
- package/src/tasks-runner/neo-output/render.d.ts +0 -13
- package/src/tasks-runner/neo-output/render.js +0 -244
- package/src/tasks-runner/neo-output/render.js.map +0 -1
- package/src/tasks-runner/run-many-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/run-one-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/task-timings-life-cycle.js.map +0 -1
@@ -1,17 +1,16 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.addUpdatedAndDeletedFiles = exports.getCachedSerializedProjectGraphPromise = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
6
5
|
const perf_hooks_1 = require("perf_hooks");
|
7
6
|
const file_utils_1 = require("../../../file-utils");
|
8
7
|
const file_hasher_1 = require("../../../hasher/file-hasher");
|
9
|
-
const git_hasher_1 = require("../../../hasher/git-hasher");
|
10
8
|
const logger_1 = require("./logger");
|
11
9
|
const build_project_graph_1 = require("../../build-project-graph");
|
12
10
|
const nx_deps_cache_1 = require("../../../nx-deps/nx-deps-cache");
|
13
11
|
const fileutils_1 = require("../../../../utilities/fileutils");
|
14
12
|
const hashing_impl_1 = require("../../../hasher/hashing-impl");
|
13
|
+
const file_map_utils_1 = require("../../../file-map-utils");
|
15
14
|
let cachedSerializedProjectGraphPromise;
|
16
15
|
let projectFileMapWithFiles;
|
17
16
|
let currentProjectGraphCache;
|
@@ -30,7 +29,7 @@ function getCachedSerializedProjectGraphPromise() {
|
|
30
29
|
}
|
31
30
|
// reset the wait time
|
32
31
|
waitPeriod = 100;
|
33
|
-
resetInternalStateIfNxDepsMissing();
|
32
|
+
yield resetInternalStateIfNxDepsMissing();
|
34
33
|
if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
|
35
34
|
if (!cachedSerializedProjectGraphPromise) {
|
36
35
|
cachedSerializedProjectGraphPromise =
|
@@ -74,52 +73,59 @@ function computeWorkspaceConfigHash(workspaceJson) {
|
|
74
73
|
return new hashing_impl_1.HashingImpl().hashArray([JSON.stringify(workspaceJson)]);
|
75
74
|
}
|
76
75
|
function processCollectedUpdatedAndDeletedFiles() {
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
76
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
77
|
+
try {
|
78
|
+
perf_hooks_1.performance.mark('hash-watched-changes-start');
|
79
|
+
const updatedFiles = yield file_hasher_1.defaultFileHasher.hashFiles([
|
80
|
+
...collectedUpdatedFiles.values(),
|
81
|
+
]);
|
82
|
+
const deletedFiles = [...collectedDeletedFiles.values()];
|
83
|
+
perf_hooks_1.performance.mark('hash-watched-changes-end');
|
84
|
+
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
85
|
+
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
86
|
+
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
87
|
+
const workspaceConfigHash = computeWorkspaceConfigHash(workspaceJson);
|
88
|
+
logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
89
|
+
// when workspace config changes we cannot incrementally update project file map
|
90
|
+
if (workspaceConfigHash !== storedWorkspaceConfigHash) {
|
91
|
+
storedWorkspaceConfigHash = workspaceConfigHash;
|
92
|
+
projectFileMapWithFiles = (0, file_map_utils_1.createProjectFileMap)(workspaceJson, file_hasher_1.defaultFileHasher.allFileData());
|
93
|
+
}
|
94
|
+
else {
|
95
|
+
projectFileMapWithFiles = projectFileMapWithFiles
|
96
|
+
? (0, file_map_utils_1.updateProjectFileMap)(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
97
|
+
: (0, file_map_utils_1.createProjectFileMap)(workspaceJson, file_hasher_1.defaultFileHasher.allFileData());
|
98
|
+
}
|
99
|
+
collectedUpdatedFiles.clear();
|
100
|
+
collectedDeletedFiles.clear();
|
91
101
|
}
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
102
|
+
catch (e) {
|
103
|
+
// this is expected
|
104
|
+
// for instance, workspace.json can be incorrect or a file we are trying to has
|
105
|
+
// has been deleted
|
106
|
+
// we are resetting internal state to start from scratch next time a file changes
|
107
|
+
// given the user the opportunity to fix the error
|
108
|
+
// if Nx requests the project graph prior to the error being fixed,
|
109
|
+
// the error will be propagated
|
110
|
+
logger_1.serverLogger.log(`Error detected when recomputing project file map: ${e.message}`);
|
111
|
+
resetInternalState();
|
112
|
+
return e;
|
96
113
|
}
|
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
|
-
}
|
114
|
+
});
|
111
115
|
}
|
112
116
|
function processFilesAndCreateAndSerializeProjectGraph() {
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
117
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
118
|
+
const err = yield processCollectedUpdatedAndDeletedFiles();
|
119
|
+
if (err) {
|
120
|
+
return Promise.resolve({
|
121
|
+
error: err,
|
122
|
+
serializedProjectGraph: null,
|
123
|
+
});
|
124
|
+
}
|
125
|
+
else {
|
126
|
+
return createAndSerializeProjectGraph();
|
127
|
+
}
|
128
|
+
});
|
123
129
|
}
|
124
130
|
function copyFileData(d) {
|
125
131
|
return d.map((t) => (Object.assign({}, t)));
|
@@ -159,23 +165,27 @@ function createAndSerializeProjectGraph() {
|
|
159
165
|
});
|
160
166
|
}
|
161
167
|
function resetInternalState() {
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
168
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
169
|
+
cachedSerializedProjectGraphPromise = undefined;
|
170
|
+
projectFileMapWithFiles = undefined;
|
171
|
+
currentProjectGraphCache = undefined;
|
172
|
+
collectedUpdatedFiles.clear();
|
173
|
+
collectedDeletedFiles.clear();
|
174
|
+
file_hasher_1.defaultFileHasher.clear();
|
175
|
+
yield file_hasher_1.defaultFileHasher.ensureInitialized();
|
176
|
+
waitPeriod = 100;
|
177
|
+
});
|
169
178
|
}
|
170
|
-
exports.resetInternalState = resetInternalState;
|
171
179
|
function resetInternalStateIfNxDepsMissing() {
|
172
|
-
|
173
|
-
|
174
|
-
|
180
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
181
|
+
try {
|
182
|
+
if (!(0, fileutils_1.fileExists)(nx_deps_cache_1.nxDepsPath) && cachedSerializedProjectGraphPromise) {
|
183
|
+
yield resetInternalState();
|
184
|
+
}
|
175
185
|
}
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
}
|
186
|
+
catch (e) {
|
187
|
+
yield resetInternalState();
|
188
|
+
}
|
189
|
+
});
|
180
190
|
}
|
181
191
|
//# sourceMappingURL=project-graph-incremental-recomputation.js.map
|
@@ -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,
|
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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"}
|
@@ -13,6 +13,7 @@ const watcher_1 = require("./watcher");
|
|
13
13
|
const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
|
14
14
|
const fs_1 = require("fs");
|
15
15
|
const hashing_impl_1 = require("../../../hasher/hashing-impl");
|
16
|
+
const file_hasher_1 = require("@nrwl/workspace/src/core/hasher/file-hasher");
|
16
17
|
function respondToClient(socket, message) {
|
17
18
|
return new Promise((res) => {
|
18
19
|
socket.write(message, () => {
|
@@ -43,7 +44,7 @@ const server = (0, net_1.createServer)((socket) => (0, tslib_1.__awaiter)(void 0
|
|
43
44
|
const entry = list.getEntries()[0];
|
44
45
|
logger_1.serverLogger.log(`Time taken for '${entry.name}'`, `${entry.duration}ms`);
|
45
46
|
});
|
46
|
-
performanceObserver.observe({ entryTypes: ['measure']
|
47
|
+
performanceObserver.observe({ entryTypes: ['measure'] });
|
47
48
|
}
|
48
49
|
socket.on('data', (data) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
49
50
|
if (watcherError) {
|
@@ -179,6 +180,7 @@ function startServer() {
|
|
179
180
|
if (!socket_utils_1.isWindows) {
|
180
181
|
(0, socket_utils_1.killSocketOrPath)();
|
181
182
|
}
|
183
|
+
yield file_hasher_1.defaultFileHasher.ensureInitialized();
|
182
184
|
return new Promise((resolve, reject) => {
|
183
185
|
try {
|
184
186
|
server.listen(socket_utils_1.FULL_OS_SOCKET_PATH, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":";;;;
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
|
-
const
|
4
|
+
const output_1 = require("../../../../utilities/output");
|
5
5
|
const server_1 = require("./server");
|
6
6
|
const process = require("process");
|
7
7
|
(() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
@@ -9,7 +9,10 @@ const process = require("process");
|
|
9
9
|
yield (0, server_1.startServer)();
|
10
10
|
}
|
11
11
|
catch (err) {
|
12
|
-
|
12
|
+
output_1.output.error({
|
13
|
+
title: (err === null || err === void 0 ? void 0 : err.message) ||
|
14
|
+
'Something unexpected went wrong when starting the server',
|
15
|
+
});
|
13
16
|
process.exit(1);
|
14
17
|
}
|
15
18
|
}))();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,qCAAuC;AACvC,mCAAmC;AAEnC,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,IAAA,oBAAW,GAAE,CAAC;KACrB;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EACH,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBACZ,0DAA0D;SAC7D,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
|
-
const
|
4
|
+
const output_1 = require("../../../../utilities/output");
|
5
5
|
const cache_1 = require("../cache");
|
6
6
|
const server_1 = require("./server");
|
7
7
|
(() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
@@ -10,7 +10,10 @@ const server_1 = require("./server");
|
|
10
10
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
11
11
|
}
|
12
12
|
catch (err) {
|
13
|
-
|
13
|
+
output_1.output.error({
|
14
|
+
title: (err === null || err === void 0 ? void 0 : err.message) ||
|
15
|
+
'Something unexpected went wrong when stopping the server',
|
16
|
+
});
|
14
17
|
}
|
15
18
|
}))();
|
16
19
|
//# sourceMappingURL=stop.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/stop.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/stop.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,oCAAwD;AACxD,qCAAsC;AAEtC,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,IAAA,mBAAU,GAAE,CAAC;QACnB,MAAM,IAAA,oCAA4B,GAAE,CAAC;KACtC;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EACH,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBACZ,0DAA0D;SAC7D,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
|
@@ -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;
|
@@ -6,53 +6,10 @@ exports.DAEMON_SOCKET_PATH = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR
|
|
6
6
|
* location within the OS's tmp directory where we write log files for background processes
|
7
7
|
* and where we create the actual unix socket/named pipe for the daemon.
|
8
8
|
*/
|
9
|
-
const devkit_1 = require("@nrwl/devkit");
|
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
9
|
const path_1 = require("path");
|
14
|
-
const
|
15
|
-
|
16
|
-
function escapeRegExp(string) {
|
17
|
-
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
18
|
-
}
|
19
|
-
/**
|
20
|
-
* As part of deterministically generating a tmp dir for the daemon related outputs to go in,
|
21
|
-
* we create a unique name for the current workspace based on the full normalized absolute
|
22
|
-
* path to its root directory.
|
23
|
-
*/
|
24
|
-
function createUniqueNameForCurrentWorkspace() {
|
25
|
-
let pathAsName = (0, devkit_1.normalizePath)(app_root_1.appRootPath).replace(
|
26
|
-
// Replace the occurrences of / in the unix-style normalized path with a -
|
27
|
-
new RegExp(escapeRegExp('/'), 'g'), '-');
|
28
|
-
if (pathAsName[0] === '-') {
|
29
|
-
pathAsName = pathAsName.slice(1);
|
30
|
-
}
|
31
|
-
return pathAsName;
|
32
|
-
}
|
33
|
-
/**
|
34
|
-
* The unique names generated by createUniqueNameForCurrentWorkspace() can potentially be too long
|
35
|
-
* to leverage for the daemon because the character length of unix sockets and named pipes is limited:
|
36
|
-
*
|
37
|
-
* - Windows: 256 chars (named pipe)
|
38
|
-
* - Unix: 108 chars (unix socket)
|
39
|
-
* - macOS and BSD: 104 chars (unix socket)
|
40
|
-
*
|
41
|
-
* We therefore hash them using a fixed length algorithm to be able to limit their length but still
|
42
|
-
* have them be unique and deterministic. SHA-1 should be "good enough" for this specific purpose.
|
43
|
-
*/
|
44
|
-
const subDirForCurrentWorkspace = (0, crypto_1.createHash)('sha1')
|
45
|
-
.update(createUniqueNameForCurrentWorkspace())
|
46
|
-
.digest('hex')
|
47
|
-
.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);
|
10
|
+
const cache_directory_1 = require("../../../utilities/cache-directory");
|
11
|
+
exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.cacheDir, 'nx-daemon');
|
54
12
|
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
13
|
exports.DAEMON_SOCKET_PATH = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE,
|
57
14
|
// As per notes above on socket/named pipe length limitations, we keep this intentionally short
|
58
15
|
'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
|
1
|
+
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/tmp-dir.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,+BAA4B;AAC5B,wEAA8D;AAEjD,QAAA,gCAAgC,GAAG,IAAA,WAAI,EAAC,0BAAQ,EAAE,WAAW,CAAC,CAAC;AAE/D,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"}
|
@@ -6,7 +6,6 @@ export declare function filterNodes(predicate?: (n: ProjectGraphNode) => boolean
|
|
6
6
|
*/
|
7
7
|
export declare function isWorkspaceProject(project: ProjectGraphNode): boolean;
|
8
8
|
export declare function isNpmProject(project: ProjectGraphNode): project is ProjectGraphExternalNode;
|
9
|
-
export declare function getSortedProjectNodes(nodes: Record<string, ProjectGraphNode>): ProjectGraphNode<any>[];
|
10
9
|
/**
|
11
10
|
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
12
11
|
*/
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.withDeps = exports.pruneExternalNodes = exports.onlyWorkspaceProjects = exports.
|
3
|
+
exports.withDeps = exports.pruneExternalNodes = exports.onlyWorkspaceProjects = exports.isNpmProject = exports.isWorkspaceProject = exports.filterNodes = exports.reverse = void 0;
|
4
4
|
const reverseMemo = new Map();
|
5
5
|
function reverse(graph) {
|
6
6
|
const resultFromMemo = reverseMemo.get(graph);
|
@@ -67,12 +67,6 @@ function isNpmProject(project) {
|
|
67
67
|
return (project === null || project === void 0 ? void 0 : project.type) === 'npm';
|
68
68
|
}
|
69
69
|
exports.isNpmProject = isNpmProject;
|
70
|
-
function getSortedProjectNodes(nodes) {
|
71
|
-
return Object.values(nodes).sort((nodeA, nodeB) => {
|
72
|
-
return nodeA.data.root.length > nodeB.data.root.length ? -1 : 1;
|
73
|
-
});
|
74
|
-
}
|
75
|
-
exports.getSortedProjectNodes = getSortedProjectNodes;
|
76
70
|
/**
|
77
71
|
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
78
72
|
*/
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/operators.ts"],"names":[],"mappings":";;;AAOA,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAC;AAE1D,SAAgB,OAAO,CAAC,KAAmB;IACzC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,YAAY,EAAE,EAAE;KACD,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACvE,+EAA+E;IAC/E,IAAI,KAAK,CAAC,aAAa,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CACrC,CAAC;KACH;IACD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACtD,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE;gBACd,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,MAAM,EAAE,GAAG,CAAC,MAAM;iBACnB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC;AAChB,CAAC;AAjCD,0BAiCC;AAED,SAAgB,WAAW,CACzB,SAA4C;IAE5C,OAAO,CAAC,QAAQ,EAAE,EAAE;QAClB,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAkB,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1C,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;gBAC9B,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAChC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClD,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;oBAC9C,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAtBD,kCAsBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAyB;IAC1D,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAC3E,CAAC;AACJ,CAAC;AAJD,gDAIC;AAED,SAAgB,YAAY,CAC1B,OAAyB;IAEzB,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,KAAK,CAAC;AACjC,CAAC;AAJD,oCAIC;AAED
|
1
|
+
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/operators.ts"],"names":[],"mappings":";;;AAOA,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAC;AAE1D,SAAgB,OAAO,CAAC,KAAmB;IACzC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,YAAY,EAAE,EAAE;KACD,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACvE,+EAA+E;IAC/E,IAAI,KAAK,CAAC,aAAa,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CACrC,CAAC;KACH;IACD,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACtD,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE;gBACd,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,MAAM,EAAE,GAAG,CAAC,MAAM;iBACnB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC;AAChB,CAAC;AAjCD,0BAiCC;AAED,SAAgB,WAAW,CACzB,SAA4C;IAE5C,OAAO,CAAC,QAAQ,EAAE,EAAE;QAClB,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAkB,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1C,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;gBAC9B,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAChC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAClD,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;oBAC9C,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAtBD,kCAsBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAyB;IAC1D,OAAO,CACL,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAC3E,CAAC;AACJ,CAAC;AAJD,gDAIC;AAED,SAAgB,YAAY,CAC1B,OAAyB;IAEzB,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,KAAK,CAAC;AACjC,CAAC;AAJD,oCAIC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAAC;AAExD,QAAA,kBAAkB,GAAG,WAAW,EAAE,CAAC;AAEhD,SAAgB,QAAQ,CACtB,QAAsB,EACtB,WAAsC;IAEtC,MAAM,GAAG,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAkB,CAAC;IAC5D,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO,GAAG,CAAC;IAEX,8EAA8E;IAE9E,SAAS,UAAU,CAAC,IAAI;QACtB,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO;QACjD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAChC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAClC;QACD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7C,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,UAAU,CAAC,IAAI;QACtB,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO;QACjD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAC7B,OAAO;aACR;YACD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAC/B,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;aACjC;YACD,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAjDD,4BAiDC"}
|
@@ -8,6 +8,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
10
|
const is_ci_1 = require("../../utilities/is_ci");
|
11
|
+
const file_hasher_1 = require("../hasher/file-hasher");
|
11
12
|
/**
|
12
13
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
13
14
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
@@ -63,6 +64,7 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
63
64
|
(useDaemonProcessOption === false && env === undefined) ||
|
64
65
|
(useDaemonProcessOption === false && env === 'false') ||
|
65
66
|
(useDaemonProcessOption === true && env === undefined && (0, is_ci_1.isCI)())) {
|
67
|
+
yield file_hasher_1.defaultFileHasher.ensureInitialized();
|
66
68
|
return projectGraphAdapter('5.0', projectGraphVersion, yield (0, build_project_graph_1.buildProjectGraph)());
|
67
69
|
}
|
68
70
|
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;AAChD,iDAA6C;
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
@@ -3,8 +3,7 @@ import { ProjectGraphExternalNode } from '@nrwl/devkit';
|
|
3
3
|
export declare class TargetProjectLocator {
|
4
4
|
private readonly nodes;
|
5
5
|
private readonly externalNodes;
|
6
|
-
private
|
7
|
-
private sortedWorkspaceProjects;
|
6
|
+
private projectRootMappings;
|
8
7
|
private npmProjects;
|
9
8
|
private tsConfig;
|
10
9
|
private paths;
|
@@ -29,4 +28,5 @@ export declare class TargetProjectLocator {
|
|
29
28
|
private findProjectOfResolvedModule;
|
30
29
|
private getAbsolutePath;
|
31
30
|
private getRootTsConfig;
|
31
|
+
private findMatchingProjectFiles;
|
32
32
|
}
|
@@ -7,14 +7,12 @@ const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const fileutils_1 = require("../utilities/fileutils");
|
8
8
|
const path_1 = require("path");
|
9
9
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
10
|
-
const project_graph_1 = require("./project-graph");
|
11
10
|
class TargetProjectLocator {
|
12
11
|
constructor(nodes, externalNodes) {
|
13
12
|
var _a, _b;
|
14
13
|
this.nodes = nodes;
|
15
14
|
this.externalNodes = externalNodes;
|
16
|
-
this.
|
17
|
-
this.sortedWorkspaceProjects = this.sortedProjects.map((node) => (Object.assign(Object.assign({}, node), { data: Object.assign(Object.assign({}, node.data), { normalizedRoot: (0, file_utils_1.normalizedProjectRoot)(node) }) })));
|
15
|
+
this.projectRootMappings = createProjectRootMappings(this.nodes);
|
18
16
|
this.npmProjects = this.externalNodes
|
19
17
|
? Object.values(this.externalNodes)
|
20
18
|
: [];
|
@@ -54,22 +52,14 @@ class TargetProjectLocator {
|
|
54
52
|
if (npmProject) {
|
55
53
|
return npmProject;
|
56
54
|
}
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
// unless we want to support local JS projects
|
66
|
-
const importedProject = this.sortedWorkspaceProjects.find((p) => {
|
67
|
-
const projectImport = `@${npmScope}/${p.data.normalizedRoot}`;
|
68
|
-
return (normalizedImportExpr === projectImport ||
|
69
|
-
normalizedImportExpr.startsWith(`${projectImport}/`));
|
70
|
-
});
|
71
|
-
if (importedProject) {
|
72
|
-
return importedProject.name;
|
55
|
+
if (this.tsConfig.config) {
|
56
|
+
// TODO(meeroslav): this block is probably obsolete
|
57
|
+
// and existed only because of the incomplete `paths` matching
|
58
|
+
// if import cannot be matched using tsconfig `paths` the compilation would fail anyway
|
59
|
+
const resolvedProject = this.resolveImportWithTypescript(normalizedImportExpr, filePath);
|
60
|
+
if (resolvedProject) {
|
61
|
+
return resolvedProject;
|
62
|
+
}
|
73
63
|
}
|
74
64
|
// nothing found, cache for later
|
75
65
|
this.npmResolutionCache.set(normalizedImportExpr, undefined);
|
@@ -122,10 +112,10 @@ class TargetProjectLocator {
|
|
122
112
|
}
|
123
113
|
}
|
124
114
|
findProjectOfResolvedModule(resolvedModule) {
|
125
|
-
const
|
126
|
-
|
127
|
-
|
128
|
-
|
115
|
+
const normalizedResolvedModule = resolvedModule.startsWith('./')
|
116
|
+
? resolvedModule.substring(2)
|
117
|
+
: resolvedModule;
|
118
|
+
const importedProject = this.findMatchingProjectFiles(normalizedResolvedModule);
|
129
119
|
return importedProject ? importedProject.name : void 0;
|
130
120
|
}
|
131
121
|
getAbsolutePath(path) {
|
@@ -140,8 +130,32 @@ class TargetProjectLocator {
|
|
140
130
|
absolutePath = this.getAbsolutePath(path);
|
141
131
|
content = (0, file_utils_1.readFileIfExisting)(absolutePath);
|
142
132
|
}
|
133
|
+
if (!content) {
|
134
|
+
return {
|
135
|
+
path: null,
|
136
|
+
absolutePath: null,
|
137
|
+
config: null,
|
138
|
+
};
|
139
|
+
}
|
143
140
|
return { path, absolutePath, config: (0, devkit_1.parseJson)(content) };
|
144
141
|
}
|
142
|
+
findMatchingProjectFiles(file) {
|
143
|
+
for (let currentPath = file; currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
|
144
|
+
const p = this.projectRootMappings.get(currentPath);
|
145
|
+
if (p) {
|
146
|
+
return p;
|
147
|
+
}
|
148
|
+
}
|
149
|
+
return null;
|
150
|
+
}
|
145
151
|
}
|
146
152
|
exports.TargetProjectLocator = TargetProjectLocator;
|
153
|
+
function createProjectRootMappings(nodes) {
|
154
|
+
const projectRootMappings = new Map();
|
155
|
+
for (const projectName of Object.keys(nodes)) {
|
156
|
+
const root = nodes[projectName].data.root;
|
157
|
+
projectRootMappings.set(root && root.endsWith('/') ? root.substring(0, root.length - 1) : root, nodes[projectName]);
|
158
|
+
}
|
159
|
+
return projectRootMappings;
|
160
|
+
}
|
147
161
|
//# sourceMappingURL=target-project-locator.js.map
|