nx 23.1.1 → 23.1.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/dist/release/changelog-renderer/index.js +4 -5
- package/dist/release/index.d.ts +1 -1
- package/dist/src/command-line/add/add.js +5 -0
- package/dist/src/command-line/affected/affected.js +1 -0
- package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js +2 -2
- package/dist/src/command-line/import/import.js +1 -2
- package/dist/src/command-line/init/init-v2.js +4 -5
- package/dist/src/command-line/migrate/migrate.d.ts +4 -0
- package/dist/src/command-line/migrate/migrate.js +89 -26
- package/dist/src/command-line/release/changelog.js +5 -0
- package/dist/src/command-line/release/index.d.ts +1 -1
- package/dist/src/command-line/release/utils/git.js +1 -1
- package/dist/src/command-line/release/utils/release-graph.d.ts +17 -0
- package/dist/src/command-line/release/utils/release-graph.js +71 -19
- package/dist/src/command-line/release/utils/remote-release-clients/github.js +6 -0
- package/dist/src/command-line/release/version/release-group-processor.d.ts +24 -0
- package/dist/src/command-line/release/version/release-group-processor.js +80 -6
- package/dist/src/command-line/release/version/version-actions.d.ts +27 -2
- package/dist/src/command-line/release/version/version-actions.js +9 -1
- package/dist/src/command-line/release/version.js +9 -5
- package/dist/src/command-line/reset/reset.js +6 -1
- package/dist/src/command-line/run/run-one.js +1 -0
- package/dist/src/command-line/run-many/run-many.js +1 -0
- package/dist/src/command-line/watch/watch.js +13 -0
- package/dist/src/core/graph/main.js +1 -1
- package/dist/src/core/graph/styles.js +1 -1
- package/dist/src/daemon/client/client.d.ts +52 -1
- package/dist/src/daemon/client/client.js +160 -36
- package/dist/src/daemon/client/daemon-environment.d.ts +17 -0
- package/dist/src/daemon/client/daemon-environment.js +110 -2
- package/dist/src/daemon/client/daemon-socket-messenger.js +4 -0
- package/dist/src/daemon/message-types/daemon-message.d.ts +32 -0
- package/dist/src/daemon/message-types/daemon-message.js +25 -0
- package/dist/src/daemon/server/file-watching/file-watcher-sockets.d.ts +5 -0
- package/dist/src/daemon/server/file-watching/file-watcher-sockets.js +16 -0
- package/dist/src/daemon/server/latest-nx.js +5 -2
- package/dist/src/daemon/server/server.js +24 -0
- package/dist/src/daemon/server/shutdown-utils.d.ts +5 -0
- package/dist/src/daemon/server/shutdown-utils.js +11 -4
- package/dist/src/daemon/socket-utils.d.ts +1 -0
- package/dist/src/daemon/socket-utils.js +24 -3
- package/dist/src/daemon/tmp-dir.d.ts +43 -3
- package/dist/src/daemon/tmp-dir.js +437 -15
- package/dist/src/devkit-internals.d.ts +93 -3
- package/dist/src/devkit-internals.js +192 -5
- package/dist/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts +5 -0
- package/dist/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js +9 -2
- package/dist/src/generators/tree.d.ts +4 -2
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.d.ts +12 -0
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.js +250 -0
- package/dist/src/migrations/update-23-2-0/set-cache-on-executor-target-defaults.md +50 -0
- package/dist/src/native/index.d.ts +10 -0
- package/dist/src/native/index.js +71 -28
- package/dist/src/native/native-bindings.js +1 -0
- package/dist/src/native/native-file-cache-location.d.ts +17 -1
- package/dist/src/native/native-file-cache-location.js +86 -12
- package/dist/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/dist/src/native/nx.wasm32-wasi.wasm +0 -0
- package/dist/src/nx-cloud/utilities/get-cloud-options.js +5 -2
- package/dist/src/nx-cloud/utilities/onboarding.js +5 -2
- package/dist/src/plugins/js/lock-file/bun-parser.js +43 -10
- package/dist/src/plugins/js/lock-file/pnpm-parser.js +60 -0
- package/dist/src/plugins/js/lock-file/project-graph-pruning.js +14 -8
- package/dist/src/plugins/js/project-graph/affected/npm-packages.js +51 -20
- package/dist/src/plugins/js/project-graph/build-dependencies/target-project-locator.js +2 -0
- package/dist/src/project-graph/affected/affected-project-graph-models.d.ts +1 -1
- package/dist/src/project-graph/affected/affected-project-graph.d.ts +1 -1
- package/dist/src/project-graph/affected/affected-project-graph.js +2 -2
- package/dist/src/project-graph/affected/locators/project-glob-changes.js +5 -2
- package/dist/src/project-graph/error-types.d.ts +12 -1
- package/dist/src/project-graph/error-types.js +27 -2
- package/dist/src/project-graph/plugins/isolation/isolated-plugin.d.ts +1 -0
- package/dist/src/project-graph/plugins/isolation/isolated-plugin.js +18 -1
- package/dist/src/project-graph/plugins/isolation/messaging.d.ts +16 -3
- package/dist/src/project-graph/plugins/isolation/messaging.js +3 -0
- package/dist/src/project-graph/plugins/isolation/plugin-worker.js +58 -8
- package/dist/src/project-graph/project-graph.js +20 -0
- package/dist/src/project-graph/utils/project-configuration/project-nodes-manager.js +5 -1
- package/dist/src/project-graph/utils/project-configuration/target-normalization.js +133 -3
- package/dist/src/tasks-runner/task-env.js +5 -2
- package/dist/src/tasks-runner/utils.js +2 -6
- package/dist/src/utils/assert-workspace-validity.js +7 -2
- package/dist/src/utils/fileutils.d.ts +5 -0
- package/dist/src/utils/fileutils.js +7 -2
- package/dist/src/utils/git-worktrees.d.ts +30 -0
- package/dist/src/utils/git-worktrees.js +212 -0
- package/dist/src/utils/ignore.d.ts +128 -1
- package/dist/src/utils/ignore.js +182 -12
- package/dist/src/utils/long-running-target.d.ts +10 -0
- package/dist/src/utils/long-running-target.js +19 -0
- package/dist/src/utils/min-release-age/behavior/bun.js +7 -11
- package/dist/src/utils/min-release-age/behavior/npm.js +5 -2
- package/dist/src/utils/min-release-age/packument.js +1 -1
- package/dist/src/utils/nx-tmp-dir.d.ts +18 -0
- package/dist/src/utils/nx-tmp-dir.js +40 -0
- package/dist/src/utils/owned-private-dir.d.ts +132 -0
- package/dist/src/utils/owned-private-dir.js +323 -0
- package/dist/src/utils/package-manager-config/bunfig.d.ts +14 -0
- package/dist/src/utils/package-manager-config/bunfig.js +49 -0
- package/dist/src/utils/package-manager-config/npmrc.d.ts +23 -0
- package/dist/src/utils/package-manager-config/npmrc.js +124 -0
- package/dist/src/utils/package-manager-config/pnpm-config.d.ts +17 -0
- package/dist/src/utils/package-manager-config/pnpm-config.js +60 -0
- package/dist/src/utils/package-manager.d.ts +21 -2
- package/dist/src/utils/package-manager.js +244 -47
- package/dist/src/utils/provenance.js +6 -14
- package/dist/src/utils/registry-config/bun.d.ts +2 -0
- package/dist/src/utils/registry-config/bun.js +257 -0
- package/dist/src/utils/registry-config/index.d.ts +13 -0
- package/dist/src/utils/registry-config/index.js +102 -0
- package/dist/src/utils/registry-config/pnpm.d.ts +2 -0
- package/dist/src/utils/registry-config/pnpm.js +1551 -0
- package/dist/src/utils/registry-config/utils.d.ts +195 -0
- package/dist/src/utils/registry-config/utils.js +496 -0
- package/dist/src/utils/registry-config/yarn-berry.d.ts +2 -0
- package/dist/src/utils/registry-config/yarn-berry.js +612 -0
- package/dist/src/utils/registry-config/yarn-classic.d.ts +2 -0
- package/dist/src/utils/registry-config/yarn-classic.js +1001 -0
- package/dist/src/utils/safe-spawn.d.ts +24 -0
- package/dist/src/utils/safe-spawn.js +104 -0
- package/dist/src/utils/shell-quoting.d.ts +15 -0
- package/dist/src/utils/shell-quoting.js +35 -0
- package/dist/src/utils/wait-for-socket-connection.d.ts +11 -0
- package/dist/src/utils/wait-for-socket-connection.js +14 -8
- package/migrations.json +6 -0
- package/package.json +12 -12
- package/dist/src/utils/min-release-age/npmrc.d.ts +0 -15
- package/dist/src/utils/min-release-age/npmrc.js +0 -45
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.readNpmrcEntries = readNpmrcEntries;
|
|
4
|
+
exports.parseNpmrcContent = parseNpmrcContent;
|
|
5
|
+
exports.readNpmrcMap = readNpmrcMap;
|
|
6
|
+
exports.npmrcEntriesToMap = npmrcEntriesToMap;
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
/**
|
|
9
|
+
* Parses an .npmrc file into its `key = value` entries the way npm/yarn/pnpm do
|
|
10
|
+
* (via the `ini` package). Returns null when the file is missing, and
|
|
11
|
+
* 'unreadable' when it exists but cannot be read (permissions, a directory):
|
|
12
|
+
* package managers diverge on that state, so each caller decides whether to
|
|
13
|
+
* skip, warn, or abort rather than having it collapsed into "absent" here.
|
|
14
|
+
*/
|
|
15
|
+
function readNpmrcEntries(path) {
|
|
16
|
+
let raw;
|
|
17
|
+
try {
|
|
18
|
+
raw = (0, fs_1.readFileSync)(path, 'utf-8');
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
// ENOTDIR (a path through a non-directory) is another shape of absent, not an
|
|
22
|
+
// unreadable file.
|
|
23
|
+
return e?.code === 'ENOENT' || e?.code === 'ENOTDIR' ? null : 'unreadable';
|
|
24
|
+
}
|
|
25
|
+
return parseNpmrcContent(raw);
|
|
26
|
+
}
|
|
27
|
+
function parseNpmrcContent(raw) {
|
|
28
|
+
const entries = [];
|
|
29
|
+
// ini breaks lines on any run of CR/LF, so splitting on `\r?\n` here would
|
|
30
|
+
// hide everything after a bare CR that npm still reads.
|
|
31
|
+
for (const line of raw.split(/[\r\n]+/)) {
|
|
32
|
+
const trimmed = line.trim();
|
|
33
|
+
if (!trimmed || trimmed.startsWith('#') || trimmed.startsWith(';')) {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
// ini matches the header on the raw line, so an indented one stays a literal
|
|
37
|
+
// bare-flag key. Everything after a header nests under it, out of npm's flat
|
|
38
|
+
// lookup, so stop here.
|
|
39
|
+
if (/^\[[^\]]*\]\s*$/.test(line)) {
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
// ini reads a valueless line as the flag `true`; dropping it would lose a bare
|
|
43
|
+
// `always-auth`/`strict-ssl` and flip the credential/TLS decision built on it.
|
|
44
|
+
const eq = trimmed.indexOf('=');
|
|
45
|
+
const rawKey = iniUnsafe(eq === -1 ? trimmed : trimmed.slice(0, eq));
|
|
46
|
+
const value = eq === -1 ? 'true' : iniUnsafe(trimmed.slice(eq + 1));
|
|
47
|
+
// ini enables bracketedArray by default, so a `key[]` suffix appends under the
|
|
48
|
+
// bare key instead of making a literal `key[]` entry.
|
|
49
|
+
if (rawKey.length > 2 && rawKey.endsWith('[]')) {
|
|
50
|
+
entries.push({ key: rawKey.slice(0, -2), value, array: true });
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
entries.push({ key: rawKey, value });
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return entries;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Reads an .npmrc-format file into a map with ini's semantics for repeated
|
|
60
|
+
* keys: scalars last-write-wins, `key[]` values joined. Null and 'unreadable'
|
|
61
|
+
* pass through from {@link readNpmrcEntries}.
|
|
62
|
+
*/
|
|
63
|
+
function readNpmrcMap(path) {
|
|
64
|
+
const entries = readNpmrcEntries(path);
|
|
65
|
+
return Array.isArray(entries) ? npmrcEntriesToMap(entries) : entries;
|
|
66
|
+
}
|
|
67
|
+
/** Those entries under ini's semantics for repeated keys. */
|
|
68
|
+
function npmrcEntriesToMap(entries) {
|
|
69
|
+
const map = new Map();
|
|
70
|
+
for (const { key, value, array } of entries) {
|
|
71
|
+
// ini collects repeated `key[]` values into an array under the bare key, and
|
|
72
|
+
// npm rebuilds a config array from the env by splitting on a blank line, so
|
|
73
|
+
// join them that way.
|
|
74
|
+
const existing = map.get(key);
|
|
75
|
+
map.set(key, array && existing !== undefined ? `${existing}\n\n${value}` : value);
|
|
76
|
+
}
|
|
77
|
+
return map;
|
|
78
|
+
}
|
|
79
|
+
function isQuoted(val) {
|
|
80
|
+
return (val.length >= 2 &&
|
|
81
|
+
((val.startsWith('"') && val.endsWith('"')) ||
|
|
82
|
+
(val.startsWith("'") && val.endsWith("'"))));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Mirrors the `ini` package's `unsafe()`, except that ini JSON-decodes a
|
|
86
|
+
* single-quoted value's contents and we keep them verbatim; that only differs
|
|
87
|
+
* when the contents are valid JSON, never true for a registry, token, or path.
|
|
88
|
+
* See https://github.com/isaacs/ini/blob/a0c72fe9e335a3f949d734fb5ef13371a850bbe3/lib/ini.js#L230
|
|
89
|
+
*/
|
|
90
|
+
function iniUnsafe(raw) {
|
|
91
|
+
const val = raw.trim();
|
|
92
|
+
if (isQuoted(val)) {
|
|
93
|
+
if (val.startsWith("'")) {
|
|
94
|
+
return val.slice(1, -1);
|
|
95
|
+
}
|
|
96
|
+
try {
|
|
97
|
+
return JSON.parse(val);
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
return val;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
let esc = false;
|
|
104
|
+
let unesc = '';
|
|
105
|
+
for (const c of val) {
|
|
106
|
+
if (esc) {
|
|
107
|
+
unesc += '\\;#'.includes(c) ? c : `\\${c}`;
|
|
108
|
+
esc = false;
|
|
109
|
+
}
|
|
110
|
+
else if (c === ';' || c === '#') {
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
113
|
+
else if (c === '\\') {
|
|
114
|
+
esc = true;
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
unesc += c;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if (esc) {
|
|
121
|
+
unesc += '\\';
|
|
122
|
+
}
|
|
123
|
+
return unesc.trim();
|
|
124
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Mirrors pnpm's getConfigDir. Hosts pnpm's global config.yaml and (v11+)
|
|
3
|
+
* auth.ini.
|
|
4
|
+
* See https://github.com/pnpm/pnpm/blob/b7195db5c8469c80908d625c648302b26c2f9977/config/reader/src/dirs.ts#L73-L92
|
|
5
|
+
*/
|
|
6
|
+
export declare function getPnpmConfigDir(env: NodeJS.ProcessEnv): string;
|
|
7
|
+
/**
|
|
8
|
+
* Reads a pnpm YAML config file (pnpm-workspace.yaml or the global
|
|
9
|
+
* config.yaml). An absent file returns null so callers can fall through to
|
|
10
|
+
* lower surfaces; everything else returns 'unusable', which every caller turns
|
|
11
|
+
* into a throw. pnpm's own reader tolerates ENOENT alone and rethrows the rest,
|
|
12
|
+
* and it dies the same way on a document it cannot parse or that is not a
|
|
13
|
+
* mapping, so the two failures need no separate states. Requiring an object
|
|
14
|
+
* also keeps the sentinel out of the success domain: a returned string can only
|
|
15
|
+
* ever mean unusable.
|
|
16
|
+
*/
|
|
17
|
+
export declare function readPnpmYamlConfig(path: string): Record<string, unknown> | 'unusable' | null;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPnpmConfigDir = getPnpmConfigDir;
|
|
4
|
+
exports.readPnpmYamlConfig = readPnpmYamlConfig;
|
|
5
|
+
const os_1 = require("os");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const fileutils_1 = require("../fileutils");
|
|
8
|
+
/**
|
|
9
|
+
* Mirrors pnpm's getConfigDir. Hosts pnpm's global config.yaml and (v11+)
|
|
10
|
+
* auth.ini.
|
|
11
|
+
* See https://github.com/pnpm/pnpm/blob/b7195db5c8469c80908d625c648302b26c2f9977/config/reader/src/dirs.ts#L73-L92
|
|
12
|
+
*/
|
|
13
|
+
function getPnpmConfigDir(env) {
|
|
14
|
+
if (env.XDG_CONFIG_HOME) {
|
|
15
|
+
return (0, path_1.join)(env.XDG_CONFIG_HOME, 'pnpm');
|
|
16
|
+
}
|
|
17
|
+
if (process.platform === 'darwin') {
|
|
18
|
+
return (0, path_1.join)((0, os_1.homedir)(), 'Library/Preferences/pnpm');
|
|
19
|
+
}
|
|
20
|
+
if (process.platform !== 'win32') {
|
|
21
|
+
return (0, path_1.join)((0, os_1.homedir)(), '.config/pnpm');
|
|
22
|
+
}
|
|
23
|
+
if (env.LOCALAPPDATA) {
|
|
24
|
+
return (0, path_1.join)(env.LOCALAPPDATA, 'pnpm/config');
|
|
25
|
+
}
|
|
26
|
+
return (0, path_1.join)((0, os_1.homedir)(), '.config/pnpm');
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Reads a pnpm YAML config file (pnpm-workspace.yaml or the global
|
|
30
|
+
* config.yaml). An absent file returns null so callers can fall through to
|
|
31
|
+
* lower surfaces; everything else returns 'unusable', which every caller turns
|
|
32
|
+
* into a throw. pnpm's own reader tolerates ENOENT alone and rethrows the rest,
|
|
33
|
+
* and it dies the same way on a document it cannot parse or that is not a
|
|
34
|
+
* mapping, so the two failures need no separate states. Requiring an object
|
|
35
|
+
* also keeps the sentinel out of the success domain: a returned string can only
|
|
36
|
+
* ever mean unusable.
|
|
37
|
+
*/
|
|
38
|
+
function readPnpmYamlConfig(path) {
|
|
39
|
+
let doc;
|
|
40
|
+
try {
|
|
41
|
+
doc = (0, fileutils_1.readYamlFile)(path);
|
|
42
|
+
}
|
|
43
|
+
catch (e) {
|
|
44
|
+
// Only ENOENT resolves on, so a path through a non-directory or a file that
|
|
45
|
+
// will not open is fatal here. Callers whose pnpm counterpart looks the file
|
|
46
|
+
// up before reading it widen "absent" themselves.
|
|
47
|
+
if (e?.code === 'ENOENT') {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
return 'unusable';
|
|
51
|
+
}
|
|
52
|
+
// An empty file declares nothing; pnpm accepts it.
|
|
53
|
+
if (doc === null || doc === undefined) {
|
|
54
|
+
return {};
|
|
55
|
+
}
|
|
56
|
+
if (typeof doc !== 'object' || Array.isArray(doc)) {
|
|
57
|
+
return 'unusable';
|
|
58
|
+
}
|
|
59
|
+
return doc;
|
|
60
|
+
}
|
|
@@ -118,14 +118,33 @@ export declare function resolvePackageVersionUsingRegistry(packageName: string,
|
|
|
118
118
|
* package.json.
|
|
119
119
|
*/
|
|
120
120
|
export declare function resolvePackageVersionUsingInstallation(packageName: string, version: string): Promise<string>;
|
|
121
|
-
|
|
121
|
+
/**
|
|
122
|
+
* The registry the fetch for `pkg` went to, with its userinfo masked because a
|
|
123
|
+
* registry URL can carry a bare token. The lookup is spawned the way
|
|
124
|
+
* `packageRegistryView` spawns the fetch this describes (same manager, same
|
|
125
|
+
* environment), so a registry the package manager keeps outside the .npmrc
|
|
126
|
+
* chain and a scope resolved for itself both land on the value that fetch used.
|
|
127
|
+
* Null where the manager yields no usable registry URL; throws where it cannot be run.
|
|
128
|
+
*/
|
|
129
|
+
export declare function getWorkspaceRegistryUrlForDisplay(pkg: string): string | null;
|
|
130
|
+
export declare function packageRegistryView(pkg: string, version: string, args: string[], options?: {
|
|
122
131
|
forceNpm?: boolean;
|
|
123
132
|
}): Promise<string>;
|
|
124
|
-
|
|
133
|
+
/**
|
|
134
|
+
* Only `npm pack` supports downloading a tarball of a specified remote
|
|
135
|
+
* package. `yarn` packs the active workspace, `pnpm pack` only packs
|
|
136
|
+
* the local project, and `bun` doesn't support pack.
|
|
137
|
+
*
|
|
138
|
+
* @param packDestination Directory passed to npm's `--pack-destination`, where
|
|
139
|
+
* the `.tgz` is written.
|
|
140
|
+
* @see https://github.com/nrwl/nx/pull/9667#discussion_r842553994
|
|
141
|
+
*/
|
|
142
|
+
export declare function packageRegistryPack(packDestination: string, pkg: string, version: string, options?: {
|
|
125
143
|
bypassMinReleaseAge?: boolean;
|
|
126
144
|
}): Promise<{
|
|
127
145
|
tarballPath: string;
|
|
128
146
|
}>;
|
|
147
|
+
export declare function clearPackageManagerVersionCache(): void;
|
|
129
148
|
/**
|
|
130
149
|
* Gets the workspaces defined in the package manager configuration.
|
|
131
150
|
* @returns workspaces defined in the package manager configuration, empty array if none are defined
|
|
@@ -13,8 +13,10 @@ exports.copyPackageManagerConfigurationFiles = copyPackageManagerConfigurationFi
|
|
|
13
13
|
exports.createTempNpmDirectory = createTempNpmDirectory;
|
|
14
14
|
exports.resolvePackageVersionUsingRegistry = resolvePackageVersionUsingRegistry;
|
|
15
15
|
exports.resolvePackageVersionUsingInstallation = resolvePackageVersionUsingInstallation;
|
|
16
|
+
exports.getWorkspaceRegistryUrlForDisplay = getWorkspaceRegistryUrlForDisplay;
|
|
16
17
|
exports.packageRegistryView = packageRegistryView;
|
|
17
18
|
exports.packageRegistryPack = packageRegistryPack;
|
|
19
|
+
exports.clearPackageManagerVersionCache = clearPackageManagerVersionCache;
|
|
18
20
|
exports.getPackageWorkspaces = getPackageWorkspaces;
|
|
19
21
|
exports.addPackagePathToWorkspaces = addPackagePathToWorkspaces;
|
|
20
22
|
const child_process_1 = require("child_process");
|
|
@@ -30,9 +32,36 @@ const file_utils_1 = require("../project-graph/file-utils");
|
|
|
30
32
|
const catalog_1 = require("./catalog");
|
|
31
33
|
const fileutils_1 = require("./fileutils");
|
|
32
34
|
const installation_directory_1 = require("./installation-directory");
|
|
35
|
+
const logger_1 = require("./logger");
|
|
33
36
|
const package_json_1 = require("./package-json");
|
|
37
|
+
const shell_quoting_1 = require("./shell-quoting");
|
|
34
38
|
const workspace_root_1 = require("./workspace-root");
|
|
35
39
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
40
|
+
const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
|
|
41
|
+
/**
|
|
42
|
+
* Shell-less spawn for the registry-bridged fetches: `exec` goes through
|
|
43
|
+
* /bin/sh, which is dash on Debian-family systems, and dash drops environment
|
|
44
|
+
* names that are not valid shell identifiers, i.e. every `//...:_authToken`
|
|
45
|
+
* credential and `@scope:registry` entry the overlay carries. Windows stays on
|
|
46
|
+
* `exec`, with every argument quoted, because Node refuses to execFile the
|
|
47
|
+
* package manager's `.cmd` shim without a shell.
|
|
48
|
+
*
|
|
49
|
+
* That quoting is the whole defence on Windows, so it goes through
|
|
50
|
+
* quoteShellArg, which throws on the one argument it cannot make safe.
|
|
51
|
+
*/
|
|
52
|
+
function execPackageManagerAsync(pm, args, options) {
|
|
53
|
+
if (process.platform === 'win32') {
|
|
54
|
+
return execAsync([pm, ...args].map(shell_quoting_1.quoteShellArg).join(' '), options);
|
|
55
|
+
}
|
|
56
|
+
return execFileAsync(pm, args, options);
|
|
57
|
+
}
|
|
58
|
+
/** Same split, and the same quoting, for a blocking caller. */
|
|
59
|
+
function execPackageManagerSync(pm, args, options) {
|
|
60
|
+
if (process.platform === 'win32') {
|
|
61
|
+
return (0, child_process_1.execSync)([pm, ...args].map(shell_quoting_1.quoteShellArg).join(' '), options);
|
|
62
|
+
}
|
|
63
|
+
return (0, child_process_1.execFileSync)(pm, args, options);
|
|
64
|
+
}
|
|
36
65
|
/**
|
|
37
66
|
* Detects which package manager is used in the workspace based on the lock file.
|
|
38
67
|
*/
|
|
@@ -408,6 +437,27 @@ function copyPackageManagerConfigurationFiles(root, destination) {
|
|
|
408
437
|
}
|
|
409
438
|
}
|
|
410
439
|
}
|
|
440
|
+
/**
|
|
441
|
+
* A non-JS workspace has no root package.json and keeps its package manager
|
|
442
|
+
* files under the Nx installation directory instead.
|
|
443
|
+
*/
|
|
444
|
+
function getPackageManagerConfigRoot() {
|
|
445
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))) {
|
|
446
|
+
return workspace_root_1.workspaceRoot;
|
|
447
|
+
}
|
|
448
|
+
const installationPath = (0, installation_directory_1.getNxInstallationPath)(workspace_root_1.workspaceRoot);
|
|
449
|
+
// The installation directory can be missing or not a directory, and spawning
|
|
450
|
+
// with such a cwd fails outright (ENOENT/ENOTDIR).
|
|
451
|
+
try {
|
|
452
|
+
return (0, fs_1.statSync)(installationPath).isDirectory()
|
|
453
|
+
? installationPath
|
|
454
|
+
: workspace_root_1.workspaceRoot;
|
|
455
|
+
}
|
|
456
|
+
catch (e) {
|
|
457
|
+
logger_1.logger.verbose(`Failed to stat the Nx installation directory at "${installationPath}".`, e);
|
|
458
|
+
return workspace_root_1.workspaceRoot;
|
|
459
|
+
}
|
|
460
|
+
}
|
|
411
461
|
/**
|
|
412
462
|
* Creates a temporary directory where you can run package manager commands safely.
|
|
413
463
|
*
|
|
@@ -424,8 +474,7 @@ function createTempNpmDirectory(skipCopy = false) {
|
|
|
424
474
|
// A package.json is needed for pnpm pack and for .npmrc to resolve
|
|
425
475
|
(0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
|
|
426
476
|
if (!skipCopy) {
|
|
427
|
-
|
|
428
|
-
copyPackageManagerConfigurationFiles(isNonJs ? (0, installation_directory_1.getNxInstallationPath)(workspace_root_1.workspaceRoot) : workspace_root_1.workspaceRoot, dir);
|
|
477
|
+
copyPackageManagerConfigurationFiles(getPackageManagerConfigRoot(), dir);
|
|
429
478
|
}
|
|
430
479
|
const cleanup = async () => {
|
|
431
480
|
try {
|
|
@@ -444,7 +493,9 @@ function createTempNpmDirectory(skipCopy = false) {
|
|
|
444
493
|
async function resolvePackageVersionUsingRegistry(packageName, version) {
|
|
445
494
|
try {
|
|
446
495
|
const resolvedVersion = (0, catalog_1.resolveCatalogReferenceIfNeeded)(packageName, version);
|
|
447
|
-
const result = await packageRegistryView(packageName, resolvedVersion,
|
|
496
|
+
const result = await packageRegistryView(packageName, resolvedVersion, [
|
|
497
|
+
'version',
|
|
498
|
+
]);
|
|
448
499
|
if (!result) {
|
|
449
500
|
throw new Error(`Unable to resolve version ${packageName}@${resolvedVersion}.`);
|
|
450
501
|
}
|
|
@@ -466,10 +517,30 @@ async function resolvePackageVersionUsingRegistry(packageName, version) {
|
|
|
466
517
|
.replace(/'/g, '');
|
|
467
518
|
return finalResolvedVersion;
|
|
468
519
|
}
|
|
469
|
-
catch {
|
|
470
|
-
|
|
520
|
+
catch (e) {
|
|
521
|
+
// npm masks a URL credential only in the password position, so a bare token
|
|
522
|
+
// in the registry URL survives into the error kept as the cause.
|
|
523
|
+
throw new Error(`Unable to resolve version ${packageName}@${version}.`, {
|
|
524
|
+
cause: redactErrorCause(e),
|
|
525
|
+
});
|
|
471
526
|
}
|
|
472
527
|
}
|
|
528
|
+
// Masks the userinfo in a URL: `user`, `user:pass`, or a bare token.
|
|
529
|
+
function redactUrlCredentials(text) {
|
|
530
|
+
return text.replace(/([a-z][a-z0-9+.-]*:\/\/)[^/@\s]+@/gi, '$1***@');
|
|
531
|
+
}
|
|
532
|
+
function redactErrorCause(error) {
|
|
533
|
+
if (error && typeof error === 'object') {
|
|
534
|
+
const e = error;
|
|
535
|
+
// An exec error carries the command and both output streams as fields.
|
|
536
|
+
for (const field of ['message', 'stack', 'stderr', 'stdout', 'cmd']) {
|
|
537
|
+
if (typeof e[field] === 'string') {
|
|
538
|
+
e[field] = redactUrlCredentials(e[field]);
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
}
|
|
542
|
+
return error;
|
|
543
|
+
}
|
|
473
544
|
/**
|
|
474
545
|
* Return the resolved version for a given package and version tag using by
|
|
475
546
|
* installing it in a temporary directory and fetching the version from the
|
|
@@ -498,12 +569,86 @@ async function resolvePackageVersionUsingInstallation(packageName, version) {
|
|
|
498
569
|
await cleanup();
|
|
499
570
|
}
|
|
500
571
|
}
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
572
|
+
/**
|
|
573
|
+
* What every registry-bound npm spawn resolves the same way: where npm runs,
|
|
574
|
+
* and an environment reproducing the workspace package manager's own registry,
|
|
575
|
+
* auth and TLS resolution for `pkg`. `buildEnv` adds the caller's own entries.
|
|
576
|
+
*/
|
|
577
|
+
function createRegistrySpawnContext(pkg) {
|
|
578
|
+
// Deferred so the registry resolvers load only for the commands that spawn
|
|
579
|
+
// npm, not with every package-manager.ts import.
|
|
580
|
+
const { getNpmSpawnRegistryEnv, getPackageScope, ignoresNpmConfigEnv, mergeNpmConfigEnv, } = require('./registry-config');
|
|
581
|
+
const workspacePm = detectPackageManager();
|
|
582
|
+
const configRoot = getPackageManagerConfigRoot();
|
|
583
|
+
const workspacePmVersion = getPackageManagerVersionSafe(workspacePm, configRoot);
|
|
584
|
+
return {
|
|
585
|
+
workspacePm,
|
|
586
|
+
workspacePmVersion,
|
|
587
|
+
configRoot,
|
|
588
|
+
scope: getPackageScope(pkg),
|
|
589
|
+
buildEnv: (extra) => mergeNpmConfigEnv(process.env, {
|
|
590
|
+
...getNpmSpawnRegistryEnv(pkg, configRoot, workspacePm, workspacePmVersion),
|
|
591
|
+
...extra,
|
|
592
|
+
}, ignoresNpmConfigEnv(workspacePm, workspacePmVersion)),
|
|
593
|
+
};
|
|
594
|
+
}
|
|
595
|
+
/**
|
|
596
|
+
* The registry the fetch for `pkg` went to, with its userinfo masked because a
|
|
597
|
+
* registry URL can carry a bare token. The lookup is spawned the way
|
|
598
|
+
* `packageRegistryView` spawns the fetch this describes (same manager, same
|
|
599
|
+
* environment), so a registry the package manager keeps outside the .npmrc
|
|
600
|
+
* chain and a scope resolved for itself both land on the value that fetch used.
|
|
601
|
+
* Null where the manager yields no usable registry URL; throws where it cannot be run.
|
|
602
|
+
*/
|
|
603
|
+
function getWorkspaceRegistryUrlForDisplay(pkg) {
|
|
604
|
+
const { workspacePm, workspacePmVersion, configRoot, scope, buildEnv } = createRegistrySpawnContext(pkg);
|
|
605
|
+
const { pm, env, usesNativePnpm } = resolveRegistrySpawnTarget(workspacePm, workspacePmVersion, buildEnv);
|
|
606
|
+
// Ask for the package scope first. Native pnpm can keep the workspace
|
|
607
|
+
// `registries.default` separate from the flat `registry`, so it is queried
|
|
608
|
+
// in between.
|
|
609
|
+
const keys = scope ? [`${scope}:registry`] : [];
|
|
610
|
+
if (usesNativePnpm) {
|
|
611
|
+
keys.push('registries.default');
|
|
612
|
+
}
|
|
613
|
+
keys.push('registry');
|
|
614
|
+
for (const key of keys) {
|
|
615
|
+
const value = execPackageManagerSync(pm, ['config', 'get', key], {
|
|
616
|
+
cwd: configRoot,
|
|
617
|
+
timeout: 5000,
|
|
618
|
+
windowsHide: true,
|
|
619
|
+
encoding: 'utf-8',
|
|
620
|
+
// The downgraded pin warns on stderr, which is noise on a path that only
|
|
621
|
+
// decorates an error message.
|
|
622
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
623
|
+
env,
|
|
624
|
+
}).trim();
|
|
625
|
+
if (!value || value === 'undefined' || value === 'null') {
|
|
626
|
+
continue;
|
|
627
|
+
}
|
|
628
|
+
// A present but unusable answer (a `registries:` map with a non-string
|
|
629
|
+
// default serializes as JSON; a non-HTTP(S) scheme) also aborted the fetch
|
|
630
|
+
// this describes, so a key below it was never contacted either.
|
|
631
|
+
if (!URL.canParse(value)) {
|
|
632
|
+
return null;
|
|
633
|
+
}
|
|
634
|
+
const protocol = new URL(value).protocol;
|
|
635
|
+
if (protocol !== 'http:' && protocol !== 'https:') {
|
|
636
|
+
return null;
|
|
637
|
+
}
|
|
638
|
+
return redactUrlCredentials(value);
|
|
639
|
+
}
|
|
640
|
+
return null;
|
|
641
|
+
}
|
|
642
|
+
/**
|
|
643
|
+
* Which manager answers a registry read for this workspace, and the environment
|
|
644
|
+
* it reads under. pnpm 11 reimplemented `view` natively, resolving registry and
|
|
645
|
+
* credentials (tokenHelper included) itself, so it runs on the untouched
|
|
646
|
+
* environment; pnpm 10 passed `view` through to the npm CLI, which needs the
|
|
647
|
+
* overlay. Shared so a lookup describing a fetch cannot resolve against a
|
|
648
|
+
* different environment than the fetch used.
|
|
649
|
+
*/
|
|
650
|
+
function resolveRegistrySpawnTarget(workspacePm, workspacePmVersion, buildEnv, options) {
|
|
651
|
+
let pm = workspacePm;
|
|
507
652
|
if (options?.forceNpm || pm === 'yarn' || pm === 'bun') {
|
|
508
653
|
/**
|
|
509
654
|
* yarn has `yarn info` but it behaves differently than (p)npm,
|
|
@@ -517,46 +662,98 @@ options) {
|
|
|
517
662
|
*/
|
|
518
663
|
pm = 'npm';
|
|
519
664
|
}
|
|
665
|
+
if (pm === 'pnpm' && ((0, semver_1.parse)(workspacePmVersion)?.major ?? 0) >= 11) {
|
|
666
|
+
return { pm, env: process.env, usesNativePnpm: true };
|
|
667
|
+
}
|
|
668
|
+
// npm_config_force downgrades npm's `devEngines.packageManager` enforcement,
|
|
669
|
+
// which otherwise aborts even a read-only lookup when the pin sets
|
|
670
|
+
// `onFail: error`. Only set for npm so a pnpm spawn is untouched.
|
|
671
|
+
return {
|
|
672
|
+
pm,
|
|
673
|
+
env: buildEnv(pm === 'npm' ? { npm_config_force: 'true' } : {}),
|
|
674
|
+
usesNativePnpm: false,
|
|
675
|
+
};
|
|
676
|
+
}
|
|
677
|
+
async function packageRegistryView(pkg, version, args,
|
|
678
|
+
// `forceNpm` runs the view through npm even in a pnpm workspace: npm projects
|
|
679
|
+
// a field across every matched version, whereas `pnpm view <pkg>@<range>`
|
|
680
|
+
// collapses to the single highest match (breaks per-version field queries).
|
|
681
|
+
options) {
|
|
682
|
+
const { workspacePm, workspacePmVersion, configRoot, buildEnv } = createRegistrySpawnContext(pkg);
|
|
683
|
+
const { pm, env } = resolveRegistrySpawnTarget(workspacePm, workspacePmVersion, buildEnv, options);
|
|
520
684
|
// An empty version means we want the full packument; omit the trailing `@`.
|
|
521
|
-
// Quote the spec so range operators (e.g. `>=0.0.0`) are not parsed as shell
|
|
522
|
-
// redirections.
|
|
523
685
|
const spec = version ? `${pkg}@${version}` : pkg;
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
686
|
+
try {
|
|
687
|
+
const { stdout } = await execPackageManagerAsync(pm, ['view', spec, ...args], {
|
|
688
|
+
windowsHide: true,
|
|
689
|
+
cwd: configRoot,
|
|
690
|
+
env,
|
|
691
|
+
});
|
|
692
|
+
return stdout.toString().trim();
|
|
693
|
+
}
|
|
694
|
+
catch (e) {
|
|
695
|
+
throw redactErrorCause(e);
|
|
696
|
+
}
|
|
535
697
|
}
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
698
|
+
/**
|
|
699
|
+
* Only `npm pack` supports downloading a tarball of a specified remote
|
|
700
|
+
* package. `yarn` packs the active workspace, `pnpm pack` only packs
|
|
701
|
+
* the local project, and `bun` doesn't support pack.
|
|
702
|
+
*
|
|
703
|
+
* @param packDestination Directory passed to npm's `--pack-destination`, where
|
|
704
|
+
* the `.tgz` is written.
|
|
705
|
+
* @see https://github.com/nrwl/nx/pull/9667#discussion_r842553994
|
|
706
|
+
*/
|
|
707
|
+
async function packageRegistryPack(packDestination, pkg, version, options) {
|
|
544
708
|
const pm = 'npm';
|
|
545
|
-
const {
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
709
|
+
const { configRoot, buildEnv } = createRegistrySpawnContext(pkg);
|
|
710
|
+
// Run from the config root, not the temp dir, so npm reads the workspace
|
|
711
|
+
// .npmrc natively; --pack-destination still writes the tarball to the temp
|
|
712
|
+
// dir. npm prints the tarball basename to stdout.
|
|
713
|
+
try {
|
|
714
|
+
const { stdout } = await execPackageManagerAsync(pm, ['pack', `${pkg}@${version}`, '--pack-destination', packDestination], {
|
|
715
|
+
cwd: configRoot,
|
|
716
|
+
windowsHide: true,
|
|
717
|
+
env: buildEnv({
|
|
718
|
+
// downgrade npm's devEngines.packageManager enforcement (onFail:
|
|
719
|
+
// error) to a warning so pack still runs in a non-npm workspace
|
|
720
|
+
npm_config_force: 'true',
|
|
721
|
+
...(options?.bypassMinReleaseAge
|
|
722
|
+
? { npm_config_min_release_age: '0' }
|
|
723
|
+
: {}),
|
|
724
|
+
}),
|
|
725
|
+
});
|
|
726
|
+
const tarballPath = stdout.trim();
|
|
727
|
+
return { tarballPath };
|
|
728
|
+
}
|
|
729
|
+
catch (e) {
|
|
730
|
+
throw redactErrorCause(e);
|
|
731
|
+
}
|
|
732
|
+
}
|
|
733
|
+
// The version probe shells out when the packageManager field is absent, and
|
|
734
|
+
// packageRegistryView/packageRegistryPack run in tight resolution loops.
|
|
735
|
+
const packageManagerVersionCache = new Map();
|
|
736
|
+
/**
|
|
737
|
+
* A null version is tolerated per package manager: pnpm and yarn skip bridging,
|
|
738
|
+
* bun assumes a current version.
|
|
739
|
+
*/
|
|
740
|
+
function getPackageManagerVersionSafe(packageManager, root) {
|
|
741
|
+
const key = `${packageManager}:${root}`;
|
|
742
|
+
if (!packageManagerVersionCache.has(key)) {
|
|
743
|
+
let version = null;
|
|
744
|
+
try {
|
|
745
|
+
version = getPackageManagerVersion(packageManager, root);
|
|
746
|
+
}
|
|
747
|
+
catch (e) {
|
|
748
|
+
logger_1.logger.verbose(`Failed to determine the ${packageManager} version in "${root}".`, e);
|
|
749
|
+
}
|
|
750
|
+
packageManagerVersionCache.set(key, version);
|
|
751
|
+
}
|
|
752
|
+
return packageManagerVersionCache.get(key);
|
|
753
|
+
}
|
|
754
|
+
// Test-only: production never re-resolves a version mid-run.
|
|
755
|
+
function clearPackageManagerVersionCache() {
|
|
756
|
+
packageManagerVersionCache.clear();
|
|
560
757
|
}
|
|
561
758
|
/**
|
|
562
759
|
* Gets the workspaces defined in the package manager configuration.
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ProvenanceError = void 0;
|
|
4
4
|
exports.ensurePackageHasProvenance = ensurePackageHasProvenance;
|
|
5
5
|
exports.getNxPackageGroup = getNxPackageGroup;
|
|
6
|
-
const child_process_1 = require("child_process");
|
|
7
6
|
const module_1 = require("module");
|
|
8
7
|
const fileutils_1 = require("./fileutils");
|
|
9
8
|
const package_manager_1 = require("./package-manager");
|
|
@@ -21,7 +20,10 @@ async function ensurePackageHasProvenance(packageName, packageVersion) {
|
|
|
21
20
|
return;
|
|
22
21
|
}
|
|
23
22
|
try {
|
|
24
|
-
const result = await (0, package_manager_1.packageRegistryView)(packageName, packageVersion,
|
|
23
|
+
const result = await (0, package_manager_1.packageRegistryView)(packageName, packageVersion, [
|
|
24
|
+
'--json',
|
|
25
|
+
'--silent',
|
|
26
|
+
]);
|
|
25
27
|
const parsed = JSON.parse(result);
|
|
26
28
|
// `npm view <pkg>@<spec> --json` returns a bare object on npm <= 11 but an
|
|
27
29
|
// array on npm 12 and pnpm, even for a single resolved version. A version
|
|
@@ -77,19 +79,9 @@ class ProvenanceError extends Error {
|
|
|
77
79
|
constructor(packageName, packageVersion, error) {
|
|
78
80
|
let customRegistry = undefined;
|
|
79
81
|
try {
|
|
80
|
-
const
|
|
81
|
-
const commands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
|
82
|
-
// Try to get registry from current package manager, fall back to npm
|
|
83
|
-
const registryCommand = commands.getRegistryUrl ?? 'npm config get registry';
|
|
84
|
-
const registry = (0, child_process_1.execSync)(registryCommand, {
|
|
85
|
-
timeout: 5000,
|
|
86
|
-
windowsHide: true,
|
|
87
|
-
encoding: 'utf-8',
|
|
88
|
-
}).trim();
|
|
82
|
+
const registry = (0, package_manager_1.getWorkspaceRegistryUrlForDisplay)(packageName);
|
|
89
83
|
// Only consider it custom if it's not the default npm registry
|
|
90
|
-
if (registry &&
|
|
91
|
-
registry !== 'undefined' &&
|
|
92
|
-
!registry.includes('registry.npmjs.org')) {
|
|
84
|
+
if (registry && !registry.includes('registry.npmjs.org')) {
|
|
93
85
|
customRegistry = registry;
|
|
94
86
|
}
|
|
95
87
|
}
|