nx 14.2.2 → 14.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/bin/init-local.js +14 -1
- package/bin/init-local.js.map +1 -1
- package/bin/nx.js +4 -2
- package/bin/nx.js.map +1 -1
- package/package.json +4 -4
- package/src/command-line/init.js +1 -2
- package/src/command-line/init.js.map +1 -1
- package/src/tasks-runner/run-command.js +6 -0
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/utils/fileutils.d.ts +13 -3
- package/src/utils/fileutils.js +18 -19
- package/src/utils/fileutils.js.map +1 -1
- package/src/utils/find-workspace-root.js +3 -5
- package/src/utils/find-workspace-root.js.map +1 -1
- package/src/utils/target-project-locator.js +1 -3
- package/src/utils/target-project-locator.js.map +1 -1
- package/src/utils/workspace-root.d.ts +0 -1
- package/src/utils/workspace-root.js +6 -15
- package/src/utils/workspace-root.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [14.2.
|
|
6
|
+
## [14.2.3](https://github.com/nrwl/nx/compare/14.2.2...14.2.3) (2022-06-09)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/bin/init-local.js
CHANGED
|
@@ -72,7 +72,15 @@ function isKnownCommand() {
|
|
|
72
72
|
}
|
|
73
73
|
function shouldDelegateToAngularCLI() {
|
|
74
74
|
const command = process.argv[2];
|
|
75
|
-
const commands = [
|
|
75
|
+
const commands = [
|
|
76
|
+
'add',
|
|
77
|
+
'analytics',
|
|
78
|
+
'deploy',
|
|
79
|
+
'config',
|
|
80
|
+
'doc',
|
|
81
|
+
'update',
|
|
82
|
+
'completion',
|
|
83
|
+
];
|
|
76
84
|
return commands.indexOf(command) > -1;
|
|
77
85
|
}
|
|
78
86
|
function handleAngularCLIFallbacks(workspace) {
|
|
@@ -109,6 +117,11 @@ function handleAngularCLIFallbacks(workspace) {
|
|
|
109
117
|
}
|
|
110
118
|
}));
|
|
111
119
|
}
|
|
120
|
+
else if (process.argv[2] === 'completion') {
|
|
121
|
+
console.log(`"ng completion" is not natively supported by Nx.
|
|
122
|
+
Instead, you could try an Nx Editor Plugin for a visual tool to run Nx commands. If you're using VSCode, you can use the Nx Console plugin, or if you're using WebStorm, you could use one of the available community plugins.
|
|
123
|
+
For more information, see https://nx.dev/using-nx/console`);
|
|
124
|
+
}
|
|
112
125
|
else {
|
|
113
126
|
require('nx/src/adapter/compat');
|
|
114
127
|
try {
|
package/bin/init-local.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":";;;AAAA,kEAAwE;AAExE,2CAAyC;AACzC,iDAAyC;AAEzC,iEAAiE;AAGjE;;;;GAIG;AACH,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;AAEhC,SAAgB,SAAS,CAAC,SAA+B;IACvD,IAAI;QACF,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAErC,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,0BAA0B,EAAE,EAAE;YAC3D,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO;SACR;QAED,IAAI,cAAc,EAAE,EAAE;YACpB,4BAAc,CAAC,IAAI,CAAC;SACrB;aAAM;YACL,MAAM,OAAO,GAAG,0BAA0B,EAAE,CAAC;YAC7C,4BAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AApBD,8BAoBC;AAED,SAAS,0BAA0B;IACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvD,OAAO;YACL,KAAK;YACL,GAAG,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YAC5C,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACzB,CAAC;KACH;SAAM;QACL,OAAO;YACL,KAAK;YACL,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/D,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACzB,CAAC;KACH;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAW;IACzC,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAClD,CAAC;AAED,SAAS,cAAc;IACrB,MAAM,QAAQ,GAAG;QACf,GAAG,MAAM,CAAC,IAAI,CACX,4BAAsB;aACpB,kBAAkB,EAAE;aACpB,kBAAkB,EAAE;aACpB,kBAAkB,EAAE,CACxB;QACD,GAAG;QACH,WAAW;QACX,oBAAoB;QACpB,QAAQ;QACR,qBAAqB;QACrB,aAAa;QACb,MAAM;KACP,CAAC;IACF,OAAO,CACL,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CACvC,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"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"}
|
package/bin/nx.js
CHANGED
|
@@ -6,14 +6,16 @@ const chalk = require("chalk");
|
|
|
6
6
|
const init_local_1 = require("./init-local");
|
|
7
7
|
const package_manager_1 = require("../src/utils/package-manager");
|
|
8
8
|
const output_1 = require("../src/utils/output");
|
|
9
|
+
const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
|
|
9
10
|
// new is a special case because there is no local workspace to load
|
|
10
11
|
if (process.argv[2] === 'new' ||
|
|
11
12
|
process.argv[2] === '_migrate' ||
|
|
12
|
-
process.argv[2] === 'init'
|
|
13
|
+
process.argv[2] === 'init' ||
|
|
14
|
+
(process.argv[2] === 'graph' && !workspace)) {
|
|
15
|
+
process.env.NX_DAEMON = 'false';
|
|
13
16
|
require('nx/src/command-line/nx-commands').commandsObject.argv;
|
|
14
17
|
}
|
|
15
18
|
else {
|
|
16
|
-
const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
|
|
17
19
|
if (workspace && workspace.type === 'nx') {
|
|
18
20
|
require('v8-compile-cache');
|
|
19
21
|
}
|
package/bin/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";;;AACA,0EAG0C;AAC1C,+BAA+B;AAC/B,6CAAyC;AACzC,kEAAoE;AACpE,gDAA6C;AAE7C,oEAAoE;AACpE,IACE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK;IACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;IAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.2.
|
|
3
|
+
"version": "14.2.3",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.2.
|
|
35
|
-
"@nrwl/tao": "14.2.
|
|
34
|
+
"@nrwl/cli": "14.2.3",
|
|
35
|
+
"@nrwl/tao": "14.2.3",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -105,5 +105,5 @@
|
|
|
105
105
|
"executors": "./executors.json",
|
|
106
106
|
"main": "./bin/nx.js",
|
|
107
107
|
"typings": "./bin/nx.d.ts",
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "48246e8ba71770e0903774e513d528447af944d3"
|
|
109
109
|
}
|
package/src/command-line/init.js
CHANGED
|
@@ -5,7 +5,6 @@ const child_process_1 = require("child_process");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const output_1 = require("../utils/output");
|
|
7
7
|
const package_manager_1 = require("../utils/package-manager");
|
|
8
|
-
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
8
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
9
|
function initHandler() {
|
|
11
10
|
const nxIsInstalled = !!(0, child_process_1.execSync)((0, package_manager_1.getPackageManagerCommand)().list)
|
|
@@ -28,7 +27,7 @@ function initHandler() {
|
|
|
28
27
|
title: 'Nx has been installed',
|
|
29
28
|
});
|
|
30
29
|
}
|
|
31
|
-
if (!(0,
|
|
30
|
+
if (!(0, fileutils_1.fileExists)('nx.json')) {
|
|
32
31
|
(0, fileutils_1.writeJsonFile)('nx.json', (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '..', '..', 'presets', 'npm.json')));
|
|
33
32
|
output_1.output.success({
|
|
34
33
|
title: 'nx.json has been created',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,4CAAyC;AACzC,8DAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,+BAA4B;AAC5B,4CAAyC;AACzC,8DAAoE;AACpE,kDAA6E;AAE7E,SAAgB,WAAW;IACzB,MAAM,aAAa,GAAG,CAAC,CAAC,IAAA,wBAAQ,EAAC,IAAA,0CAAwB,GAAE,CAAC,IAAI,CAAC;SAC9D,QAAQ,EAAE;SACV,KAAK,CAAC,IAAI,CAAC;SACX,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,aAAa,EAAE;QACjB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,yBAAyB;SACjC,CAAC,CAAC;KACJ;SAAM;QACL,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,IAAA,wBAAQ,EAAC,GAAG,IAAA,0CAAwB,GAAE,CAAC,MAAM,YAAY,EAAE;YACzD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,uBAAuB;SAC/B,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,IAAA,sBAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,yBAAa,EACX,SAAS,EACT,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CACjE,CAAC;QAEF,eAAM,CAAC,OAAO,CAAC;YACb,KAAK,EAAE,0BAA0B;SAClC,CAAC,CAAC;KACJ;AACH,CAAC;AAhCD,kCAgCC"}
|
|
@@ -184,6 +184,12 @@ function shouldUseDynamicLifeCycle(tasks, options, outputStyle) {
|
|
|
184
184
|
function getRunner(nxArgs, nxJson) {
|
|
185
185
|
let runner = nxArgs.runner;
|
|
186
186
|
runner = runner || 'default';
|
|
187
|
+
if (!nxJson.tasksRunnerOptions) {
|
|
188
|
+
output_1.output.error({
|
|
189
|
+
title: `Could not find any runner configurations in nx.json`,
|
|
190
|
+
});
|
|
191
|
+
process.exit(1);
|
|
192
|
+
}
|
|
187
193
|
if (nxJson.tasksRunnerOptions[runner]) {
|
|
188
194
|
let modulePath = nxJson.tasksRunnerOptions[runner].runner;
|
|
189
195
|
let tasksRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
package/src/utils/fileutils.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import type { JsonParseOptions, JsonSerializeOptions } from './json';
|
|
3
|
+
import { PathLike } from 'fs';
|
|
2
4
|
export interface JsonReadOptions extends JsonParseOptions {
|
|
3
5
|
/**
|
|
4
6
|
* mutable field recording whether JSON ends with new line
|
|
@@ -29,9 +31,17 @@ export declare function readJsonFile<T extends object = any>(path: string, optio
|
|
|
29
31
|
* @param options JSON serialize options
|
|
30
32
|
*/
|
|
31
33
|
export declare function writeJsonFile<T extends object = object>(path: string, data: T, options?: JsonWriteOptions): void;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
/**
|
|
35
|
+
* Check if a directory exists
|
|
36
|
+
* @param path Path to directory
|
|
37
|
+
*/
|
|
38
|
+
export declare function directoryExists(path: PathLike): boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Check if a file exists.
|
|
41
|
+
* @param path Path to file
|
|
42
|
+
*/
|
|
43
|
+
export declare function fileExists(path: PathLike): boolean;
|
|
44
|
+
export declare function createDirectory(path: PathLike): void;
|
|
35
45
|
export declare function isRelativePath(path: string): boolean;
|
|
36
46
|
/**
|
|
37
47
|
* Extracts a file from a given tarball to the specified destination.
|
package/src/utils/fileutils.js
CHANGED
|
@@ -5,9 +5,6 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const json_1 = require("./json");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const fs_extra_1 = require("fs-extra");
|
|
9
|
-
const fs_2 = require("fs");
|
|
10
|
-
const path_2 = require("path");
|
|
11
8
|
const tar = require("tar-stream");
|
|
12
9
|
const zlib_1 = require("zlib");
|
|
13
10
|
/**
|
|
@@ -39,7 +36,7 @@ exports.readJsonFile = readJsonFile;
|
|
|
39
36
|
* @param options JSON serialize options
|
|
40
37
|
*/
|
|
41
38
|
function writeJsonFile(path, data, options) {
|
|
42
|
-
(0,
|
|
39
|
+
(0, fs_1.mkdirSync)((0, path_1.dirname)(path), { recursive: true });
|
|
43
40
|
const serializedJson = (0, json_1.serializeJson)(data, options);
|
|
44
41
|
const content = (options === null || options === void 0 ? void 0 : options.appendNewLine)
|
|
45
42
|
? `${serializedJson}\n`
|
|
@@ -47,32 +44,34 @@ function writeJsonFile(path, data, options) {
|
|
|
47
44
|
(0, fs_1.writeFileSync)(path, content, { encoding: 'utf-8' });
|
|
48
45
|
}
|
|
49
46
|
exports.writeJsonFile = writeJsonFile;
|
|
50
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Check if a directory exists
|
|
49
|
+
* @param path Path to directory
|
|
50
|
+
*/
|
|
51
|
+
function directoryExists(path) {
|
|
51
52
|
try {
|
|
52
|
-
return (0,
|
|
53
|
+
return (0, fs_1.statSync)(path).isDirectory();
|
|
53
54
|
}
|
|
54
|
-
catch (
|
|
55
|
+
catch (_a) {
|
|
55
56
|
return false;
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
exports.directoryExists = directoryExists;
|
|
59
|
-
|
|
60
|
+
/**
|
|
61
|
+
* Check if a file exists.
|
|
62
|
+
* @param path Path to file
|
|
63
|
+
*/
|
|
64
|
+
function fileExists(path) {
|
|
60
65
|
try {
|
|
61
|
-
return (0,
|
|
66
|
+
return (0, fs_1.statSync)(path).isFile();
|
|
62
67
|
}
|
|
63
|
-
catch (
|
|
68
|
+
catch (_a) {
|
|
64
69
|
return false;
|
|
65
70
|
}
|
|
66
71
|
}
|
|
67
72
|
exports.fileExists = fileExists;
|
|
68
|
-
function createDirectory(
|
|
69
|
-
|
|
70
|
-
if (!directoryExists(parentPath)) {
|
|
71
|
-
createDirectory(parentPath);
|
|
72
|
-
}
|
|
73
|
-
if (!directoryExists(directoryPath)) {
|
|
74
|
-
(0, fs_2.mkdirSync)(directoryPath);
|
|
75
|
-
}
|
|
73
|
+
function createDirectory(path) {
|
|
74
|
+
(0, fs_1.mkdirSync)(path, { recursive: true });
|
|
76
75
|
}
|
|
77
76
|
exports.createDirectory = createDirectory;
|
|
78
77
|
function isRelativePath(path) {
|
|
@@ -92,7 +91,7 @@ exports.isRelativePath = isRelativePath;
|
|
|
92
91
|
function extractFileFromTarball(tarballPath, file, destinationFilePath) {
|
|
93
92
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
94
93
|
return new Promise((resolve, reject) => {
|
|
95
|
-
(0,
|
|
94
|
+
(0, fs_1.mkdirSync)((0, path_1.dirname)(destinationFilePath), { recursive: true });
|
|
96
95
|
var tarExtractStream = tar.extract();
|
|
97
96
|
const destinationFileStream = (0, fs_1.createWriteStream)(destinationFilePath);
|
|
98
97
|
let isFileExtracted = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/fileutils.ts"],"names":[],"mappings":";;;;AAAA,iCAAkD;AAElD,
|
|
1
|
+
{"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/fileutils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,16 +12,14 @@ const workspace_root_1 = require("./workspace-root");
|
|
|
12
12
|
*/
|
|
13
13
|
function findWorkspaceRoot(dir) {
|
|
14
14
|
const r = (0, workspace_root_1.workspaceRootInner)(dir, null);
|
|
15
|
+
if (r === null)
|
|
16
|
+
return null;
|
|
15
17
|
if ((0, fs_1.existsSync)(path.join(r, 'angular.json'))) {
|
|
16
18
|
return { type: 'angular', dir: r };
|
|
17
19
|
}
|
|
18
|
-
|
|
20
|
+
else {
|
|
19
21
|
return { type: 'nx', dir: r };
|
|
20
22
|
}
|
|
21
|
-
if ((0, fs_1.existsSync)(path.join(r, 'node_modules', 'nx', 'package.json'))) {
|
|
22
|
-
return { type: 'nx', dir: r };
|
|
23
|
-
}
|
|
24
|
-
return null;
|
|
25
23
|
}
|
|
26
24
|
exports.findWorkspaceRoot = findWorkspaceRoot;
|
|
27
25
|
//# sourceMappingURL=find-workspace-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-workspace-root.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,6BAA6B;AAC7B,qDAAsD;AAEtD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,CAAC,GAAG,IAAA,mCAAkB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,
|
|
1
|
+
{"version":3,"file":"find-workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-workspace-root.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,6BAA6B;AAC7B,qDAAsD;AAEtD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,CAAC,GAAG,IAAA,mCAAkB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAE5B,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE;QAC5C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KACpC;SAAM;QACL,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KAC/B;AACH,CAAC;AAVD,8CAUC"}
|
|
@@ -5,8 +5,6 @@ const typescript_1 = require("./typescript");
|
|
|
5
5
|
const fileutils_1 = require("./fileutils");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const workspace_root_1 = require("./workspace-root");
|
|
8
|
-
const fs_1 = require("fs");
|
|
9
|
-
const json_1 = require("./json");
|
|
10
8
|
class TargetProjectLocator {
|
|
11
9
|
constructor(nodes, externalNodes) {
|
|
12
10
|
var _a, _b;
|
|
@@ -134,7 +132,7 @@ class TargetProjectLocator {
|
|
|
134
132
|
return {
|
|
135
133
|
absolutePath,
|
|
136
134
|
path,
|
|
137
|
-
config: (0,
|
|
135
|
+
config: (0, fileutils_1.readJsonFile)(absolutePath),
|
|
138
136
|
};
|
|
139
137
|
}
|
|
140
138
|
findMatchingProjectFiles(file) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/target-project-locator.ts"],"names":[],"mappings":";;;AAAA,6CAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/target-project-locator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.workspaceRootInner = exports.appRootPath = exports.workspaceRoot = void 0;
|
|
4
4
|
const path = require("path");
|
|
5
|
-
const
|
|
5
|
+
const fileutils_1 = require("./fileutils");
|
|
6
6
|
/**
|
|
7
7
|
* The root of the workspace
|
|
8
8
|
*/
|
|
9
|
-
exports.workspaceRoot = workspaceRootInner(
|
|
9
|
+
exports.workspaceRoot = workspaceRootInner(process.cwd(), process.cwd());
|
|
10
10
|
/**
|
|
11
11
|
* The root of the workspace.
|
|
12
12
|
*
|
|
@@ -17,11 +17,11 @@ function workspaceRootInner(dir, candidateRoot) {
|
|
|
17
17
|
if (process.env.NX_WORKSPACE_ROOT_PATH)
|
|
18
18
|
return process.env.NX_WORKSPACE_ROOT_PATH;
|
|
19
19
|
if (path.dirname(dir) === dir)
|
|
20
|
-
return candidateRoot
|
|
21
|
-
if (fileExists(path.join(dir, 'nx.json'))) {
|
|
20
|
+
return candidateRoot;
|
|
21
|
+
if ((0, fileutils_1.fileExists)(path.join(dir, 'nx.json'))) {
|
|
22
22
|
return dir;
|
|
23
23
|
}
|
|
24
|
-
else if (fileExists(path.join(dir, 'node_modules', 'nx', 'package.json'))) {
|
|
24
|
+
else if ((0, fileutils_1.fileExists)(path.join(dir, 'node_modules', 'nx', 'package.json'))) {
|
|
25
25
|
return workspaceRootInner(path.dirname(dir), dir);
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
@@ -29,13 +29,4 @@ function workspaceRootInner(dir, candidateRoot) {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
exports.workspaceRootInner = workspaceRootInner;
|
|
32
|
-
function fileExists(filePath) {
|
|
33
|
-
try {
|
|
34
|
-
return (0, fs_1.statSync)(filePath).isFile();
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
return false;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
exports.fileExists = fileExists;
|
|
41
32
|
//# sourceMappingURL=workspace-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/workspace-root.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/workspace-root.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,2CAAyC;AAEzC;;GAEG;AACU,QAAA,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAE9E;;;;GAIG;AACU,QAAA,WAAW,GAAG,qBAAa,CAAC;AAEzC,SAAgB,kBAAkB,CAChC,GAAW,EACX,aAA4B;IAE5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,aAAa,CAAC;IACpD,IAAI,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE;QACzC,OAAO,GAAG,CAAC;KACZ;SAAM,IAAI,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;QAC3E,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;KACnD;SAAM;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;KAC7D;AACH,CAAC;AAdD,gDAcC"}
|