nx 16.0.0 → 16.0.2
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/README.md +3 -3
- package/package.json +15 -15
- package/src/adapter/ngcli-adapter.d.ts +3 -3
- package/src/adapter/ngcli-adapter.js +7 -5
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/examples.js +6 -6
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/migrate.d.ts +1 -0
- package/src/command-line/migrate.js +4 -1
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +6 -13
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/report.js +39 -5
- package/src/command-line/report.js.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +3 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/devkit-internals.d.ts +6 -0
- package/src/devkit-internals.js +11 -0
- package/src/devkit-internals.js.map +1 -0
- package/src/executors/run-commands/run-commands.impl.js +4 -0
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/nx-init/react/index.js +40 -3
- package/src/nx-init/react/index.js.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/typescript-import-locator.js +2 -0
- package/src/plugins/js/project-graph/build-dependencies/typescript-import-locator.js.map +1 -1
- package/src/project-graph/affected/locators/project-glob-changes.d.ts +1 -3
- package/src/project-graph/affected/locators/project-glob-changes.js +7 -3
- package/src/project-graph/affected/locators/project-glob-changes.js.map +1 -1
- package/src/project-graph/project-graph-builder.js +12 -9
- package/src/project-graph/project-graph-builder.js.map +1 -1
- package/src/utils/command-line-utils.js +43 -8
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/find-matching-projects.js +11 -2
- package/src/utils/find-matching-projects.js.map +1 -1
- package/src/utils/package-manager.d.ts +2 -1
- package/src/utils/package-manager.js +21 -9
- package/src/utils/package-manager.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-builder.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph-builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project-graph-builder.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/project-graph-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,14 +113,7 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
113
113
|
if (!nxArgs.skipNxCache) {
|
|
114
114
|
nxArgs.skipNxCache = process.env.NX_SKIP_NX_CACHE === 'true';
|
|
115
115
|
}
|
|
116
|
-
|
|
117
|
-
nxArgs.runner = process.env.NX_RUNNER;
|
|
118
|
-
if (options.printWarnings) {
|
|
119
|
-
output_1.output.note({
|
|
120
|
-
title: `No explicit --runner argument provided, but found environment variable NX_RUNNER so using its value: ${output_1.output.bold(`${nxArgs.runner}`)}`,
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
}
|
|
116
|
+
normalizeNxArgsRunner(nxArgs, nxJson, options);
|
|
124
117
|
if (args['parallel'] === 'false' || args['parallel'] === false) {
|
|
125
118
|
nxArgs['parallel'] = 1;
|
|
126
119
|
}
|
|
@@ -136,6 +129,48 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
136
129
|
return { nxArgs, overrides };
|
|
137
130
|
}
|
|
138
131
|
exports.splitArgsIntoNxArgsAndOverrides = splitArgsIntoNxArgsAndOverrides;
|
|
132
|
+
function normalizeNxArgsRunner(nxArgs, nxJson, options) {
|
|
133
|
+
var _a;
|
|
134
|
+
if (!nxArgs.runner) {
|
|
135
|
+
// TODO: Remove NX_RUNNER environment variable support in Nx v17
|
|
136
|
+
for (const envKey of ['NX_TASKS_RUNNER', 'NX_RUNNER']) {
|
|
137
|
+
const runner = process.env[envKey];
|
|
138
|
+
if (runner) {
|
|
139
|
+
const runnerExists = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a[runner];
|
|
140
|
+
if (options.printWarnings) {
|
|
141
|
+
if (runnerExists) {
|
|
142
|
+
output_1.output.note({
|
|
143
|
+
title: `No explicit --runner argument provided, but found environment variable ${envKey} so using its value: ${output_1.output.bold(`${runner}`)}`,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
else if (nxArgs.verbose ||
|
|
147
|
+
process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
148
|
+
output_1.output.warn({
|
|
149
|
+
title: `Could not find ${output_1.output.bold(`${runner}`)} within \`nx.json\` tasksRunnerOptions.`,
|
|
150
|
+
bodyLines: [
|
|
151
|
+
`${output_1.output.bold(`${runner}`)} was set by ${envKey}`,
|
|
152
|
+
``,
|
|
153
|
+
`To suppress this message, either:`,
|
|
154
|
+
` - provide a valid task runner with --runner`,
|
|
155
|
+
` - ensure NX_TASKS_RUNNER matches a task runner defined in nx.json`,
|
|
156
|
+
],
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (runnerExists) {
|
|
161
|
+
// TODO: Remove in v17
|
|
162
|
+
if (envKey === 'NX_RUNNER' && options.printWarnings) {
|
|
163
|
+
output_1.output.warn({
|
|
164
|
+
title: 'NX_RUNNER is deprecated, please use NX_TASKS_RUNNER instead.',
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
nxArgs.runner = runner;
|
|
168
|
+
}
|
|
169
|
+
break;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
139
174
|
function parseFiles(options) {
|
|
140
175
|
const { files, uncommitted, untracked, base, head } = options;
|
|
141
176
|
if (files) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,10 +17,16 @@ const globCharacters = ['*', '|', '{', '}', '(', ')'];
|
|
|
17
17
|
* @returns
|
|
18
18
|
*/
|
|
19
19
|
function findMatchingProjects(patterns = [], projects) {
|
|
20
|
+
if (!patterns.length || patterns.filter((p) => p.length).length === 0) {
|
|
21
|
+
return []; // Short circuit if called with no patterns
|
|
22
|
+
}
|
|
20
23
|
const projectNames = keys(projects);
|
|
21
24
|
const selectedProjects = new Set();
|
|
22
25
|
const excludedProjects = new Set();
|
|
23
26
|
for (const stringPattern of patterns) {
|
|
27
|
+
if (!stringPattern.length) {
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
24
30
|
const pattern = parseStringPattern(stringPattern, projects);
|
|
25
31
|
// Handle wildcard with short-circuit, as its a common case with potentially
|
|
26
32
|
// large project sets and we can avoid the more expensive glob matching.
|
|
@@ -157,16 +163,19 @@ function isValidPatternType(type) {
|
|
|
157
163
|
exports.getMatchingStringsWithCache = (() => {
|
|
158
164
|
// Map< Pattern, Map< Item, Result >>
|
|
159
165
|
const minimatchCache = new Map();
|
|
166
|
+
const regexCache = new Map();
|
|
160
167
|
return (pattern, items) => {
|
|
161
168
|
if (!minimatchCache.has(pattern)) {
|
|
162
169
|
minimatchCache.set(pattern, new Map());
|
|
163
170
|
}
|
|
164
171
|
const patternCache = minimatchCache.get(pattern);
|
|
165
|
-
|
|
172
|
+
if (!regexCache.has(pattern)) {
|
|
173
|
+
regexCache.set(pattern, minimatch.makeRe(pattern));
|
|
174
|
+
}
|
|
175
|
+
const matcher = regexCache.get(pattern);
|
|
166
176
|
return items.filter((item) => {
|
|
167
177
|
let entry = patternCache.get(item);
|
|
168
178
|
if (entry === undefined || entry === null) {
|
|
169
|
-
matcher !== null && matcher !== void 0 ? matcher : (matcher = minimatch.makeRe(pattern));
|
|
170
179
|
entry = item === pattern ? true : matcher.test(item);
|
|
171
180
|
patternCache.set(item, entry);
|
|
172
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-matching-projects.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-matching-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AAOxC,MAAM,iBAAiB,GAAG;IACxB,MAAM;IACN,KAAK;IACL,WAAW;IACX,WAAW,EAAE,+CAA+C;CACpD,CAAC;AAYX,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEtD;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,WAAqB,EAAE,EACvB,QAAwB;IAExB,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAChD,MAAM,gBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEhD,KAAK,MAAM,aAAa,IAAI,QAAQ,EAAE;QACpC,MAAM,OAAO,GAAG,kBAAkB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAE5D,4EAA4E;QAC5E,wEAAwE;QACxE,IAAI,OAAO,CAAC,KAAK,KAAK,GAAG,EAAE;YACzB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;gBACtC,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;iBACnC;qBAAM;oBACL,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;iBACnC;aACF;YACD,SAAS;SACV;QAED,QAAQ,OAAO,CAAC,IAAI,EAAE;YACpB,KAAK,KAAK,CAAC,CAAC;gBACV,wBAAwB,CACtB,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;gBACF,SAAS;aACV;YACD,KAAK,MAAM,CAAC,CAAC;gBACX,yBAAyB,CACvB,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;gBACF,SAAS;aACV;YACD,KAAK,WAAW,CAAC,CAAC;gBAChB,8BAA8B,CAC5B,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;gBACF,SAAS;aACV;YACD,8DAA8D;YAC9D,qEAAqE;YACrE,OAAO,CAAC,CAAC;gBACP,gEAAgE;gBAChE,+DAA+D;gBAC/D,sDAAsD;gBACtD,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC;gBACnE,yBAAyB,CACvB,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;gBACF,IAAI,gBAAgB,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,GAAG,YAAY,EAAE;oBAChE,wDAAwD;oBACxD,SAAS;iBACV;gBACD,8BAA8B,CAC5B,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,gBAAgB,EAChB,gBAAgB,CACjB,CAAC;gBACF,IAAI,gBAAgB,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,GAAG,YAAY,EAAE;oBAChE,6DAA6D;oBAC7D,kEAAkE;oBAClE,QAAQ;oBACR,SAAS;iBACV;aACF;SACF;KACF;IAED,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;QACtC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAClC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;AACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"find-matching-projects.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-matching-projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,8 @@ export declare function getPackageManagerVersion(packageManager?: PackageManager
|
|
|
35
35
|
* Checks for a project level npmrc file by crawling up the file tree until
|
|
36
36
|
* hitting a package.json file, as this is how npm finds them as well.
|
|
37
37
|
*/
|
|
38
|
-
export declare function
|
|
38
|
+
export declare function findFileInPackageJsonDirectory(file: string, directory?: string): string | null;
|
|
39
|
+
export declare function copyPackageManagerConfigurationFiles(root: string, destination: string): void;
|
|
39
40
|
/**
|
|
40
41
|
* Creates a temporary directory where you can run package manager commands safely.
|
|
41
42
|
*
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.packageRegistryPack = exports.packageRegistryView = exports.resolvePackageVersionUsingInstallation = exports.resolvePackageVersionUsingRegistry = exports.createTempNpmDirectory = exports.
|
|
3
|
+
exports.packageRegistryPack = exports.packageRegistryView = exports.resolvePackageVersionUsingInstallation = exports.resolvePackageVersionUsingRegistry = exports.createTempNpmDirectory = exports.copyPackageManagerConfigurationFiles = exports.findFileInPackageJsonDirectory = exports.getPackageManagerVersion = exports.getPackageManagerCommand = exports.detectPackageManager = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs_1 = require("fs");
|
|
@@ -11,6 +11,7 @@ const util_1 = require("util");
|
|
|
11
11
|
const fileutils_1 = require("./fileutils");
|
|
12
12
|
const package_json_1 = require("./package-json");
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
|
+
const workspace_root_1 = require("./workspace-root");
|
|
14
15
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
15
16
|
/**
|
|
16
17
|
* Detects which package manager is used in the workspace based on the lock file.
|
|
@@ -99,14 +100,29 @@ exports.getPackageManagerVersion = getPackageManagerVersion;
|
|
|
99
100
|
* Checks for a project level npmrc file by crawling up the file tree until
|
|
100
101
|
* hitting a package.json file, as this is how npm finds them as well.
|
|
101
102
|
*/
|
|
102
|
-
function
|
|
103
|
+
function findFileInPackageJsonDirectory(file, directory = process.cwd()) {
|
|
103
104
|
while (!(0, fs_1.existsSync)((0, path_1.join)(directory, 'package.json'))) {
|
|
104
105
|
directory = (0, path_1.dirname)(directory);
|
|
105
106
|
}
|
|
106
|
-
const path = (0, path_1.join)(directory,
|
|
107
|
+
const path = (0, path_1.join)(directory, file);
|
|
107
108
|
return (0, fs_1.existsSync)(path) ? path : null;
|
|
108
109
|
}
|
|
109
|
-
exports.
|
|
110
|
+
exports.findFileInPackageJsonDirectory = findFileInPackageJsonDirectory;
|
|
111
|
+
function copyPackageManagerConfigurationFiles(root, destination) {
|
|
112
|
+
for (const packageManagerConfigFile of ['.npmrc', '.yarnrc', '.yarnrc.yml']) {
|
|
113
|
+
// f is an absolute path, including the {workspaceRoot}.
|
|
114
|
+
const f = findFileInPackageJsonDirectory(packageManagerConfigFile, root);
|
|
115
|
+
if (f) {
|
|
116
|
+
// Destination should be the same relative path from the {workspaceRoot},
|
|
117
|
+
// but now relative to the destination. `relative` makes `{workspaceRoot}/some/path`
|
|
118
|
+
// look like `./some/path`, and joining that gets us `{destination}/some/path
|
|
119
|
+
const destinationPath = (0, path_1.join)(destination, (0, path_1.relative)(root, f));
|
|
120
|
+
// Copy config file if it exists, so that the package manager still follows it.
|
|
121
|
+
(0, fs_1.copyFileSync)(f, destinationPath);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
exports.copyPackageManagerConfigurationFiles = copyPackageManagerConfigurationFiles;
|
|
110
126
|
/**
|
|
111
127
|
* Creates a temporary directory where you can run package manager commands safely.
|
|
112
128
|
*
|
|
@@ -118,11 +134,7 @@ function createTempNpmDirectory() {
|
|
|
118
134
|
const dir = (0, tmp_1.dirSync)().name;
|
|
119
135
|
// A package.json is needed for pnpm pack and for .npmrc to resolve
|
|
120
136
|
(0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
|
|
121
|
-
|
|
122
|
-
if (npmrc) {
|
|
123
|
-
// Copy npmrc if it exists, so that npm still follows it.
|
|
124
|
-
(0, fs_1.copyFileSync)(npmrc, `${dir}/.npmrc`);
|
|
125
|
-
}
|
|
137
|
+
copyPackageManagerConfigurationFiles(workspace_root_1.workspaceRoot, dir);
|
|
126
138
|
const cleanup = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
127
139
|
try {
|
|
128
140
|
yield (0, fs_extra_1.remove)(dir);
|
|
@@ -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,+
|
|
1
|
+
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
|