nx 14.0.3 → 14.0.4
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/migrations.json +8 -1
- package/package.json +4 -4
- package/src/adapter/ngcli-adapter.d.ts +1 -1
- package/src/adapter/ngcli-adapter.js +4 -2
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/generate.js +1 -1
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/migrate.js +12 -18
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.d.ts +1 -0
- package/src/command-line/nx-commands.js +7 -12
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -0
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/nx-json.d.ts +0 -7
- package/src/config/project-graph.d.ts +1 -1
- package/src/config/workspaces.js +11 -3
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/daemon/client/client.js +3 -0
- package/src/daemon/client/client.js.map +1 -1
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts +6 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js +46 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js.map +1 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +5 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js +35 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -0
- package/src/generators/testing-utils/create-tree.d.ts +5 -0
- package/src/generators/testing-utils/create-tree.js +12 -0
- package/src/generators/testing-utils/create-tree.js.map +1 -0
- package/src/{config → generators}/tree.d.ts +0 -0
- package/src/{config → generators}/tree.js +0 -0
- package/src/generators/tree.js.map +1 -0
- package/src/generators/utils/json.d.ts +28 -0
- package/src/generators/utils/json.js +49 -0
- package/src/generators/utils/json.js.map +1 -0
- package/src/generators/utils/project-configuration.d.ts +77 -0
- package/src/generators/utils/project-configuration.js +383 -0
- package/src/generators/utils/project-configuration.js.map +1 -0
- package/src/migrations/update-14-0-4/remove-roots.d.ts +2 -0
- package/src/migrations/update-14-0-4/remove-roots.js +16 -0
- package/src/migrations/update-14-0-4/remove-roots.js.map +1 -0
- package/src/project-graph/build-project-graph.js +20 -17
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/operators.d.ts +0 -8
- package/src/project-graph/operators.js +1 -12
- package/src/project-graph/operators.js.map +1 -1
- package/src/tasks-runner/run-command.js +5 -24
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/utils/nx-plugin.js +12 -3
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/package-manager.d.ts +4 -1
- package/src/utils/package-manager.js +14 -10
- package/src/utils/package-manager.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/config/tree.js.map +0 -1
|
@@ -4,7 +4,6 @@ exports.getRunner = exports.createTask = exports.createTasksForProjectToRun = ex
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const app_root_1 = require("../utils/app-root");
|
|
7
|
-
const logger_1 = require("../utils/logger");
|
|
8
7
|
const fileutils_1 = require("../utils/fileutils");
|
|
9
8
|
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
10
9
|
const output_1 = require("../utils/output");
|
|
@@ -64,8 +63,6 @@ function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, p
|
|
|
64
63
|
function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides, terminalOutputStrategy, initiatingProject) {
|
|
65
64
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
66
65
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
|
67
|
-
// Doing this for backwards compatibility, should be removed in v14
|
|
68
|
-
ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs);
|
|
69
66
|
const defaultDependencyConfigs = nxJson.targetDependencies;
|
|
70
67
|
const tasks = createTasksForProjectToRun(projectsToRun, {
|
|
71
68
|
target: nxArgs.target,
|
|
@@ -217,7 +214,7 @@ function addTasksForProjectDependencyConfig(project, { target, configuration, ov
|
|
|
217
214
|
hasTarget: (0, project_graph_utils_1.projectHasTarget)(project, target),
|
|
218
215
|
};
|
|
219
216
|
const newPath = [...path, pathFragment];
|
|
220
|
-
seenSet.add(
|
|
217
|
+
seenSet.add(targetIdentifier);
|
|
221
218
|
if (tasksMap.has(targetIdentifier)) {
|
|
222
219
|
return;
|
|
223
220
|
}
|
|
@@ -230,11 +227,11 @@ function addTasksForProjectDependencyConfig(project, { target, configuration, ov
|
|
|
230
227
|
(0, project_graph_utils_1.projectHasTarget)(depProject, dependencyConfig.target)) {
|
|
231
228
|
const depTargetId = getId({
|
|
232
229
|
project: depProject.name,
|
|
233
|
-
target,
|
|
230
|
+
target: dependencyConfig.target,
|
|
234
231
|
configuration: configuration,
|
|
235
232
|
});
|
|
236
233
|
exitOnCircularDep(newPath, depTargetId);
|
|
237
|
-
if (seenSet.has(
|
|
234
|
+
if (seenSet.has(depTargetId)) {
|
|
238
235
|
continue;
|
|
239
236
|
}
|
|
240
237
|
addTasksForProjectTarget({
|
|
@@ -247,16 +244,15 @@ function addTasksForProjectDependencyConfig(project, { target, configuration, ov
|
|
|
247
244
|
}
|
|
248
245
|
else {
|
|
249
246
|
if (!depProject) {
|
|
250
|
-
seenSet.add(dep.target);
|
|
251
247
|
continue;
|
|
252
248
|
}
|
|
253
249
|
const depTargetId = getId({
|
|
254
250
|
project: depProject.name,
|
|
255
|
-
target,
|
|
251
|
+
target: dependencyConfig.target,
|
|
256
252
|
configuration: configuration,
|
|
257
253
|
});
|
|
258
254
|
exitOnCircularDep(newPath, depTargetId);
|
|
259
|
-
if (seenSet.has(
|
|
255
|
+
if (seenSet.has(depTargetId)) {
|
|
260
256
|
continue;
|
|
261
257
|
}
|
|
262
258
|
addTasksForProjectDependencyConfig(depProject, { target, configuration, overrides }, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
@@ -359,19 +355,4 @@ function interpolateOverrides(args, projectName, projectMetadata) {
|
|
|
359
355
|
});
|
|
360
356
|
return interpolatedArgs;
|
|
361
357
|
}
|
|
362
|
-
function ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs) {
|
|
363
|
-
var _a;
|
|
364
|
-
(_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : (nxJson.targetDependencies = {});
|
|
365
|
-
if (nxArgs.withDeps) {
|
|
366
|
-
logger_1.logger.warn((0, logger_1.stripIndent)(`
|
|
367
|
-
DEPRECATION WARNING: --with-deps is deprecated and it will be removed in v14.
|
|
368
|
-
Configure target dependencies instead: https://nx.dev/configuration/projectjson
|
|
369
|
-
`));
|
|
370
|
-
if (!nxJson.targetDependencies[nxArgs.target]) {
|
|
371
|
-
nxJson.targetDependencies[nxArgs.target] = [
|
|
372
|
-
{ target: nxArgs.target, projects: 'dependencies' },
|
|
373
|
-
];
|
|
374
|
-
}
|
|
375
|
-
}
|
|
376
|
-
}
|
|
377
358
|
//# sourceMappingURL=run-command.js.map
|
|
@@ -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/nx-plugin.js
CHANGED
|
@@ -9,6 +9,7 @@ const app_root_1 = require("../utils/app-root");
|
|
|
9
9
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
10
|
const register_1 = require("./register");
|
|
11
11
|
const target_project_locator_1 = require("./target-project-locator");
|
|
12
|
+
const logger_1 = require("./logger");
|
|
12
13
|
// Short lived cache (cleared between cmd runs)
|
|
13
14
|
// holding resolved nx plugin objects.
|
|
14
15
|
// Allows loadNxPlugins to be called multiple times w/o
|
|
@@ -27,8 +28,16 @@ function loadNxPlugins(plugins, paths = [app_root_1.workspaceRoot]) {
|
|
|
27
28
|
catch (e) {
|
|
28
29
|
if (e.code === 'MODULE_NOT_FOUND') {
|
|
29
30
|
const plugin = resolveLocalNxPlugin(moduleName);
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
if (plugin) {
|
|
32
|
+
const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
|
|
33
|
+
pluginPath = main
|
|
34
|
+
? path.join(app_root_1.workspaceRoot, main)
|
|
35
|
+
: plugin.path;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
logger_1.logger.error(`Plugin listed in \`nx.json\` not found: ${moduleName}`);
|
|
39
|
+
throw e;
|
|
40
|
+
}
|
|
32
41
|
}
|
|
33
42
|
else {
|
|
34
43
|
throw e;
|
|
@@ -155,7 +164,7 @@ function readTsConfigPaths(root = app_root_1.workspaceRoot) {
|
|
|
155
164
|
const { compilerOptions } = (0, fileutils_1.readJsonFile)(tsconfigPath);
|
|
156
165
|
tsconfigPaths = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.paths;
|
|
157
166
|
}
|
|
158
|
-
return tsconfigPaths;
|
|
167
|
+
return tsconfigPaths !== null && tsconfigPaths !== void 0 ? tsconfigPaths : {};
|
|
159
168
|
}
|
|
160
169
|
function readPluginMainFromProjectConfiguration(plugin) {
|
|
161
170
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,2BAAgC;AAChC,6BAA6B;AAE7B,qDAAkD;AAElD,gDAAkD;AAClD,kDAAkD;AAElD,yCAA+C;AAM/C,qEAAsE;
|
|
1
|
+
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,10 @@ export declare function checkForNPMRC(directory?: string): string | null;
|
|
|
44
44
|
* this function looks up for the nearest `.npmrc` (if exists) and copies it over to the
|
|
45
45
|
* temp directory.
|
|
46
46
|
*/
|
|
47
|
-
export declare function createTempNpmDirectory():
|
|
47
|
+
export declare function createTempNpmDirectory(): {
|
|
48
|
+
dir: string;
|
|
49
|
+
cleanup: () => Promise<void>;
|
|
50
|
+
};
|
|
48
51
|
/**
|
|
49
52
|
* Returns the resolved version for a given package and version tag using the
|
|
50
53
|
* NPM registry (when using Yarn it will fall back to NPM to fetch the info).
|
|
@@ -9,6 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const tmp_1 = require("tmp");
|
|
10
10
|
const util_1 = require("util");
|
|
11
11
|
const fileutils_1 = require("./fileutils");
|
|
12
|
+
const semver_1 = require("semver");
|
|
12
13
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
13
14
|
/**
|
|
14
15
|
* Detects which package manager is used in the workspace based on the lock file.
|
|
@@ -46,9 +47,9 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
|
|
|
46
47
|
list: 'yarn list',
|
|
47
48
|
}),
|
|
48
49
|
pnpm: () => {
|
|
49
|
-
const
|
|
50
|
+
const pnpmVersion = getPackageManagerVersion('pnpm');
|
|
50
51
|
let useExec = false;
|
|
51
|
-
if (
|
|
52
|
+
if ((0, semver_1.gte)(pnpmVersion, '6.13.0')) {
|
|
52
53
|
useExec = true;
|
|
53
54
|
}
|
|
54
55
|
return {
|
|
@@ -120,7 +121,15 @@ function createTempNpmDirectory() {
|
|
|
120
121
|
// Copy npmrc if it exists, so that npm still follows it.
|
|
121
122
|
(0, fs_1.copyFileSync)(npmrc, `${dir}/.npmrc`);
|
|
122
123
|
}
|
|
123
|
-
|
|
124
|
+
const cleanup = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
try {
|
|
126
|
+
yield (0, fs_extra_1.remove)(dir);
|
|
127
|
+
}
|
|
128
|
+
catch (_a) {
|
|
129
|
+
// It's okay if this fails, the OS will clean it up eventually
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
return { dir, cleanup };
|
|
124
133
|
}
|
|
125
134
|
exports.createTempNpmDirectory = createTempNpmDirectory;
|
|
126
135
|
/**
|
|
@@ -156,7 +165,7 @@ exports.resolvePackageVersionUsingRegistry = resolvePackageVersionUsingRegistry;
|
|
|
156
165
|
*/
|
|
157
166
|
function resolvePackageVersionUsingInstallation(packageName, version) {
|
|
158
167
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
159
|
-
const dir = createTempNpmDirectory();
|
|
168
|
+
const { dir, cleanup } = createTempNpmDirectory();
|
|
160
169
|
try {
|
|
161
170
|
const pmc = getPackageManagerCommand();
|
|
162
171
|
yield execAsync(`${pmc.add} ${packageName}@${version}`, { cwd: dir });
|
|
@@ -166,12 +175,7 @@ function resolvePackageVersionUsingInstallation(packageName, version) {
|
|
|
166
175
|
return (0, fileutils_1.readJsonFile)(packageJsonPath).version;
|
|
167
176
|
}
|
|
168
177
|
finally {
|
|
169
|
-
|
|
170
|
-
yield (0, fs_extra_1.remove)(dir);
|
|
171
|
-
}
|
|
172
|
-
catch (_a) {
|
|
173
|
-
// It's okay if this fails, the OS will clean it up eventually
|
|
174
|
-
}
|
|
178
|
+
yield cleanup();
|
|
175
179
|
}
|
|
176
180
|
});
|
|
177
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":";;;;AAAA,iDAA+C;AAC/C,2BAA8C;AAC9C,uCAAkC;AAClC,+BAAqC;AACrC,6BAA8B;AAC9B,+BAAiC;AACjC,2CAA0D;
|
|
1
|
+
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.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 = '14.0.
|
|
4
|
+
exports.nxVersion = '14.0.4';
|
|
5
5
|
exports.angularCliVersion = '~13.2.0';
|
|
6
6
|
exports.typescriptVersion = '~4.5.2';
|
|
7
7
|
exports.prettierVersion = '^2.5.1';
|
package/src/config/tree.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../../packages/nx/src/config/tree.ts"],"names":[],"mappings":"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"}
|