@mpis/monorepo 0.0.10 → 0.0.12
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/common/cmd.build.d.ts.map +1 -1
- package/lib/common/cmd.build.js +14 -1
- package/lib/common/cmd.build.js.map +1 -1
- package/lib/common/cmd.list.js +1 -1
- package/lib/common/cmd.list.js.map +1 -1
- package/lib/common/workspace.d.ts +1 -1
- package/lib/common/workspace.d.ts.map +1 -1
- package/lib/common/workspace.js +13 -6
- package/lib/common/workspace.js.map +1 -1
- package/package.json +11 -11
- package/src/common/cmd.build.ts +13 -1
- package/src/common/cmd.list.ts +1 -1
- package/src/common/workspace.ts +12 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.build.d.ts","sourceRoot":"","sources":["../../src/common/cmd.build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cmd.build.d.ts","sourceRoot":"","sources":["../../src/common/cmd.build.ts"],"names":[],"mappings":"AAQA,wBAAsB,QAAQ,uBAqD7B"}
|
package/lib/common/cmd.build.js
CHANGED
|
@@ -2,6 +2,7 @@ import { argv } from '@idlebox/args/default';
|
|
|
2
2
|
import { prettyPrintError } from '@idlebox/common';
|
|
3
3
|
import { logger } from '@idlebox/logger';
|
|
4
4
|
import { isShuttingDown, setExitCodeIfNot, shutdown } from '@idlebox/node';
|
|
5
|
+
import { CompileError } from '@mpis/server';
|
|
5
6
|
import { debugMode } from './args.js';
|
|
6
7
|
import { createMonorepoObject } from './workspace.js';
|
|
7
8
|
export async function runBuild() {
|
|
@@ -41,7 +42,19 @@ export async function runBuild() {
|
|
|
41
42
|
setExitCodeIfNot(0);
|
|
42
43
|
}
|
|
43
44
|
catch (error) {
|
|
44
|
-
|
|
45
|
+
if (process.stderr.isTTY) {
|
|
46
|
+
process.stderr.write('\x1Bc');
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
console.error('='.repeat(process.stderr.columns || 80));
|
|
50
|
+
}
|
|
51
|
+
repo.printScreen(false, true);
|
|
52
|
+
if (!logger.debug.isEnabled && error instanceof CompileError) {
|
|
53
|
+
logger.error `编译失败: ${error.message}`;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
prettyPrintError('monorepo build', error);
|
|
57
|
+
}
|
|
45
58
|
shutdown(1);
|
|
46
59
|
}
|
|
47
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.build.js","sourceRoot":"","sources":["../../src/common/cmd.build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC7B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAA,sBAAsB,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,oBAAoB,EAAE,CAAC;IAE1C,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YACvB,IAAI,cAAc,EAAE;gBAAE,OAAO;YAC7B,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,2BAA2B;IAC3B,wBAAwB;IACxB,8BAA8B;IAC9B,yBAAyB;IACzB,aAAa;IACb,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM;IACN,2CAA2C;IAC3C,2BAA2B;IAC3B,MAAM;IACN,OAAO;IACP,KAAK;IAEL,IAAI,CAAC;QACJ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAChD,oBAAoB;QACpB,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACrB,gBAAgB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cmd.build.js","sourceRoot":"","sources":["../../src/common/cmd.build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC7B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAA,sBAAsB,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,oBAAoB,EAAE,CAAC;IAE1C,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YACvB,IAAI,cAAc,EAAE;gBAAE,OAAO;YAC7B,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,2BAA2B;IAC3B,wBAAwB;IACxB,8BAA8B;IAC9B,yBAAyB;IACzB,aAAa;IACb,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM;IACN,2CAA2C;IAC3C,2BAA2B;IAC3B,MAAM;IACN,OAAO;IACP,KAAK;IAEL,IAAI,CAAC;QACJ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAChD,oBAAoB;QACpB,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACrB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAC9D,MAAM,CAAC,KAAK,CAAA,SAAS,KAAK,CAAC,OAAO,EAAE,CAAC;QACtC,CAAC;aAAM,CAAC;YACP,gBAAgB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;QACD,QAAQ,CAAC,CAAC,CAAC,CAAC;IACb,CAAC;AACF,CAAC"}
|
package/lib/common/cmd.list.js
CHANGED
|
@@ -3,7 +3,7 @@ import { logger } from '@idlebox/logger';
|
|
|
3
3
|
import { shutdown } from '@idlebox/node';
|
|
4
4
|
import { createMonorepoObject } from './workspace.js';
|
|
5
5
|
export async function runList() {
|
|
6
|
-
const depth = parseInt(argv.single(['--depth']) || '0');
|
|
6
|
+
const depth = parseInt(argv.single(['--depth']) || '0', 10);
|
|
7
7
|
if (argv.unused().length) {
|
|
8
8
|
logger.error `Unknown arguments: ${argv.unused().join(', ')}`;
|
|
9
9
|
return shutdown(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.list.js","sourceRoot":"","sources":["../../src/common/cmd.list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,OAAO;IAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cmd.list.js","sourceRoot":"","sources":["../../src/common/cmd.list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,OAAO;IAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAA,sBAAsB,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,oBAAoB,EAAE,CAAC;IAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;IAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC"}
|
|
@@ -23,7 +23,7 @@ declare class PnpmMonoRepo extends AsyncDisposable {
|
|
|
23
23
|
private getRig;
|
|
24
24
|
private forkPath;
|
|
25
25
|
dump(depth?: number, short?: boolean): string;
|
|
26
|
-
printScreen(short?: boolean): void;
|
|
26
|
+
printScreen(short?: boolean, listAbove?: boolean): void;
|
|
27
27
|
}
|
|
28
28
|
export {};
|
|
29
29
|
//# sourceMappingURL=workspace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAE,eAAe,EAAgD,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ9D,wBAAsB,oBAAoB,0BAMzC;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAKzC,cAAM,YAAa,SAAQ,eAAe;aAaxB,MAAM,EAAE,SAAS;IACjC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB;IAbhD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IAEjE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuC;IACtE,SAAgB,aAAa,gDAA6B;IAE1D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;gBAG5D,MAAM,EAAE,SAAS,EACd,SAAS,EAAE,iBAAiB;IAe1C,UAAU;IAgBV,SAAS;IAIT,OAAO;IAOb,OAAO,CAAC,YAAY;IA2DpB,YAAY;IAiCZ,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAiBhB,IAAI,CAAC,KAAK,GAAE,MAAU,EAAE,KAAK,UAAQ;IAuBrC,WAAW,CAAC,KAAK,UAAQ,EAAE,SAAS,UAAQ;CAS5C"}
|
package/lib/common/workspace.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createWorkspace } from '@build-script/monorepo-lib';
|
|
2
|
-
import { AsyncDisposable,
|
|
2
|
+
import { AsyncDisposable, DisposedError, Emitter, isWindows, PathArray } from '@idlebox/common';
|
|
3
3
|
import { CSI, logger } from '@idlebox/logger';
|
|
4
4
|
import { getEnvironment, workingDirectory } from '@idlebox/node';
|
|
5
5
|
import { CompileError, ModeKind, ProcessIPCClient, WorkersManager } from '@mpis/server';
|
|
@@ -16,6 +16,7 @@ export async function createMonorepoObject() {
|
|
|
16
16
|
}
|
|
17
17
|
const colorReg = /\x1B\[[0-9;]+?m/g;
|
|
18
18
|
const unclosedColorReg = /\x1B\[[^m]*$/g;
|
|
19
|
+
const firstEmptyLine = /^\s*\n/;
|
|
19
20
|
class PnpmMonoRepo extends AsyncDisposable {
|
|
20
21
|
logger;
|
|
21
22
|
workspace;
|
|
@@ -108,7 +109,7 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
108
109
|
this._onStateChange.fireNoError();
|
|
109
110
|
}
|
|
110
111
|
catch (e) {
|
|
111
|
-
if (e instanceof
|
|
112
|
+
if (e instanceof DisposedError) {
|
|
112
113
|
// 不知道这里是不是真的需要触发 onStateChange
|
|
113
114
|
return;
|
|
114
115
|
}
|
|
@@ -134,7 +135,8 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
134
135
|
return `\n${CSI}${barC}m ${CSI}0;${textC}m ${txt} ${CSI}0${barC}m${' '.repeat(lWidth - psize)}${CSI}0m\n`;
|
|
135
136
|
}
|
|
136
137
|
for (const [project, text] of this.errorMessages.entries()) {
|
|
137
|
-
const block = text.replace(
|
|
138
|
+
const block = text.replace(firstEmptyLine, '').trimEnd();
|
|
139
|
+
// biome-ignore lint/style/noNonNullAssertion: no error if no worker
|
|
138
140
|
const exec = this.packageToWorker.get(project);
|
|
139
141
|
output += buildLine(`[@mpis/monorepo] below is output in project ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m: ${exec.commandline.join(' ')}`);
|
|
140
142
|
output += workingDirectory.escapeVscodeCwd(project.absolute);
|
|
@@ -191,11 +193,16 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
191
193
|
else {
|
|
192
194
|
graphTxt = graph.debugFormatGraph(depth);
|
|
193
195
|
}
|
|
194
|
-
return graphTxt
|
|
196
|
+
return `${graphTxt}\n${graph.debugFormatSummary()}`;
|
|
195
197
|
}
|
|
196
|
-
printScreen(short = false) {
|
|
198
|
+
printScreen(short = false, listAbove = false) {
|
|
197
199
|
let r = this.formatErrors();
|
|
198
|
-
|
|
200
|
+
if (listAbove) {
|
|
201
|
+
r = this.dump(0, short) + r;
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
r += this.dump(0, short);
|
|
205
|
+
}
|
|
199
206
|
console.error(r);
|
|
200
207
|
}
|
|
201
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA6C,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mpis/monorepo",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.12",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"bin": {
|
|
7
7
|
"build-manager": "./loader/bin.js"
|
|
@@ -12,20 +12,20 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@rushstack/rig-package": "^0.5.3",
|
|
14
14
|
"split-cmd": "^1.1.0",
|
|
15
|
-
"@build-script/monorepo-lib": "^0.0.
|
|
16
|
-
"@idlebox/args": "^0.0.
|
|
17
|
-
"@idlebox/
|
|
18
|
-
"@idlebox/
|
|
19
|
-
"@
|
|
20
|
-
"@
|
|
21
|
-
"@idlebox/source-map-support": "^0.0.
|
|
15
|
+
"@build-script/monorepo-lib": "^0.0.14",
|
|
16
|
+
"@idlebox/args": "^0.0.19",
|
|
17
|
+
"@idlebox/common": "^1.5.10",
|
|
18
|
+
"@idlebox/logger": "^0.0.13",
|
|
19
|
+
"@mpis/server": "^0.0.12",
|
|
20
|
+
"@idlebox/node": "^1.4.19",
|
|
21
|
+
"@idlebox/source-map-support": "^0.0.13"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/node": "^24.0.14",
|
|
25
25
|
"@build-script/single-dog-asset": "latest",
|
|
26
|
-
"@idlebox/esbuild-executer": "^0.0.
|
|
27
|
-
"@mpis/
|
|
28
|
-
"@mpis/
|
|
26
|
+
"@idlebox/esbuild-executer": "^0.0.9",
|
|
27
|
+
"@mpis/typescript": "^0.0.15",
|
|
28
|
+
"@mpis/run": "^0.0.16"
|
|
29
29
|
},
|
|
30
30
|
"sideEffects": false,
|
|
31
31
|
"license": "MIT",
|
package/src/common/cmd.build.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { argv } from '@idlebox/args/default';
|
|
|
2
2
|
import { prettyPrintError } from '@idlebox/common';
|
|
3
3
|
import { logger } from '@idlebox/logger';
|
|
4
4
|
import { isShuttingDown, setExitCodeIfNot, shutdown } from '@idlebox/node';
|
|
5
|
+
import { CompileError } from '@mpis/server';
|
|
5
6
|
import { debugMode } from './args.js';
|
|
6
7
|
import { createMonorepoObject } from './workspace.js';
|
|
7
8
|
|
|
@@ -44,7 +45,18 @@ export async function runBuild() {
|
|
|
44
45
|
// completed = true;
|
|
45
46
|
setExitCodeIfNot(0);
|
|
46
47
|
} catch (error: any) {
|
|
47
|
-
|
|
48
|
+
if (process.stderr.isTTY) {
|
|
49
|
+
process.stderr.write('\x1Bc');
|
|
50
|
+
} else {
|
|
51
|
+
console.error('='.repeat(process.stderr.columns || 80));
|
|
52
|
+
}
|
|
53
|
+
repo.printScreen(false, true);
|
|
54
|
+
|
|
55
|
+
if (!logger.debug.isEnabled && error instanceof CompileError) {
|
|
56
|
+
logger.error`编译失败: ${error.message}`;
|
|
57
|
+
} else {
|
|
58
|
+
prettyPrintError('monorepo build', error);
|
|
59
|
+
}
|
|
48
60
|
shutdown(1);
|
|
49
61
|
}
|
|
50
62
|
}
|
package/src/common/cmd.list.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { shutdown } from '@idlebox/node';
|
|
|
4
4
|
import { createMonorepoObject } from './workspace.js';
|
|
5
5
|
|
|
6
6
|
export async function runList() {
|
|
7
|
-
const depth = parseInt(argv.single(['--depth']) || '0');
|
|
7
|
+
const depth = parseInt(argv.single(['--depth']) || '0', 10);
|
|
8
8
|
if (argv.unused().length) {
|
|
9
9
|
logger.error`Unknown arguments: ${argv.unused().join(', ')}`;
|
|
10
10
|
return shutdown(1);
|
package/src/common/workspace.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createWorkspace, type IPackageInfo, type MonorepoWorkspace } from '@build-script/monorepo-lib';
|
|
2
|
-
import { AsyncDisposable,
|
|
2
|
+
import { AsyncDisposable, DisposedError, Emitter, isWindows, PathArray } from '@idlebox/common';
|
|
3
3
|
import { CSI, logger, type IMyLogger } from '@idlebox/logger';
|
|
4
4
|
import { getEnvironment, workingDirectory } from '@idlebox/node';
|
|
5
5
|
import { CompileError, ModeKind, ProcessIPCClient, WorkersManager } from '@mpis/server';
|
|
@@ -20,6 +20,7 @@ export type IPnpmMonoRepo = PnpmMonoRepo;
|
|
|
20
20
|
const colorReg = /\x1B\[[0-9;]+?m/g;
|
|
21
21
|
const unclosedColorReg = /\x1B\[[^m]*$/g;
|
|
22
22
|
|
|
23
|
+
const firstEmptyLine = /^\s*\n/;
|
|
23
24
|
class PnpmMonoRepo extends AsyncDisposable {
|
|
24
25
|
private readonly workersManager: WorkersManager;
|
|
25
26
|
private readonly pathvar: PathArray;
|
|
@@ -122,7 +123,7 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
122
123
|
try {
|
|
123
124
|
this._onStateChange.fireNoError();
|
|
124
125
|
} catch (e) {
|
|
125
|
-
if (e instanceof
|
|
126
|
+
if (e instanceof DisposedError) {
|
|
126
127
|
// 不知道这里是不是真的需要触发 onStateChange
|
|
127
128
|
return;
|
|
128
129
|
}
|
|
@@ -154,7 +155,8 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
154
155
|
}
|
|
155
156
|
|
|
156
157
|
for (const [project, text] of this.errorMessages.entries()) {
|
|
157
|
-
const block = text.replace(
|
|
158
|
+
const block = text.replace(firstEmptyLine, '').trimEnd();
|
|
159
|
+
// biome-ignore lint/style/noNonNullAssertion: no error if no worker
|
|
158
160
|
const exec = this.packageToWorker.get(project)!;
|
|
159
161
|
output += buildLine(`[@mpis/monorepo] below is output in project ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m: ${exec.commandline.join(' ')}`);
|
|
160
162
|
output += workingDirectory.escapeVscodeCwd(project.absolute);
|
|
@@ -215,12 +217,16 @@ class PnpmMonoRepo extends AsyncDisposable {
|
|
|
215
217
|
} else {
|
|
216
218
|
graphTxt = graph.debugFormatGraph(depth);
|
|
217
219
|
}
|
|
218
|
-
return graphTxt
|
|
220
|
+
return `${graphTxt}\n${graph.debugFormatSummary()}`;
|
|
219
221
|
}
|
|
220
222
|
|
|
221
|
-
printScreen(short = false) {
|
|
223
|
+
printScreen(short = false, listAbove = false) {
|
|
222
224
|
let r = this.formatErrors();
|
|
223
|
-
|
|
225
|
+
if (listAbove) {
|
|
226
|
+
r = this.dump(0, short) + r;
|
|
227
|
+
} else {
|
|
228
|
+
r += this.dump(0, short);
|
|
229
|
+
}
|
|
224
230
|
console.error(r);
|
|
225
231
|
}
|
|
226
232
|
}
|