@idlebox/node 1.4.1 → 1.4.3
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/lib/cjs/__create_index.generated.cjs +6 -6
- package/lib/cjs/__create_index.generated.cjs.map +1 -1
- package/lib/cjs/child_process/error.cjs +6 -3
- package/lib/cjs/child_process/error.cjs.map +1 -1
- package/lib/cjs/child_process/execa.cjs +2 -2
- package/lib/cjs/child_process/execa.cjs.map +1 -1
- package/lib/cjs/child_process/lateError.cjs +26 -14
- package/lib/cjs/child_process/lateError.cjs.map +1 -1
- package/lib/cjs/child_process/respawn.cjs +4 -4
- package/lib/cjs/child_process/respawn.cjs.map +1 -1
- package/lib/cjs/cli-io/output.cjs +1 -1
- package/lib/cjs/cli-io/output.cjs.map +1 -1
- package/lib/cjs/environment/findBinary.cjs +4 -4
- package/lib/cjs/environment/findBinary.cjs.map +1 -1
- package/lib/cjs/environment/npmConfig.cjs +2 -2
- package/lib/cjs/environment/npmConfig.cjs.map +1 -1
- package/lib/cjs/environment/pathEnvironment.cjs +3 -3
- package/lib/cjs/environment/pathEnvironment.cjs.map +1 -1
- package/lib/cjs/error/nodejs-error-code.generated.cjs +268 -217
- package/lib/cjs/error/nodejs-error-code.generated.cjs.map +1 -1
- package/lib/cjs/error/types.cjs +6 -6
- package/lib/cjs/error/types.cjs.map +1 -1
- package/lib/cjs/fs/commandExists.cjs +3 -3
- package/lib/cjs/fs/commandExists.cjs.map +1 -1
- package/lib/cjs/fs/exists.cjs +3 -3
- package/lib/cjs/fs/exists.cjs.map +1 -1
- package/lib/cjs/fs/tempFolder.cjs +2 -2
- package/lib/cjs/fs/tempFolder.cjs.map +1 -1
- package/lib/cjs/fs/weiteChanged.cjs +3 -3
- package/lib/cjs/fs/weiteChanged.cjs.map +1 -1
- package/lib/cjs/path-resolve/findPackageRoot.cjs +2 -2
- package/lib/cjs/path-resolve/findPackageRoot.cjs.map +1 -1
- package/lib/cjs/path-resolve/findUp.cjs +57 -18
- package/lib/cjs/path-resolve/findUp.cjs.map +1 -1
- package/lib/cjs/stream/collectingStream.cjs +11 -11
- package/lib/cjs/stream/collectingStream.cjs.map +1 -1
- package/lib/cjs/stream/streamPromise.cjs +5 -4
- package/lib/cjs/stream/streamPromise.cjs.map +1 -1
- package/lib/esm/__create_index.generated.d.ts +2 -0
- package/lib/esm/__create_index.generated.d.ts.map +1 -1
- package/lib/esm/__create_index.generated.js +1 -2
- package/lib/esm/__create_index.generated.js.map +1 -1
- package/lib/esm/__virtual_tsconfig.tsbuildinfo +1 -1
- package/lib/esm/child_process/error.d.ts.map +1 -1
- package/lib/esm/child_process/error.js +6 -3
- package/lib/esm/child_process/error.js.map +1 -1
- package/lib/esm/child_process/execa.js +1 -1
- package/lib/esm/child_process/execa.js.map +1 -1
- package/lib/esm/child_process/lateError.d.ts +6 -5
- package/lib/esm/child_process/lateError.d.ts.map +1 -1
- package/lib/esm/child_process/lateError.js +23 -11
- package/lib/esm/child_process/lateError.js.map +1 -1
- package/lib/esm/child_process/respawn.js +2 -2
- package/lib/esm/child_process/respawn.js.map +1 -1
- package/lib/esm/cli-io/output.js +1 -1
- package/lib/esm/cli-io/output.js.map +1 -1
- package/lib/esm/environment/findBinary.js +2 -2
- package/lib/esm/environment/findBinary.js.map +1 -1
- package/lib/esm/environment/npmConfig.js +1 -1
- package/lib/esm/environment/npmConfig.js.map +1 -1
- package/lib/esm/environment/pathEnvironment.js +1 -1
- package/lib/esm/environment/pathEnvironment.js.map +1 -1
- package/lib/esm/error/nodejs-error-code.generated.d.ts +269 -218
- package/lib/esm/error/nodejs-error-code.generated.d.ts.map +1 -1
- package/lib/esm/error/nodejs-error-code.generated.js +268 -217
- package/lib/esm/error/nodejs-error-code.generated.js.map +1 -1
- package/lib/esm/error/types.d.ts +2 -2
- package/lib/esm/error/types.d.ts.map +1 -1
- package/lib/esm/error/types.js +2 -2
- package/lib/esm/error/types.js.map +1 -1
- package/lib/esm/fs/commandExists.js +1 -1
- package/lib/esm/fs/commandExists.js.map +1 -1
- package/lib/esm/fs/exists.js +1 -1
- package/lib/esm/fs/exists.js.map +1 -1
- package/lib/esm/fs/tempFolder.js +1 -1
- package/lib/esm/fs/tempFolder.js.map +1 -1
- package/lib/esm/fs/weiteChanged.js +1 -1
- package/lib/esm/fs/weiteChanged.js.map +1 -1
- package/lib/esm/path-resolve/findPackageRoot.js +1 -1
- package/lib/esm/path-resolve/findPackageRoot.js.map +1 -1
- package/lib/esm/path-resolve/findUp.d.ts +12 -0
- package/lib/esm/path-resolve/findUp.d.ts.map +1 -1
- package/lib/esm/path-resolve/findUp.js +57 -18
- package/lib/esm/path-resolve/findUp.js.map +1 -1
- package/lib/esm/stream/collectingStream.d.ts +1 -1
- package/lib/esm/stream/collectingStream.d.ts.map +1 -1
- package/lib/esm/stream/collectingStream.js +9 -9
- package/lib/esm/stream/collectingStream.js.map +1 -1
- package/lib/esm/stream/streamPromise.d.ts.map +1 -1
- package/lib/esm/stream/streamPromise.js +5 -4
- package/lib/esm/stream/streamPromise.js.map +1 -1
- package/package.json +5 -5
- package/src/child_process/error.ts +7 -3
- package/src/child_process/execa.ts +1 -1
- package/src/child_process/lateError.ts +27 -14
- package/src/child_process/respawn.ts +2 -2
- package/src/cli-io/output.ts +1 -1
- package/src/environment/findBinary.ts +2 -2
- package/src/environment/npmConfig.ts +1 -1
- package/src/environment/pathEnvironment.ts +1 -1
- package/src/error/cache.generated.json +467 -323
- package/src/error/nodejs-error-code.generated.ts +268 -218
- package/src/error/types.ts +2 -2
- package/src/fs/commandExists.ts +1 -1
- package/src/fs/exists.ts +1 -1
- package/src/fs/tempFolder.ts +1 -1
- package/src/fs/weiteChanged.ts +1 -1
- package/src/path-resolve/findPackageRoot.ts +1 -1
- package/src/path-resolve/findUp.ts +80 -19
- package/src/stream/collectingStream.ts +13 -13
- package/src/stream/streamPromise.ts +5 -4
|
@@ -22,8 +22,8 @@ export function checkChildProcessResult(result) {
|
|
|
22
22
|
if (result.killed && !signal) {
|
|
23
23
|
throw new Error(title + 'killed by unknown reason');
|
|
24
24
|
}
|
|
25
|
-
if (result.
|
|
26
|
-
throw new Error(title + '
|
|
25
|
+
if (result.timedOut) {
|
|
26
|
+
throw new Error(title + 'execution timed out');
|
|
27
27
|
}
|
|
28
28
|
if (signal) {
|
|
29
29
|
if (result.signalDescription) {
|
|
@@ -31,9 +31,12 @@ export function checkChildProcessResult(result) {
|
|
|
31
31
|
}
|
|
32
32
|
throw new Error(title + 'killed by signal ' + signal);
|
|
33
33
|
}
|
|
34
|
-
if (code > 0) {
|
|
34
|
+
if (code !== undefined && code > 0) {
|
|
35
35
|
throw new Error(title + 'exit with code ' + code);
|
|
36
36
|
}
|
|
37
|
+
if (result.failed) {
|
|
38
|
+
throw new Error(title + 'process failed to spawn');
|
|
39
|
+
}
|
|
37
40
|
throw new Error(title + 'status unknown');
|
|
38
41
|
}
|
|
39
42
|
//# sourceMappingURL=error.js.map
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/error.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAkBA,cAAc;AACd,MAAM,UAAU,uBAAuB,CAAC,MAA2B;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAEjF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,GAAG,GAAW,MAAM,CAAC,KAAK,CAAC,OAAO,IAAK,MAAM,CAAC,KAAa,CAAC;QAClE,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,GAAG,mBAAmB,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,CAAC,CAAC;IACT,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;IAC3D,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,CAAC,OAAO;IAChB,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC;IAEhD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,oBAAoB,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,0BAA0B,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,MAAM,CAAC,
|
|
9
|
+
"mappings": "AAkBA,cAAc;AACd,MAAM,UAAU,uBAAuB,CAAC,MAA2B;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAEjF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,GAAG,GAAW,MAAM,CAAC,KAAK,CAAC,OAAO,IAAK,MAAM,CAAC,KAAa,CAAC;QAClE,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,GAAG,mBAAmB,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,CAAC,CAAC;IACT,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;IAC3D,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,CAAC,OAAO;IAChB,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC;IAEhD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,oBAAoB,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,0BAA0B,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,qBAAqB,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACZ,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,mBAAmB,GAAG,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,yBAAyB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,KAAK,GAAG,gBAAgB,CAAC,CAAC;AAC3C,CAAC"
|
|
10
10
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import '@gongt/fix-esm';
|
|
2
2
|
import { isWindows, sepList } from '@idlebox/common';
|
|
3
3
|
import { execa, execaSync } from 'execa';
|
|
4
|
-
import { checkChildProcessResult } from
|
|
4
|
+
import { checkChildProcessResult } from './error.js';
|
|
5
5
|
function sanitizeEnv(env, addonPath) {
|
|
6
6
|
if (!env)
|
|
7
7
|
return undefined;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/execa.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -8,16 +8,17 @@ type ISpawnConst = {
|
|
|
8
8
|
stderr: 'pipe';
|
|
9
9
|
encoding: 'utf8';
|
|
10
10
|
};
|
|
11
|
-
type ConvStdout<T extends ISpawnOptions> = T extends {
|
|
12
|
-
stdout: 'inherit';
|
|
13
|
-
} ? Omit<T, 'stdout'> & {
|
|
11
|
+
type ConvStdout<T extends ISpawnOptions> = T['stdout'] extends 'inherit' ? Omit<T, 'stdout'> & {
|
|
14
12
|
stdout: 'pipe';
|
|
15
13
|
} : T;
|
|
16
14
|
export type ExecaReturnValue<options extends ISpawnOptions> = Result<ConvStdout<Omit<options, 'verbose'>> & ISpawnConst>;
|
|
15
|
+
type NoStdio = Omit<ISpawnOptions, 'stdio'> & {
|
|
16
|
+
stdio?: never;
|
|
17
|
+
};
|
|
17
18
|
/**
|
|
18
19
|
* 运行命令，如果出错，则输出缓冲的stderr（如果stdout是inherit，也同时输出stdout）
|
|
19
|
-
* 如果程序正常结束，则程序向stderr
|
|
20
|
+
* 如果程序正常结束，则程序向stderr输出的内容直接丢弃（如果stdout是inherit，也同时丢弃）
|
|
20
21
|
*/
|
|
21
|
-
export declare function execLazyError<T extends
|
|
22
|
+
export declare function execLazyError<T extends NoStdio = NoStdio>(cmd: string, args: string[], spawnOptions: T): Promise<ExecaReturnValue<T>>;
|
|
22
23
|
export {};
|
|
23
24
|
//# sourceMappingURL=lateError.d.ts.map
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/lateError.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAS,OAAO,IAAI,YAAY,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAI/D,MAAM,MAAM,aAAa,GAAG,IAAI,CAC/B,YAAY,EACZ,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CACxE,GAAG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,KAAK,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,UAAU,CAAC,CAAC,SAAS,aAAa,IAAI,CAAC,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAS,OAAO,IAAI,YAAY,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAI/D,MAAM,MAAM,aAAa,GAAG,IAAI,CAC/B,YAAY,EACZ,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CACxE,GAAG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,KAAK,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,UAAU,CAAC,CAAC,SAAS,aAAa,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,SAAS,GAAG,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,CAAC;AAEtH,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,aAAa,IAAI,MAAM,CACnE,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,GAAG,WAAW,CAClD,CAAC;AAEF,KAAK,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EACxD,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,YAAY,EAAE,CAAC,GACb,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAyD9B"
|
|
10
10
|
}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { execa } from 'execa';
|
|
2
|
-
import { printLine } from
|
|
3
|
-
import { checkChildProcessResult } from
|
|
2
|
+
import { printLine } from '../cli-io/output.js';
|
|
3
|
+
import { checkChildProcessResult } from './error.js';
|
|
4
4
|
/**
|
|
5
5
|
* 运行命令，如果出错，则输出缓冲的stderr（如果stdout是inherit，也同时输出stdout）
|
|
6
|
-
* 如果程序正常结束，则程序向stderr
|
|
6
|
+
* 如果程序正常结束，则程序向stderr输出的内容直接丢弃（如果stdout是inherit，也同时丢弃）
|
|
7
7
|
*/
|
|
8
|
-
export
|
|
8
|
+
export function execLazyError(cmd, args, spawnOptions) {
|
|
9
9
|
let all = false;
|
|
10
|
-
let { stdout,
|
|
11
|
-
if (stdout === 'inherit') {
|
|
10
|
+
let { stdout, verbose, ...others } = spawnOptions;
|
|
11
|
+
if (stdout === 'inherit' || stdout === undefined) {
|
|
12
12
|
all = true;
|
|
13
13
|
stdout = 'pipe';
|
|
14
14
|
}
|
|
@@ -21,28 +21,40 @@ export async function execLazyError(cmd, args, spawnOptions) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
const opt = {
|
|
24
|
+
stdin: 'ignore',
|
|
24
25
|
...others,
|
|
25
26
|
verbose: 'none',
|
|
26
27
|
lines: false,
|
|
27
28
|
stdio: undefined,
|
|
28
|
-
stdin: stdin || 'ignore',
|
|
29
29
|
stdout,
|
|
30
30
|
stderr: 'pipe',
|
|
31
31
|
all: all,
|
|
32
32
|
encoding: 'utf8',
|
|
33
33
|
reject: false,
|
|
34
34
|
};
|
|
35
|
-
|
|
36
|
-
return p.then((ret) => {
|
|
35
|
+
return execa(cmd, args, opt).then((ret) => {
|
|
37
36
|
try {
|
|
38
37
|
checkChildProcessResult(ret);
|
|
39
38
|
}
|
|
40
39
|
catch (e) {
|
|
41
40
|
if (process.stderr.isTTY) {
|
|
41
|
+
console.error('');
|
|
42
42
|
printLine();
|
|
43
|
-
console.error('\x1B[
|
|
43
|
+
console.error('\x1B[38;5;9mcommand failed execute: %s', e.message);
|
|
44
|
+
console.error('\x1B[2m$ "%s" %s\x1B[0m', cmd, args.map((v) => JSON.stringify(v)).join(' '));
|
|
45
|
+
console.error('\x1B[2mcwd: %s\x1B[0m', opt.cwd ?? process.cwd());
|
|
46
|
+
console.error('\x1B[2m%s\x1B[0m', ret.all ? '[stdout+stderr]' : '[stderr]');
|
|
47
|
+
}
|
|
48
|
+
if (all && ret.all) {
|
|
49
|
+
console.error('\x1B[2m[stdout+stderr]\x1B[0m');
|
|
50
|
+
console.error(ret.all);
|
|
51
|
+
console.error('\x1B[2m[stdout+stderr] END\x1B[0m');
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
console.error('\x1B[2m[stderr]\x1B[0m');
|
|
55
|
+
console.error(ret.stderr);
|
|
56
|
+
console.error('\x1B[2m[stderr] END\x1B[0m');
|
|
44
57
|
}
|
|
45
|
-
console.error(ret.all || ret.stderr);
|
|
46
58
|
if (process.stderr.isTTY) {
|
|
47
59
|
printLine();
|
|
48
60
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/lateError.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,KAAK,EAAmC,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { spawnSync } from 'child_process';
|
|
2
2
|
import { createRequire } from 'module';
|
|
3
3
|
import { platform } from 'os';
|
|
4
|
-
import { findBinary } from
|
|
5
|
-
import { spawnGetOutputSync } from
|
|
4
|
+
import { findBinary } from '../environment/findBinary.js';
|
|
5
|
+
import { spawnGetOutputSync } from './execa.js';
|
|
6
6
|
const unshareArgs = ['--pid', '--cgroup', '--fork', '--mount-proc', '--propagation=slave'];
|
|
7
7
|
if (platform() === 'linux' && process.getuid() !== 0) {
|
|
8
8
|
unshareArgs.push('--map-root-user');
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/respawn.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
package/lib/esm/cli-io/output.js
CHANGED
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/cli-io/output.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,MAAM,UAAU,SAAS,CAAC,IAAI,GAAG,GAAG;IACnC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;
|
|
9
|
+
"mappings": "AAAA,MAAM,UAAU,SAAS,CAAC,IAAI,GAAG,GAAG;IACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;AAC1E,CAAC"
|
|
10
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { resolve } from 'path';
|
|
2
|
-
import { existsSync } from
|
|
3
|
-
import { PathEnvironment } from
|
|
2
|
+
import { existsSync } from '../fs/exists.js';
|
|
3
|
+
import { PathEnvironment } from './pathEnvironment.js';
|
|
4
4
|
export function findBinary(what, pathvar = new PathEnvironment(), cwd = process.cwd()) {
|
|
5
5
|
for (const path of pathvar.values()) {
|
|
6
6
|
if (existsSync(path + '/' + what)) {
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/findBinary.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,UAAU,UAAU,CACzB,IAAY,EACZ,UAA+C,IAAI,eAAe,EAAE,EACpE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAEnB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACrC,IAAI,UAAU,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC"
|
|
10
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { linux_case } from '@idlebox/common';
|
|
2
2
|
import { dirname } from 'path';
|
|
3
|
-
import { spawnGetOutput } from
|
|
3
|
+
import { spawnGetOutput } from '../child_process/execa.js';
|
|
4
4
|
export async function getNpmConfigValue(field) {
|
|
5
5
|
const env_name = 'npm_config_' + linux_case(field);
|
|
6
6
|
if (typeof process.env[env_name] === 'string') {
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/npmConfig.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAa;IACpD,MAAM,QAAQ,GAAG,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/C,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;IAC/B,CAAC;IAED,OAAO,MAAM,cAAc,CAAC;QAC3B,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC;QACrC,SAAS,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACnC,CAAC;SACA,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;SACf,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;aAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,CAAC,CAAC;AACL,CAAC"
|
|
10
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { platform } from 'os';
|
|
2
2
|
import { PathArray } from '@idlebox/common';
|
|
3
|
-
import { cleanupEnvironment, getEnvironment } from
|
|
3
|
+
import { cleanupEnvironment, getEnvironment } from './getEnvironment.js';
|
|
4
4
|
export const PATH_SEPARATOR = platform() === 'win32' ? ';' : ':';
|
|
5
5
|
export class PathEnvironment extends PathArray {
|
|
6
6
|
name;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/pathEnvironment.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEzE,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjE,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5B,IAAI,CAAS;IACb,GAAG,CAAoB;IAExC,YAAY,OAAO,GAAG,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAyB,OAAO,CAAC,GAAG;QACnG,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrD,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,KAAK;YAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5B,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEQ,GAAG,CAAC,CAAS;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACb,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IACQ,KAAK;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,CAAS;QACxB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI;QACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;CACD"
|
|
10
10
|
}
|