@take-out/cli 0.0.42 → 0.0.43
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/cjs/commands/changed.cjs +1 -1
- package/dist/cjs/commands/changed.js +1 -1
- package/dist/cjs/commands/changed.native.js +1 -1
- package/dist/cjs/commands/run.cjs +18 -17
- package/dist/cjs/commands/run.js +8 -11
- package/dist/cjs/commands/run.js.map +2 -2
- package/dist/cjs/commands/run.native.js +10 -9
- package/dist/cjs/commands/run.native.js.map +2 -2
- package/dist/cjs/commands/sync.cjs +1 -1
- package/dist/cjs/commands/sync.js +1 -1
- package/dist/cjs/commands/sync.native.js +1 -1
- package/dist/cjs/utils/parallel-runner.cjs +9 -3
- package/dist/cjs/utils/parallel-runner.js +8 -3
- package/dist/cjs/utils/parallel-runner.js.map +1 -1
- package/dist/cjs/utils/parallel-runner.native.js +12 -3
- package/dist/cjs/utils/parallel-runner.native.js.map +1 -1
- package/dist/esm/commands/changed.js +1 -1
- package/dist/esm/commands/changed.mjs +1 -1
- package/dist/esm/commands/changed.native.js +1 -1
- package/dist/esm/commands/run.js +8 -11
- package/dist/esm/commands/run.js.map +2 -2
- package/dist/esm/commands/run.mjs +18 -17
- package/dist/esm/commands/run.mjs.map +1 -1
- package/dist/esm/commands/run.native.js +12 -9
- package/dist/esm/commands/run.native.js.map +1 -1
- package/dist/esm/commands/sync.js +1 -1
- package/dist/esm/commands/sync.mjs +1 -1
- package/dist/esm/commands/sync.native.js +1 -1
- package/dist/esm/utils/parallel-runner.js +8 -3
- package/dist/esm/utils/parallel-runner.js.map +1 -1
- package/dist/esm/utils/parallel-runner.mjs +9 -3
- package/dist/esm/utils/parallel-runner.mjs.map +1 -1
- package/dist/esm/utils/parallel-runner.native.js +12 -3
- package/dist/esm/utils/parallel-runner.native.js.map +1 -1
- package/package.json +4 -4
- package/src/commands/changed.ts +1 -1
- package/src/commands/run.ts +6 -10
- package/src/commands/sync.ts +1 -1
- package/src/utils/parallel-runner.ts +34 -9
- package/types/commands/run.d.ts.map +1 -1
- package/types/utils/parallel-runner.d.ts.map +1 -1
|
@@ -39,7 +39,7 @@ var import_node_child_process = require("node:child_process"),
|
|
|
39
39
|
import_node_path = require("node:path"),
|
|
40
40
|
import_citty = require("citty"),
|
|
41
41
|
import_picocolors = __toESM(require("picocolors"), 1);
|
|
42
|
-
const UPSTREAM_REPO = "tamagui/
|
|
42
|
+
const UPSTREAM_REPO = "tamagui/takeout2",
|
|
43
43
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
44
44
|
TAKEOUT_FILE = ".takeout",
|
|
45
45
|
COMMIT_TYPE_ORDER = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci"];
|
|
@@ -26,7 +26,7 @@ __export(changed_exports, {
|
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(changed_exports);
|
|
28
28
|
var import_node_child_process = require("node:child_process"), import_node_fs = require("node:fs"), import_node_path = require("node:path"), import_citty = require("citty"), import_picocolors = __toESM(require("picocolors"), 1);
|
|
29
|
-
const UPSTREAM_REPO = "tamagui/
|
|
29
|
+
const UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout", COMMIT_TYPE_ORDER = [
|
|
30
30
|
"feat",
|
|
31
31
|
"fix",
|
|
32
32
|
"perf",
|
|
@@ -26,7 +26,7 @@ __export(changed_exports, {
|
|
|
26
26
|
changedCommand: () => changedCommand
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(changed_exports);
|
|
29
|
-
var import_child_process = require("child_process"), import_fs = require("fs"), import_path = require("path"), import_citty = require("citty"), import_picocolors = __toESM(require("picocolors"), 1), UPSTREAM_REPO = "tamagui/
|
|
29
|
+
var import_child_process = require("child_process"), import_fs = require("fs"), import_path = require("path"), import_citty = require("citty"), import_picocolors = __toESM(require("picocolors"), 1), UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout", COMMIT_TYPE_ORDER = [
|
|
30
30
|
"feat",
|
|
31
31
|
"fix",
|
|
32
32
|
"perf",
|
|
@@ -107,16 +107,15 @@ const runCommand = (0, import_citty.defineCommand)({
|
|
|
107
107
|
} = await import("./script"),
|
|
108
108
|
scriptPath2 = findScript(normalizedName);
|
|
109
109
|
if (scriptPath2) {
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
return;
|
|
110
|
+
const scriptArgsToPass = scriptArgs.slice(1),
|
|
111
|
+
child2 = (0, import_node_child_process.spawn)("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
112
|
+
stdio: "inherit",
|
|
113
|
+
shell: !1
|
|
114
|
+
}),
|
|
115
|
+
code2 = await new Promise(resolve2 => {
|
|
116
|
+
child2.on("exit", code3 => resolve2(code3 || 0));
|
|
117
|
+
});
|
|
118
|
+
process.exit(code2);
|
|
120
119
|
}
|
|
121
120
|
}
|
|
122
121
|
let currentDir = process.cwd(),
|
|
@@ -134,12 +133,14 @@ const runCommand = (0, import_citty.defineCommand)({
|
|
|
134
133
|
}
|
|
135
134
|
projectRoot || (console.error("Could not find project root"), process.exit(1));
|
|
136
135
|
const localScriptsPath = (0, import_node_path.resolve)(projectRoot, "packages/scripts/src/run.ts"),
|
|
137
|
-
scriptPath = (0, import_node_fs.existsSync)(localScriptsPath) ? localScriptsPath : (0, import_node_path.resolve)(projectRoot, "node_modules/@take-out/scripts/src/run.ts")
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
136
|
+
scriptPath = (0, import_node_fs.existsSync)(localScriptsPath) ? localScriptsPath : (0, import_node_path.resolve)(projectRoot, "node_modules/@take-out/scripts/src/run.ts"),
|
|
137
|
+
child = (0, import_node_child_process.spawn)("bun", [scriptPath, ...scriptArgs], {
|
|
138
|
+
stdio: "inherit",
|
|
139
|
+
shell: !1
|
|
140
|
+
}),
|
|
141
|
+
code = await new Promise(resolve2 => {
|
|
142
|
+
child.on("exit", code2 => resolve2(code2 || 0));
|
|
143
|
+
});
|
|
144
|
+
process.exit(code);
|
|
144
145
|
}
|
|
145
146
|
});
|
package/dist/cjs/commands/run.js
CHANGED
|
@@ -77,16 +77,13 @@ const runCommand = (0, import_citty.defineCommand)({
|
|
|
77
77
|
}
|
|
78
78
|
const normalizedName = firstArg.replace(/:/g, "/"), { findScript } = await import("./script"), scriptPath2 = findScript(normalizedName);
|
|
79
79
|
if (scriptPath2) {
|
|
80
|
-
const
|
|
81
|
-
console.info(pc.dim(`Running: ${normalizedName}`)), console.info();
|
|
82
|
-
const scriptArgsToPass = scriptArgs.slice(1);
|
|
83
|
-
(0, import_node_child_process.spawn)("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
80
|
+
const scriptArgsToPass = scriptArgs.slice(1), child2 = (0, import_node_child_process.spawn)("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
84
81
|
stdio: "inherit",
|
|
85
82
|
shell: !1
|
|
86
|
-
})
|
|
87
|
-
|
|
83
|
+
}), code2 = await new Promise((resolve2) => {
|
|
84
|
+
child2.on("exit", (code3) => resolve2(code3 || 0));
|
|
88
85
|
});
|
|
89
|
-
|
|
86
|
+
process.exit(code2);
|
|
90
87
|
}
|
|
91
88
|
}
|
|
92
89
|
let currentDir = process.cwd(), projectRoot = "";
|
|
@@ -104,13 +101,13 @@ const runCommand = (0, import_citty.defineCommand)({
|
|
|
104
101
|
currentDir = (0, import_node_path.resolve)(currentDir, "..");
|
|
105
102
|
}
|
|
106
103
|
projectRoot || (console.error("Could not find project root"), process.exit(1));
|
|
107
|
-
const localScriptsPath = (0, import_node_path.resolve)(projectRoot, "packages/scripts/src/run.ts"), scriptPath = (0, import_node_fs.existsSync)(localScriptsPath) ? localScriptsPath : (0, import_node_path.resolve)(projectRoot, "node_modules/@take-out/scripts/src/run.ts")
|
|
108
|
-
(0, import_node_child_process.spawn)("bun", [scriptPath, ...scriptArgs], {
|
|
104
|
+
const localScriptsPath = (0, import_node_path.resolve)(projectRoot, "packages/scripts/src/run.ts"), scriptPath = (0, import_node_fs.existsSync)(localScriptsPath) ? localScriptsPath : (0, import_node_path.resolve)(projectRoot, "node_modules/@take-out/scripts/src/run.ts"), child = (0, import_node_child_process.spawn)("bun", [scriptPath, ...scriptArgs], {
|
|
109
105
|
stdio: "inherit",
|
|
110
106
|
shell: !1
|
|
111
|
-
})
|
|
112
|
-
|
|
107
|
+
}), code = await new Promise((resolve2) => {
|
|
108
|
+
child.on("exit", (code2) => resolve2(code2 || 0));
|
|
113
109
|
});
|
|
110
|
+
process.exit(code);
|
|
114
111
|
}
|
|
115
112
|
});
|
|
116
113
|
//# sourceMappingURL=run.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/commands/run.ts"],
|
|
4
|
-
"mappings": "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
|
|
5
|
-
"names": ["discoverScripts", "pc", "categoryScripts", "scriptPath"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["discoverScripts", "pc", "categoryScripts", "scriptPath", "child", "code", "resolve"]
|
|
6
6
|
}
|
|
@@ -90,19 +90,18 @@ var import_child_process = require("child_process"), import_fs = require("fs"),
|
|
|
90
90
|
}
|
|
91
91
|
var normalizedName = firstArg.replace(/:/g, "/"), { findScript } = await import("./script"), scriptPath = findScript(normalizedName);
|
|
92
92
|
if (scriptPath) {
|
|
93
|
-
var pc3 = (await import("picocolors")).default;
|
|
94
|
-
console.info(pc3.dim(`Running: ${normalizedName}`)), console.info();
|
|
95
93
|
var scriptArgsToPass = scriptArgs.slice(1), child = (0, import_child_process.spawn)("bun", [
|
|
96
94
|
scriptPath,
|
|
97
95
|
...scriptArgsToPass
|
|
98
96
|
], {
|
|
99
97
|
stdio: "inherit",
|
|
100
98
|
shell: !1
|
|
99
|
+
}), code = await new Promise(function(resolve2) {
|
|
100
|
+
child.on("exit", function(code2) {
|
|
101
|
+
return resolve2(code2 || 0);
|
|
102
|
+
});
|
|
101
103
|
});
|
|
102
|
-
|
|
103
|
-
process.exit(code || 0);
|
|
104
|
-
});
|
|
105
|
-
return;
|
|
104
|
+
process.exit(code);
|
|
106
105
|
}
|
|
107
106
|
}
|
|
108
107
|
for (var currentDir = process.cwd(), projectRoot = ""; currentDir !== (0, import_path.parse)(currentDir).root; ) {
|
|
@@ -125,10 +124,12 @@ var import_child_process = require("child_process"), import_fs = require("fs"),
|
|
|
125
124
|
], {
|
|
126
125
|
stdio: "inherit",
|
|
127
126
|
shell: !1
|
|
127
|
+
}), code1 = await new Promise(function(resolve2) {
|
|
128
|
+
child1.on("exit", function(code2) {
|
|
129
|
+
return resolve2(code2 || 0);
|
|
130
|
+
});
|
|
128
131
|
});
|
|
129
|
-
|
|
130
|
-
process.exit(code || 0);
|
|
131
|
-
});
|
|
132
|
+
process.exit(code1);
|
|
132
133
|
}
|
|
133
134
|
});
|
|
134
135
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/commands/run.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAsB,0BACtB,YAAmD,eACnD,cAAqC,iBACrC,eAA8B,kBACnB,iBAAa,4BAAc;AAAA,EAClC,MAAM;AAAA,IACF,MAAM;AAAA,IACN,aAAa;AAAA,EACjB;AAAA,EACA,MAAM;AAAA,IACF,SAAS;AAAA,MACL,MAAM;AAAA,MACN,aAAa;AAAA,MACb,UAAU;AAAA,IACd;AAAA,EACJ;AAAA,EACA,KAAK,iBAAiB;AAElB,QAAI,aAAa,QAAQ,KAAK,MAAM,CAAC,GACjC,WAAW,WAAW,CAAC,GACvB,YAAY,WAAW,CAAC;AAE5B,QAAI,UAAU;AACV,UAAI,eAAW,kBAAK,QAAQ,IAAI,GAAG,SAAS,GACxC,mBAAe,kBAAK,UAAU,QAAQ;AAE1C,cAAI,sBAAW,YAAY,SAAK,oBAAS,YAAY,EAAE,YAAY,GAAG;AAElE,YAAI,aAAa,cAAc;AAC/B,YAAI,YAAY;AAEZ,cAAI,EAAE,gBAAgB,IAAI,MAAM,OAAO,UAAU,GAC7C,EAAE,qBAAqB,IAAI,MAAM,OAAO,0BAA0B,GAClE,MAAM,MAAM,OAAO,YAAY,GAAG,SAClC,kBAAkB,gBAAgB,YAAY;AAClD,cAAI,gBAAgB,SAAS,GAAG;AAC5B,oBAAQ,KAAK,GAAG,OAAO,uBAAuB,QAAQ,GAAG,CAAC;AAC1D;AAAA,UACJ;AACA,cAAI,eAAe,MAAM,KAAK,gBAAgB,QAAQ,CAAC,EAAE,IAAI,SAAS,OAAO;AACzE,gBAAI,CAACA,OAAMC,KAAI,IAAI;AACnB,mBAAO;AAAA,cACH,MAAMD,MAAK,QAAQ,GAAG,QAAQ,KAAK,EAAE;AAAA,cACrC,MAAAC;AAAA,YACJ;AAAA,UACJ,CAAC;AACD,gBAAM,qBAAqB,cAAc;AAAA,YACrC,OAAO,GAAG,KAAK,GAAG,KAAK,0BAA0B,QAAQ,GAAG,CAAC;AAAA,UACjE,CAAC;AACD;AAAA,QACJ;AAEA,YAAI,EAAE,iBAAiB,kBAAkB,kBAAkB,IAAI,MAAM,OAAO,UAAU,GAClF,OAAO,MAAM,OAAO,YAAY,GAAG,SAEnC,mBAAmB,iBAAiB,YAAY;AACpD,YAAI,iBAAiB,OAAO,GAAG;AAC3B,kBAAQ,KAAK,GACb,QAAQ,KAAK,IAAI,KAAK,IAAI,KAAK,aAAM,QAAQ,UAAU,CAAC,CAAC,GACzD,QAAQ,KAAK;AACb,cAAI,4BAA4B,IAAM,oBAAoB,IAAO,iBAAiB;AAClF,cAAI;AACA,qBAAQ,YAAY,iBAAiB,OAAO,QAAQ,EAAE,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,GAAG,OAAO,4BAA4B,IAAK;AAC7J,kBAAI,CAAC,MAAM,IAAI,IAAI,MAAM,OACrB,YAAY,KAAK,QAAQ,GAAG,QAAQ,KAAK,EAAE,GAC3C,WAAW,kBAAkB,IAAI,GACjC,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AACpC,cAAI,SAAS,gBACT,QAAQ,IAAI,IAAI,MAAM,SAAS,WAAW,EAAE,IAE5C,SAAS,QAAQ,SAAS,KAAK,SAAS,MACxC,QAAQ,IAAI,IAAI,KAAK,SAAS,KAAK,KAAK,IAAI,CAAC,GAAG,IAEpD,QAAQ,KAAK,IAAI;AAAA,YACrB;AAAA,UACJ,SAAS,KAAK;AACV,gCAAoB,IACpB,iBAAiB;AAAA,UACrB,UAAE;AACE,gBAAI;AACA,cAAI,CAAC,6BAA6B,UAAU,UAAU,QAClD,UAAU,OAAO;AAAA,YAEzB,UAAE;AACE,kBAAI;AACA,sBAAM;AAAA,YAEd;AAAA,UACJ;AACA,kBAAQ,KAAK,GACb,QAAQ,KAAK,IAAI,IAAI,YAAY,QAAQ,mBAAmB,CAAC,GAC7D,QAAQ,KAAK,IAAI,IAAI,YAAY,QAAQ,2BAA2B,CAAC,GACrE,QAAQ,KAAK,IAAI,IAAI,gBAAgB,QAAQ,8BAA8B,CAAC,GAC5E,QAAQ,KAAK;AAAA,QACjB,OAAO;AACH,cAAI,OAAO,MAAM,OAAO,YAAY,GAAG;AACvC,kBAAQ,KAAK,IAAI,OAAO,uBAAuB,QAAQ,GAAG,CAAC;AAAA,QAC/D;AACA;AAAA,MACJ;AAEA,UAAI,iBAAiB,SAAS,QAAQ,MAAM,GAAG,GAE3C,EAAE,WAAW,IAAI,MAAM,OAAO,UAAU,GACxC,aAAa,WAAW,cAAc;AAC1C,UAAI,YAAY;AAEZ,YAAI,
|
|
5
|
-
"names": ["name", "path"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["name", "path", "resolve", "code"]
|
|
6
6
|
}
|
|
@@ -43,7 +43,7 @@ var import_node_child_process = require("node:child_process"),
|
|
|
43
43
|
import_picocolors = __toESM(require("picocolors"), 1),
|
|
44
44
|
import_prompts = require("../utils/prompts.cjs");
|
|
45
45
|
const import_meta = {},
|
|
46
|
-
UPSTREAM_REPO = "tamagui/
|
|
46
|
+
UPSTREAM_REPO = "tamagui/takeout2",
|
|
47
47
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
48
48
|
TAKEOUT_FILE = ".takeout";
|
|
49
49
|
function getSyncPrompt() {
|
|
@@ -26,7 +26,7 @@ __export(sync_exports, {
|
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(sync_exports);
|
|
28
28
|
var import_node_child_process = require("node:child_process"), import_node_fs = require("node:fs"), import_node_os = require("node:os"), import_node_path = require("node:path"), import_node_url = require("node:url"), import_citty = require("citty"), import_picocolors = __toESM(require("picocolors"), 1), import_prompts = require("../utils/prompts");
|
|
29
|
-
const import_meta = {}, UPSTREAM_REPO = "tamagui/
|
|
29
|
+
const import_meta = {}, UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout";
|
|
30
30
|
function getSyncPrompt() {
|
|
31
31
|
try {
|
|
32
32
|
let packageRoot = (0, import_node_path.dirname)((0, import_node_url.fileURLToPath)(import_meta.url));
|
|
@@ -31,7 +31,7 @@ const import_meta = {};
|
|
|
31
31
|
function _instanceof(left, right) {
|
|
32
32
|
return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
|
|
33
33
|
}
|
|
34
|
-
var UPSTREAM_REPO = "tamagui/
|
|
34
|
+
var UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout";
|
|
35
35
|
function getSyncPrompt() {
|
|
36
36
|
try {
|
|
37
37
|
for (var currentDir = (0, import_path.dirname)((0, import_url.fileURLToPath)(import_meta.url)), packageRoot = currentDir; packageRoot !== (0, import_path.parse)(packageRoot).root; ) {
|
|
@@ -41,6 +41,12 @@ const colors = ["\x1B[36m",
|
|
|
41
41
|
// Gray
|
|
42
42
|
],
|
|
43
43
|
reset = "\x1B[0m";
|
|
44
|
+
function isBunShellNoise(line) {
|
|
45
|
+
const stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
46
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) ||
|
|
47
|
+
// source code lines like "24 | await $`..."
|
|
48
|
+
/^\s*\^$/.test(stripped);
|
|
49
|
+
}
|
|
44
50
|
async function runScriptsInParallel(scripts, options = {}) {
|
|
45
51
|
const {
|
|
46
52
|
title,
|
|
@@ -87,13 +93,13 @@ function runSingleScript(script, colorIndex) {
|
|
|
87
93
|
stderrBuffer += dataStr;
|
|
88
94
|
const lines = dataStr.split(`
|
|
89
95
|
`);
|
|
90
|
-
for (const line of lines) line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
96
|
+
for (const line of lines) line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
91
97
|
}), proc.on("error", error => {
|
|
92
98
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
93
99
|
}), proc.on("close", code => {
|
|
94
|
-
code && code !== 0 ? (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
100
|
+
code && code !== 0 ? (stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell") || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
95
101
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
96
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
102
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
97
103
|
});
|
|
98
104
|
});
|
|
99
105
|
}
|
|
@@ -34,6 +34,11 @@ const colors = [
|
|
|
34
34
|
"\x1B[90m"
|
|
35
35
|
// Gray
|
|
36
36
|
], reset = "\x1B[0m";
|
|
37
|
+
function isBunShellNoise(line) {
|
|
38
|
+
const stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
39
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) || // source code lines like "24 | await $`..."
|
|
40
|
+
/^\s*\^$/.test(stripped);
|
|
41
|
+
}
|
|
37
42
|
async function runScriptsInParallel(scripts, options = {}) {
|
|
38
43
|
const { title, onError = "exit", maxParallelism = (0, import_node_os.cpus)().length } = options;
|
|
39
44
|
title && (console.info(), console.info(title), console.info());
|
|
@@ -71,13 +76,13 @@ function runSingleScript(script, colorIndex) {
|
|
|
71
76
|
const lines = dataStr.split(`
|
|
72
77
|
`);
|
|
73
78
|
for (const line of lines)
|
|
74
|
-
line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
79
|
+
line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
75
80
|
}), proc.on("error", (error) => {
|
|
76
81
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
77
82
|
}), proc.on("close", (code) => {
|
|
78
|
-
code && code !== 0 ? (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
83
|
+
code && code !== 0 ? (stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell") || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
79
84
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
80
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
85
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
81
86
|
});
|
|
82
87
|
});
|
|
83
88
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/parallel-runner.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,gCAAsB,+BACtB,iBAAqB;AAErB,MAAM,SAAS;AAAA,EACb;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AACF,GAEM,QAAQ;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -33,6 +33,11 @@ var import_child_process = require("child_process"), import_os = require("os"),
|
|
|
33
33
|
// Red
|
|
34
34
|
"\x1B[90m"
|
|
35
35
|
], reset = "\x1B[0m";
|
|
36
|
+
function isBunShellNoise(line) {
|
|
37
|
+
var stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
38
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) || // source code lines like "24 | await $`..."
|
|
39
|
+
/^\s*\^$/.test(stripped);
|
|
40
|
+
}
|
|
36
41
|
async function runScriptsInParallel(scripts) {
|
|
37
42
|
var _loop = async function(i2) {
|
|
38
43
|
var script = scripts[i2], scriptPromise = runSingleScript(script, i2).finally(function() {
|
|
@@ -95,7 +100,7 @@ function runSingleScript(script, colorIndex) {
|
|
|
95
100
|
try {
|
|
96
101
|
for (var _iterator = lines[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
97
102
|
var line = _step.value;
|
|
98
|
-
line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
103
|
+
line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
99
104
|
}
|
|
100
105
|
} catch (err) {
|
|
101
106
|
_didIteratorError = !0, _iteratorError = err;
|
|
@@ -110,9 +115,13 @@ function runSingleScript(script, colorIndex) {
|
|
|
110
115
|
}), proc.on("error", function(error) {
|
|
111
116
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
112
117
|
}), proc.on("close", function(code) {
|
|
113
|
-
code && code !== 0
|
|
118
|
+
if (code && code !== 0) {
|
|
119
|
+
var isBunShellError = stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell");
|
|
120
|
+
isBunShellError || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
114
121
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
115
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))
|
|
122
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`));
|
|
123
|
+
} else
|
|
124
|
+
console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve();
|
|
116
125
|
});
|
|
117
126
|
});
|
|
118
127
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/parallel-runner.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEI,2BAAsB,0BAC1B,YAAqB,eACjB,SAAS;AAAA,EACT;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AAAA;AAAA,EAEA;AACJ,GAEI,QAAQ;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["i"]
|
|
6
6
|
}
|
|
@@ -3,7 +3,7 @@ import { existsSync, readFileSync } from "node:fs";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { defineCommand } from "citty";
|
|
5
5
|
import pc from "picocolors";
|
|
6
|
-
const UPSTREAM_REPO = "tamagui/
|
|
6
|
+
const UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout", COMMIT_TYPE_ORDER = [
|
|
7
7
|
"feat",
|
|
8
8
|
"fix",
|
|
9
9
|
"perf",
|
|
@@ -3,7 +3,7 @@ import { existsSync, readFileSync } from "node:fs";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { defineCommand } from "citty";
|
|
5
5
|
import pc from "picocolors";
|
|
6
|
-
const UPSTREAM_REPO = "tamagui/
|
|
6
|
+
const UPSTREAM_REPO = "tamagui/takeout2",
|
|
7
7
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
8
8
|
TAKEOUT_FILE = ".takeout",
|
|
9
9
|
COMMIT_TYPE_ORDER = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci"];
|
|
@@ -3,7 +3,7 @@ import { existsSync, readFileSync } from "fs";
|
|
|
3
3
|
import { join } from "path";
|
|
4
4
|
import { defineCommand } from "citty";
|
|
5
5
|
import pc from "picocolors";
|
|
6
|
-
var UPSTREAM_REPO = "tamagui/
|
|
6
|
+
var UPSTREAM_REPO = "tamagui/takeout2",
|
|
7
7
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
8
8
|
TAKEOUT_FILE = ".takeout",
|
|
9
9
|
COMMIT_TYPE_ORDER = ["feat", "fix", "perf", "refactor", "docs", "chore", "test", "ci"];
|
package/dist/esm/commands/run.js
CHANGED
|
@@ -53,16 +53,13 @@ const runCommand = defineCommand({
|
|
|
53
53
|
}
|
|
54
54
|
const normalizedName = firstArg.replace(/:/g, "/"), { findScript } = await import("./script"), scriptPath2 = findScript(normalizedName);
|
|
55
55
|
if (scriptPath2) {
|
|
56
|
-
const
|
|
57
|
-
console.info(pc.dim(`Running: ${normalizedName}`)), console.info();
|
|
58
|
-
const scriptArgsToPass = scriptArgs.slice(1);
|
|
59
|
-
spawn("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
56
|
+
const scriptArgsToPass = scriptArgs.slice(1), child2 = spawn("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
60
57
|
stdio: "inherit",
|
|
61
58
|
shell: !1
|
|
62
|
-
})
|
|
63
|
-
|
|
59
|
+
}), code2 = await new Promise((resolve2) => {
|
|
60
|
+
child2.on("exit", (code3) => resolve2(code3 || 0));
|
|
64
61
|
});
|
|
65
|
-
|
|
62
|
+
process.exit(code2);
|
|
66
63
|
}
|
|
67
64
|
}
|
|
68
65
|
let currentDir = process.cwd(), projectRoot = "";
|
|
@@ -80,13 +77,13 @@ const runCommand = defineCommand({
|
|
|
80
77
|
currentDir = resolve(currentDir, "..");
|
|
81
78
|
}
|
|
82
79
|
projectRoot || (console.error("Could not find project root"), process.exit(1));
|
|
83
|
-
const localScriptsPath = resolve(projectRoot, "packages/scripts/src/run.ts"), scriptPath = existsSync(localScriptsPath) ? localScriptsPath : resolve(projectRoot, "node_modules/@take-out/scripts/src/run.ts")
|
|
84
|
-
spawn("bun", [scriptPath, ...scriptArgs], {
|
|
80
|
+
const localScriptsPath = resolve(projectRoot, "packages/scripts/src/run.ts"), scriptPath = existsSync(localScriptsPath) ? localScriptsPath : resolve(projectRoot, "node_modules/@take-out/scripts/src/run.ts"), child = spawn("bun", [scriptPath, ...scriptArgs], {
|
|
85
81
|
stdio: "inherit",
|
|
86
82
|
shell: !1
|
|
87
|
-
})
|
|
88
|
-
|
|
83
|
+
}), code = await new Promise((resolve2) => {
|
|
84
|
+
child.on("exit", (code2) => resolve2(code2 || 0));
|
|
89
85
|
});
|
|
86
|
+
process.exit(code);
|
|
90
87
|
}
|
|
91
88
|
});
|
|
92
89
|
export {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/commands/run.ts"],
|
|
4
|
-
"mappings": "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
|
|
5
|
-
"names": ["discoverScripts", "pc", "categoryScripts", "scriptPath"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["discoverScripts", "pc", "categoryScripts", "scriptPath", "child", "code", "resolve"]
|
|
6
6
|
}
|
|
@@ -71,16 +71,15 @@ const runCommand = defineCommand({
|
|
|
71
71
|
} = await import("./script.mjs"),
|
|
72
72
|
scriptPath2 = findScript(normalizedName);
|
|
73
73
|
if (scriptPath2) {
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
return;
|
|
74
|
+
const scriptArgsToPass = scriptArgs.slice(1),
|
|
75
|
+
child2 = spawn("bun", [scriptPath2, ...scriptArgsToPass], {
|
|
76
|
+
stdio: "inherit",
|
|
77
|
+
shell: !1
|
|
78
|
+
}),
|
|
79
|
+
code2 = await new Promise(resolve2 => {
|
|
80
|
+
child2.on("exit", code3 => resolve2(code3 || 0));
|
|
81
|
+
});
|
|
82
|
+
process.exit(code2);
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
85
|
let currentDir = process.cwd(),
|
|
@@ -98,13 +97,15 @@ const runCommand = defineCommand({
|
|
|
98
97
|
}
|
|
99
98
|
projectRoot || (console.error("Could not find project root"), process.exit(1));
|
|
100
99
|
const localScriptsPath = resolve(projectRoot, "packages/scripts/src/run.ts"),
|
|
101
|
-
scriptPath = existsSync(localScriptsPath) ? localScriptsPath : resolve(projectRoot, "node_modules/@take-out/scripts/src/run.ts")
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
100
|
+
scriptPath = existsSync(localScriptsPath) ? localScriptsPath : resolve(projectRoot, "node_modules/@take-out/scripts/src/run.ts"),
|
|
101
|
+
child = spawn("bun", [scriptPath, ...scriptArgs], {
|
|
102
|
+
stdio: "inherit",
|
|
103
|
+
shell: !1
|
|
104
|
+
}),
|
|
105
|
+
code = await new Promise(resolve2 => {
|
|
106
|
+
child.on("exit", code2 => resolve2(code2 || 0));
|
|
107
|
+
});
|
|
108
|
+
process.exit(code);
|
|
108
109
|
}
|
|
109
110
|
});
|
|
110
111
|
export { runCommand };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["spawn","existsSync","readFileSync","statSync","resolve","join","parse","defineCommand","runCommand","meta","name","description","args","scripts","type","required","run","scriptArgs","process","argv","slice","firstArg","secondArg","localDir","cwd","categoryPath","isDirectory","discoverScripts","discoverScripts2","runScriptsInParallel","pc2","default","categoryScripts2","size","console","info","yellow","scriptsToRun","Array","from","entries","map","path","replace","title","bold","cyan","getScriptMetadata","pc","categoryScripts","shortName","metadata","line","green","dim","length","normalizedName","findScript","scriptPath2","scriptArgsToPass","stdio","shell","on","
|
|
1
|
+
{"version":3,"names":["spawn","existsSync","readFileSync","statSync","resolve","join","parse","defineCommand","runCommand","meta","name","description","args","scripts","type","required","run","scriptArgs","process","argv","slice","firstArg","secondArg","localDir","cwd","categoryPath","isDirectory","discoverScripts","discoverScripts2","runScriptsInParallel","pc2","default","categoryScripts2","size","console","info","yellow","scriptsToRun","Array","from","entries","map","path","replace","title","bold","cyan","getScriptMetadata","pc","categoryScripts","shortName","metadata","line","green","dim","length","normalizedName","findScript","scriptPath2","scriptArgsToPass","child2","stdio","shell","code2","Promise","resolve2","on","code3","exit","currentDir","projectRoot","root","packageJsonPath","pkg","JSON","workspaces","takeout","error","localScriptsPath","scriptPath","child","code"],"sources":["../../../src/commands/run.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AACtB,SAASC,UAAA,EAAYC,YAAA,EAAcC,QAAA,QAAgB;AACnD,SAASC,OAAA,EAASC,IAAA,EAAMC,KAAA,QAAa;AAErC,SAASC,aAAA,QAAqB;AAEvB,MAAMC,UAAA,GAAaD,aAAA,CAAc;EACtCE,IAAA,EAAM;IACJC,IAAA,EAAM;IACNC,WAAA,EAAa;EACf;EACAC,IAAA,EAAM;IACJC,OAAA,EAAS;MACPC,IAAA,EAAM;MACNH,WAAA,EAAa;MACbI,QAAA,EAAU;IACZ;EACF;EACAC,GAAA,EAAK,MAAAA,CAAA,KAAY;IAEf,MAAMC,UAAA,GAAaC,OAAA,CAAQC,IAAA,CAAKC,KAAA,CAAM,CAAC;MACjCC,QAAA,GAAWJ,UAAA,CAAW,CAAC;MACvBK,SAAA,GAAYL,UAAA,CAAW,CAAC;IAG9B,IAAII,QAAA,EAAU;MACZ,MAAME,QAAA,GAAWlB,IAAA,CAAKa,OAAA,CAAQM,GAAA,CAAI,GAAG,SAAS;QACxCC,YAAA,GAAepB,IAAA,CAAKkB,QAAA,EAAUF,QAAQ;MAG5C,IAAIpB,UAAA,CAAWwB,YAAY,KAAKtB,QAAA,CAASsB,YAAY,EAAEC,WAAA,CAAY,GAAG;QAIpE,IAFmBJ,SAAA,KAAc,SAEjB;UAEd,MAAM;cAAEK,eAAA,EAAAC;YAAgB,IAAI,MAAM,OAAO,cAAU;YAC7C;cAAEC;YAAqB,IAAI,MAAM,OAAO,8BAA0B;YAClEC,GAAA,IAAM,MAAM,OAAO,YAAY,GAAGC,OAAA;YAClCC,gBAAA,GAAkBJ,gBAAA,CAAgBH,YAAY;UAEpD,IAAIO,gBAAA,CAAgBC,IAAA,KAAS,GAAG;YAC9BC,OAAA,CAAQC,IAAA,CAAKL,GAAA,CAAGM,MAAA,CAAO,uBAAuBf,QAAQ,GAAG,CAAC;YAC1D;UACF;UAEA,MAAMgB,YAAA,GAAeC,KAAA,CAAMC,IAAA,CAAKP,gBAAA,CAAgBQ,OAAA,CAAQ,CAAC,EAAEC,GAAA,CACzD,CAAC,CAAC/B,IAAA,EAAMgC,IAAI,OAAO;YACjBhC,IAAA,EAAMA,IAAA,CAAKiC,OAAA,CAAQ,GAAGtB,QAAQ,KAAK,EAAE;YACrCqB;UACF,EACF;UAEA,MAAMb,oBAAA,CAAqBQ,YAAA,EAAc;YACvCO,KAAA,EAAOd,GAAA,CAAGe,IAAA,CAAKf,GAAA,CAAGgB,IAAA,CAAK,0BAA0BzB,QAAQ,GAAG,CAAC;UAC/D,CAAC;UAED;QACF;QAGA,MAAM;YAAEM,eAAA;YAAiBoB;UAAkB,IAAI,MAAM,OAAO,cAAU;UAChEC,EAAA,IAAM,MAAM,OAAO,YAAY,GAAGjB,OAAA;UAGlCkB,eAAA,GAAkBtB,eAAA,CAAgBF,YAAY;QAEpD,IAAIwB,eAAA,CAAgBhB,IAAA,GAAO,GAAG;UAC5BC,OAAA,CAAQC,IAAA,CAAK,GACbD,OAAA,CAAQC,IAAA,CAAKa,EAAA,CAAGH,IAAA,CAAKG,EAAA,CAAGF,IAAA,CAAK,aAAMzB,QAAQ,UAAU,CAAC,CAAC,GACvDa,OAAA,CAAQC,IAAA,CAAK;UAEb,WAAW,CAACzB,IAAA,EAAMgC,IAAI,KAAKO,eAAA,EAAiB;YAC1C,MAAMC,SAAA,GAAYxC,IAAA,CAAKiC,OAAA,CAAQ,GAAGtB,QAAQ,KAAK,EAAE;cAC3C8B,QAAA,GAAWJ,iBAAA,CAAkBL,IAAI;YACvC,IAAIU,IAAA,GAAO,KAAKJ,EAAA,CAAGK,KAAA,CAAMH,SAAS,CAAC;YAE/BC,QAAA,CAASxC,WAAA,KACXyC,IAAA,IAAQJ,EAAA,CAAGM,GAAA,CAAI,MAAMH,QAAA,CAASxC,WAAW,EAAE,IAGzCwC,QAAA,CAASvC,IAAA,IAAQuC,QAAA,CAASvC,IAAA,CAAK2C,MAAA,GAAS,MAC1CH,IAAA,IAAQJ,EAAA,CAAGM,GAAA,CAAI,KAAKH,QAAA,CAASvC,IAAA,CAAKP,IAAA,CAAK,IAAI,CAAC,GAAG,IAGjD6B,OAAA,CAAQC,IAAA,CAAKiB,IAAI;UACnB;UAEAlB,OAAA,CAAQC,IAAA,CAAK,GACbD,OAAA,CAAQC,IAAA,CAAKa,EAAA,CAAGM,GAAA,CAAI,YAAYjC,QAAQ,mBAAmB,CAAC,GAC5Da,OAAA,CAAQC,IAAA,CAAKa,EAAA,CAAGM,GAAA,CAAI,YAAYjC,QAAQ,2BAA2B,CAAC,GACpEa,OAAA,CAAQC,IAAA,CAAKa,EAAA,CAAGM,GAAA,CAAI,gBAAgBjC,QAAQ,8BAA8B,CAAC,GAC3Ea,OAAA,CAAQC,IAAA,CAAK;QACf,OAAO;UACL,MAAML,GAAA,IAAM,MAAM,OAAO,YAAY,GAAGC,OAAA;UACxCG,OAAA,CAAQC,IAAA,CAAKL,GAAA,CAAGM,MAAA,CAAO,uBAAuBf,QAAQ,GAAG,CAAC;QAC5D;QACA;MACF;MAGA,MAAMmC,cAAA,GAAiBnC,QAAA,CAASsB,OAAA,CAAQ,MAAM,GAAG;QAG3C;UAAEc;QAAW,IAAI,MAAM,OAAO,cAAU;QACxCC,WAAA,GAAaD,UAAA,CAAWD,cAAc;MAE5C,IAAIE,WAAA,EAAY;QAEd,MAAMC,gBAAA,GAAmB1C,UAAA,CAAWG,KAAA,CAAM,CAAC;UACrCwC,MAAA,GAAQ5D,KAAA,CAAM,OAAO,CAAC0D,WAAA,EAAY,GAAGC,gBAAgB,GAAG;YAC5DE,KAAA,EAAO;YACPC,KAAA,EAAO;UACT,CAAC;UAEKC,KAAA,GAAO,MAAM,IAAIC,OAAA,CAAiBC,QAAA,IAAY;YAClDL,MAAA,CAAMM,EAAA,CAAG,QAASC,KAAA,IAASF,QAAA,CAAQE,KAAA,IAAQ,CAAC,CAAC;UAC/C,CAAC;QACDjD,OAAA,CAAQkD,IAAA,CAAKL,KAAI;MACnB;IACF;IAIA,IAAIM,UAAA,GAAanD,OAAA,CAAQM,GAAA,CAAI;MACzB8C,WAAA,GAAc;IAElB,OAAOD,UAAA,KAAe/D,KAAA,CAAM+D,UAAU,EAAEE,IAAA,GAAM;MAC5C,MAAMC,eAAA,GAAkBpE,OAAA,CAAQiE,UAAA,EAAY,cAAc;MAC1D,IAAIpE,UAAA,CAAWuE,eAAe,GAC5B,IAAI;QACF,MAAMC,GAAA,GAAMC,IAAA,CAAKpE,KAAA,CAAMJ,YAAA,CAAasE,eAAA,EAAiB,MAAM,CAAC;QAC5D,IAAIC,GAAA,CAAIE,UAAA,IAAcF,GAAA,CAAIG,OAAA,EAAS;UACjCN,WAAA,GAAcD,UAAA;UACd;QACF;MACF,QAAQ,CAAC;MAEXA,UAAA,GAAajE,OAAA,CAAQiE,UAAA,EAAY,IAAI;IACvC;IAEKC,WAAA,KACHpC,OAAA,CAAQ2C,KAAA,CAAM,6BAA6B,GAC3C3D,OAAA,CAAQkD,IAAA,CAAK,CAAC;IAIhB,MAAMU,gBAAA,GAAmB1E,OAAA,CAAQkE,WAAA,EAAa,6BAA6B;MACrES,UAAA,GAAa9E,UAAA,CAAW6E,gBAAgB,IAC1CA,gBAAA,GACA1E,OAAA,CAAQkE,WAAA,EAAa,2CAA2C;MAE9DU,KAAA,GAAQhF,KAAA,CAAM,OAAO,CAAC+E,UAAA,EAAY,GAAG9D,UAAU,GAAG;QACtD4C,KAAA,EAAO;QACPC,KAAA,EAAO;MACT,CAAC;MAEKmB,IAAA,GAAO,MAAM,IAAIjB,OAAA,CAAiBC,QAAA,IAAY;QAClDe,KAAA,CAAMd,EAAA,CAAG,QAASH,KAAA,IAASE,QAAA,CAAQF,KAAA,IAAQ,CAAC,CAAC;MAC/C,CAAC;IACD7C,OAAA,CAAQkD,IAAA,CAAKa,IAAI;EACnB;AACF,CAAC","ignoreList":[]}
|
|
@@ -89,17 +89,17 @@ var runCommand = defineCommand({
|
|
|
89
89
|
} = await import("./script.native.js"),
|
|
90
90
|
scriptPath = findScript(normalizedName);
|
|
91
91
|
if (scriptPath) {
|
|
92
|
-
var pc3 = (await import("picocolors")).default;
|
|
93
|
-
console.info(pc3.dim(`Running: ${normalizedName}`)), console.info();
|
|
94
92
|
var scriptArgsToPass = scriptArgs.slice(1),
|
|
95
93
|
child = spawn("bun", [scriptPath, ...scriptArgsToPass], {
|
|
96
94
|
stdio: "inherit",
|
|
97
95
|
shell: !1
|
|
96
|
+
}),
|
|
97
|
+
code = await new Promise(function (resolve2) {
|
|
98
|
+
child.on("exit", function (code2) {
|
|
99
|
+
return resolve2(code2 || 0);
|
|
100
|
+
});
|
|
98
101
|
});
|
|
99
|
-
|
|
100
|
-
process.exit(code || 0);
|
|
101
|
-
});
|
|
102
|
-
return;
|
|
102
|
+
process.exit(code);
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
for (var currentDir = process.cwd(), projectRoot = ""; currentDir !== parse(currentDir).root;) {
|
|
@@ -119,10 +119,13 @@ var runCommand = defineCommand({
|
|
|
119
119
|
child1 = spawn("bun", [scriptPath1, ...scriptArgs], {
|
|
120
120
|
stdio: "inherit",
|
|
121
121
|
shell: !1
|
|
122
|
+
}),
|
|
123
|
+
code1 = await new Promise(function (resolve2) {
|
|
124
|
+
child1.on("exit", function (code2) {
|
|
125
|
+
return resolve2(code2 || 0);
|
|
126
|
+
});
|
|
122
127
|
});
|
|
123
|
-
|
|
124
|
-
process.exit(code || 0);
|
|
125
|
-
});
|
|
128
|
+
process.exit(code1);
|
|
126
129
|
}
|
|
127
130
|
});
|
|
128
131
|
export { runCommand };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["spawn","existsSync","readFileSync","statSync","resolve","join","parse","defineCommand","runCommand","meta","name","description","args","scripts","type","required","run","scriptArgs","process","argv","slice","firstArg","secondArg","localDir","cwd","categoryPath","isDirectory","hasAllFlag","discoverScripts","runScriptsInParallel","pc","default","categoryScripts","size","console","info","yellow","scriptsToRun","Array","from","entries","map","param","name2","path2","replace","path","title","bold","cyan","discoverScripts1","getScriptMetadata","pc1","categoryScripts1","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","shortName","metadata","line","green","dim","length","err","return","pc2","normalizedName","findScript","scriptPath","
|
|
1
|
+
{"version":3,"names":["spawn","existsSync","readFileSync","statSync","resolve","join","parse","defineCommand","runCommand","meta","name","description","args","scripts","type","required","run","scriptArgs","process","argv","slice","firstArg","secondArg","localDir","cwd","categoryPath","isDirectory","hasAllFlag","discoverScripts","runScriptsInParallel","pc","default","categoryScripts","size","console","info","yellow","scriptsToRun","Array","from","entries","map","param","name2","path2","replace","path","title","bold","cyan","discoverScripts1","getScriptMetadata","pc1","categoryScripts1","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","shortName","metadata","line","green","dim","length","err","return","pc2","normalizedName","findScript","scriptPath","scriptArgsToPass","child","stdio","shell","code","Promise","resolve2","on","code2","exit","currentDir","projectRoot","root","packageJsonPath","pkg","JSON","workspaces","takeout"],"sources":["../../../src/commands/run.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
showStep,
|
|
14
14
|
showSuccess
|
|
15
15
|
} from "../utils/prompts";
|
|
16
|
-
const UPSTREAM_REPO = "tamagui/
|
|
16
|
+
const UPSTREAM_REPO = "tamagui/takeout2", UPSTREAM_REMOTE = "takeout-upstream", TAKEOUT_FILE = ".takeout";
|
|
17
17
|
function getSyncPrompt() {
|
|
18
18
|
try {
|
|
19
19
|
let packageRoot = dirname(fileURLToPath(import.meta.url));
|
|
@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
|
|
|
6
6
|
import { defineCommand } from "citty";
|
|
7
7
|
import pc from "picocolors";
|
|
8
8
|
import { confirmContinue, promptSelect, showError, showInfo, showStep, showSuccess } from "../utils/prompts.mjs";
|
|
9
|
-
const UPSTREAM_REPO = "tamagui/
|
|
9
|
+
const UPSTREAM_REPO = "tamagui/takeout2",
|
|
10
10
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
11
11
|
TAKEOUT_FILE = ".takeout";
|
|
12
12
|
function getSyncPrompt() {
|
|
@@ -9,7 +9,7 @@ import { confirmContinue, promptSelect, showError, showInfo, showStep, showSucce
|
|
|
9
9
|
function _instanceof(left, right) {
|
|
10
10
|
return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
|
|
11
11
|
}
|
|
12
|
-
var UPSTREAM_REPO = "tamagui/
|
|
12
|
+
var UPSTREAM_REPO = "tamagui/takeout2",
|
|
13
13
|
UPSTREAM_REMOTE = "takeout-upstream",
|
|
14
14
|
TAKEOUT_FILE = ".takeout";
|
|
15
15
|
function getSyncPrompt() {
|
|
@@ -16,6 +16,11 @@ const colors = [
|
|
|
16
16
|
"\x1B[90m"
|
|
17
17
|
// Gray
|
|
18
18
|
], reset = "\x1B[0m";
|
|
19
|
+
function isBunShellNoise(line) {
|
|
20
|
+
const stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
21
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) || // source code lines like "24 | await $`..."
|
|
22
|
+
/^\s*\^$/.test(stripped);
|
|
23
|
+
}
|
|
19
24
|
async function runScriptsInParallel(scripts, options = {}) {
|
|
20
25
|
const { title, onError = "exit", maxParallelism = cpus().length } = options;
|
|
21
26
|
title && (console.info(), console.info(title), console.info());
|
|
@@ -53,13 +58,13 @@ function runSingleScript(script, colorIndex) {
|
|
|
53
58
|
const lines = dataStr.split(`
|
|
54
59
|
`);
|
|
55
60
|
for (const line of lines)
|
|
56
|
-
line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
61
|
+
line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
57
62
|
}), proc.on("error", (error) => {
|
|
58
63
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
59
64
|
}), proc.on("close", (code) => {
|
|
60
|
-
code && code !== 0 ? (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
65
|
+
code && code !== 0 ? (stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell") || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
61
66
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
62
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
67
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
63
68
|
});
|
|
64
69
|
});
|
|
65
70
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/parallel-runner.ts"],
|
|
4
|
-
"mappings": "AAIA,SAAS,aAAa;AACtB,SAAS,YAAY;AAErB,MAAM,SAAS;AAAA,EACb;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAAA;AACF,GAEM,QAAQ;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,6 +16,12 @@ const colors = ["\x1B[36m",
|
|
|
16
16
|
// Gray
|
|
17
17
|
],
|
|
18
18
|
reset = "\x1B[0m";
|
|
19
|
+
function isBunShellNoise(line) {
|
|
20
|
+
const stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
21
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) ||
|
|
22
|
+
// source code lines like "24 | await $`..."
|
|
23
|
+
/^\s*\^$/.test(stripped);
|
|
24
|
+
}
|
|
19
25
|
async function runScriptsInParallel(scripts, options = {}) {
|
|
20
26
|
const {
|
|
21
27
|
title,
|
|
@@ -62,13 +68,13 @@ function runSingleScript(script, colorIndex) {
|
|
|
62
68
|
stderrBuffer += dataStr;
|
|
63
69
|
const lines = dataStr.split(`
|
|
64
70
|
`);
|
|
65
|
-
for (const line of lines) line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
71
|
+
for (const line of lines) line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
66
72
|
}), proc.on("error", error => {
|
|
67
73
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
68
74
|
}), proc.on("close", code => {
|
|
69
|
-
code && code !== 0 ? (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
75
|
+
code && code !== 0 ? (stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell") || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
70
76
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
71
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
77
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))) : (console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve());
|
|
72
78
|
});
|
|
73
79
|
});
|
|
74
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["spawn","cpus","colors","reset","runScriptsInParallel","scripts","options","title","onError","maxParallelism","length","console","info","allPromises","executing","Set","i","script","scriptPromise","runSingleScript","finally","delete","push","add","size","Promise","race","failures","allSettled","filter","r","status","error","process","exit","colorIndex","resolve","reject","color","prefixLabel","name","proc","path","args","stdio","shell","env","FORCE_COLOR","detached","stderrBuffer","stdout","on","data","lines","toString","split","
|
|
1
|
+
{"version":3,"names":["spawn","cpus","colors","reset","isBunShellNoise","line","stripped","replace","trim","startsWith","test","runScriptsInParallel","scripts","options","title","onError","maxParallelism","length","console","info","allPromises","executing","Set","i","script","scriptPromise","runSingleScript","finally","delete","push","add","size","Promise","race","failures","allSettled","filter","r","status","error","process","exit","colorIndex","resolve","reject","color","prefixLabel","name","proc","path","args","stdio","shell","env","FORCE_COLOR","detached","stderrBuffer","stdout","on","data","lines","toString","split","stderr","dataStr","message","code","includes","repeat","Error"],"sources":["../../../src/utils/parallel-runner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -14,6 +14,12 @@ var colors = ["\x1B[36m",
|
|
|
14
14
|
// Red
|
|
15
15
|
"\x1B[90m"],
|
|
16
16
|
reset = "\x1B[0m";
|
|
17
|
+
function isBunShellNoise(line) {
|
|
18
|
+
var stripped = line.replace(/\x1b\[[0-9;]*m/g, "").trim();
|
|
19
|
+
return stripped.startsWith("ShellError:") || stripped.startsWith("exitCode:") || stripped.startsWith("stdout:") || stripped.startsWith("stderr:") || stripped.startsWith("at ShellPromise") || stripped.startsWith("at BunShell") || stripped.startsWith("Bun v") || /^\d+\s*\|/.test(stripped) ||
|
|
20
|
+
// source code lines like "24 | await $`..."
|
|
21
|
+
/^\s*\^$/.test(stripped);
|
|
22
|
+
}
|
|
17
23
|
async function runScriptsInParallel(scripts) {
|
|
18
24
|
var _loop = async function (i2) {
|
|
19
25
|
var script = scripts[i2],
|
|
@@ -85,7 +91,7 @@ function runSingleScript(script, colorIndex) {
|
|
|
85
91
|
try {
|
|
86
92
|
for (var _iterator = lines[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
87
93
|
var line = _step.value;
|
|
88
|
-
line && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
94
|
+
line && !isBunShellNoise(line) && console.error(`${color}${prefixLabel}${reset} ${line}`);
|
|
89
95
|
}
|
|
90
96
|
} catch (err) {
|
|
91
97
|
_didIteratorError = !0, _iteratorError = err;
|
|
@@ -99,9 +105,12 @@ function runSingleScript(script, colorIndex) {
|
|
|
99
105
|
}), proc.on("error", function (error) {
|
|
100
106
|
console.error(`${color}${prefixLabel}${reset} Failed to start: ${error.message}`), reject(error);
|
|
101
107
|
}), proc.on("close", function (code) {
|
|
102
|
-
code && code !== 0
|
|
108
|
+
if (code && code !== 0) {
|
|
109
|
+
var isBunShellError = stderrBuffer.includes("ShellError") || stderrBuffer.includes("at BunShell");
|
|
110
|
+
isBunShellError || (console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`), stderrBuffer.trim() && (console.error(`
|
|
103
111
|
${color}${prefixLabel}${reset} Error output:`), console.error("\x1B[90m" + "\u2500".repeat(80) + "\x1B[0m"), console.error(stderrBuffer), console.error("\x1B[90m" + "\u2500".repeat(80) + `\x1B[0m
|
|
104
|
-
`)), reject(new Error(`Script ${prefixLabel} failed with code ${code}`))
|
|
112
|
+
`))), reject(new Error(`Script ${prefixLabel} failed with code ${code}`));
|
|
113
|
+
} else console.info(`${color}${prefixLabel}${reset} \x1B[32m\u2713 completed${reset}`), resolve();
|
|
105
114
|
});
|
|
106
115
|
});
|
|
107
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["spawn","cpus","colors","reset","runScriptsInParallel","scripts","_loop","i2","script","scriptPromise","runSingleScript","finally","executing","delete","allPromises","push","add","size","maxParallelism","Promise","race","options","arguments","length","title","onError","console","info","Set","i","settledResults","allSettled","failures","filter","r","status","error","process","exit","colorIndex","resolve","reject","color","prefixLabel","name","proc","path","args","stdio","shell","env","FORCE_COLOR","detached","stderrBuffer","stdout","on","data","lines","toString","split","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","
|
|
1
|
+
{"version":3,"names":["spawn","cpus","colors","reset","isBunShellNoise","line","stripped","replace","trim","startsWith","test","runScriptsInParallel","scripts","_loop","i2","script","scriptPromise","runSingleScript","finally","executing","delete","allPromises","push","add","size","maxParallelism","Promise","race","options","arguments","length","title","onError","console","info","Set","i","settledResults","allSettled","failures","filter","r","status","error","process","exit","colorIndex","resolve","reject","color","prefixLabel","name","proc","path","args","stdio","shell","env","FORCE_COLOR","detached","stderrBuffer","stdout","on","data","lines","toString","split","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","err"],"sources":["../../../src/utils/parallel-runner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@take-out/cli",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.43",
|
|
4
4
|
"description": "CLI tools for Takeout starter kit - interactive onboarding and project setup",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
52
|
"@clack/prompts": "^0.8.2",
|
|
53
|
-
"@take-out/docs": "0.0.
|
|
54
|
-
"@take-out/scripts": "0.0.
|
|
53
|
+
"@take-out/docs": "0.0.43",
|
|
54
|
+
"@take-out/scripts": "0.0.43",
|
|
55
55
|
"citty": "^0.1.6",
|
|
56
56
|
"picocolors": "^1.1.1"
|
|
57
57
|
},
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@tamagui/build": "
|
|
67
|
+
"@tamagui/build": "^2.0.0-1768869088163",
|
|
68
68
|
"@types/node": "24.0.3",
|
|
69
69
|
"bun-types": "latest",
|
|
70
70
|
"oxfmt": "^0.16.0",
|
package/src/commands/changed.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { join } from 'node:path'
|
|
|
9
9
|
import { defineCommand } from 'citty'
|
|
10
10
|
import pc from 'picocolors'
|
|
11
11
|
|
|
12
|
-
const UPSTREAM_REPO = 'tamagui/
|
|
12
|
+
const UPSTREAM_REPO = 'tamagui/takeout2'
|
|
13
13
|
const UPSTREAM_REMOTE = 'takeout-upstream'
|
|
14
14
|
const TAKEOUT_FILE = '.takeout'
|
|
15
15
|
|
package/src/commands/run.ts
CHANGED
|
@@ -106,11 +106,6 @@ export const runCommand = defineCommand({
|
|
|
106
106
|
const scriptPath = findScript(normalizedName)
|
|
107
107
|
|
|
108
108
|
if (scriptPath) {
|
|
109
|
-
// Run the filesystem script
|
|
110
|
-
const pc = (await import('picocolors')).default
|
|
111
|
-
console.info(pc.dim(`Running: ${normalizedName}`))
|
|
112
|
-
console.info()
|
|
113
|
-
|
|
114
109
|
// Use spawn instead of Bun's $ helper since we're in a compiled context
|
|
115
110
|
const scriptArgsToPass = scriptArgs.slice(1)
|
|
116
111
|
const child = spawn('bun', [scriptPath, ...scriptArgsToPass], {
|
|
@@ -118,10 +113,10 @@ export const runCommand = defineCommand({
|
|
|
118
113
|
shell: false,
|
|
119
114
|
})
|
|
120
115
|
|
|
121
|
-
|
|
122
|
-
|
|
116
|
+
const code = await new Promise<number>((resolve) => {
|
|
117
|
+
child.on('exit', (code) => resolve(code || 0))
|
|
123
118
|
})
|
|
124
|
-
|
|
119
|
+
process.exit(code)
|
|
125
120
|
}
|
|
126
121
|
}
|
|
127
122
|
|
|
@@ -160,8 +155,9 @@ export const runCommand = defineCommand({
|
|
|
160
155
|
shell: false,
|
|
161
156
|
})
|
|
162
157
|
|
|
163
|
-
|
|
164
|
-
|
|
158
|
+
const code = await new Promise<number>((resolve) => {
|
|
159
|
+
child.on('exit', (code) => resolve(code || 0))
|
|
165
160
|
})
|
|
161
|
+
process.exit(code)
|
|
166
162
|
},
|
|
167
163
|
})
|
package/src/commands/sync.ts
CHANGED
|
@@ -17,6 +17,23 @@ const colors = [
|
|
|
17
17
|
|
|
18
18
|
const reset = '\x1b[0m'
|
|
19
19
|
|
|
20
|
+
// filter out bun shell's verbose error output
|
|
21
|
+
function isBunShellNoise(line: string): boolean {
|
|
22
|
+
// eslint-disable-next-line no-control-regex
|
|
23
|
+
const stripped = line.replace(/\x1b\[[0-9;]*m/g, '').trim()
|
|
24
|
+
return (
|
|
25
|
+
stripped.startsWith('ShellError:') ||
|
|
26
|
+
stripped.startsWith('exitCode:') ||
|
|
27
|
+
stripped.startsWith('stdout:') ||
|
|
28
|
+
stripped.startsWith('stderr:') ||
|
|
29
|
+
stripped.startsWith('at ShellPromise') ||
|
|
30
|
+
stripped.startsWith('at BunShell') ||
|
|
31
|
+
stripped.startsWith('Bun v') ||
|
|
32
|
+
/^\d+\s*\|/.test(stripped) || // source code lines like "24 | await $`..."
|
|
33
|
+
/^\s*\^$/.test(stripped) // caret pointer line
|
|
34
|
+
)
|
|
35
|
+
}
|
|
36
|
+
|
|
20
37
|
interface ScriptToRun {
|
|
21
38
|
name: string
|
|
22
39
|
path: string
|
|
@@ -98,7 +115,9 @@ function runSingleScript(script: ScriptToRun, colorIndex: number): Promise<void>
|
|
|
98
115
|
|
|
99
116
|
const lines = dataStr.split('\n')
|
|
100
117
|
for (const line of lines) {
|
|
101
|
-
if (line
|
|
118
|
+
if (line && !isBunShellNoise(line)) {
|
|
119
|
+
console.error(`${color}${prefixLabel}${reset} ${line}`)
|
|
120
|
+
}
|
|
102
121
|
}
|
|
103
122
|
})
|
|
104
123
|
|
|
@@ -109,14 +128,20 @@ function runSingleScript(script: ScriptToRun, colorIndex: number): Promise<void>
|
|
|
109
128
|
|
|
110
129
|
proc.on('close', (code) => {
|
|
111
130
|
if (code && code !== 0) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
console.error(
|
|
119
|
-
|
|
131
|
+
// detect if this was a bun shell error (already printed inline)
|
|
132
|
+
// check for ShellError or the bun shell stack trace pattern
|
|
133
|
+
const isBunShellError =
|
|
134
|
+
stderrBuffer.includes('ShellError') || stderrBuffer.includes('at BunShell')
|
|
135
|
+
|
|
136
|
+
if (!isBunShellError) {
|
|
137
|
+
console.error(`${color}${prefixLabel}${reset} Process exited with code ${code}`)
|
|
138
|
+
|
|
139
|
+
if (stderrBuffer.trim()) {
|
|
140
|
+
console.error(`\n${color}${prefixLabel}${reset} Error output:`)
|
|
141
|
+
console.error('\x1b[90m' + '─'.repeat(80) + '\x1b[0m')
|
|
142
|
+
console.error(stderrBuffer)
|
|
143
|
+
console.error('\x1b[90m' + '─'.repeat(80) + '\x1b[0m\n')
|
|
144
|
+
}
|
|
120
145
|
}
|
|
121
146
|
|
|
122
147
|
reject(new Error(`Script ${prefixLabel} failed with code ${code}`))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU;;;;;;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU;;;;;;EA4JrB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallel-runner.d.ts","sourceRoot":"","sources":["../../src/utils/parallel-runner.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"parallel-runner.d.ts","sourceRoot":"","sources":["../../src/utils/parallel-runner.ts"],"names":[],"mappings":"AAAA;;GAEG;AAkCH,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,WAAW,EAAE,EACtB,OAAO,GAAE;IACP,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;CACnB,GACL,OAAO,CAAC,IAAI,CAAC,CAuCf"}
|