nx 14.2.0-beta.5 → 14.2.0-rc.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/CHANGELOG.md +1 -1
- package/migrations.json +6 -0
- package/package.json +4 -4
- package/src/command-line/run-many.js +4 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute.d.ts +2 -0
- package/src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute.js +20 -0
- package/src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute.js.map +1 -0
- package/src/tasks-runner/create-task-graph.js +5 -14
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +1 -0
- package/src/tasks-runner/utils.js +15 -4
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
- package/src/utils/versions.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.0-
|
|
6
|
+
# [14.2.0-rc.0](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-rc.0) (2022-06-03)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/migrations.json
CHANGED
|
@@ -17,6 +17,12 @@
|
|
|
17
17
|
"version": "14.2.0-beta.0",
|
|
18
18
|
"description": "Remove default collection from configuration to switch to prompts for collection",
|
|
19
19
|
"factory": "./src/migrations/update-14-2-0/remove-default-collection"
|
|
20
|
+
},
|
|
21
|
+
"14-2-0-replace-relative-outputs-with-absolute": {
|
|
22
|
+
"cli": "nx",
|
|
23
|
+
"version": "14.2.0-beta.5",
|
|
24
|
+
"description": "Replace all ./ and ../ in outputs with absolute paths",
|
|
25
|
+
"factory": "./src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute"
|
|
20
26
|
}
|
|
21
27
|
}
|
|
22
28
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.2.0-
|
|
3
|
+
"version": "14.2.0-rc.0",
|
|
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.0-
|
|
35
|
-
"@nrwl/tao": "14.2.0-
|
|
34
|
+
"@nrwl/cli": "14.2.0-rc.0",
|
|
35
|
+
"@nrwl/tao": "14.2.0-rc.0",
|
|
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": "1de896f3e88bc21f6bde3087d363d6f3e4e740b8"
|
|
109
109
|
}
|
|
@@ -27,10 +27,12 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
27
27
|
const allProjects = Object.values(projectGraph.nodes);
|
|
28
28
|
const excludedProjects = new Set((_a = nxArgs.exclude) !== null && _a !== void 0 ? _a : []);
|
|
29
29
|
if (nxArgs.all) {
|
|
30
|
-
|
|
30
|
+
const res = runnableForTarget(allProjects, nxArgs.target).filter((proj) => !excludedProjects.has(proj.name));
|
|
31
|
+
res.sort((a, b) => a.name.localeCompare(b.name));
|
|
32
|
+
return res;
|
|
31
33
|
}
|
|
32
34
|
checkForInvalidProjects(nxArgs, allProjects);
|
|
33
|
-
|
|
35
|
+
const selectedProjects = nxArgs.projects.map((name) => allProjects.find((project) => project.name === name));
|
|
34
36
|
return runnableForTarget(selectedProjects, nxArgs.target, true).filter((proj) => !excludedProjects.has(proj.name));
|
|
35
37
|
}
|
|
36
38
|
function checkForInvalidProjects(nxArgs, allProjects) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":";;;;AACA,6DAAyD;AAEzD,oEAA8E;AAC9E,sEAAgE;AAChE,4CAAyC;AACzC,+DAAkE;AAClE,2CAAyC;AAEzC,kEAAyE;AACzE,yDAAqD;AAGrD,SAAsB,OAAO,CAC3B,UAAuC,EACvC,0BAGI,EAAE;;QAEN,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAA,kCAAe,GAAE,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,UAAU,EACV,UAAU,EACV,EAAE,aAAa,EAAE,IAAI,EAAE,EACvB,GAAG,CAAC,MAAM,CACX,CAAC;QAEF,MAAM,IAAA,+CAAyB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,MAAM,IAAA,wBAAU,EACd,QAAQ,EACR,YAAY,EACZ,GAAG,EACH,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,CACxB,CAAC;IACJ,CAAC;CAAA;AA9BD,0BA8BC;AAED,SAAS,aAAa,CACpB,MAAc,EACd,YAA0B;;IAE1B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,
|
|
1
|
+
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
5
|
+
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
6
|
+
const path_1 = require("nx/src/utils/path");
|
|
7
|
+
function default_1(tree) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
for (const [name, value] of (0, project_configuration_1.getProjects)(tree).entries()) {
|
|
10
|
+
for (const t of Object.values(value.targets)) {
|
|
11
|
+
if (t.outputs) {
|
|
12
|
+
t.outputs = t.outputs.map((o) => (0, fileutils_1.isRelativePath)(o) ? (0, path_1.joinPathFragments)(value.root, o) : o);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, name, value);
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
exports.default = default_1;
|
|
20
|
+
//# sourceMappingURL=replace-all-relative-outputs-with-absolute.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replace-all-relative-outputs-with-absolute.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,sDAAwD;AACxD,4CAAsD;AAEtD,mBAA+B,IAAU;;QACvC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACvD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC5C,IAAI,CAAC,CAAC,OAAO,EAAE;oBACb,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,IAAA,0BAAc,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAiB,EAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACzD,CAAC;iBACH;aACF;YACD,IAAA,kDAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SAC/C;IACH,CAAC;CAAA;AAXD,4BAWC"}
|
|
@@ -16,7 +16,6 @@ class ProcessTasks {
|
|
|
16
16
|
for (const target of targets) {
|
|
17
17
|
const resolvedConfiguration = this.resolveConfiguration(this.projectGraph.nodes[projectName], target, configuration);
|
|
18
18
|
const id = this.getId(projectName, target, resolvedConfiguration);
|
|
19
|
-
debugger;
|
|
20
19
|
const task = this.createTask(id, this.projectGraph.nodes[projectName], target, resolvedConfiguration, overrides);
|
|
21
20
|
this.tasks[task.id] = task;
|
|
22
21
|
this.dependencies[task.id] = [];
|
|
@@ -117,21 +116,13 @@ function createTaskGraph(projectGraph, defaultDependencyConfigs = {}, projectNam
|
|
|
117
116
|
};
|
|
118
117
|
}
|
|
119
118
|
exports.createTaskGraph = createTaskGraph;
|
|
120
|
-
function interpolateOverrides(args, projectName,
|
|
119
|
+
function interpolateOverrides(args, projectName, project) {
|
|
121
120
|
const interpolatedArgs = Object.assign({}, args);
|
|
122
121
|
Object.entries(interpolatedArgs).forEach(([name, value]) => {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
throw new Error('Only top-level properties can be interpolated');
|
|
128
|
-
}
|
|
129
|
-
if (group === 'name') {
|
|
130
|
-
return projectName;
|
|
131
|
-
}
|
|
132
|
-
return projectMetadata[group];
|
|
133
|
-
});
|
|
134
|
-
}
|
|
122
|
+
interpolatedArgs[name] =
|
|
123
|
+
typeof value === 'string'
|
|
124
|
+
? (0, utils_1.interpolate)(value, { project: Object.assign(Object.assign({}, project), { name: projectName }) })
|
|
125
|
+
: value;
|
|
135
126
|
});
|
|
136
127
|
return interpolatedArgs;
|
|
137
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare function getOutputs(p: Record<string, ProjectGraphProjectNode>, t
|
|
|
15
15
|
*/
|
|
16
16
|
export declare function getOutputsForTargetAndConfiguration(task: Pick<Task, 'target' | 'overrides'>, node: ProjectGraphProjectNode): any;
|
|
17
17
|
export declare function unparse(options: Object): string[];
|
|
18
|
+
export declare function interpolate(template: string, data: any): string;
|
|
18
19
|
export declare function getExecutorNameForTask(task: Task, workspace: Workspaces): string;
|
|
19
20
|
export declare function getExecutorForTask(task: Task, workspace: Workspaces): import("../config/misc-interfaces").ExecutorConfig;
|
|
20
21
|
export declare function getCustomHasher(task: Task, workspace: Workspaces): import("../config/misc-interfaces").CustomHasher;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.unparse = exports.getOutputsForTargetAndConfiguration = exports.getOutputs = exports.getDependencyConfigs = exports.getCommandAsString = void 0;
|
|
3
|
+
exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.interpolate = exports.unparse = exports.getOutputsForTargetAndConfiguration = exports.getOutputs = exports.getDependencyConfigs = exports.getCommandAsString = void 0;
|
|
4
4
|
const flat_1 = require("flat");
|
|
5
5
|
const output_1 = require("../utils/output");
|
|
6
6
|
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
@@ -9,6 +9,8 @@ const path_1 = require("path");
|
|
|
9
9
|
const nx_plugin_1 = require("../utils/nx-plugin");
|
|
10
10
|
const package_manager_1 = require("../utils/package-manager");
|
|
11
11
|
const workspace_root_1 = require("../utils/workspace-root");
|
|
12
|
+
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
13
|
+
const path_2 = require("nx/src/utils/path");
|
|
12
14
|
function getCommandAsString(task) {
|
|
13
15
|
const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
|
|
14
16
|
const args = getPrintableCommandArgsForTask(task);
|
|
@@ -60,7 +62,15 @@ function getOutputsForTargetAndConfiguration(task, node) {
|
|
|
60
62
|
const options = Object.assign(Object.assign(Object.assign({}, targets.options), (_a = targets === null || targets === void 0 ? void 0 : targets.configurations) === null || _a === void 0 ? void 0 : _a[configuration]), task.overrides);
|
|
61
63
|
if (targets === null || targets === void 0 ? void 0 : targets.outputs) {
|
|
62
64
|
return targets.outputs
|
|
63
|
-
.map((output) =>
|
|
65
|
+
.map((output) => {
|
|
66
|
+
const interpolated = interpolate(output, {
|
|
67
|
+
options,
|
|
68
|
+
project: Object.assign(Object.assign({}, node.data), { name: node.name }),
|
|
69
|
+
});
|
|
70
|
+
return (0, fileutils_1.isRelativePath)(interpolated)
|
|
71
|
+
? (0, path_2.joinPathFragments)(node.data.root, interpolated)
|
|
72
|
+
: interpolated;
|
|
73
|
+
})
|
|
64
74
|
.filter((output) => !!output);
|
|
65
75
|
}
|
|
66
76
|
// Keep backwards compatibility in case `outputs` doesn't exist
|
|
@@ -119,10 +129,10 @@ function unparseOption(key, value, unparsed) {
|
|
|
119
129
|
function stringShouldBeWrappedIntoQuotes(str) {
|
|
120
130
|
return str.includes(' ') || str.includes('{') || str.includes('"');
|
|
121
131
|
}
|
|
122
|
-
function
|
|
132
|
+
function interpolate(template, data) {
|
|
123
133
|
return template.replace(/{([\s\S]+?)}/g, (match) => {
|
|
124
134
|
let value = data;
|
|
125
|
-
let path = match.slice(1, -1).trim().split('.')
|
|
135
|
+
let path = match.slice(1, -1).trim().split('.');
|
|
126
136
|
for (let idx = 0; idx < path.length; idx++) {
|
|
127
137
|
if (!value[path[idx]]) {
|
|
128
138
|
return;
|
|
@@ -132,6 +142,7 @@ function interpolateOutputs(template, data) {
|
|
|
132
142
|
return value;
|
|
133
143
|
});
|
|
134
144
|
}
|
|
145
|
+
exports.interpolate = interpolate;
|
|
135
146
|
function getExecutorNameForTask(task, workspace) {
|
|
136
147
|
const workspaceConfiguration = workspace.readWorkspaceConfiguration();
|
|
137
148
|
const project = workspaceConfiguration.projects[task.target.project];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,4CAAyC;AAEzC,sEAA0E;AAC1E,2BAAgC;AAChC,+BAA4B;AAC5B,kDAG4B;AAE5B,8DAAoE;AAGpE,4DAAwD;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const angularCliVersion = "~14.0.0
|
|
2
|
+
export declare const angularCliVersion = "~14.0.0";
|
|
3
3
|
export declare const typescriptVersion = "~4.7.2";
|
|
4
|
-
export declare const prettierVersion = "^2.
|
|
4
|
+
export declare const prettierVersion = "^2.6.2";
|
|
5
5
|
export declare const tslintVersion = "~6.1.0";
|
|
6
6
|
export declare const typescriptESLintVersion = "~5.24.0";
|
|
7
7
|
export declare const eslintVersion = "~8.15.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.swcCoreVersion = exports.swcNodeVersion = exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
|
-
exports.angularCliVersion = '~14.0.0
|
|
5
|
+
exports.angularCliVersion = '~14.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.7.2';
|
|
7
|
-
exports.prettierVersion = '^2.
|
|
7
|
+
exports.prettierVersion = '^2.6.2';
|
|
8
8
|
exports.tslintVersion = '~6.1.0';
|
|
9
9
|
exports.typescriptESLintVersion = '~5.24.0';
|
|
10
10
|
exports.eslintVersion = '~8.15.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC;AACtC,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,cAAc,GAAG,UAAU,CAAC"}
|