nx 15.8.0-beta.8 → 15.8.0
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/package.json +13 -13
- package/src/command-line/connect.js +27 -3
- package/src/command-line/connect.js.map +1 -1
- package/src/nx-init/encapsulated/nxw.js +12 -2
- package/src/nx-init/encapsulated/nxw.js.map +1 -1
- package/src/utils/command-line-utils.js +4 -1
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/ignore.js +6 -6
- package/src/utils/ignore.js.map +1 -1
- package/src/utils/plugins/installed-plugins.js +5 -1
- package/src/utils/plugins/installed-plugins.js.map +1 -1
- package/src/utils/plugins/local-plugins.js +5 -4
- package/src/utils/plugins/local-plugins.js.map +1 -1
- package/src/utils/plugins/models.d.ts +4 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "15.8.0
|
|
3
|
+
"version": "15.8.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "15.8.0
|
|
36
|
-
"@nrwl/tao": "15.8.0
|
|
35
|
+
"@nrwl/cli": "15.8.0",
|
|
36
|
+
"@nrwl/tao": "15.8.0",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -81,15 +81,15 @@
|
|
|
81
81
|
}
|
|
82
82
|
},
|
|
83
83
|
"optionalDependencies": {
|
|
84
|
-
"@nrwl/nx-darwin-arm64": "15.8.0
|
|
85
|
-
"@nrwl/nx-darwin-x64": "15.8.0
|
|
86
|
-
"@nrwl/nx-linux-arm-gnueabihf": "15.8.0
|
|
87
|
-
"@nrwl/nx-linux-arm64-gnu": "15.8.0
|
|
88
|
-
"@nrwl/nx-linux-arm64-musl": "15.8.0
|
|
89
|
-
"@nrwl/nx-linux-x64-gnu": "15.8.0
|
|
90
|
-
"@nrwl/nx-linux-x64-musl": "15.8.0
|
|
91
|
-
"@nrwl/nx-win32-arm64-msvc": "15.8.0
|
|
92
|
-
"@nrwl/nx-win32-x64-msvc": "15.8.0
|
|
84
|
+
"@nrwl/nx-darwin-arm64": "15.8.0",
|
|
85
|
+
"@nrwl/nx-darwin-x64": "15.8.0",
|
|
86
|
+
"@nrwl/nx-linux-arm-gnueabihf": "15.8.0",
|
|
87
|
+
"@nrwl/nx-linux-arm64-gnu": "15.8.0",
|
|
88
|
+
"@nrwl/nx-linux-arm64-musl": "15.8.0",
|
|
89
|
+
"@nrwl/nx-linux-x64-gnu": "15.8.0",
|
|
90
|
+
"@nrwl/nx-linux-x64-musl": "15.8.0",
|
|
91
|
+
"@nrwl/nx-win32-arm64-msvc": "15.8.0",
|
|
92
|
+
"@nrwl/nx-win32-x64-msvc": "15.8.0"
|
|
93
93
|
},
|
|
94
94
|
"nx-migrations": {
|
|
95
95
|
"migrations": "./migrations.json",
|
|
@@ -148,5 +148,5 @@
|
|
|
148
148
|
},
|
|
149
149
|
"main": "./bin/nx.js",
|
|
150
150
|
"types": "./bin/nx.d.ts",
|
|
151
|
-
"gitHead": "
|
|
151
|
+
"gitHead": "fad9516a08004144d9d0ff57db599d0c60cb97d3"
|
|
152
152
|
}
|
|
@@ -7,6 +7,9 @@ const package_manager_1 = require("../utils/package-manager");
|
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
8
|
const configuration_1 = require("../config/configuration");
|
|
9
9
|
const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
|
|
10
|
+
const fs_1 = require("fs");
|
|
11
|
+
const path_1 = require("path");
|
|
12
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
10
13
|
function connectToNxCloudIfExplicitlyAsked(opts) {
|
|
11
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
15
|
if (opts['cloud'] === true) {
|
|
@@ -19,7 +22,12 @@ function connectToNxCloudIfExplicitlyAsked(opts) {
|
|
|
19
22
|
title: '--cloud requires the workspace to be connected to Nx Cloud.',
|
|
20
23
|
});
|
|
21
24
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
22
|
-
(0,
|
|
25
|
+
const nxCommand = (0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))
|
|
26
|
+
? `${pmc.exec} nx`
|
|
27
|
+
: process.platform === 'win32'
|
|
28
|
+
? './nx.bat'
|
|
29
|
+
: './nx';
|
|
30
|
+
(0, child_process_1.execSync)(`${nxCommand} connect-to-nx-cloud`, {
|
|
23
31
|
stdio: [0, 1, 2],
|
|
24
32
|
});
|
|
25
33
|
output_1.output.success({
|
|
@@ -31,6 +39,8 @@ function connectToNxCloudIfExplicitlyAsked(opts) {
|
|
|
31
39
|
}
|
|
32
40
|
exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
|
|
33
41
|
function connectToNxCloudCommand(promptOverride) {
|
|
42
|
+
var _a;
|
|
43
|
+
var _b;
|
|
34
44
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
45
|
if ((0, nx_cloud_utils_1.isNxCloudUsed)()) {
|
|
36
46
|
output_1.output.log({
|
|
@@ -49,8 +59,22 @@ function connectToNxCloudCommand(promptOverride) {
|
|
|
49
59
|
if (!res)
|
|
50
60
|
return false;
|
|
51
61
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
52
|
-
|
|
53
|
-
|
|
62
|
+
const nxCommand = pmc
|
|
63
|
+
? `${pmc.exec} nx`
|
|
64
|
+
: process.platform === 'win32'
|
|
65
|
+
? './nx.bat'
|
|
66
|
+
: './nx';
|
|
67
|
+
if (pmc) {
|
|
68
|
+
(0, child_process_1.execSync)(`${pmc.addDev} @nrwl/nx-cloud@latest`);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
72
|
+
if (nxJson.installation) {
|
|
73
|
+
(_a = (_b = nxJson.installation).plugins) !== null && _a !== void 0 ? _a : (_b.plugins = {});
|
|
74
|
+
nxJson.installation.plugins['@nrwl/nx-cloud'] = (0, child_process_1.execSync)(`npm view @nrwl/nx-cloud@latest version`).toString();
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
(0, child_process_1.execSync)(`${nxCommand} g @nrwl/nx-cloud:init`, {
|
|
54
78
|
stdio: [0, 1, 2],
|
|
55
79
|
});
|
|
56
80
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AACrD,4DAIiC;
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,8 +59,18 @@ function ensureUpToDateInstallation() {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
catch (e) {
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
const messageLines = [
|
|
63
|
+
'[NX]: Nx wrapper failed to synchronize installation.',
|
|
64
|
+
];
|
|
65
|
+
if (e instanceof Error) {
|
|
66
|
+
messageLines.push('');
|
|
67
|
+
messageLines.push(e.message);
|
|
68
|
+
messageLines.push(e.stack);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
messageLines.push(e.toString());
|
|
72
|
+
}
|
|
73
|
+
console.error(messageLines.join('\n'));
|
|
64
74
|
process.exit(1);
|
|
65
75
|
}
|
|
66
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxw.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-init/encapsulated/nxw.ts"],"names":[],"mappings":";AAAA,4EAA4E;AAC5E,gDAAgD;AAChD,mFAAmF;AACnF,EAAE;AACF,yEAAyE;AACzE,yEAAyE;AACzE,yDAAyD;;AAEzD,MAAM,EAAE,GAAwB,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9C,MAAM,IAAI,GAA0B,OAAO,CAAC,MAAM,CAAC,CAAC;AACpD,MAAM,EAAE,GAAmC,OAAO,CAAC,eAAe,CAAC,CAAC;AAKpE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;AAE9E,SAAS,uBAAuB,CAC9B,kBAAuD;IAEvD,IAAI;QACF,MAAM,mBAAmB,GAAgB,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACnE,IACE,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC;YACvC,kBAAkB,CAAC,OAAO;YAC5B,OAAO,CAAC,IAAI,CAAC,IAAI,CACf,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC9B,cAAc,EACd,IAAI,EACJ,cAAc,CACf,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO,EACzC;YACA,OAAO,KAAK,CAAC;SACd;QACD,KAAK,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CACnD,kBAAkB,CAAC,OAAO,IAAI,EAAE,CACjC,EAAE;YACD,IAAI,mBAAmB,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,cAAc,EAAE;gBAClE,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,SAAS,CAAC,CAAS;IAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QACrB,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtC;AACH,CAAC;AAED,SAAS,0BAA0B;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAEzD,IAAI,MAA2B,CAAC;IAEhC,IAAI;QACF,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;KAC9B;IAAC,WAAM;QACN,OAAO,CAAC,KAAK,CACX,8GAA8G,CAC/G,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI;QACF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YACjD,EAAE,CAAC,aAAa,CACd,gBAAgB,EAChB,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,iBAAiB;gBACvB,eAAe,kBACb,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAC/B;aACF,CAAC,CACH,CAAC;YACF,EAAE,CAAC,QAAQ,CAAC,0BAA0B,EAAE;gBACtC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBACnC,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"nxw.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/nx-init/encapsulated/nxw.ts"],"names":[],"mappings":";AAAA,4EAA4E;AAC5E,gDAAgD;AAChD,mFAAmF;AACnF,EAAE;AACF,yEAAyE;AACzE,yEAAyE;AACzE,yDAAyD;;AAEzD,MAAM,EAAE,GAAwB,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9C,MAAM,IAAI,GAA0B,OAAO,CAAC,MAAM,CAAC,CAAC;AACpD,MAAM,EAAE,GAAmC,OAAO,CAAC,eAAe,CAAC,CAAC;AAKpE,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;AAE9E,SAAS,uBAAuB,CAC9B,kBAAuD;IAEvD,IAAI;QACF,MAAM,mBAAmB,GAAgB,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACnE,IACE,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC;YACvC,kBAAkB,CAAC,OAAO;YAC5B,OAAO,CAAC,IAAI,CAAC,IAAI,CACf,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC9B,cAAc,EACd,IAAI,EACJ,cAAc,CACf,CAAC,CAAC,OAAO,KAAK,kBAAkB,CAAC,OAAO,EACzC;YACA,OAAO,KAAK,CAAC;SACd;QACD,KAAK,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CACnD,kBAAkB,CAAC,OAAO,IAAI,EAAE,CACjC,EAAE;YACD,IAAI,mBAAmB,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,cAAc,EAAE;gBAClE,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,SAAS,CAAC,CAAS;IAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QACrB,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtC;AACH,CAAC;AAED,SAAS,0BAA0B;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAEzD,IAAI,MAA2B,CAAC;IAEhC,IAAI;QACF,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;KAC9B;IAAC,WAAM;QACN,OAAO,CAAC,KAAK,CACX,8GAA8G,CAC/G,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI;QACF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YACjD,EAAE,CAAC,aAAa,CACd,gBAAgB,EAChB,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,iBAAiB;gBACvB,eAAe,kBACb,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAC/B;aACF,CAAC,CACH,CAAC;YACF,EAAE,CAAC,QAAQ,CAAC,0BAA0B,EAAE;gBACtC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBACnC,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,CAAU,EAAE;QACnB,MAAM,YAAY,GAAG;YACnB,sDAAsD;SACvD,CAAC;QACF,IAAI,CAAC,YAAY,KAAK,EAAE;YACtB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC5B;aAAM;YACL,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,0BAA0B,EAAE,CAAC;IAC7B,OAAO,CAAC,uCAAuC,CAAC,CAAC;CAClD"}
|
|
@@ -5,6 +5,7 @@ const yargsParser = require("yargs-parser");
|
|
|
5
5
|
const file_utils_1 = require("../project-graph/file-utils");
|
|
6
6
|
const output_1 = require("./output");
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
|
+
const workspace_root_1 = require("./workspace-root");
|
|
8
9
|
function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings: true }, nxJson) {
|
|
9
10
|
var _a;
|
|
10
11
|
// this is to lerna case when this function is invoked imperatively
|
|
@@ -165,6 +166,7 @@ function getFilesUsingBaseAndHead(base, head) {
|
|
|
165
166
|
try {
|
|
166
167
|
mergeBase = (0, child_process_1.execSync)(`git merge-base "${base}" "${head}"`, {
|
|
167
168
|
maxBuffer: file_utils_1.TEN_MEGABYTES,
|
|
169
|
+
cwd: workspace_root_1.workspaceRoot,
|
|
168
170
|
})
|
|
169
171
|
.toString()
|
|
170
172
|
.trim();
|
|
@@ -172,6 +174,7 @@ function getFilesUsingBaseAndHead(base, head) {
|
|
|
172
174
|
catch (_a) {
|
|
173
175
|
mergeBase = (0, child_process_1.execSync)(`git merge-base --fork-point "${base}" "${head}"`, {
|
|
174
176
|
maxBuffer: file_utils_1.TEN_MEGABYTES,
|
|
177
|
+
cwd: workspace_root_1.workspaceRoot,
|
|
175
178
|
})
|
|
176
179
|
.toString()
|
|
177
180
|
.trim();
|
|
@@ -179,7 +182,7 @@ function getFilesUsingBaseAndHead(base, head) {
|
|
|
179
182
|
return parseGitOutput(`git diff --name-only --relative "${mergeBase}" "${head}"`);
|
|
180
183
|
}
|
|
181
184
|
function parseGitOutput(command) {
|
|
182
|
-
return (0, child_process_1.execSync)(command, { maxBuffer: file_utils_1.TEN_MEGABYTES })
|
|
185
|
+
return (0, child_process_1.execSync)(command, { maxBuffer: file_utils_1.TEN_MEGABYTES, cwd: workspace_root_1.workspaceRoot })
|
|
183
186
|
.toString('utf-8')
|
|
184
187
|
.split('\n')
|
|
185
188
|
.map((a) => a.trim())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,4DAA4D;AAC5D,qCAAkC;AAElC,iDAAyC;
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/ignore.js
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getIgnoreObject = exports.getAlwaysIgnore = exports.getIgnoredGlobs = exports.ALWAYS_IGNORE = void 0;
|
|
4
4
|
const fs_extra_1 = require("fs-extra");
|
|
5
5
|
const ignore_1 = require("ignore");
|
|
6
|
-
const posix_1 = require("path/posix");
|
|
7
6
|
const fileutils_1 = require("./fileutils");
|
|
7
|
+
const path_1 = require("./path");
|
|
8
8
|
const workspace_root_1 = require("./workspace-root");
|
|
9
9
|
/**
|
|
10
10
|
* An array of glob patterns that should always be ignored.
|
|
@@ -16,20 +16,20 @@ function getIgnoredGlobs(root = workspace_root_1.workspaceRoot, prependRoot = tr
|
|
|
16
16
|
if (prependRoot) {
|
|
17
17
|
return [
|
|
18
18
|
...getAlwaysIgnore(root),
|
|
19
|
-
...files.flatMap((f) => getIgnoredGlobsFromFile((0,
|
|
19
|
+
...files.flatMap((f) => getIgnoredGlobsFromFile((0, path_1.joinPathFragments)(root, f), root)),
|
|
20
20
|
];
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
return [
|
|
24
24
|
...getAlwaysIgnore(),
|
|
25
|
-
...files.flatMap((f) => getIgnoredGlobsFromFile((0,
|
|
25
|
+
...files.flatMap((f) => getIgnoredGlobsFromFile((0, path_1.joinPathFragments)(root, f))),
|
|
26
26
|
];
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.getIgnoredGlobs = getIgnoredGlobs;
|
|
30
30
|
function getAlwaysIgnore(root) {
|
|
31
31
|
const paths = ['node_modules', '**/node_modules', '.git'];
|
|
32
|
-
return root ? paths.map((x) => (0,
|
|
32
|
+
return root ? paths.map((x) => (0, path_1.joinPathFragments)(root, x)) : paths;
|
|
33
33
|
}
|
|
34
34
|
exports.getAlwaysIgnore = getAlwaysIgnore;
|
|
35
35
|
function getIgnoreObject(root = workspace_root_1.workspaceRoot) {
|
|
@@ -51,10 +51,10 @@ function getIgnoredGlobsFromFile(file, root) {
|
|
|
51
51
|
}
|
|
52
52
|
else if (trimmed.startsWith('/')) {
|
|
53
53
|
if (root) {
|
|
54
|
-
results.push((0,
|
|
54
|
+
results.push((0, path_1.joinPathFragments)(root, trimmed));
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
|
-
results.push((0,
|
|
57
|
+
results.push((0, path_1.joinPathFragments)('.', trimmed));
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
else {
|
package/src/utils/ignore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/ignore.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,mCAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/ignore.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,mCAA4B;AAC5B,2CAAiD;AACjD,iCAA2C;AAC3C,qDAAiD;AAEjD;;;GAGG;AACU,QAAA,aAAa,GAAG,eAAe,EAAE,CAAC;AAE/C,SAAgB,eAAe,CAC7B,OAAe,8BAAa,EAC5B,cAAuB,IAAI;IAE3B,MAAM,KAAK,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1C,IAAI,WAAW,EAAE;QACf,OAAO;YACL,GAAG,eAAe,CAAC,IAAI,CAAC;YACxB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,uBAAuB,CAAC,IAAA,wBAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAC1D;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,GAAG,eAAe,EAAE;YACpB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACrB,uBAAuB,CAAC,IAAA,wBAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CACpD;SACF,CAAC;KACH;AACH,CAAC;AApBD,0CAoBC;AAED,SAAgB,eAAe,CAAC,IAAa;IAC3C,MAAM,KAAK,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wBAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACrE,CAAC;AAHD,0CAGC;AAED,SAAgB,eAAe,CAAC,OAAe,8BAAa;IAC1D,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,IAAA,8BAAkB,EAAC,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC;IACjD,EAAE,CAAC,GAAG,CAAC,IAAA,8BAAkB,EAAC,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC;AACZ,CAAC;AALD,0CAKC;AAED,SAAS,uBAAuB,CAAC,IAAY,EAAE,IAAa;IAC1D,IAAI;QACF,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACvC,SAAS;aACV;iBAAM,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAClC,IAAI,IAAI,EAAE;oBACR,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;iBAChD;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAiB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC/C;aACF;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QACD,OAAO,OAAO,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
|
|
@@ -64,7 +64,11 @@ function getInstalledPluginsAndCapabilities(workspaceRoot) {
|
|
|
64
64
|
for (const plugin of Array.from(plugins).sort()) {
|
|
65
65
|
try {
|
|
66
66
|
const capabilities = (0, plugin_capabilities_1.getPluginCapabilities)(workspaceRoot, plugin);
|
|
67
|
-
if (capabilities
|
|
67
|
+
if (capabilities &&
|
|
68
|
+
(capabilities.executors ||
|
|
69
|
+
capabilities.generators ||
|
|
70
|
+
capabilities.projectGraphExtension ||
|
|
71
|
+
capabilities.projectInference)) {
|
|
68
72
|
result.set(plugin, capabilities);
|
|
69
73
|
}
|
|
70
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AACvC,4CAA4C;AAC5C,kDAAqE;AACrE,sDAAkD;AAClD,+BAA4B;AAE5B,sEAA8D;AAE9D,SAAgB,oBAAoB;IAClC,MAAM,eAAe,GAAG,8BAA8B,EAAE,CAAC;IACzD,MAAM,UAAU,GAAG,yBAAyB,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;QAC5D,IAAI,iBAAiB,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAChC;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,oDAYC;AAED,SAAS,4BAA4B,CAAC,GAAW;IAC/C,IAAI;QACF,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,oCAAqB,EAAC,GAAG,EAAE,IAAA,0CAAiB,GAAE,CAAC,CAAC;QACxE,OAAO,WAAW;YAChB;gBACE,WAAW;gBACX,eAAe;gBACf,YAAY;gBACZ,YAAY;gBACZ,UAAU;gBACV,WAAW;aACZ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,WAAW,CAAC;YACvC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAI,CAAC;KACV;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAS,8BAA8B,CACrC,eAAe,GAAG,cAAc;IAEhC,IAAI;QACF,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,wBAAY,EACpD,IAAA,WAAI,EAAC,8BAAa,EAAE,eAAe,CAAC,CACrC,CAAC;QACF,OAAO,MAAM,CAAC,IAAI,iCAAM,YAAY,GAAK,eAAe,EAAG,CAAC;KAC7D;IAAC,WAAM,GAAE;IACV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,yBAAyB;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,wBAAY,EACnC,IAAA,WAAI,EAAC,8BAAa,EAAE,SAAS,CAAC,CAC/B,CAAC;IACF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IACD,OAAO,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,kCAAkC,CAChD,aAAqB;IAErB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE1D,MAAM,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/C,IAAI;YACF,MAAM,YAAY,GAAG,IAAA,2CAAqB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAClE,
|
|
1
|
+
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/installed-plugins.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,11 @@ function getLocalWorkspacePlugins(projectsConfiguration) {
|
|
|
16
16
|
if ((0, fs_1.existsSync)(packageJsonPath)) {
|
|
17
17
|
const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
18
18
|
const capabilities = (0, plugin_capabilities_1.getPluginCapabilities)(workspace_root_1.workspaceRoot, packageJson.name);
|
|
19
|
-
if (capabilities
|
|
20
|
-
capabilities.
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
if (capabilities &&
|
|
20
|
+
(capabilities.executors ||
|
|
21
|
+
capabilities.generators ||
|
|
22
|
+
capabilities.projectGraphExtension ||
|
|
23
|
+
capabilities.projectInference)) {
|
|
23
24
|
plugins.set(packageJson.name, Object.assign(Object.assign({}, capabilities), { name: packageJson.name }));
|
|
24
25
|
}
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-plugins.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/local-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAEnC,qCAAuC;AACvC,4CAA4C;AAG5C,+BAA4B;AAC5B,sDAAkD;AAClD,2BAAgC;
|
|
1
|
+
{"version":3,"file":"local-plugins.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/local-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAEnC,qCAAuC;AACvC,4CAA4C;AAG5C,+BAA4B;AAC5B,sDAAkD;AAClD,2BAAgC;AAChC,+DAA8D;AAE9D,SAAgB,wBAAwB,CACtC,qBAA6C;IAE7C,MAAM,OAAO,GAAoC,IAAI,GAAG,EAAE,CAAC;IAC3D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,EAAE;QACnE,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC1E,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAC/B,MAAM,WAAW,GAAgB,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;YAC/D,MAAM,YAAY,GAAG,IAAA,2CAAqB,EACxC,8BAAa,EACb,WAAW,CAAC,IAAI,CACjB,CAAC;YACF,IACE,YAAY;gBACZ,CAAC,YAAY,CAAC,SAAS;oBACrB,YAAY,CAAC,UAAU;oBACvB,YAAY,CAAC,qBAAqB;oBAClC,YAAY,CAAC,gBAAgB,CAAC,EAChC;gBACA,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,kCACvB,YAAY,KACf,IAAI,EAAE,WAAW,CAAC,IAAI,IACtB,CAAC;aACJ;SACF;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,4DA4BC;AAED,SAAgB,yBAAyB,CACvC,gBAAiD;IAEjD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAgB,EAAE;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAClE;IAED,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,0BAA0B;QACjC,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AApBD,8DAoBC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { ExecutorsJsonEntry, GeneratorsJsonEntry } from '../../config/misc-interfaces';
|
|
2
2
|
export interface PluginCapabilities {
|
|
3
3
|
name: string;
|
|
4
|
-
executors
|
|
4
|
+
executors?: {
|
|
5
5
|
[name: string]: ExecutorsJsonEntry;
|
|
6
6
|
};
|
|
7
|
-
generators
|
|
7
|
+
generators?: {
|
|
8
8
|
[name: string]: GeneratorsJsonEntry;
|
|
9
9
|
};
|
|
10
|
-
projectInference
|
|
11
|
-
projectGraphExtension
|
|
10
|
+
projectInference?: boolean;
|
|
11
|
+
projectGraphExtension?: boolean;
|
|
12
12
|
}
|
|
13
13
|
export interface CorePlugin {
|
|
14
14
|
name: string;
|