@nrwl/workspace 13.3.11 → 13.3.12
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 +5 -5
- package/presets/npm.json +0 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +4 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +11 -4
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +2 -0
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +26 -19
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/project-graph-worker.js +3 -1
- package/src/core/project-graph/project-graph-worker.js.map +1 -1
- package/src/tasks-runner/utils.js +4 -1
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +2 -2
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.3.
|
|
3
|
+
"version": "13.3.12",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -82,10 +82,10 @@
|
|
|
82
82
|
"minimatch": "3.0.4",
|
|
83
83
|
"enquirer": "~2.3.6",
|
|
84
84
|
"tslib": "^2.3.0",
|
|
85
|
-
"@nrwl/cli": "13.3.
|
|
86
|
-
"@nrwl/devkit": "13.3.
|
|
87
|
-
"@nrwl/jest": "13.3.
|
|
88
|
-
"@nrwl/linter": "13.3.
|
|
85
|
+
"@nrwl/cli": "13.3.12",
|
|
86
|
+
"@nrwl/devkit": "13.3.12",
|
|
87
|
+
"@nrwl/jest": "13.3.12",
|
|
88
|
+
"@nrwl/linter": "13.3.12"
|
|
89
89
|
},
|
|
90
90
|
"nx-migrations": {
|
|
91
91
|
"migrations": "./migrations.json"
|
package/presets/npm.json
CHANGED
|
@@ -1,2 +1,5 @@
|
|
|
1
1
|
import { ProjectFileMap, ProjectGraph, Workspace } from '@nrwl/devkit';
|
|
2
|
-
export declare function buildExplicitTypescriptAndPackageJsonDependencies(
|
|
2
|
+
export declare function buildExplicitTypescriptAndPackageJsonDependencies(jsPluginConfig: {
|
|
3
|
+
analyzeSourceFiles?: boolean;
|
|
4
|
+
analyzePackageJson?: boolean;
|
|
5
|
+
}, workspace: Workspace, projectGraph: ProjectGraph, filesToProcess: ProjectFileMap): any[];
|
|
@@ -3,10 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildExplicitTypescriptAndPackageJsonDependencies = void 0;
|
|
4
4
|
const explicit_project_dependencies_1 = require("./explicit-project-dependencies");
|
|
5
5
|
const explicit_package_json_dependencies_1 = require("./explicit-package-json-dependencies");
|
|
6
|
-
function buildExplicitTypescriptAndPackageJsonDependencies(workspace, projectGraph, filesToProcess) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
.
|
|
6
|
+
function buildExplicitTypescriptAndPackageJsonDependencies(jsPluginConfig, workspace, projectGraph, filesToProcess) {
|
|
7
|
+
let res = [];
|
|
8
|
+
if (jsPluginConfig.analyzeSourceFiles === undefined ||
|
|
9
|
+
jsPluginConfig.analyzeSourceFiles === true) {
|
|
10
|
+
res = res.concat((0, explicit_project_dependencies_1.buildExplicitTypeScriptDependencies)(workspace, projectGraph, filesToProcess));
|
|
11
|
+
}
|
|
12
|
+
if (jsPluginConfig.analyzePackageJson === undefined ||
|
|
13
|
+
jsPluginConfig.analyzePackageJson === true) {
|
|
14
|
+
res = res.concat((0, explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies)(workspace, projectGraph, filesToProcess));
|
|
15
|
+
}
|
|
16
|
+
return res;
|
|
10
17
|
}
|
|
11
18
|
exports.buildExplicitTypescriptAndPackageJsonDependencies = buildExplicitTypescriptAndPackageJsonDependencies;
|
|
12
19
|
//# sourceMappingURL=build-explicit-typescript-and-package-json-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-explicit-typescript-and-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,mFAAsF;AACtF,6FAA4F;AAE5F,SAAgB,iDAAiD,CAC/D,SAAoB,EACpB,YAA0B,EAC1B,cAA8B;IAE9B,
|
|
1
|
+
{"version":3,"file":"build-explicit-typescript-and-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,mFAAsF;AACtF,6FAA4F;AAE5F,SAAgB,iDAAiD,CAC/D,cAGC,EACD,SAAoB,EACpB,YAA0B,EAC1B,cAA8B;IAE9B,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IACE,cAAc,CAAC,kBAAkB,KAAK,SAAS;QAC/C,cAAc,CAAC,kBAAkB,KAAK,IAAI,EAC1C;QACA,GAAG,GAAG,GAAG,CAAC,MAAM,CACd,IAAA,mEAAmC,EACjC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF,CAAC;KACH;IACD,IACE,cAAc,CAAC,kBAAkB,KAAK,SAAS;QAC/C,cAAc,CAAC,kBAAkB,KAAK,IAAI,EAC1C;QACA,GAAG,GAAG,GAAG,CAAC,MAAM,CACd,IAAA,yEAAoC,EAClC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF,CAAC;KACH;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAnCD,8GAmCC"}
|
|
@@ -5,6 +5,7 @@ const path_1 = require("path");
|
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const project_graph_utils_1 = require("../../../utilities/project-graph-utils");
|
|
7
7
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
|
+
const nx_plugin_1 = require("@nrwl/tao/src/shared/nx-plugin");
|
|
8
9
|
function buildWorkspaceProjectNodes(ctx, builder) {
|
|
9
10
|
const toAdd = [];
|
|
10
11
|
Object.keys(ctx.workspace.projects).forEach((key) => {
|
|
@@ -13,6 +14,7 @@ function buildWorkspaceProjectNodes(ctx, builder) {
|
|
|
13
14
|
if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
|
|
14
15
|
p.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, p.targets);
|
|
15
16
|
}
|
|
17
|
+
p.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(p.root, p.targets, (0, nx_plugin_1.loadNxPlugins)(ctx.workspace.plugins));
|
|
16
18
|
const projectType = p.projectType === 'application'
|
|
17
19
|
? key.endsWith('-e2e')
|
|
18
20
|
? 'e2e'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAIA,+BAA4B;AAC5B,2BAAgC;AAChC,gFAAoF;AACpF,2DAA2D;
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAIA,+BAA4B;AAC5B,2BAAgC;AAChC,gFAAoF;AACpF,2DAA2D;AAC3D,8DAGwC;AAExC,SAAgB,0BAA0B,CACxC,GAAiC,EACjC,OAA4B;IAE5B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,sBAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE;YACjD,CAAC,CAAC,OAAO,GAAG,IAAA,gDAA0B,EAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SAChE;QACD,CAAC,CAAC,OAAO,GAAG,IAAA,2CAA+B,EACzC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,IAAA,yBAAa,EAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,WAAW,GACf,CAAC,CAAC,WAAW,KAAK,aAAa;YAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK;YACT,CAAC,CAAC,KAAK,CAAC;QACZ,MAAM,IAAI,GACR,GAAG,CAAC,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;YACxC,CAAC,CAAC,EAAE,CAAC;QAET,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,WAAW;YACjB,IAAI,kCACC,CAAC,KACJ,IAAI,EACJ,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GACxB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,OAAO,CAAC,OAAO,CAAC;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AApDD,gEAoDC"}
|
|
@@ -15,6 +15,7 @@ const build_nodes_1 = require("./build-nodes");
|
|
|
15
15
|
const fs_1 = require("fs");
|
|
16
16
|
const os = require("os");
|
|
17
17
|
const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
|
|
18
|
+
const nx_plugin_1 = require("@nrwl/tao/src/shared/nx-plugin");
|
|
18
19
|
function buildProjectGraph() {
|
|
19
20
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
20
21
|
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
|
@@ -46,7 +47,7 @@ function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, all
|
|
|
46
47
|
cachedFileData = {};
|
|
47
48
|
}
|
|
48
49
|
const context = createContext(workspaceJson, normalizedNxJson, projectFileMap, filesToProcess);
|
|
49
|
-
let projectGraph = yield buildProjectGraphUsingContext(context, cachedFileData, projectGraphVersion);
|
|
50
|
+
let projectGraph = yield buildProjectGraphUsingContext(nxJson, context, cachedFileData, projectGraphVersion);
|
|
50
51
|
const projectGraphCache = (0, nx_deps_cache_1.createCache)(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
51
52
|
if (shouldWriteCache) {
|
|
52
53
|
(0, nx_deps_cache_1.writeCache)(projectGraphCache);
|
|
@@ -63,7 +64,7 @@ function readCombinedDeps() {
|
|
|
63
64
|
const json = (0, devkit_1.readJsonFile)((0, path_1.join)(app_root_1.appRootPath, 'package.json'));
|
|
64
65
|
return Object.assign(Object.assign({}, json.dependencies), json.devDependencies);
|
|
65
66
|
}
|
|
66
|
-
function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion) {
|
|
67
|
+
function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraphVersion) {
|
|
67
68
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
68
69
|
perf_hooks_1.performance.mark('build project graph:start');
|
|
69
70
|
const builder = new devkit_1.ProjectGraphBuilder();
|
|
@@ -77,7 +78,7 @@ function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion)
|
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
|
-
yield buildExplicitDependencies(ctx, builder);
|
|
81
|
+
yield buildExplicitDependencies(jsPluginConfig(nxJson), ctx, builder);
|
|
81
82
|
(0, build_dependencies_1.buildImplicitProjectDependencies)(ctx, builder);
|
|
82
83
|
builder.setVersion(projectGraphVersion);
|
|
83
84
|
const initProjectGraph = builder.getUpdatedProjectGraph();
|
|
@@ -87,17 +88,28 @@ function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion)
|
|
|
87
88
|
return r;
|
|
88
89
|
});
|
|
89
90
|
}
|
|
90
|
-
function
|
|
91
|
+
function jsPluginConfig(nxJson) {
|
|
92
|
+
if (nxJson &&
|
|
93
|
+
nxJson &&
|
|
94
|
+
(nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig) &&
|
|
95
|
+
(nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig['@nrwl/js'])) {
|
|
96
|
+
return nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig['@nrwl/js'];
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
return {};
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
function buildExplicitDependencies(jsPluginConfig, ctx, builder) {
|
|
91
103
|
let totalNumOfFilesToProcess = totalNumberOfFilesToProcess(ctx);
|
|
92
104
|
// using workers has an overhead, so we only do it when the number of
|
|
93
105
|
// files we need to process is >= 100 and there are more than 2 CPUs
|
|
94
106
|
// to be able to use at least 2 workers (1 worker per CPU and
|
|
95
107
|
// 1 CPU for the main thread)
|
|
96
108
|
if (totalNumOfFilesToProcess < 100 || os.cpus().length < 3) {
|
|
97
|
-
return buildExplicitDependenciesWithoutWorkers(ctx, builder);
|
|
109
|
+
return buildExplicitDependenciesWithoutWorkers(jsPluginConfig, ctx, builder);
|
|
98
110
|
}
|
|
99
111
|
else {
|
|
100
|
-
return buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, builder);
|
|
112
|
+
return buildExplicitDependenciesUsingWorkers(jsPluginConfig, ctx, totalNumOfFilesToProcess, builder);
|
|
101
113
|
}
|
|
102
114
|
}
|
|
103
115
|
function totalNumberOfFilesToProcess(ctx) {
|
|
@@ -136,12 +148,12 @@ function createWorkerPool(numberOfWorkers) {
|
|
|
136
148
|
}
|
|
137
149
|
return res;
|
|
138
150
|
}
|
|
139
|
-
function buildExplicitDependenciesWithoutWorkers(ctx, builder) {
|
|
140
|
-
(0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(ctx.workspace, builder.graph, ctx.filesToProcess).forEach((r) => {
|
|
151
|
+
function buildExplicitDependenciesWithoutWorkers(jsPluginConfig, ctx, builder) {
|
|
152
|
+
(0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(jsPluginConfig, ctx.workspace, builder.graph, ctx.filesToProcess).forEach((r) => {
|
|
141
153
|
builder.addExplicitDependency(r.sourceProjectName, r.sourceProjectFile, r.targetProjectName);
|
|
142
154
|
});
|
|
143
155
|
}
|
|
144
|
-
function buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, builder) {
|
|
156
|
+
function buildExplicitDependenciesUsingWorkers(jsPluginConfig, ctx, totalNumOfFilesToProcess, builder) {
|
|
145
157
|
const numberOfWorkers = os.cpus().length - 1;
|
|
146
158
|
const bins = splitFilesIntoBins(ctx, totalNumOfFilesToProcess, numberOfWorkers);
|
|
147
159
|
const workers = createWorkerPool(numberOfWorkers);
|
|
@@ -172,6 +184,7 @@ function buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, bu
|
|
|
172
184
|
w.postMessage({
|
|
173
185
|
workspace: ctx.workspace,
|
|
174
186
|
projectGraph: builder.graph,
|
|
187
|
+
jsPluginConfig,
|
|
175
188
|
});
|
|
176
189
|
w.postMessage({ filesToProcess: bins.shift() });
|
|
177
190
|
}
|
|
@@ -189,19 +202,13 @@ function createContext(workspaceJson, nxJson, fileMap, filesToProcess) {
|
|
|
189
202
|
};
|
|
190
203
|
}
|
|
191
204
|
function updateProjectGraphWithPlugins(context, initProjectGraph) {
|
|
192
|
-
|
|
205
|
+
const plugins = (0, nx_plugin_1.loadNxPlugins)(context.workspace.plugins).filter((x) => !!x.processProjectGraph);
|
|
206
|
+
return (plugins || []).reduce((graph, plugin) => {
|
|
193
207
|
try {
|
|
194
|
-
|
|
195
|
-
paths: [app_root_1.appRootPath],
|
|
196
|
-
});
|
|
197
|
-
const pluginModule = require(pluginPath);
|
|
198
|
-
if (!pluginModule.processProjectGraph) {
|
|
199
|
-
return graph;
|
|
200
|
-
}
|
|
201
|
-
return pluginModule.processProjectGraph(graph, context);
|
|
208
|
+
return plugin.processProjectGraph(graph, context);
|
|
202
209
|
}
|
|
203
210
|
catch (e) {
|
|
204
|
-
const message = `Failed to process the project graph with "${
|
|
211
|
+
const message = `Failed to process the project graph with "${plugin.name}". This will error in the future!`;
|
|
205
212
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
206
213
|
console.error(e);
|
|
207
214
|
devkit_1.logger.error(message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2DAA2D;AAC3D,+BAA4B;AAC5B,2CAAyC;AACzC,4EAAuE;AACvE,8CAIuB;AACvB,4DAAuD;AACvD,4DAOkC;AAClC,6DAAwE;AACxE,+CAGuB;AACvB,2BAAgC;AAChC,yBAAyB;AACzB,0JAAiJ;
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,15 @@ const worker_threads_1 = require("worker_threads");
|
|
|
4
4
|
const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
|
|
5
5
|
let workspace;
|
|
6
6
|
let projectGraph;
|
|
7
|
+
let jsPluginConfig;
|
|
7
8
|
worker_threads_1.parentPort.on('message', (message) => {
|
|
8
9
|
if (message.workspace) {
|
|
9
10
|
workspace = message.workspace;
|
|
10
11
|
projectGraph = message.projectGraph;
|
|
12
|
+
jsPluginConfig = message.jsPluginConfig;
|
|
11
13
|
}
|
|
12
14
|
else {
|
|
13
|
-
const res = (0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(workspace, projectGraph, message.filesToProcess);
|
|
15
|
+
const res = (0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(jsPluginConfig, workspace, projectGraph, message.filesToProcess);
|
|
14
16
|
worker_threads_1.parentPort.postMessage(res);
|
|
15
17
|
}
|
|
16
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-worker.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-worker.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAE5C,0JAAiJ;AAEjJ,IAAI,SAA2B,CAAC;AAChC,IAAI,YAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"project-graph-worker.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-worker.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAE5C,0JAAiJ;AAEjJ,IAAI,SAA2B,CAAC;AAChC,IAAI,YAAiC,CAAC;AACtC,IAAI,cAGI,CAAC;AAET,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;IACnC,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QAC9B,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACpC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,GAAG,IAAA,2GAAiD,EAC3D,cAAc,EACd,SAAS,EACT,YAAY,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,2BAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KAC7B;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -7,6 +7,7 @@ const output_1 = require("../utilities/output");
|
|
|
7
7
|
const project_graph_utils_1 = require("../utilities/project-graph-utils");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = require("path");
|
|
10
|
+
const nx_plugin_1 = require("@nrwl/tao/src/shared/nx-plugin");
|
|
10
11
|
function getCommandAsString(task) {
|
|
11
12
|
const execCommand = (0, devkit_1.getPackageManagerCommand)().exec;
|
|
12
13
|
const args = getCommandArgsForTask(task);
|
|
@@ -116,10 +117,12 @@ function interpolateOutputs(template, data) {
|
|
|
116
117
|
});
|
|
117
118
|
}
|
|
118
119
|
function getExecutorNameForTask(task, workspace) {
|
|
119
|
-
const
|
|
120
|
+
const workspaceConfiguration = workspace.readWorkspaceConfiguration();
|
|
121
|
+
const project = workspaceConfiguration.projects[task.target.project];
|
|
120
122
|
if ((0, fs_1.existsSync)((0, path_1.join)(project.root, 'package.json'))) {
|
|
121
123
|
project.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(project.root, project.targets);
|
|
122
124
|
}
|
|
125
|
+
project.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(project.root, project.targets, (0, nx_plugin_1.loadNxPlugins)(workspaceConfiguration.plugins));
|
|
123
126
|
if (!project.targets[task.target.target]) {
|
|
124
127
|
throw new Error(`Cannot find configuration for task ${task.target.project}:${task.target.target}`);
|
|
125
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+BAA+B;AAC/B,gDAA6C;AAE7C,0EAA8E;AAC9E,2BAAgC;AAChC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { ProjectGraph, ProjectGraphNode } from '@nrwl/devkit';
|
|
1
|
+
import { ProjectGraph, ProjectGraphNode, TargetConfiguration } from '@nrwl/devkit';
|
|
2
2
|
export declare function projectHasTarget(project: ProjectGraphNode, target: string): any;
|
|
3
3
|
export declare function projectHasTargetAndConfiguration(project: ProjectGraphNode, target: string, configuration: string): any;
|
|
4
|
-
export declare function mergeNpmScriptsWithTargets(projectRoot: string, targets: any):
|
|
4
|
+
export declare function mergeNpmScriptsWithTargets(projectRoot: string, targets: any): Record<string, TargetConfiguration>;
|
|
5
5
|
export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph<any>): string[];
|
|
6
6
|
/**
|
|
7
7
|
* Finds the project node name by a file that lives within it's src root
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"project-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/project-graph-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.3.
|
|
4
|
+
exports.nxVersion = '13.3.12';
|
|
5
5
|
exports.angularCliVersion = '~13.1.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|