@idlebox/node 1.2.17 → 1.2.19
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 +18 -9
- package/lib/cjs/__create_index.generated.cjs.map +1 -1
- package/lib/cjs/__create_index.generated.d.cts +15 -14
- package/lib/cjs/child_process/execa.cjs +61 -26
- package/lib/cjs/child_process/execa.cjs.map +1 -1
- package/lib/cjs/child_process/execa.lib.cjs +13 -0
- package/lib/cjs/child_process/execa.lib.cjs.map +10 -0
- package/lib/cjs/child_process/respawn.cjs +1 -2
- package/lib/cjs/child_process/respawn.cjs.map +1 -1
- package/lib/cjs/environment/findBinary.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/emptyDir.cjs +31 -0
- package/lib/cjs/fs/emptyDir.cjs.map +10 -0
- package/lib/esm/__create_index.generated.d.mts +15 -14
- package/lib/esm/__create_index.generated.mjs +9 -1
- package/lib/esm/__create_index.generated.mjs.map +1 -1
- package/lib/esm/child_process/execa.lib.mjs +10 -0
- package/lib/esm/child_process/execa.lib.mjs.map +10 -0
- package/lib/esm/child_process/execa.mjs +34 -24
- package/lib/esm/child_process/execa.mjs.map +1 -1
- package/lib/esm/child_process/respawn.mjs +2 -3
- package/lib/esm/child_process/respawn.mjs.map +1 -1
- package/lib/esm/environment/findBinary.mjs.map +1 -1
- package/lib/esm/fs/commandExists.mjs +1 -1
- package/lib/esm/fs/commandExists.mjs.map +1 -1
- package/lib/esm/fs/emptyDir.mjs +27 -0
- package/lib/esm/fs/emptyDir.mjs.map +10 -0
- package/package.json +18 -11
- package/src/child_process/execa.lib.ts +12 -0
- package/src/child_process/execa.ts +39 -34
- package/src/child_process/respawn.ts +2 -3
- package/src/environment/findBinary.ts +5 -2
- package/src/fs/commandExists.ts +1 -1
- package/src/fs/emptyDir.ts +25 -0
- package/scripts/prefix.js +0 -2
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
require('@gongt/fix-esm').register();
|
|
3
|
-
|
|
4
1
|
"use strict";
|
|
5
2
|
// DO NOT EDIT THIS FILE
|
|
6
3
|
// @ts-ignore
|
|
7
4
|
/* eslint-disable */
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
10
|
-
exports.HexDumpLoggerStream = exports.LoggerStream = exports.drainStream = void 0;
|
|
6
|
+
exports.streamHasEnd = exports.streamPromise = exports.BlackHoleStream = exports.nodeResolvePathArray = exports.lrelative = exports.getAllPathUpToRoot = exports.findPackageRoot = exports.findUpUntilSync = exports.findUpUntil = exports.WrappedTerminalConsole = exports.writeFileIfChange = exports.writeFileIfChangeSync = exports.createTempFolder = exports.emptyDir = exports.commandInPathSync = exports.commandInPath = exports.dumpEventEmitterEmit = exports.ERRNO_LINUX = exports.getNpmConfigValue = exports.sha256 = exports.md5 = exports.respawnInScope = exports.trySpawnInScope = exports.spawnRecreateEventHandlers = exports.findBinary = exports.PathEnvironment = exports.PATH_SEPARATOR = exports.cleanupEnvironment = exports.deleteEnvironment = exports.getEnvironment = exports.exists = exports.existsSync = exports.execLazyError = exports.printLine = exports.spawnGetEverything = exports.spawnGetOutput = exports.spawnGetOutputSync = exports.spawnWithoutOutput = exports.spawnWithoutOutputSync = exports.execaSyncLibrary = exports.checkChildProcessResult = exports.runMain = exports.ExitError = exports.prettyFormatError = exports.prettyPrintError = exports.setErrorLogRoot = exports.relativePath = exports.osTempDir = exports.normalizePath = exports.resolvePath = void 0;
|
|
7
|
+
exports.HexDumpLoggerStream = exports.LoggerStream = exports.drainStream = exports.disposableStream = exports.CollectingStream = exports.RawCollectingStream = exports.streamToBuffer = void 0;
|
|
11
8
|
var resolvePath_js_1 = require("./path-resolve/resolvePath.cjs");
|
|
12
9
|
Object.defineProperty(exports, "resolvePath", { enumerable: true, get: function () { return resolvePath_js_1.resolvePath; } });
|
|
13
10
|
var resolvePath_js_2 = require("./path-resolve/resolvePath.cjs");
|
|
@@ -32,12 +29,20 @@ Object.defineProperty(exports, "runMain", { enumerable: true, get: function () {
|
|
|
32
29
|
// Identifiers
|
|
33
30
|
var error_js_1 = require("./child_process/error.cjs");
|
|
34
31
|
Object.defineProperty(exports, "checkChildProcessResult", { enumerable: true, get: function () { return error_js_1.checkChildProcessResult; } });
|
|
32
|
+
/* child_process/execa.lib.ts */
|
|
33
|
+
// Identifiers
|
|
34
|
+
var execa_lib_js_1 = require("./child_process/execa.lib.cjs");
|
|
35
|
+
Object.defineProperty(exports, "execaSyncLibrary", { enumerable: true, get: function () { return execa_lib_js_1.execaSyncLibrary; } });
|
|
35
36
|
var execa_js_1 = require("./child_process/execa.cjs");
|
|
36
|
-
Object.defineProperty(exports, "
|
|
37
|
+
Object.defineProperty(exports, "spawnWithoutOutputSync", { enumerable: true, get: function () { return execa_js_1.spawnWithoutOutputSync; } });
|
|
37
38
|
var execa_js_2 = require("./child_process/execa.cjs");
|
|
38
|
-
Object.defineProperty(exports, "
|
|
39
|
+
Object.defineProperty(exports, "spawnWithoutOutput", { enumerable: true, get: function () { return execa_js_2.spawnWithoutOutput; } });
|
|
39
40
|
var execa_js_3 = require("./child_process/execa.cjs");
|
|
40
|
-
Object.defineProperty(exports, "
|
|
41
|
+
Object.defineProperty(exports, "spawnGetOutputSync", { enumerable: true, get: function () { return execa_js_3.spawnGetOutputSync; } });
|
|
42
|
+
var execa_js_4 = require("./child_process/execa.cjs");
|
|
43
|
+
Object.defineProperty(exports, "spawnGetOutput", { enumerable: true, get: function () { return execa_js_4.spawnGetOutput; } });
|
|
44
|
+
var execa_js_5 = require("./child_process/execa.cjs");
|
|
45
|
+
Object.defineProperty(exports, "spawnGetEverything", { enumerable: true, get: function () { return execa_js_5.spawnGetEverything; } });
|
|
41
46
|
/* cli-io/output.ts */
|
|
42
47
|
// Identifiers
|
|
43
48
|
var output_js_1 = require("./cli-io/output.cjs");
|
|
@@ -99,7 +104,11 @@ Object.defineProperty(exports, "dumpEventEmitterEmit", { enumerable: true, get:
|
|
|
99
104
|
var commandExists_js_1 = require("./fs/commandExists.cjs");
|
|
100
105
|
Object.defineProperty(exports, "commandInPath", { enumerable: true, get: function () { return commandExists_js_1.commandInPath; } });
|
|
101
106
|
var commandExists_js_2 = require("./fs/commandExists.cjs");
|
|
102
|
-
Object.defineProperty(exports, "
|
|
107
|
+
Object.defineProperty(exports, "commandInPathSync", { enumerable: true, get: function () { return commandExists_js_2.commandInPathSync; } });
|
|
108
|
+
/* fs/emptyDir.ts */
|
|
109
|
+
// Identifiers
|
|
110
|
+
var emptyDir_js_1 = require("./fs/emptyDir.cjs");
|
|
111
|
+
Object.defineProperty(exports, "emptyDir", { enumerable: true, get: function () { return emptyDir_js_1.emptyDir; } });
|
|
103
112
|
/* fs/tempFolder.ts */
|
|
104
113
|
// Identifiers
|
|
105
114
|
var tempFolder_js_1 = require("./fs/tempFolder.cjs");
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../src/__create_index.generated.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";AAAA,wBAAwB;AACxB,aAAa;AACb,oBAAoB;;;;AAQnB,iEAA0D;AAAlD,6GAAA,WAAW,OAAA;AAEnB,iEAA4D;AAApD,+GAAA,aAAa,OAAA;AACrB,iEAAwD;AAAhD,2GAAA,SAAS,OAAA;AACjB,iEAA2D;AAAnD,8GAAA,YAAY,OAAA;AACrB,qBAAqB;AACpB,cAAc;AACd,gDAAkD;AAA1C,4GAAA,eAAe,OAAA;AACvB,gDAAmD;AAA3C,6GAAA,gBAAgB,OAAA;AACxB,gDAAoD;AAA5C,8GAAA,iBAAiB,OAAA;AAIzB,gDAAyC;AAAjC,yGAAA,SAAS,OAAA;AACjB,gDAAuC;AAA/B,uGAAA,OAAO,OAAA;AAChB,4BAA4B;AAC3B,cAAc;AACd,sDAAiE;AAAzD,mHAAA,uBAAuB,OAAA;
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { EventEmitter } from 'events';
|
|
4
4
|
import { ExecaReturnValue } from 'execa';
|
|
5
|
+
import { execaSync } from 'execa';
|
|
5
6
|
import { IDisposable } from '@idlebox/common';
|
|
6
7
|
import { Options } from 'execa';
|
|
7
8
|
import { PathArray } from '@idlebox/common';
|
|
@@ -11,10 +12,6 @@ import { WrappedConsole } from '@idlebox/common';
|
|
|
11
12
|
import { WrappedConsoleOptions } from '@idlebox/common';
|
|
12
13
|
import { Writable } from 'stream';
|
|
13
14
|
|
|
14
|
-
export declare interface Async {
|
|
15
|
-
sync?: boolean;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
15
|
export declare type AsyncMainFunction = () => Promise<void | number>;
|
|
19
16
|
|
|
20
17
|
export declare class BlackHoleStream extends Writable {
|
|
@@ -47,7 +44,7 @@ declare const colorMap: {
|
|
|
47
44
|
|
|
48
45
|
export declare function commandInPath(cmd: string, alterExt?: string[]): Promise<string | undefined>;
|
|
49
46
|
|
|
50
|
-
export declare function
|
|
47
|
+
export declare function commandInPathSync(cmd: string, alterExt?: string[]): string | undefined;
|
|
51
48
|
|
|
52
49
|
export declare function createTempFolder(fullPath: string): IDisposable;
|
|
53
50
|
|
|
@@ -59,6 +56,13 @@ export declare function drainStream(stream: NodeJS.ReadableStream, size: number,
|
|
|
59
56
|
|
|
60
57
|
export declare function dumpEventEmitterEmit(ev: EventEmitter): void;
|
|
61
58
|
|
|
59
|
+
/**
|
|
60
|
+
* delete all content in a dir,
|
|
61
|
+
* and create it if not exists
|
|
62
|
+
* @public
|
|
63
|
+
*/
|
|
64
|
+
export declare function emptyDir(path: string, create_if_nexists?: boolean): Promise<void>;
|
|
65
|
+
|
|
62
66
|
export declare enum ERRNO_LINUX {
|
|
63
67
|
EPERM = 1,
|
|
64
68
|
ENOENT = 2,
|
|
@@ -184,6 +188,8 @@ export declare enum ERRNO_LINUX {
|
|
|
184
188
|
EOVERFLOW = 139
|
|
185
189
|
}
|
|
186
190
|
|
|
191
|
+
export declare const execaSyncLibrary: typeof execaSync;
|
|
192
|
+
|
|
187
193
|
export declare function execLazyError(cmd: string, args: string[], spawnOptions?: Omit<Options, 'reject' | 'stdio' | 'encoding' | 'all' | 'stderr'> & ISpawnAdditionOptions): Promise<ExecaReturnValue<string>>;
|
|
188
194
|
|
|
189
195
|
export declare function exists(path: string): Promise<boolean>;
|
|
@@ -233,7 +239,6 @@ export declare interface ICommand {
|
|
|
233
239
|
exec: string[];
|
|
234
240
|
addonPath?: string[];
|
|
235
241
|
cwd?: string;
|
|
236
|
-
sync?: boolean;
|
|
237
242
|
env?: ProcessEnv;
|
|
238
243
|
}
|
|
239
244
|
|
|
@@ -339,15 +344,15 @@ export declare function sha256(data: Buffer): string;
|
|
|
339
344
|
|
|
340
345
|
export declare function spawnGetEverything({ exec, cwd, env, addonPath }: ICommand): Promise<string | undefined>;
|
|
341
346
|
|
|
342
|
-
export declare function spawnGetOutput(
|
|
347
|
+
export declare function spawnGetOutput({ exec, cwd, env, addonPath }: ICommand): Promise<string>;
|
|
343
348
|
|
|
344
|
-
export declare function
|
|
349
|
+
export declare function spawnGetOutputSync({ exec, cwd, env, addonPath }: ICommand): string;
|
|
345
350
|
|
|
346
351
|
export declare function spawnRecreateEventHandlers(): void;
|
|
347
352
|
|
|
348
|
-
export declare function spawnWithoutOutput(
|
|
353
|
+
export declare function spawnWithoutOutput({ exec, cwd, env, addonPath }: ICommand): Promise<void>;
|
|
349
354
|
|
|
350
|
-
export declare function
|
|
355
|
+
export declare function spawnWithoutOutputSync({ exec, cwd, env, addonPath }: ICommand): void;
|
|
351
356
|
|
|
352
357
|
export declare function streamHasEnd(S: NodeJS.ReadableStream | NodeJS.WritableStream): any;
|
|
353
358
|
|
|
@@ -361,10 +366,6 @@ export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: false
|
|
|
361
366
|
|
|
362
367
|
export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: true): Promise<Buffer>;
|
|
363
368
|
|
|
364
|
-
export declare interface Sync {
|
|
365
|
-
sync: true;
|
|
366
|
-
}
|
|
367
|
-
|
|
368
369
|
declare interface TerminalConsoleOptions {
|
|
369
370
|
color?: boolean | Partial<typeof colorMap>;
|
|
370
371
|
}
|
|
@@ -1,9 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.spawnGetEverything = exports.spawnGetOutput = exports.spawnWithoutOutput = void 0;
|
|
26
|
+
exports.spawnGetEverything = exports.spawnGetOutput = exports.spawnGetOutputSync = exports.spawnWithoutOutput = exports.spawnWithoutOutputSync = void 0;
|
|
4
27
|
const common_1 = require("@idlebox/common");
|
|
5
|
-
const execa_1 = require("execa");
|
|
6
28
|
const error_1 = require("./error.cjs");
|
|
29
|
+
const execa_lib_1 = require("./execa.lib.cjs");
|
|
7
30
|
function sanitizeEnv(env, addonPath) {
|
|
8
31
|
if (!env)
|
|
9
32
|
return undefined;
|
|
@@ -25,7 +48,7 @@ function handleError(result) {
|
|
|
25
48
|
}
|
|
26
49
|
return result;
|
|
27
50
|
}
|
|
28
|
-
function
|
|
51
|
+
function spawnWithoutOutputSync({ exec, cwd, env, addonPath }) {
|
|
29
52
|
const [cmd, ...args] = exec;
|
|
30
53
|
const opts = {
|
|
31
54
|
stdio: ['ignore', process.stderr, process.stderr],
|
|
@@ -33,19 +56,23 @@ function spawnWithoutOutput({ exec, cwd, sync, env, addonPath }) {
|
|
|
33
56
|
reject: false,
|
|
34
57
|
env: sanitizeEnv(env, addonPath),
|
|
35
58
|
};
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
59
|
+
(0, error_1.checkChildProcessResult)((0, execa_lib_1.execaSyncLibrary)(cmd, args, opts));
|
|
60
|
+
}
|
|
61
|
+
exports.spawnWithoutOutputSync = spawnWithoutOutputSync;
|
|
62
|
+
async function spawnWithoutOutput({ exec, cwd, env, addonPath }) {
|
|
63
|
+
const [cmd, ...args] = exec;
|
|
64
|
+
const opts = {
|
|
65
|
+
stdio: ['ignore', process.stderr, process.stderr],
|
|
66
|
+
cwd,
|
|
67
|
+
reject: false,
|
|
68
|
+
env: sanitizeEnv(env, addonPath),
|
|
69
|
+
};
|
|
70
|
+
const { execa } = await Promise.resolve().then(() => __importStar(require('execa')));
|
|
71
|
+
const e = await execa(cmd, args, opts);
|
|
72
|
+
handleError(e);
|
|
46
73
|
}
|
|
47
74
|
exports.spawnWithoutOutput = spawnWithoutOutput;
|
|
48
|
-
function
|
|
75
|
+
function spawnGetOutputSync({ exec, cwd, env, addonPath }) {
|
|
49
76
|
const [cmd, ...args] = exec;
|
|
50
77
|
const opts = {
|
|
51
78
|
stdio: ['ignore', 'pipe', process.stderr],
|
|
@@ -55,17 +82,24 @@ function spawnGetOutput({ exec, cwd, sync, env, addonPath }) {
|
|
|
55
82
|
encoding: 'utf8',
|
|
56
83
|
env: sanitizeEnv(env, addonPath),
|
|
57
84
|
};
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
85
|
+
const result = handleError((0, execa_lib_1.execaSyncLibrary)(cmd, args, opts));
|
|
86
|
+
return result.stdout;
|
|
87
|
+
}
|
|
88
|
+
exports.spawnGetOutputSync = spawnGetOutputSync;
|
|
89
|
+
async function spawnGetOutput({ exec, cwd, env, addonPath }) {
|
|
90
|
+
const [cmd, ...args] = exec;
|
|
91
|
+
const opts = {
|
|
92
|
+
stdio: ['ignore', 'pipe', process.stderr],
|
|
93
|
+
cwd,
|
|
94
|
+
reject: false,
|
|
95
|
+
stripFinalNewline: true,
|
|
96
|
+
encoding: 'utf8',
|
|
97
|
+
env: sanitizeEnv(env, addonPath),
|
|
98
|
+
};
|
|
99
|
+
const { execa } = await Promise.resolve().then(() => __importStar(require('execa')));
|
|
100
|
+
const e = await execa(cmd, args, opts);
|
|
101
|
+
const result = handleError(e);
|
|
102
|
+
return result.stdout;
|
|
69
103
|
}
|
|
70
104
|
exports.spawnGetOutput = spawnGetOutput;
|
|
71
105
|
async function spawnGetEverything({ exec, cwd, env, addonPath }) {
|
|
@@ -79,7 +113,8 @@ async function spawnGetEverything({ exec, cwd, env, addonPath }) {
|
|
|
79
113
|
all: true,
|
|
80
114
|
env: sanitizeEnv(env, addonPath),
|
|
81
115
|
};
|
|
82
|
-
const
|
|
116
|
+
const { execa } = await Promise.resolve().then(() => __importStar(require('execa')));
|
|
117
|
+
const result = await execa(cmd, args, opts);
|
|
83
118
|
handleError(result);
|
|
84
119
|
return result.all;
|
|
85
120
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/execa.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.execaSyncLibrary = void 0;
|
|
4
|
+
const cjs = typeof require !== 'undefined';
|
|
5
|
+
if (cjs) {
|
|
6
|
+
require('fix-esm').register();
|
|
7
|
+
}
|
|
8
|
+
const execa_1 = require("execa");
|
|
9
|
+
if (cjs) {
|
|
10
|
+
require('fix-esm').unregister();
|
|
11
|
+
}
|
|
12
|
+
exports.execaSyncLibrary = execa_1.execaSync;
|
|
13
|
+
//# sourceMappingURL=execa.lib.cjs.map
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "execa.lib.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../../src/child_process/execa.lib.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": ";;;AAAA,MAAM,GAAG,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC;AAC3C,IAAI,GAAG,EAAE;IACR,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;CAC9B;AAED,iCAAkC;AAElC,IAAI,GAAG,EAAE;IACR,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAC;CAChC;AAEY,QAAA,gBAAgB,GAAG,iBAAS,CAAC"
|
|
10
|
+
}
|
|
@@ -69,9 +69,8 @@ function supportScope() {
|
|
|
69
69
|
return false;
|
|
70
70
|
}
|
|
71
71
|
try {
|
|
72
|
-
const supported = (0, execa_1.
|
|
72
|
+
const supported = (0, execa_1.spawnGetOutputSync)({
|
|
73
73
|
exec: [unshare, ...unshareArgs, 'echo', 'yes'],
|
|
74
|
-
sync: true,
|
|
75
74
|
});
|
|
76
75
|
if (supported !== 'yes') {
|
|
77
76
|
return false;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/respawn.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,iDAA0C;AAC1C,mCAAuC;AACvC,2BAA8B;AAC9B,8DAAuD;AACvD,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/findBinary.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;
|
|
9
|
+
"mappings": ";;;AAAA,+BAA+B;AAC/B,6CAA0C;AAC1C,2DAAoD;AAEpD,SAAgB,UAAU,CACzB,IAAY,EACZ,UAA+C,IAAI,iCAAe,EAAE,EACpE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAEnB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;QACpC,IAAI,IAAA,mBAAU,EAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE;YAClC,OAAO,IAAA,cAAO,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAChC;KACD;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AAXD,gCAWC"
|
|
10
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.commandInPathSync = exports.commandInPath = void 0;
|
|
4
4
|
const common_1 = require("@idlebox/common");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const pathEnvironment_1 = require("../environment/pathEnvironment.cjs");
|
|
@@ -39,7 +39,7 @@ async function commandInPath(cmd, alterExt) {
|
|
|
39
39
|
return undefined;
|
|
40
40
|
}
|
|
41
41
|
exports.commandInPath = commandInPath;
|
|
42
|
-
function
|
|
42
|
+
function commandInPathSync(cmd, alterExt) {
|
|
43
43
|
const pathVar = new pathEnvironment_1.PathEnvironment();
|
|
44
44
|
for (const item of pathVar.join(cmd)) {
|
|
45
45
|
for (const ext of exts(alterExt)) {
|
|
@@ -52,5 +52,5 @@ function commmandInPathSync(cmd, alterExt) {
|
|
|
52
52
|
}
|
|
53
53
|
return undefined;
|
|
54
54
|
}
|
|
55
|
-
exports.
|
|
55
|
+
exports.commandInPathSync = commandInPathSync;
|
|
56
56
|
//# sourceMappingURL=commandExists.cjs.map
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/fs/commandExists.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,4CAA4C;AAC5C,2BAAmD;AACnD,wEAAiE;AAEjE,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEvE,SAAS,IAAI,CAAC,QAAmB;IAChC,IAAI,QAAQ,EAAE;QACb,MAAM,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAS,EAAE;YACf,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;KACX;IACD,IAAI,kBAAS,EAAE;QACd,OAAO,qBAAqB,CAAC;KAC7B;SAAM;QACN,OAAO,CAAC,EAAE,CAAC,CAAC;KACZ;AACF,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,QAAmB;IACnE,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,IAAA,WAAM,EAAC,IAAI,GAAG,GAAG,EAAE,cAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;oBACxC,IAAI,CAAC;wBAAE,OAAO,CAAC,KAAK,CAAC,CAAC;;wBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,KAAK;gBAAE,OAAO,IAAI,GAAG,GAAG,CAAC;SAC7B;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAdD,sCAcC;AACD,SAAgB,
|
|
9
|
+
"mappings": ";;;AAAA,4CAA4C;AAC5C,2BAAmD;AACnD,wEAAiE;AAEjE,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEvE,SAAS,IAAI,CAAC,QAAmB;IAChC,IAAI,QAAQ,EAAE;QACb,MAAM,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAS,EAAE;YACf,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;KACX;IACD,IAAI,kBAAS,EAAE;QACd,OAAO,qBAAqB,CAAC;KAC7B;SAAM;QACN,OAAO,CAAC,EAAE,CAAC,CAAC;KACZ;AACF,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,QAAmB;IACnE,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,IAAA,WAAM,EAAC,IAAI,GAAG,GAAG,EAAE,cAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;oBACxC,IAAI,CAAC;wBAAE,OAAO,CAAC,KAAK,CAAC,CAAC;;wBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,KAAK;gBAAE,OAAO,IAAI,GAAG,GAAG,CAAC;SAC7B;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAdD,sCAcC;AACD,SAAgB,iBAAiB,CAAC,GAAW,EAAE,QAAmB;IACjE,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI;gBACH,IAAA,eAAU,EAAC,IAAI,GAAG,GAAG,EAAE,cAAS,CAAC,IAAI,CAAC,CAAC;gBACvC,OAAO,IAAI,GAAG,GAAG,CAAC;aAClB;YAAC,MAAM,GAAE;SACV;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAXD,8CAWC"
|
|
10
10
|
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.emptyDir = void 0;
|
|
4
|
+
const promises_1 = require("fs/promises");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
/**
|
|
7
|
+
* delete all content in a dir,
|
|
8
|
+
* and create it if not exists
|
|
9
|
+
* @public
|
|
10
|
+
*/
|
|
11
|
+
async function emptyDir(path, create_if_nexists = true) {
|
|
12
|
+
let files;
|
|
13
|
+
try {
|
|
14
|
+
files = await (0, promises_1.readdir)(path);
|
|
15
|
+
}
|
|
16
|
+
catch (e) {
|
|
17
|
+
if (e.code === 'ENOENT') {
|
|
18
|
+
if (create_if_nexists)
|
|
19
|
+
await (0, promises_1.mkdir)(path, { recursive: true });
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
throw e;
|
|
23
|
+
}
|
|
24
|
+
if (files.length === 0)
|
|
25
|
+
return;
|
|
26
|
+
for (const item of files) {
|
|
27
|
+
await (0, promises_1.rm)((0, path_1.resolve)(path, item), { recursive: true });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.emptyDir = emptyDir;
|
|
31
|
+
//# sourceMappingURL=emptyDir.cjs.map
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "emptyDir.cjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../../src/fs/emptyDir.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": ";;;AAAA,0CAAiD;AACjD,+BAA+B;AAE/B;;;;GAIG;AACI,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,iBAAiB,GAAG,IAAI;IACpE,IAAI,KAAK,CAAC;IACV,IAAI;QACH,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,CAAC,CAAC;KAC5B;IAAC,OAAO,CAAM,EAAE;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACxB,IAAI,iBAAiB;gBAAE,MAAM,IAAA,gBAAK,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,MAAM,CAAC,CAAC;KACR;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACzB,MAAM,IAAA,aAAE,EAAC,IAAA,cAAO,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACnD;AACF,CAAC;AAhBD,4BAgBC"
|
|
10
|
+
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { EventEmitter } from 'events';
|
|
4
4
|
import { ExecaReturnValue } from 'execa';
|
|
5
|
+
import { execaSync } from 'execa';
|
|
5
6
|
import { IDisposable } from '@idlebox/common';
|
|
6
7
|
import { Options } from 'execa';
|
|
7
8
|
import { PathArray } from '@idlebox/common';
|
|
@@ -11,10 +12,6 @@ import { WrappedConsole } from '@idlebox/common';
|
|
|
11
12
|
import { WrappedConsoleOptions } from '@idlebox/common';
|
|
12
13
|
import { Writable } from 'stream';
|
|
13
14
|
|
|
14
|
-
export declare interface Async {
|
|
15
|
-
sync?: boolean;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
15
|
export declare type AsyncMainFunction = () => Promise<void | number>;
|
|
19
16
|
|
|
20
17
|
export declare class BlackHoleStream extends Writable {
|
|
@@ -47,7 +44,7 @@ declare const colorMap: {
|
|
|
47
44
|
|
|
48
45
|
export declare function commandInPath(cmd: string, alterExt?: string[]): Promise<string | undefined>;
|
|
49
46
|
|
|
50
|
-
export declare function
|
|
47
|
+
export declare function commandInPathSync(cmd: string, alterExt?: string[]): string | undefined;
|
|
51
48
|
|
|
52
49
|
export declare function createTempFolder(fullPath: string): IDisposable;
|
|
53
50
|
|
|
@@ -59,6 +56,13 @@ export declare function drainStream(stream: NodeJS.ReadableStream, size: number,
|
|
|
59
56
|
|
|
60
57
|
export declare function dumpEventEmitterEmit(ev: EventEmitter): void;
|
|
61
58
|
|
|
59
|
+
/**
|
|
60
|
+
* delete all content in a dir,
|
|
61
|
+
* and create it if not exists
|
|
62
|
+
* @public
|
|
63
|
+
*/
|
|
64
|
+
export declare function emptyDir(path: string, create_if_nexists?: boolean): Promise<void>;
|
|
65
|
+
|
|
62
66
|
export declare enum ERRNO_LINUX {
|
|
63
67
|
EPERM = 1,
|
|
64
68
|
ENOENT = 2,
|
|
@@ -184,6 +188,8 @@ export declare enum ERRNO_LINUX {
|
|
|
184
188
|
EOVERFLOW = 139
|
|
185
189
|
}
|
|
186
190
|
|
|
191
|
+
export declare const execaSyncLibrary: typeof execaSync;
|
|
192
|
+
|
|
187
193
|
export declare function execLazyError(cmd: string, args: string[], spawnOptions?: Omit<Options, 'reject' | 'stdio' | 'encoding' | 'all' | 'stderr'> & ISpawnAdditionOptions): Promise<ExecaReturnValue<string>>;
|
|
188
194
|
|
|
189
195
|
export declare function exists(path: string): Promise<boolean>;
|
|
@@ -233,7 +239,6 @@ export declare interface ICommand {
|
|
|
233
239
|
exec: string[];
|
|
234
240
|
addonPath?: string[];
|
|
235
241
|
cwd?: string;
|
|
236
|
-
sync?: boolean;
|
|
237
242
|
env?: ProcessEnv;
|
|
238
243
|
}
|
|
239
244
|
|
|
@@ -339,15 +344,15 @@ export declare function sha256(data: Buffer): string;
|
|
|
339
344
|
|
|
340
345
|
export declare function spawnGetEverything({ exec, cwd, env, addonPath }: ICommand): Promise<string | undefined>;
|
|
341
346
|
|
|
342
|
-
export declare function spawnGetOutput(
|
|
347
|
+
export declare function spawnGetOutput({ exec, cwd, env, addonPath }: ICommand): Promise<string>;
|
|
343
348
|
|
|
344
|
-
export declare function
|
|
349
|
+
export declare function spawnGetOutputSync({ exec, cwd, env, addonPath }: ICommand): string;
|
|
345
350
|
|
|
346
351
|
export declare function spawnRecreateEventHandlers(): void;
|
|
347
352
|
|
|
348
|
-
export declare function spawnWithoutOutput(
|
|
353
|
+
export declare function spawnWithoutOutput({ exec, cwd, env, addonPath }: ICommand): Promise<void>;
|
|
349
354
|
|
|
350
|
-
export declare function
|
|
355
|
+
export declare function spawnWithoutOutputSync({ exec, cwd, env, addonPath }: ICommand): void;
|
|
351
356
|
|
|
352
357
|
export declare function streamHasEnd(S: NodeJS.ReadableStream | NodeJS.WritableStream): any;
|
|
353
358
|
|
|
@@ -361,10 +366,6 @@ export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: false
|
|
|
361
366
|
|
|
362
367
|
export declare function streamToBuffer(stream: NodeJS.ReadableStream, raw: true): Promise<Buffer>;
|
|
363
368
|
|
|
364
|
-
export declare interface Sync {
|
|
365
|
-
sync: true;
|
|
366
|
-
}
|
|
367
|
-
|
|
368
369
|
declare interface TerminalConsoleOptions {
|
|
369
370
|
color?: boolean | Partial<typeof colorMap>;
|
|
370
371
|
}
|
|
@@ -15,7 +15,12 @@ export { runMain } from "./asyncLoad.mjs";
|
|
|
15
15
|
/* child_process/error.ts */
|
|
16
16
|
// Identifiers
|
|
17
17
|
export { checkChildProcessResult } from "./child_process/error.mjs";
|
|
18
|
+
/* child_process/execa.lib.ts */
|
|
19
|
+
// Identifiers
|
|
20
|
+
export { execaSyncLibrary } from "./child_process/execa.lib.mjs";
|
|
21
|
+
export { spawnWithoutOutputSync } from "./child_process/execa.mjs";
|
|
18
22
|
export { spawnWithoutOutput } from "./child_process/execa.mjs";
|
|
23
|
+
export { spawnGetOutputSync } from "./child_process/execa.mjs";
|
|
19
24
|
export { spawnGetOutput } from "./child_process/execa.mjs";
|
|
20
25
|
export { spawnGetEverything } from "./child_process/execa.mjs";
|
|
21
26
|
/* cli-io/output.ts */
|
|
@@ -59,7 +64,10 @@ export { dumpEventEmitterEmit } from "./events/dumpEventEmitter.mjs";
|
|
|
59
64
|
/* fs/commandExists.ts */
|
|
60
65
|
// Identifiers
|
|
61
66
|
export { commandInPath } from "./fs/commandExists.mjs";
|
|
62
|
-
export {
|
|
67
|
+
export { commandInPathSync } from "./fs/commandExists.mjs";
|
|
68
|
+
/* fs/emptyDir.ts */
|
|
69
|
+
// Identifiers
|
|
70
|
+
export { emptyDir } from "./fs/emptyDir.mjs";
|
|
63
71
|
/* fs/tempFolder.ts */
|
|
64
72
|
// Identifiers
|
|
65
73
|
export { createTempFolder } from "./fs/tempFolder.mjs";
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../src/__create_index.generated.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,wBAAwB;AACxB,aAAa;AACb,oBAAoB;AAQnB,OAAO,EAAC,WAAW,EAAC,uCAAsC;AAE1D,OAAO,EAAC,aAAa,EAAC,uCAAsC;AAC5D,OAAO,EAAC,SAAS,EAAC,uCAAsC;AACxD,OAAO,EAAC,YAAY,EAAC,uCAAsC;AAC5D,qBAAqB;AACpB,cAAc;AACd,OAAO,EAAC,eAAe,EAAC,2BAA0B;AAClD,OAAO,EAAC,gBAAgB,EAAC,2BAA0B;AACnD,OAAO,EAAC,iBAAiB,EAAC,2BAA0B;AAIpD,OAAO,EAAC,SAAS,EAAC,wBAAuB;AACzC,OAAO,EAAC,OAAO,EAAC,wBAAuB;AACxC,4BAA4B;AAC3B,cAAc;AACd,OAAO,EAAC,uBAAuB,EAAC,kCAAiC;
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
const cjs = typeof require !== 'undefined';
|
|
2
|
+
if (cjs) {
|
|
3
|
+
require('fix-esm').register();
|
|
4
|
+
}
|
|
5
|
+
import { execaSync } from 'execa';
|
|
6
|
+
if (cjs) {
|
|
7
|
+
require('fix-esm').unregister();
|
|
8
|
+
}
|
|
9
|
+
export const execaSyncLibrary = execaSync;
|
|
10
|
+
//# sourceMappingURL=execa.lib.mjs.map
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "execa.lib.mjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../../src/child_process/execa.lib.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": "AAAA,MAAM,GAAG,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC;AAC3C,IAAI,GAAG,EAAE;IACR,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;CAC9B;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,IAAI,GAAG,EAAE;IACR,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAC;CAChC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,SAAS,CAAC"
|
|
10
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isWindows, sepList } from '@idlebox/common';
|
|
2
|
-
import { execa, execaSync } from 'execa';
|
|
3
2
|
import { checkChildProcessResult } from "./error.mjs";
|
|
3
|
+
import { execaSyncLibrary } from "./execa.lib.mjs";
|
|
4
4
|
function sanitizeEnv(env, addonPath) {
|
|
5
5
|
if (!env)
|
|
6
6
|
return undefined;
|
|
@@ -22,7 +22,7 @@ function handleError(result) {
|
|
|
22
22
|
}
|
|
23
23
|
return result;
|
|
24
24
|
}
|
|
25
|
-
export function
|
|
25
|
+
export function spawnWithoutOutputSync({ exec, cwd, env, addonPath }) {
|
|
26
26
|
const [cmd, ...args] = exec;
|
|
27
27
|
const opts = {
|
|
28
28
|
stdio: ['ignore', process.stderr, process.stderr],
|
|
@@ -30,18 +30,21 @@ export function spawnWithoutOutput({ exec, cwd, sync, env, addonPath }) {
|
|
|
30
30
|
reject: false,
|
|
31
31
|
env: sanitizeEnv(env, addonPath),
|
|
32
32
|
};
|
|
33
|
-
|
|
34
|
-
checkChildProcessResult(execaSync(cmd, args, opts));
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
return execa(cmd, args, opts)
|
|
38
|
-
.then(checkChildProcessResult)
|
|
39
|
-
.then(() => {
|
|
40
|
-
return;
|
|
41
|
-
});
|
|
42
|
-
}
|
|
33
|
+
checkChildProcessResult(execaSyncLibrary(cmd, args, opts));
|
|
43
34
|
}
|
|
44
|
-
export function
|
|
35
|
+
export async function spawnWithoutOutput({ exec, cwd, env, addonPath }) {
|
|
36
|
+
const [cmd, ...args] = exec;
|
|
37
|
+
const opts = {
|
|
38
|
+
stdio: ['ignore', process.stderr, process.stderr],
|
|
39
|
+
cwd,
|
|
40
|
+
reject: false,
|
|
41
|
+
env: sanitizeEnv(env, addonPath),
|
|
42
|
+
};
|
|
43
|
+
const { execa } = await import('execa');
|
|
44
|
+
const e = await execa(cmd, args, opts);
|
|
45
|
+
handleError(e);
|
|
46
|
+
}
|
|
47
|
+
export function spawnGetOutputSync({ exec, cwd, env, addonPath }) {
|
|
45
48
|
const [cmd, ...args] = exec;
|
|
46
49
|
const opts = {
|
|
47
50
|
stdio: ['ignore', 'pipe', process.stderr],
|
|
@@ -51,17 +54,23 @@ export function spawnGetOutput({ exec, cwd, sync, env, addonPath }) {
|
|
|
51
54
|
encoding: 'utf8',
|
|
52
55
|
env: sanitizeEnv(env, addonPath),
|
|
53
56
|
};
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
57
|
+
const result = handleError(execaSyncLibrary(cmd, args, opts));
|
|
58
|
+
return result.stdout;
|
|
59
|
+
}
|
|
60
|
+
export async function spawnGetOutput({ exec, cwd, env, addonPath }) {
|
|
61
|
+
const [cmd, ...args] = exec;
|
|
62
|
+
const opts = {
|
|
63
|
+
stdio: ['ignore', 'pipe', process.stderr],
|
|
64
|
+
cwd,
|
|
65
|
+
reject: false,
|
|
66
|
+
stripFinalNewline: true,
|
|
67
|
+
encoding: 'utf8',
|
|
68
|
+
env: sanitizeEnv(env, addonPath),
|
|
69
|
+
};
|
|
70
|
+
const { execa } = await import('execa');
|
|
71
|
+
const e = await execa(cmd, args, opts);
|
|
72
|
+
const result = handleError(e);
|
|
73
|
+
return result.stdout;
|
|
65
74
|
}
|
|
66
75
|
export async function spawnGetEverything({ exec, cwd, env, addonPath }) {
|
|
67
76
|
const [cmd, ...args] = exec;
|
|
@@ -74,6 +83,7 @@ export async function spawnGetEverything({ exec, cwd, env, addonPath }) {
|
|
|
74
83
|
all: true,
|
|
75
84
|
env: sanitizeEnv(env, addonPath),
|
|
76
85
|
};
|
|
86
|
+
const { execa } = await import('execa');
|
|
77
87
|
const result = await execa(cmd, args, opts);
|
|
78
88
|
handleError(result);
|
|
79
89
|
return result.all;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/execa.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -2,7 +2,7 @@ import { spawnSync } from 'child_process';
|
|
|
2
2
|
import { createRequire } from 'module';
|
|
3
3
|
import { platform } from 'os';
|
|
4
4
|
import { findBinary } from "../environment/findBinary.mjs";
|
|
5
|
-
import {
|
|
5
|
+
import { spawnGetOutputSync } from "./execa.mjs";
|
|
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');
|
|
@@ -63,9 +63,8 @@ function supportScope() {
|
|
|
63
63
|
return false;
|
|
64
64
|
}
|
|
65
65
|
try {
|
|
66
|
-
const supported =
|
|
66
|
+
const supported = spawnGetOutputSync({
|
|
67
67
|
exec: [unshare, ...unshareArgs, 'echo', 'yes'],
|
|
68
|
-
sync: true,
|
|
69
68
|
});
|
|
70
69
|
if (supported !== 'yes') {
|
|
71
70
|
return false;
|
|
@@ -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,sCAAkC;AACvD,OAAO,EAAE,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/findBinary.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,yBAAqB;AAC1C,OAAO,EAAE,eAAe,EAAE,8BAA0B;AAEpD,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;QACpC,IAAI,UAAU,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE;YAClC,OAAO,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAChC;KACD;IACD,OAAO,EAAE,CAAC;AACX,CAAC"
|
|
10
10
|
}
|
|
@@ -35,7 +35,7 @@ export async function commandInPath(cmd, alterExt) {
|
|
|
35
35
|
}
|
|
36
36
|
return undefined;
|
|
37
37
|
}
|
|
38
|
-
export function
|
|
38
|
+
export function commandInPathSync(cmd, alterExt) {
|
|
39
39
|
const pathVar = new PathEnvironment();
|
|
40
40
|
for (const item of pathVar.join(cmd)) {
|
|
41
41
|
for (const ext of exts(alterExt)) {
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/fs/commandExists.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,2CAAuC;AAEjE,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEvE,SAAS,IAAI,CAAC,QAAmB;IAChC,IAAI,QAAQ,EAAE;QACb,MAAM,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC1B,IAAI,CAAC,SAAS,EAAE;YACf,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;KACX;IACD,IAAI,SAAS,EAAE;QACd,OAAO,qBAAqB,CAAC;KAC7B;SAAM;QACN,OAAO,CAAC,EAAE,CAAC,CAAC;KACZ;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,QAAmB;IACnE,MAAM,OAAO,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;oBACxC,IAAI,CAAC;wBAAE,OAAO,CAAC,KAAK,CAAC,CAAC;;wBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,KAAK;gBAAE,OAAO,IAAI,GAAG,GAAG,CAAC;SAC7B;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AACD,MAAM,UAAU,
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,2CAAuC;AAEjE,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEvE,SAAS,IAAI,CAAC,QAAmB;IAChC,IAAI,QAAQ,EAAE;QACb,MAAM,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC1B,IAAI,CAAC,SAAS,EAAE;YACf,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChB;QACD,OAAO,GAAG,CAAC;KACX;IACD,IAAI,SAAS,EAAE;QACd,OAAO,qBAAqB,CAAC;KAC7B;SAAM;QACN,OAAO,CAAC,EAAE,CAAC,CAAC;KACZ;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,QAAmB;IACnE,MAAM,OAAO,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;oBACxC,IAAI,CAAC;wBAAE,OAAO,CAAC,KAAK,CAAC,CAAC;;wBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,IAAI,KAAK;gBAAE,OAAO,IAAI,GAAG,GAAG,CAAC;SAC7B;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AACD,MAAM,UAAU,iBAAiB,CAAC,GAAW,EAAE,QAAmB;IACjE,MAAM,OAAO,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI;gBACH,UAAU,CAAC,IAAI,GAAG,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBACvC,OAAO,IAAI,GAAG,GAAG,CAAC;aAClB;YAAC,MAAM,GAAE;SACV;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC"
|
|
10
10
|
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { mkdir, readdir, rm } from 'fs/promises';
|
|
2
|
+
import { resolve } from 'path';
|
|
3
|
+
/**
|
|
4
|
+
* delete all content in a dir,
|
|
5
|
+
* and create it if not exists
|
|
6
|
+
* @public
|
|
7
|
+
*/
|
|
8
|
+
export async function emptyDir(path, create_if_nexists = true) {
|
|
9
|
+
let files;
|
|
10
|
+
try {
|
|
11
|
+
files = await readdir(path);
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
if (e.code === 'ENOENT') {
|
|
15
|
+
if (create_if_nexists)
|
|
16
|
+
await mkdir(path, { recursive: true });
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
throw e;
|
|
20
|
+
}
|
|
21
|
+
if (files.length === 0)
|
|
22
|
+
return;
|
|
23
|
+
for (const item of files) {
|
|
24
|
+
await rm(resolve(path, item), { recursive: true });
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=emptyDir.mjs.map
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"file": "emptyDir.mjs",
|
|
4
|
+
"sourceRoot": "",
|
|
5
|
+
"sources": [
|
|
6
|
+
"../../../src/fs/emptyDir.ts"
|
|
7
|
+
],
|
|
8
|
+
"names": [],
|
|
9
|
+
"mappings": "AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,iBAAiB,GAAG,IAAI;IACpE,IAAI,KAAK,CAAC;IACV,IAAI;QACH,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5B;IAAC,OAAO,CAAM,EAAE;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACxB,IAAI,iBAAiB;gBAAE,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,OAAO;SACP;QACD,MAAM,CAAC,CAAC;KACR;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACzB,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACnD;AACF,CAAC"
|
|
10
|
+
}
|
package/package.json
CHANGED
|
@@ -1,35 +1,42 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@idlebox/node",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.2.
|
|
4
|
+
"version": "1.2.19",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "./lib/cjs/__create_index.generated.cjs",
|
|
7
7
|
"module": "./lib/esm/__create_index.generated.mjs",
|
|
8
8
|
"exports": {
|
|
9
9
|
".": {
|
|
10
|
-
"
|
|
11
|
-
"
|
|
10
|
+
"import": "./lib/esm/__create_index.generated.mjs",
|
|
11
|
+
"require": "./lib/cjs/__create_index.generated.cjs"
|
|
12
12
|
},
|
|
13
13
|
"./package.json": "./package.json"
|
|
14
14
|
},
|
|
15
|
+
"sideEffects": false,
|
|
15
16
|
"repository": "https://github.com/GongT/baobao",
|
|
16
17
|
"dependencies": {
|
|
17
|
-
"execa": "^
|
|
18
|
+
"execa": "^7.1.1",
|
|
18
19
|
"source-map-support": "^0.5.21",
|
|
19
|
-
"tslib": "^2.
|
|
20
|
-
"@
|
|
21
|
-
"@idlebox/common": "^1.3.19"
|
|
20
|
+
"tslib": "^2.6.0",
|
|
21
|
+
"@idlebox/common": "^1.3.22"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@gongt/kexec": "^3.0.0",
|
|
25
|
-
"@rushstack/heft": "^0.
|
|
26
|
-
"@types/node": "^
|
|
25
|
+
"@rushstack/heft": "^0.57.1",
|
|
26
|
+
"@types/node": "^20.4.2",
|
|
27
27
|
"chai": "^4.3.7",
|
|
28
|
-
"
|
|
29
|
-
"mocha": "^10.1.0",
|
|
28
|
+
"mocha": "^10.2.0",
|
|
30
29
|
"@internal/dualstack-rig": "^1.0.1",
|
|
31
30
|
"@build-script/single-dog-asset": "^1.0.27"
|
|
32
31
|
},
|
|
32
|
+
"peerDependencies": {
|
|
33
|
+
"fix-esm": "^1.0.1"
|
|
34
|
+
},
|
|
35
|
+
"peerDependenciesMeta": {
|
|
36
|
+
"fix-esm": {
|
|
37
|
+
"optional": true
|
|
38
|
+
}
|
|
39
|
+
},
|
|
33
40
|
"optionalDependencies": {
|
|
34
41
|
"@gongt/kexec": "latest"
|
|
35
42
|
},
|
|
@@ -1,13 +1,7 @@
|
|
|
1
1
|
import { isWindows, sepList } from '@idlebox/common';
|
|
2
|
-
import {
|
|
2
|
+
import type { ExecaReturnBase, SyncOptions } from 'execa';
|
|
3
3
|
import { checkChildProcessResult } from './error';
|
|
4
|
-
|
|
5
|
-
export interface Sync {
|
|
6
|
-
sync: true;
|
|
7
|
-
}
|
|
8
|
-
export interface Async {
|
|
9
|
-
sync?: boolean;
|
|
10
|
-
}
|
|
4
|
+
import { execaSyncLibrary } from './execa.lib';
|
|
11
5
|
|
|
12
6
|
type ProcessEnv = Record<string, string> & {
|
|
13
7
|
Path?: never;
|
|
@@ -17,7 +11,6 @@ export interface ICommand {
|
|
|
17
11
|
exec: string[];
|
|
18
12
|
addonPath?: string[];
|
|
19
13
|
cwd?: string;
|
|
20
|
-
sync?: boolean;
|
|
21
14
|
env?: ProcessEnv;
|
|
22
15
|
}
|
|
23
16
|
|
|
@@ -43,9 +36,7 @@ function handleError<T extends ExecaReturnBase<string>>(result: T): T {
|
|
|
43
36
|
return result;
|
|
44
37
|
}
|
|
45
38
|
|
|
46
|
-
export function
|
|
47
|
-
export function spawnWithoutOutput(opt: ICommand & Async): Promise<void>;
|
|
48
|
-
export function spawnWithoutOutput({ exec, cwd, sync, env, addonPath }: ICommand & Async): void | Promise<void> {
|
|
39
|
+
export function spawnWithoutOutputSync({ exec, cwd, env, addonPath }: ICommand): void {
|
|
49
40
|
const [cmd, ...args] = exec;
|
|
50
41
|
const opts: SyncOptions = {
|
|
51
42
|
stdio: ['ignore', process.stderr, process.stderr],
|
|
@@ -54,20 +45,24 @@ export function spawnWithoutOutput({ exec, cwd, sync, env, addonPath }: ICommand
|
|
|
54
45
|
env: sanitizeEnv(env, addonPath),
|
|
55
46
|
};
|
|
56
47
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
48
|
+
checkChildProcessResult(execaSyncLibrary(cmd, args, opts));
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export async function spawnWithoutOutput({ exec, cwd, env, addonPath }: ICommand) {
|
|
52
|
+
const [cmd, ...args] = exec;
|
|
53
|
+
const opts: SyncOptions = {
|
|
54
|
+
stdio: ['ignore', process.stderr, process.stderr],
|
|
55
|
+
cwd,
|
|
56
|
+
reject: false,
|
|
57
|
+
env: sanitizeEnv(env, addonPath),
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
const { execa } = await import('execa');
|
|
61
|
+
const e = await execa(cmd, args, opts);
|
|
62
|
+
handleError(e);
|
|
66
63
|
}
|
|
67
64
|
|
|
68
|
-
export function
|
|
69
|
-
export function spawnGetOutput(opt: ICommand & Async): Promise<string>;
|
|
70
|
-
export function spawnGetOutput({ exec, cwd, sync, env, addonPath }: ICommand) {
|
|
65
|
+
export function spawnGetOutputSync({ exec, cwd, env, addonPath }: ICommand) {
|
|
71
66
|
const [cmd, ...args] = exec;
|
|
72
67
|
const opts: SyncOptions = {
|
|
73
68
|
stdio: ['ignore', 'pipe', process.stderr],
|
|
@@ -78,16 +73,25 @@ export function spawnGetOutput({ exec, cwd, sync, env, addonPath }: ICommand) {
|
|
|
78
73
|
env: sanitizeEnv(env, addonPath),
|
|
79
74
|
};
|
|
80
75
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
76
|
+
const result = handleError(execaSyncLibrary(cmd, args, opts));
|
|
77
|
+
return result.stdout;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
export async function spawnGetOutput({ exec, cwd, env, addonPath }: ICommand) {
|
|
81
|
+
const [cmd, ...args] = exec;
|
|
82
|
+
const opts: SyncOptions = {
|
|
83
|
+
stdio: ['ignore', 'pipe', process.stderr],
|
|
84
|
+
cwd,
|
|
85
|
+
reject: false,
|
|
86
|
+
stripFinalNewline: true,
|
|
87
|
+
encoding: 'utf8',
|
|
88
|
+
env: sanitizeEnv(env, addonPath),
|
|
89
|
+
};
|
|
90
|
+
|
|
91
|
+
const { execa } = await import('execa');
|
|
92
|
+
const e = await execa(cmd, args, opts);
|
|
93
|
+
const result = handleError(e);
|
|
94
|
+
return result.stdout;
|
|
91
95
|
}
|
|
92
96
|
|
|
93
97
|
export async function spawnGetEverything({ exec, cwd, env, addonPath }: ICommand) {
|
|
@@ -102,6 +106,7 @@ export async function spawnGetEverything({ exec, cwd, env, addonPath }: ICommand
|
|
|
102
106
|
env: sanitizeEnv(env, addonPath),
|
|
103
107
|
};
|
|
104
108
|
|
|
109
|
+
const { execa } = await import('execa');
|
|
105
110
|
const result = await execa(cmd, args, opts);
|
|
106
111
|
handleError(result);
|
|
107
112
|
return result.all;
|
|
@@ -2,7 +2,7 @@ import { spawnSync } from 'child_process';
|
|
|
2
2
|
import { createRequire } from 'module';
|
|
3
3
|
import { platform } from 'os';
|
|
4
4
|
import { findBinary } from '../environment/findBinary';
|
|
5
|
-
import {
|
|
5
|
+
import { spawnGetOutputSync } from './execa';
|
|
6
6
|
|
|
7
7
|
const unshareArgs = ['--pid', '--cgroup', '--fork', '--mount-proc', '--propagation=slave'];
|
|
8
8
|
|
|
@@ -70,9 +70,8 @@ function supportScope() {
|
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
try {
|
|
73
|
-
const supported =
|
|
73
|
+
const supported = spawnGetOutputSync({
|
|
74
74
|
exec: [unshare, ...unshareArgs, 'echo', 'yes'],
|
|
75
|
-
sync: true,
|
|
76
75
|
});
|
|
77
76
|
if (supported !== 'yes') {
|
|
78
77
|
return false;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { PathArray } from '@idlebox/common';
|
|
2
1
|
import { resolve } from 'path';
|
|
3
2
|
import { existsSync } from '../fs/exists';
|
|
4
3
|
import { PathEnvironment } from './pathEnvironment';
|
|
5
4
|
|
|
6
|
-
export function findBinary(
|
|
5
|
+
export function findBinary(
|
|
6
|
+
what: string,
|
|
7
|
+
pathvar: import('@idlebox/common').PathArray = new PathEnvironment(),
|
|
8
|
+
cwd = process.cwd()
|
|
9
|
+
) {
|
|
7
10
|
for (const path of pathvar.values()) {
|
|
8
11
|
if (existsSync(path + '/' + what)) {
|
|
9
12
|
return resolve(cwd, path, what);
|
package/src/fs/commandExists.ts
CHANGED
|
@@ -34,7 +34,7 @@ export async function commandInPath(cmd: string, alterExt?: string[]): Promise<s
|
|
|
34
34
|
}
|
|
35
35
|
return undefined;
|
|
36
36
|
}
|
|
37
|
-
export function
|
|
37
|
+
export function commandInPathSync(cmd: string, alterExt?: string[]): string | undefined {
|
|
38
38
|
const pathVar = new PathEnvironment();
|
|
39
39
|
for (const item of pathVar.join(cmd)) {
|
|
40
40
|
for (const ext of exts(alterExt)) {
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { mkdir, readdir, rm } from 'fs/promises';
|
|
2
|
+
import { resolve } from 'path';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* delete all content in a dir,
|
|
6
|
+
* and create it if not exists
|
|
7
|
+
* @public
|
|
8
|
+
*/
|
|
9
|
+
export async function emptyDir(path: string, create_if_nexists = true) {
|
|
10
|
+
let files;
|
|
11
|
+
try {
|
|
12
|
+
files = await readdir(path);
|
|
13
|
+
} catch (e: any) {
|
|
14
|
+
if (e.code === 'ENOENT') {
|
|
15
|
+
if (create_if_nexists) await mkdir(path, { recursive: true });
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
throw e;
|
|
19
|
+
}
|
|
20
|
+
if (files.length === 0) return;
|
|
21
|
+
|
|
22
|
+
for (const item of files) {
|
|
23
|
+
await rm(resolve(path, item), { recursive: true });
|
|
24
|
+
}
|
|
25
|
+
}
|
package/scripts/prefix.js
DELETED