rbxts-orchestra 0.1.3 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/run.js +2 -2
- package/dist/src/helpers/script.d.ts +4 -0
- package/dist/src/helpers/script.js +2 -1
- package/dist/src/helpers/script.js.map +1 -1
- package/dist/src/orchestra/orchestra.js +1 -1
- package/dist/src/orchestra/orchestra.js.map +1 -1
- package/package.json +2 -2
- package/src/helpers/script.ts +6 -1
- package/src/orchestra/orchestra.ts +1 -1
package/dist/run.js
CHANGED
|
@@ -32,7 +32,7 @@ var import_yargs = __toESM(require("yargs"));
|
|
|
32
32
|
// package.json
|
|
33
33
|
var package_default = {
|
|
34
34
|
name: "rbxts-orchestra",
|
|
35
|
-
version: "0.1.
|
|
35
|
+
version: "0.1.4",
|
|
36
36
|
description: "A build orchestrator.",
|
|
37
37
|
main: "src/index.ts",
|
|
38
38
|
bin: {
|
|
@@ -123,7 +123,7 @@ var Orchestra = class _Orchestra {
|
|
|
123
123
|
this.environment = environmentName;
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
|
-
(0, import_assert.default)(this.environment, `Orchestra
|
|
126
|
+
(0, import_assert.default)(this.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
|
|
127
127
|
}
|
|
128
128
|
static async fromDirectory(directoryPath) {
|
|
129
129
|
return await _Orchestra.fromFileConfig((0, import_path.resolve)(directoryPath, ORCHESTRA_CONFIG_FILENAME));
|
|
@@ -8,6 +8,10 @@ interface SpawnConfig {
|
|
|
8
8
|
* Whether to ignore a non-zero exit code
|
|
9
9
|
*/
|
|
10
10
|
ignoreNonZeroExitCode: boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Additional arguments to pass to the process
|
|
13
|
+
*/
|
|
14
|
+
argv: string[];
|
|
11
15
|
}
|
|
12
16
|
export declare function sh<E extends Environments>(cmd: string, config?: Partial<SpawnConfig>): Value<E, Script<E>>;
|
|
13
17
|
export declare function script<E extends Environments>(path: string, config?: Partial<SpawnConfig>): Value<E, Script<E>>;
|
|
@@ -4,6 +4,7 @@ import { val } from "../orchestra/config";
|
|
|
4
4
|
const DEFAULT_SPAWN_CONFIG = {
|
|
5
5
|
waitForExit: true,
|
|
6
6
|
ignoreNonZeroExitCode: false,
|
|
7
|
+
argv: [],
|
|
7
8
|
};
|
|
8
9
|
function generateEnv(orchestra, place) {
|
|
9
10
|
return {
|
|
@@ -22,7 +23,7 @@ export function sh(cmd, config = {}) {
|
|
|
22
23
|
};
|
|
23
24
|
return val((orchestra, place, argv = []) => {
|
|
24
25
|
return new Promise((resolvePromise, reject) => {
|
|
25
|
-
const child = spawn(`${cmd}`, argv, {
|
|
26
|
+
const child = spawn(`${cmd}`, [...argv, ...fullConfig.argv], {
|
|
26
27
|
cwd: place ? resolve(orchestra.resolveConfig(place.rootDir)) : undefined,
|
|
27
28
|
stdio: "inherit",
|
|
28
29
|
env: generateEnv(orchestra, place),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/helpers/script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAqC,GAAG,EAAS,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/helpers/script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAqC,GAAG,EAAS,MAAM,qBAAqB,CAAC;AAkBpF,MAAM,oBAAoB,GAAgB;IACzC,WAAW,EAAE,IAAI;IACjB,qBAAqB,EAAE,KAAK;IAC5B,IAAI,EAAE,EAAE;CACR,CAAC;AAEF,SAAS,WAAW,CACnB,SAAuB,EACvB,KAAsB;IAEtB,OAAO;QACN,GAAG,OAAO,CAAC,GAAG;QACd,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC;QAC3B,cAAc,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;QACvE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QACnE,QAAQ,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE;QACrE,aAAa,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE;KAC/E,CAAC;AACH,CAAC;AAED,MAAM,UAAU,EAAE,CAAyB,GAAW,EAAE,SAA+B,EAAE;IACxF,MAAM,UAAU,GAAG;QAClB,GAAG,oBAAoB;QACvB,GAAG,MAAM;KACT,CAAC;IAEF,OAAO,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC5D,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBACxE,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB;wBAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAClE,cAAc,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,cAAc,EAAE,CAAC;YAClB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,MAAM,CAAyB,IAAY,EAAE,SAA+B,EAAE;IAC7F,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -29,7 +29,7 @@ export class Orchestra {
|
|
|
29
29
|
this.environment = environmentName;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
assert(this.environment, `Orchestra
|
|
32
|
+
assert(this.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
|
|
33
33
|
}
|
|
34
34
|
async runScripts(scriptName, argv) {
|
|
35
35
|
await this.resolveConfig(this.config.scripts?.prepare)?.(this, undefined, argv);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestra.js","sourceRoot":"","sources":["../../../src/orchestra/orchestra.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAA6C,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAE/D,MAAM,OAAO,SAAS;IAeO;IAdrB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,aAAqB;QACtD,OAAO,MAAM,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAC1F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,QAAgB;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACnD,OAAO,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,SAAS,CAAC,MAAgC,CAAC,CAAC;IACxD,CAAC;IAEe,WAAW,CAAU;IAErC,YAA4B,MAA0B;QAA1B,WAAM,GAAN,MAAM,CAAoB;QACrD,KAAK,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YACxF,IAAI,IAAK,CAAC,WAAW;gBAAE,SAAS;YAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;YACnD,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;iBAAM,IAAI,QAAQ,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAClD,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;QACF,CAAC;QACD,MAAM,CAAC,IAAK,CAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"orchestra.js","sourceRoot":"","sources":["../../../src/orchestra/orchestra.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAA6C,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAE/D,MAAM,OAAO,SAAS;IAeO;IAdrB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,aAAqB;QACtD,OAAO,MAAM,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAC1F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,QAAgB;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACnD,OAAO,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,SAAS,CAAC,MAAgC,CAAC,CAAC;IACxD,CAAC;IAEe,WAAW,CAAU;IAErC,YAA4B,MAA0B;QAA1B,WAAM,GAAN,MAAM,CAAoB;QACrD,KAAK,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YACxF,IAAI,IAAK,CAAC,WAAW;gBAAE,SAAS;YAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;YACnD,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;iBAAM,IAAI,QAAQ,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAClD,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;QACF,CAAC;QACD,MAAM,CAAC,IAAK,CAAC,WAAW,EAAE,kFAAkF,CAAC,CAAC;IAC/G,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,IAAe;QAC1D,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAEhF,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAErF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;IAEM,aAAa,CAAI,MAAwB;QAC/C,OAAO,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;CACD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rbxts-orchestra",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"description": "A build orchestrator.",
|
|
5
5
|
"main": "src/index.ts",
|
|
6
6
|
"bin": {
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"consola": "^3.2.3",
|
|
49
49
|
"jiti": "^2.6.1",
|
|
50
50
|
"picocolors": "^1.0.1",
|
|
51
|
-
"rbxts-orchestra": "^0.1.
|
|
51
|
+
"rbxts-orchestra": "^0.1.3",
|
|
52
52
|
"yargs": "^17.7.2"
|
|
53
53
|
}
|
|
54
54
|
}
|
package/src/helpers/script.ts
CHANGED
|
@@ -13,11 +13,16 @@ interface SpawnConfig {
|
|
|
13
13
|
* Whether to ignore a non-zero exit code
|
|
14
14
|
*/
|
|
15
15
|
ignoreNonZeroExitCode: boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Additional arguments to pass to the process
|
|
18
|
+
*/
|
|
19
|
+
argv: string[];
|
|
16
20
|
}
|
|
17
21
|
|
|
18
22
|
const DEFAULT_SPAWN_CONFIG: SpawnConfig = {
|
|
19
23
|
waitForExit: true,
|
|
20
24
|
ignoreNonZeroExitCode: false,
|
|
25
|
+
argv: [],
|
|
21
26
|
};
|
|
22
27
|
|
|
23
28
|
function generateEnv<E extends Environments>(
|
|
@@ -42,7 +47,7 @@ export function sh<E extends Environments>(cmd: string, config: Partial<SpawnCon
|
|
|
42
47
|
|
|
43
48
|
return val((orchestra, place, argv = []) => {
|
|
44
49
|
return new Promise((resolvePromise, reject) => {
|
|
45
|
-
const child = spawn(`${cmd}`, argv, {
|
|
50
|
+
const child = spawn(`${cmd}`, [...argv, ...fullConfig.argv], {
|
|
46
51
|
cwd: place ? resolve(orchestra.resolveConfig(place.rootDir)) : undefined,
|
|
47
52
|
stdio: "inherit",
|
|
48
53
|
env: generateEnv(orchestra, place),
|
|
@@ -33,7 +33,7 @@ export class Orchestra<E extends Environments> {
|
|
|
33
33
|
this.environment = environmentName;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
assert(this!.environment, `Orchestra
|
|
36
|
+
assert(this!.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
public async runScripts(scriptName: string, argv?: string[]) {
|