@nrwl/workspace 13.4.6 → 13.5.0-beta.3
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +2 -75
- package/package.json +6 -5
- package/src/command-line/daemon.js +7 -3
- package/src/command-line/daemon.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/file-map-utils.js +41 -55
- package/src/core/file-map-utils.js.map +1 -1
- package/src/core/file-utils.d.ts +2 -3
- package/src/core/file-utils.js +3 -17
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/git-based-file-hasher.js +2 -2
- package/src/core/hasher/git-based-file-hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.d.ts +1 -1
- package/src/core/hasher/node-based-file-hasher.js +2 -2
- package/src/core/hasher/node-based-file-hasher.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +5 -3
- package/src/core/project-graph/daemon/client/client.js.map +1 -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/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/target-project-locator.d.ts +2 -2
- package/src/core/target-project-locator.js +22 -17
- package/src/core/target-project-locator.js.map +1 -1
- 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/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 +342 -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} +4 -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} +25 -14
- 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} +23 -13
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js.map +1 -0
- package/src/tasks-runner/{task-profiling-life-cycle.d.ts → life-cycles/task-profiling-life-cycle.d.ts} +2 -2
- package/src/tasks-runner/{task-profiling-life-cycle.js → life-cycles/task-profiling-life-cycle.js} +0 -0
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js.map +1 -0
- package/src/tasks-runner/{task-timings-life-cycle.d.ts → life-cycles/task-timings-life-cycle.d.ts} +2 -2
- package/src/tasks-runner/{task-timings-life-cycle.js → life-cycles/task-timings-life-cycle.js} +0 -0
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.js.map +1 -0
- package/src/tasks-runner/run-command.js +13 -12
- package/src/tasks-runner/run-command.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 +3 -2
- package/src/utilities/perf-logging.js.map +1 -1
- package/src/utils/rules/visit-not-ignored-files.js.map +1 -1
- package/src/utils/versions.js +1 -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-profiling-life-cycle.js.map +0 -1
- package/src/tasks-runner/task-timings-life-cycle.js.map +0 -1
package/README.md
CHANGED
|
@@ -15,81 +15,8 @@
|
|
|
15
15
|
|
|
16
16
|
<hr>
|
|
17
17
|
|
|
18
|
-
#
|
|
19
|
-
|
|
20
|
-
# Smart, Fast and Extensible Build System
|
|
18
|
+
# Nx: Smart, Fast and Extensible Build System
|
|
21
19
|
|
|
22
20
|
Nx is a next generation build system with first class monorepo support and powerful integrations.
|
|
23
21
|
|
|
24
|
-
|
|
25
|
-
## Getting Started
|
|
26
|
-
|
|
27
|
-
### Creating an Nx Workspace
|
|
28
|
-
|
|
29
|
-
**Using `npx`**
|
|
30
|
-
|
|
31
|
-
```bash
|
|
32
|
-
npx create-nx-workspace
|
|
33
|
-
```
|
|
34
|
-
|
|
35
|
-
**Using `npm init`**
|
|
36
|
-
|
|
37
|
-
```bash
|
|
38
|
-
npm init nx-workspace
|
|
39
|
-
```
|
|
40
|
-
|
|
41
|
-
**Using `yarn create`**
|
|
42
|
-
|
|
43
|
-
```bash
|
|
44
|
-
yarn create nx-workspace
|
|
45
|
-
```
|
|
46
|
-
|
|
47
|
-
The `create-nx-workspace` command will ask you to select a preset, which will configure some plugins and create your applications to help you get started.
|
|
48
|
-
|
|
49
|
-
```
|
|
50
|
-
? What to create in the new workspace (Use arrow keys)
|
|
51
|
-
❯ apps [an empty workspace with no plugins with a layout that works best for building apps]
|
|
52
|
-
core [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
|
|
53
|
-
ts [an empty workspace with the JS/TS plugin preinstalled]
|
|
54
|
-
react [a workspace with a single React application]
|
|
55
|
-
angular [a workspace with a single Angular application]
|
|
56
|
-
next.js [a workspace with a single Next.js application]
|
|
57
|
-
gatsby [a workspace with a single Gatsby application]
|
|
58
|
-
nest [a workspace with a single Nest application]
|
|
59
|
-
express [a workspace with a single Express application]
|
|
60
|
-
web components [a workspace with a single app built using web components]
|
|
61
|
-
react-native [a workspace with a single React Native application]
|
|
62
|
-
react-express [a workspace with a full stack application (React + Express)]
|
|
63
|
-
```
|
|
64
|
-
|
|
65
|
-
Select the preset that works best for you.
|
|
66
|
-
|
|
67
|
-
### Adding Nx to an Existing Monorepo
|
|
68
|
-
|
|
69
|
-
Run:
|
|
70
|
-
|
|
71
|
-
```bash
|
|
72
|
-
npx add-nx-to-monorepo@latest
|
|
73
|
-
```
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
If it's your first Nx project, the command will recommend you to install the `nx` package globally, so you can invoke `nx` directly without going through yarn or npm.
|
|
77
|
-
|
|
78
|
-
### Serving Application
|
|
79
|
-
|
|
80
|
-
- Run `nx serve myapp` to serve the newly generated application!
|
|
81
|
-
- Run `nx test myapp` to test it.
|
|
82
|
-
- Run `nx e2e myapp-e2e` to run e2e tests for it.
|
|
83
|
-
|
|
84
|
-
## Documentation & Resources
|
|
85
|
-
|
|
86
|
-
A few links to help you get started:
|
|
87
|
-
|
|
88
|
-
- [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
|
|
89
|
-
- [Tutorial: Adding Nx to an Existing Monorepo](https://nx.dev/migration/adding-to-monorepo)
|
|
90
|
-
- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
|
|
91
|
-
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
92
|
-
|
|
93
|
-
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="./images/nx-courses-and-videos.svg"
|
|
94
|
-
width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
|
|
95
|
-
|
|
22
|
+
{{content}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.5.0-beta.3",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"@parcel/watcher": "2.0.4",
|
|
65
65
|
"chokidar": "^3.5.1",
|
|
66
|
+
"cli-cursor": "3.1.0",
|
|
66
67
|
"cli-spinners": "2.6.1",
|
|
67
68
|
"fs-extra": "^9.1.0",
|
|
68
69
|
"dotenv": "~10.0.0",
|
|
@@ -81,10 +82,10 @@
|
|
|
81
82
|
"minimatch": "3.0.4",
|
|
82
83
|
"enquirer": "~2.3.6",
|
|
83
84
|
"tslib": "^2.3.0",
|
|
84
|
-
"@nrwl/cli": "13.
|
|
85
|
-
"@nrwl/devkit": "13.
|
|
86
|
-
"@nrwl/jest": "13.
|
|
87
|
-
"@nrwl/linter": "13.
|
|
85
|
+
"@nrwl/cli": "13.5.0-beta.3",
|
|
86
|
+
"@nrwl/devkit": "13.5.0-beta.3",
|
|
87
|
+
"@nrwl/jest": "13.5.0-beta.3",
|
|
88
|
+
"@nrwl/linter": "13.5.0-beta.3"
|
|
88
89
|
},
|
|
89
90
|
"nx-migrations": {
|
|
90
91
|
"migrations": "./migrations.json"
|
|
@@ -2,17 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.daemonHandler = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const tmp_dir_1 = require("../core/project-graph/daemon/tmp-dir");
|
|
6
|
+
const output_1 = require("../utilities/output");
|
|
7
7
|
function daemonHandler(args) {
|
|
8
8
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
9
|
const { startInBackground, startInCurrentProcess } = yield Promise.resolve().then(() => require('../core/project-graph/daemon/client/client'));
|
|
10
10
|
if (!args.background) {
|
|
11
11
|
return startInCurrentProcess();
|
|
12
12
|
}
|
|
13
|
-
devkit_1.logger.info(`NX Daemon Server - Starting in a background process...`);
|
|
14
13
|
const pid = yield startInBackground();
|
|
15
|
-
|
|
14
|
+
output_1.output.log({
|
|
15
|
+
title: `Daemon Server - Started in a background process...`,
|
|
16
|
+
bodyLines: [
|
|
17
|
+
`${output_1.output.dim('Logs from the Daemon process (')}ID: ${pid}${output_1.output.dim(') can be found here:')} ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}\n`,
|
|
18
|
+
],
|
|
19
|
+
});
|
|
16
20
|
});
|
|
17
21
|
}
|
|
18
22
|
exports.daemonHandler = daemonHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/daemon.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/daemon.ts"],"names":[],"mappings":";;;;AACA,kEAA8E;AAC9E,gDAA6C;AAE7C,SAAsB,aAAa,CAAC,IAAe;;QACjD,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,GAAG,2CACnD,4CAA4C,EAC7C,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,qBAAqB,EAAE,CAAC;SAChC;QACD,MAAM,GAAG,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACtC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,oDAAoD;YAC3D,SAAS,EAAE;gBACT,GAAG,eAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,OAAO,GAAG,GAAG,eAAM,CAAC,GAAG,CACpE,sBAAsB,CACvB,IAAI,gCAAsB,IAAI;aAChC;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,sCAgBC"}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTouchedProjectsFromTsConfig = void 0;
|
|
4
|
-
const path_1 = require("path");
|
|
5
4
|
const json_diff_1 = require("../../../utilities/json-diff");
|
|
6
|
-
const project_graph_1 = require("../../project-graph");
|
|
7
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
5
|
const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
|
|
9
6
|
const tsConfigJsonChanges = touchedFiles.find((change) => change.file === 'tsconfig.json' || change.file === 'tsconfig.base.json');
|
|
10
7
|
if (!tsConfigJsonChanges) {
|
|
11
8
|
return [];
|
|
12
9
|
}
|
|
13
|
-
const sortedNodes = (0, project_graph_1.getSortedProjectNodes)(graph.nodes);
|
|
14
10
|
const changes = tsConfigJsonChanges.getChanges();
|
|
15
11
|
if (!allChangesArePathChanges(changes)) {
|
|
16
12
|
return Object.keys(graph.nodes);
|
|
@@ -25,7 +21,7 @@ const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
|
|
|
25
21
|
if (change.type === json_diff_1.DiffType.Deleted) {
|
|
26
22
|
return Object.keys(graph.nodes);
|
|
27
23
|
}
|
|
28
|
-
touched.push(...getProjectsAffectedByPaths(change,
|
|
24
|
+
touched.push(...getProjectsAffectedByPaths(change, Object.values(graph.nodes)));
|
|
29
25
|
}
|
|
30
26
|
return touched;
|
|
31
27
|
};
|
|
@@ -36,14 +32,16 @@ function allChangesArePathChanges(changes) {
|
|
|
36
32
|
/**
|
|
37
33
|
* Gets both previous project and current project of a particular change to tsconfig paths
|
|
38
34
|
*/
|
|
39
|
-
function getProjectsAffectedByPaths(change,
|
|
35
|
+
function getProjectsAffectedByPaths(change, nodes) {
|
|
40
36
|
const result = [];
|
|
41
37
|
const paths = [change.value.lhs, change.value.rhs];
|
|
42
38
|
paths.forEach((path) => {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
39
|
+
nodes.forEach((project) => {
|
|
40
|
+
const normalizedPath = path && path.startsWith('./') ? path.substring(2) : path;
|
|
41
|
+
const r = project.data.root;
|
|
42
|
+
const root = r && r.endsWith('/') ? r.substring(0, r.length - 1) : r;
|
|
43
|
+
if ((normalizedPath && root && normalizedPath.startsWith(root)) ||
|
|
44
|
+
normalizedPath == root) {
|
|
47
45
|
result.push(project.name);
|
|
48
46
|
}
|
|
49
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":";;;AACA,4DAIsC;AAI/B,MAAM,8BAA8B,GAEvC,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAY,EAAE;IAChD,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAC3C,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,IAAI,KAAK,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAC1E,CAAC;IACF,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAEjD,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE;QACtC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KACjC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAE1B,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,SAAS;SACV;QAED,8CAA8C;QAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,oBAAQ,CAAC,OAAO,EAAE;YACpC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,IAAI,CACV,GAAG,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAClE,CAAC;KACH;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAlCW,QAAA,8BAA8B,kCAkCzC;AAEF,SAAS,wBAAwB,CAC/B,OAA4C;IAE5C,OAAO,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CACjC,MAAkB,EAClB,KAAyB;IAEzB,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,KAAK,GAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7D,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxB,MAAM,cAAc,GAClB,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC3D,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5B,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,IACE,CAAC,cAAc,IAAI,IAAI,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC3D,cAAc,IAAI,IAAI,EACtB;gBACA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAC7B,MAAoC;IAEpC,OAAO,CACL,IAAA,wBAAY,EAAC,MAAM,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,iBAAiB;QACpC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAChD,CAAC;AACJ,CAAC"}
|
|
@@ -1,64 +1,53 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateProjectFileMap = exports.createProjectFileMap = void 0;
|
|
4
|
-
const
|
|
5
|
-
function
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
function createProjectRootMappings(workspaceJson, projectFileMap) {
|
|
6
|
+
const projectRootMappings = new Map();
|
|
7
|
+
for (const projectName of Object.keys(workspaceJson.projects)) {
|
|
8
|
+
if (!projectFileMap[projectName]) {
|
|
9
|
+
projectFileMap[projectName] = [];
|
|
10
|
+
}
|
|
11
|
+
const root = workspaceJson.projects[projectName].root;
|
|
12
|
+
projectRootMappings.set(root.endsWith('/') ? root.substring(0, root.length - 1) : root, projectFileMap[projectName]);
|
|
13
|
+
}
|
|
14
|
+
return projectRootMappings;
|
|
15
|
+
}
|
|
16
|
+
function findMatchingProjectFiles(projectRootMappings, file) {
|
|
17
|
+
for (let currentPath = (0, path_1.dirname)(file); currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
|
|
18
|
+
const p = projectRootMappings.get(currentPath);
|
|
19
|
+
if (p) {
|
|
20
|
+
return p;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return null;
|
|
17
24
|
}
|
|
18
25
|
function createProjectFileMap(workspaceJson, allWorkspaceFiles) {
|
|
19
26
|
const projectFileMap = {};
|
|
20
|
-
const
|
|
21
|
-
const seen = new Set();
|
|
22
|
-
for (const projectName of sortedProjects) {
|
|
23
|
-
projectFileMap[projectName] = [];
|
|
24
|
-
}
|
|
27
|
+
const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
|
|
25
28
|
for (const f of allWorkspaceFiles) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
for (const projectName of sortedProjects) {
|
|
30
|
-
const p = workspaceJson.projects[projectName];
|
|
31
|
-
if (f.file.startsWith(p.root || p.sourceRoot)) {
|
|
32
|
-
projectFileMap[projectName].push(f);
|
|
33
|
-
break;
|
|
34
|
-
}
|
|
29
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f.file);
|
|
30
|
+
if (matchingProjectFiles) {
|
|
31
|
+
matchingProjectFiles.push(f);
|
|
35
32
|
}
|
|
36
33
|
}
|
|
37
34
|
return { projectFileMap, allWorkspaceFiles };
|
|
38
35
|
}
|
|
39
36
|
exports.createProjectFileMap = createProjectFileMap;
|
|
40
37
|
function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, updatedFiles, deletedFiles) {
|
|
41
|
-
const
|
|
42
|
-
for (let projectName of sortedProjects) {
|
|
43
|
-
if (!projectFileMap[projectName]) {
|
|
44
|
-
projectFileMap[projectName] = [];
|
|
45
|
-
}
|
|
46
|
-
}
|
|
38
|
+
const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
|
|
47
39
|
for (const f of updatedFiles.keys()) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
break;
|
|
40
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
|
|
41
|
+
if (matchingProjectFiles) {
|
|
42
|
+
const fileData = matchingProjectFiles.find((t) => t.file === f);
|
|
43
|
+
if (fileData) {
|
|
44
|
+
fileData.hash = updatedFiles.get(f);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
matchingProjectFiles.push({
|
|
48
|
+
file: f,
|
|
49
|
+
hash: updatedFiles.get(f),
|
|
50
|
+
});
|
|
62
51
|
}
|
|
63
52
|
}
|
|
64
53
|
const fileData = allWorkspaceFiles.find((t) => t.file === f);
|
|
@@ -73,14 +62,11 @@ function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles,
|
|
|
73
62
|
}
|
|
74
63
|
}
|
|
75
64
|
for (const f of deletedFiles) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
projectFileMap[projectName].splice(index, 1);
|
|
82
|
-
}
|
|
83
|
-
break;
|
|
65
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
|
|
66
|
+
if (matchingProjectFiles) {
|
|
67
|
+
const index = matchingProjectFiles.findIndex((t) => t.file === f);
|
|
68
|
+
if (index > -1) {
|
|
69
|
+
matchingProjectFiles.splice(index, 1);
|
|
84
70
|
}
|
|
85
71
|
}
|
|
86
72
|
const index = allWorkspaceFiles.findIndex((t) => t.file === f);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":";;;AAEA,+BAA+B;AAE/B,SAAS,yBAAyB,CAChC,aAAkB,EAClB,cAA8B;IAE9B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;IACtC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QAC7D,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;YAChC,cAAc,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SAClC;QACD,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACtD,mBAAmB,CAAC,GAAG,CACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAC9D,cAAc,CAAC,WAAW,CAAC,CAC5B,CAAC;KACH;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,SAAS,wBAAwB,CAC/B,mBAA4C,EAC5C,IAAY;IAEZ,KACE,IAAI,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,EAC/B,WAAW,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,EACnC,WAAW,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,EAClC;QACA,MAAM,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,CAAC;SACV;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,oBAAoB,CAClC,aAAkB,EAClB,iBAA6B;IAE7B,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,MAAM,mBAAmB,GAAG,yBAAyB,CACnD,aAAa,EACb,cAAc,CACf,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,iBAAiB,EAAE;QACjC,MAAM,oBAAoB,GAAG,wBAAwB,CACnD,mBAAmB,EACnB,CAAC,CAAC,IAAI,CACP,CAAC;QACF,IAAI,oBAAoB,EAAE;YACxB,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AAnBD,oDAmBC;AAED,SAAgB,oBAAoB,CAClC,aAAkB,EAClB,cAA8B,EAC9B,iBAA6B,EAC7B,YAAiC,EACjC,YAAsB;IAEtB,MAAM,mBAAmB,GAAG,yBAAyB,CACnD,aAAa,EACb,cAAc,CACf,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,oBAAoB,GAAG,wBAAwB,CACnD,mBAAmB,EACnB,CAAC,CACF,CAAC;QACF,IAAI,oBAAoB,EAAE;YACxB,MAAM,QAAQ,GAAa,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAC1E,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACrC;iBAAM;gBACL,oBAAoB,CAAC,IAAI,CAAC;oBACxB,IAAI,EAAE,CAAC;oBACP,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC1B,CAAC,CAAC;aACJ;SACF;QAED,MAAM,QAAQ,GAAa,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QACvE,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACrC;aAAM;YACL,iBAAiB,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;aAC1B,CAAC,CAAC;SACJ;KACF;IAED,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;QAC5B,MAAM,oBAAoB,GAAG,wBAAwB,CACnD,mBAAmB,EACnB,CAAC,CACF,CAAC;QACF,IAAI,oBAAoB,EAAE;YACxB,MAAM,KAAK,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAClE,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;gBACd,oBAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;aACvC;SACF;QACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACpC;KACF;IACD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AAzDD,oDAyDC"}
|
package/src/core/file-utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { WorkspaceJsonConfiguration } from '@nrwl/tao/src/shared/workspace';
|
|
2
|
-
import type { FileData, NxJsonConfiguration
|
|
2
|
+
import type { FileData, NxJsonConfiguration } from '@nrwl/devkit';
|
|
3
3
|
import type { NxArgs } from '../command-line/utils';
|
|
4
4
|
import type { Environment } from './shared-interfaces';
|
|
5
5
|
export interface Change {
|
|
@@ -13,7 +13,7 @@ export declare class WholeFileChange implements Change {
|
|
|
13
13
|
}
|
|
14
14
|
export declare function isWholeFileChange(change: Change): change is WholeFileChange;
|
|
15
15
|
export declare function readFileIfExisting(path: string): string;
|
|
16
|
-
export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?:
|
|
16
|
+
export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: import("ignore").Ignore): FileChange[];
|
|
17
17
|
export declare const TEN_MEGABYTES: number;
|
|
18
18
|
export declare function readWorkspaceJson(): WorkspaceJsonConfiguration;
|
|
19
19
|
export declare function readWorkspaceConfig(opts: {
|
|
@@ -29,5 +29,4 @@ export declare function workspaceLayout(): {
|
|
|
29
29
|
libsDir: string;
|
|
30
30
|
};
|
|
31
31
|
export declare function readEnvironment(): Environment;
|
|
32
|
-
export declare function normalizedProjectRoot(p: ProjectGraphNode): string;
|
|
33
32
|
export { FileData };
|
package/src/core/file-utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.readEnvironment = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
|
|
4
4
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
@@ -9,7 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
10
10
|
const fileutils_1 = require("../utilities/fileutils");
|
|
11
11
|
const json_diff_1 = require("../utilities/json-diff");
|
|
12
|
-
const
|
|
12
|
+
const ignore_1 = require("ignore");
|
|
13
13
|
class WholeFileChange {
|
|
14
14
|
constructor() {
|
|
15
15
|
this.type = 'WholeFileChange';
|
|
@@ -25,7 +25,7 @@ function readFileIfExisting(path) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.readFileIfExisting = readFileIfExisting;
|
|
27
27
|
function getIgnoredGlobs() {
|
|
28
|
-
const ig =
|
|
28
|
+
const ig = (0, ignore_1.default)();
|
|
29
29
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
30
30
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
31
31
|
return ig;
|
|
@@ -166,18 +166,4 @@ function readEnvironment() {
|
|
|
166
166
|
return { nxJson, workspaceJson, workspaceResults: null };
|
|
167
167
|
}
|
|
168
168
|
exports.readEnvironment = readEnvironment;
|
|
169
|
-
function normalizedProjectRoot(p) {
|
|
170
|
-
if (p.data && p.data.root) {
|
|
171
|
-
const path = p.data.root.split('/').filter((v) => !!v);
|
|
172
|
-
if (path.length === 1) {
|
|
173
|
-
return path[0];
|
|
174
|
-
}
|
|
175
|
-
// Remove the first part of the path, usually 'libs'
|
|
176
|
-
return path.slice(1).join('/');
|
|
177
|
-
}
|
|
178
|
-
else {
|
|
179
|
-
return '';
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
exports.normalizedProjectRoot = normalizedProjectRoot;
|
|
183
169
|
//# sourceMappingURL=file-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":";;;AAAA,8DAIwC;AAMxC,
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const perf_hooks_1 = require("perf_hooks");
|
|
|
7
7
|
const git_hasher_1 = require("./git-hasher");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const file_hasher_base_1 = require("./file-hasher-base");
|
|
10
|
-
const
|
|
10
|
+
const ignore_1 = require("ignore");
|
|
11
11
|
class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
12
12
|
/**
|
|
13
13
|
* For the project graph daemon server use-case we can potentially skip expensive work
|
|
@@ -39,7 +39,7 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
39
39
|
exports.GitBasedFileHasher = GitBasedFileHasher;
|
|
40
40
|
function getIgnoredGlobs() {
|
|
41
41
|
if ((0, fs_1.existsSync)(`${app_root_1.appRootPath}/.nxignore`)) {
|
|
42
|
-
const ig =
|
|
42
|
+
const ig = (0, ignore_1.default)();
|
|
43
43
|
ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.nxignore`, 'utf-8'));
|
|
44
44
|
return ig;
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAAiE;AACjE,2BAA8C;AAC9C,yDAAoD;
|
|
1
|
+
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAAiE;AACjE,2BAA8C;AAC9C,yDAAoD;AACpD,mCAA4B;AAE5B,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,sBAAW,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YACjC,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,sBAAW,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/D,CAAC;KAAA;CACF;AA7BD,gDA6BC;AAED,SAAS,eAAe;IACtB,IAAI,IAAA,eAAU,EAAC,GAAG,sBAAW,YAAY,CAAC,EAAE;QAC1C,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;QACpB,EAAE,CAAC,GAAG,CAAC,IAAA,iBAAY,EAAC,GAAG,sBAAW,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;KACX;SAAM;QACL,OAAO,EAAE,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;KAC7C;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FileHasherBase } from './file-hasher-base';
|
|
2
2
|
export declare class NodeBasedFileHasher extends FileHasherBase {
|
|
3
|
-
ignoredGlobs:
|
|
3
|
+
ignoredGlobs: import("ignore").Ignore;
|
|
4
4
|
init(): Promise<void>;
|
|
5
5
|
hashFiles(files: string[]): Promise<Map<string, string>>;
|
|
6
6
|
private allFilesInDir;
|
|
@@ -8,7 +8,7 @@ const path_1 = require("path");
|
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const file_hasher_base_1 = require("./file-hasher-base");
|
|
10
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
|
-
const
|
|
11
|
+
const ignore_1 = require("ignore");
|
|
12
12
|
class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
@@ -61,7 +61,7 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
61
61
|
}
|
|
62
62
|
exports.NodeBasedFileHasher = NodeBasedFileHasher;
|
|
63
63
|
function getIgnoredGlobs() {
|
|
64
|
-
const ig =
|
|
64
|
+
const ig = (0, ignore_1.default)();
|
|
65
65
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
66
66
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
67
67
|
ig.add((0, devkit_1.stripIndents) `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,yCAA4C;
|
|
1
|
+
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,yCAA4C;AAC5C,mCAA4B;AAE5B,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAkDnC,CAAC;IAhDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,sBAAW,EAAE,IAAI,CAAC,CAAC;YAEtC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,sBAAW,EAAE,eAAe,CAAC,CAAC;QAC1D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,sBAAW,EAAE,aAAa,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;qBACxD;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,OAAO,CAAC,EAAE,GAAE;YAChB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE,GAAE;IAChB,CAAC;CACF;AAnDD,kDAmDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,sBAAW,aAAa,CAAC,CAAC,CAAC;IACxD,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,sBAAW,YAAY,CAAC,CAAC,CAAC;IACvD,EAAE,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getProjectGraphFromServer = exports.isServerAvailable = exports.stop = exports.startInCurrentProcess = exports.startInBackground = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const child_process_1 = require("child_process");
|
|
7
6
|
const fs_1 = require("fs");
|
|
8
7
|
const fs_extra_1 = require("fs-extra");
|
|
9
8
|
const net_1 = require("net");
|
|
10
9
|
const perf_hooks_1 = require("perf_hooks");
|
|
10
|
+
const output_1 = require("../../../../utilities/output");
|
|
11
11
|
const cache_1 = require("../cache");
|
|
12
12
|
const socket_utils_1 = require("../socket-utils");
|
|
13
13
|
const tmp_dir_1 = require("../tmp-dir");
|
|
@@ -77,7 +77,9 @@ function daemonProcessException(message) {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
function startInCurrentProcess() {
|
|
80
|
-
|
|
80
|
+
output_1.output.log({
|
|
81
|
+
title: `Daemon Server - Starting in the current process...`,
|
|
82
|
+
});
|
|
81
83
|
(0, child_process_1.spawnSync)(process.execPath, ['../server/start.js'], {
|
|
82
84
|
cwd: __dirname,
|
|
83
85
|
stdio: 'inherit',
|
|
@@ -89,7 +91,7 @@ function stop() {
|
|
|
89
91
|
cwd: __dirname,
|
|
90
92
|
stdio: 'inherit',
|
|
91
93
|
});
|
|
92
|
-
|
|
94
|
+
output_1.output.log({ title: 'Daemon Server - Stopped' });
|
|
93
95
|
}
|
|
94
96
|
exports.stop = stop;
|
|
95
97
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AACA,iDAA+D;AAC/D,2BAA4C;AAC5C,uCAAyD;AACzD,6BAA8B;AAC9B,2CAAyC;AACzC,yDAAsD;AACtD,oCAGkB;AAClB,kDAAwE;AACxE,wCAGoB;AAEpB,SAAsB,iBAAiB;;QACrC,MAAM,IAAA,oCAA4B,GAAE,CAAC;QACrC,IAAA,wBAAa,EAAC,0CAAgC,CAAC,CAAC;QAChD,IAAA,yBAAc,EAAC,gCAAsB,CAAC,CAAC;QAEvC,IAAI;YACF,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;YAClD,MAAM,iBAAiB,GAAG,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,oBAAoB,CAAC,EAAE;gBACxE,GAAG,EAAE,SAAS;gBACd,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;gBAC3B,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI;gBACjB,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YACH,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAE1B,6FAA6F;YAC7F,MAAM,IAAA,mCAA2B,EAAC;gBAChC,SAAS,EAAE,iBAAiB,CAAC,GAAG;aACjC,CAAC,CAAC;YAEH;;eAEG;YACH,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC7B,MAAM,EAAE,GAAG,WAAW,CAAC,GAAS,EAAE;oBAChC,IAAI,MAAM,iBAAiB,EAAE,EAAE;wBAC7B,aAAa,CAAC,EAAE,CAAC,CAAC;wBAClB,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;qBAChC;yBAAM,IAAI,QAAQ,GAAG,GAAG,EAAE;wBACzB,qDAAqD;wBACrD,wCAAwC;wBACxC,MAAM,sBAAsB,CAC1B,wCAAwC,CACzC,CAAC;qBACH;yBAAM;wBACL,QAAQ,EAAE,CAAC;qBACZ;gBACH,CAAC,CAAA,EAAE,EAAE,CAAC,CAAC;YACT,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,CAAC;SACX;IACH,CAAC;CAAA;AA7CD,8CA6CC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,IAAI;QACF,IAAI,GAAG,GAAG,IAAA,iBAAY,EAAC,gCAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE;YACnB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,KAAK,CACd;YACE,OAAO;YACP,wBAAwB;YACxB,GAAG,GAAG;YACN,IAAI;YACJ,qBAAqB,gCAAsB,EAAE;SAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC;AAED,SAAgB,qBAAqB;IACnC,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oDAAoD;KAC5D,CAAC,CAAC;IAEH,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,oBAAoB,CAAC,EAAE;QAClD,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC;AATD,sDASC;AAED,SAAgB,IAAI;IAClB,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,EAAE;QACjD,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;AACnD,CAAC;AAPD,oBAOC;AAED;;;;;;;GAOG;AACH,SAAsB,iBAAiB;;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,kCAAmB,EAAE,GAAG,EAAE;oBAC/C,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;oBACxB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAdD,8CAcC;AAED;;;;;;;;;GASG;AACH,SAAsB,yBAAyB;;QAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,wBAAW,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,kCAAmB,CAAC,CAAC;YAE5C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,KAAU,CAAC;gBACf,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBAC5C,KAAK,GAAG,sBAAsB,CAAC,kCAAkC,CAAC,CAAC;iBACpE;gBACD,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;oBAClD,KAAK,GAAG,sBAAsB,CAC5B,uFAAuF,CACxF,CAAC;oBACF,IAAA,+BAAgB,GAAE,CAAC;iBACpB;gBACD,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;oBAC7C,KAAK,GAAG,sBAAsB,CAC5B,0CAA0C,CAC3C,CAAC;iBACH;gBACD,OAAO,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEH;;;;eAIG;YACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACxB,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAE9C,IAAI,4BAA4B,GAAG,EAAE,CAAC;gBACtC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,4BAA4B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACpB,IAAI;wBACF,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACrC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;wBACpE,wBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;wBACnC,wBAAW,CAAC,OAAO,CACjB,wCAAwC,EACxC,kBAAkB,EAClB,gBAAgB,CACjB,CAAC;wBACF,IAAI,kBAAkB,CAAC,KAAK,EAAE;4BAC5B,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;yBAClC;6BAAM;4BACL,wBAAW,CAAC,OAAO,CACjB,uCAAuC,EACvC,iCAAiC,EACjC,gBAAgB,CACjB,CAAC;4BACF,OAAO,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;yBACjD;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,UAAU,GACd,4BAA4B,CAAC,MAAM,GAAG,GAAG;4BACvC,CAAC,CAAC,4BAA4B,CAAC,SAAS,CACpC,4BAA4B,CAAC,MAAM,GAAG,GAAG,CAC1C;4BACH,CAAC,CAAC,4BAA4B,CAAC;wBACnC,MAAM,CACJ,sBAAsB,CACpB;4BACE,sCAAsC;4BACtC,YAAY,CAAC,CAAC,OAAO,EAAE;4BACvB,IAAI;4BACJ,WAAW;4BACX,UAAU;4BACV,IAAI;yBACL,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CACF,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAhFD,8DAgFC"}
|
|
@@ -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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"}
|