@mpis/monorepo 0.0.27 → 0.0.28
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAA0B,uBAAuB,EAAwB,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzD,OAAO,EAA0B,gBAAgB,EAAqB,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,EAA0B,uBAAuB,EAAwB,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzD,OAAO,EAA0B,gBAAgB,EAAqB,cAAc,EAAE,MAAM,cAAc,CAAC;AAQ3G,UAAU,QAAQ;IACjB,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CAAC,OAAO,CAAC,EAAE,QAAQ,yBAM5D;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAIzC,UAAU,YAAY;IACrB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,cAAM,YAAa,SAAQ,uBAAuB;aAchC,MAAM,EAAE,SAAS;aACjB,SAAS,EAAE,iBAAiB;IAd7C,SAAgB,cAAc,EAAE,cAAc,CAAC;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqC;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IAEjE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+C;IAC9E,SAAgB,aAAa,wDAA6B;IAE1D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAW;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;gBAG5D,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,iBAAiB;IAevC,UAAU,CAAC,EAAE,aAAqB,EAAE,GAAE,QAAa;IAuBnD,SAAS;IAIT,OAAO;IAOb,OAAO,CAAC,YAAY;IAoEpB,eAAe;IAIf,oBAAoB;IAOpB;;OAEG;IACH,YAAY,CAAC,OAAO,EAAE,YAAY;IAIlC;;OAEG;IACH,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS;IAK1D,SAAS,IAAI,WAAW,CAAC,YAAY,EAAE,MAAM,CAAC;IAI9C,YAAY;IAkCZ,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,QAAQ;IAiBhB,WAAW,CAAC,aAAa,UAAO;IAYhC,IAAI,CAAC,EAAE,KAAS,EAAE,KAAa,EAAE,OAAc,EAAE,OAAe,EAAE,GAAE,YAAiB;IAyBrF,WAAW,CAAC,KAAK,UAAQ,EAAE,SAAS,UAAQ;CAS5C"}
|
package/lib/common/workspace.js
CHANGED
|
@@ -5,6 +5,7 @@ import { getEnvironment, workingDirectory } from '@idlebox/node';
|
|
|
5
5
|
import { CSI } from '@idlebox/terminal-control/constants';
|
|
6
6
|
import { CompileError, ModeKind, ProcessIPCClient, WorkerClientState, WorkersManager } from '@mpis/server';
|
|
7
7
|
import { RigConfig } from '@rushstack/rig-package';
|
|
8
|
+
import assert from 'node:assert';
|
|
8
9
|
import { dirname, resolve } from 'node:path';
|
|
9
10
|
import { split as splitCmd } from 'split-cmd';
|
|
10
11
|
import { currentCommand } from '../bin.js';
|
|
@@ -174,16 +175,16 @@ class PnpmMonoRepo extends EnhancedAsyncDisposable {
|
|
|
174
175
|
txt = txt.slice(Math.max(lWidth - 20), 20).replace(unclosedColorReg, '');
|
|
175
176
|
psize = 4 + 2 + txt.replace(colorReg, '').length + 2;
|
|
176
177
|
}
|
|
177
|
-
return `\n${CSI}${barC}m ${CSI}0;${textC}m ${txt} ${CSI}0${barC}m${
|
|
178
|
+
return `\n${CSI}${barC}m ${CSI}0;${textC}m ${txt} ${CSI}0${barC}m${CSI}K${CSI}0m\n`;
|
|
178
179
|
}
|
|
179
180
|
for (const [project, text] of this.errorMessages.entries()) {
|
|
180
181
|
const block = text.replace(firstEmptyLine, '').trimEnd();
|
|
181
|
-
// biome-ignore lint/style/noNonNullAssertion: no error if no worker
|
|
182
182
|
const exec = this.packageToWorker.get(project);
|
|
183
|
-
|
|
183
|
+
assert.ok(exec);
|
|
184
|
+
output += buildLine(`[@mpis/monorepo] 以下是项目 ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m 中此命令的输出: ${exec.commandline.join(' ')}`);
|
|
184
185
|
output += workingDirectory.escapeVscodeCwd(project.absolute);
|
|
185
186
|
output += `\nwd: ${project.absolute}\n${block}\n`.replace('\x1bc', '').replace(/^/gm, `${CSI}${barC}m ${CSI}0m `);
|
|
186
|
-
output += buildLine(`[@mpis/monorepo]
|
|
187
|
+
output += buildLine(`[@mpis/monorepo] 结束项目 ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m 的输出`);
|
|
187
188
|
}
|
|
188
189
|
if (output) {
|
|
189
190
|
output += workingDirectory.escapeVscodeCwd(process.cwd());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/common/workspace.ts"],"names":[],"mappings":"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"}
|
|
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.28",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"author": "GongT <admin@gongt.me>",
|
|
@@ -15,14 +15,14 @@
|
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@rushstack/rig-package": "^0.6.0",
|
|
17
17
|
"split-cmd": "^1.1.0",
|
|
18
|
-
"@build-script/monorepo-lib": "^0.0.27",
|
|
19
18
|
"@idlebox/args": "^0.0.28",
|
|
20
|
-
"@
|
|
19
|
+
"@build-script/monorepo-lib": "^0.0.27",
|
|
20
|
+
"@idlebox/common": "^1.5.28",
|
|
21
21
|
"@idlebox/logger": "^0.0.27",
|
|
22
|
-
"@idlebox/node": "^1.4.
|
|
23
|
-
"@idlebox/source-map-support": "^0.0.23",
|
|
22
|
+
"@idlebox/node": "^1.4.37",
|
|
24
23
|
"@idlebox/terminal-control": "^0.0.6",
|
|
25
|
-
"@mpis/server": "^0.0.24"
|
|
24
|
+
"@mpis/server": "^0.0.24",
|
|
25
|
+
"@idlebox/source-map-support": "^0.0.23"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@types/node": "^25.5.0",
|
package/src/common/workspace.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { getEnvironment, workingDirectory } from '@idlebox/node';
|
|
|
5
5
|
import { CSI } from '@idlebox/terminal-control/constants';
|
|
6
6
|
import { CompileError, ModeKind, ProcessIPCClient, WorkerClientState, WorkersManager } from '@mpis/server';
|
|
7
7
|
import { RigConfig, type IRigConfig } from '@rushstack/rig-package';
|
|
8
|
+
import assert from 'node:assert';
|
|
8
9
|
import { dirname, resolve } from 'node:path';
|
|
9
10
|
import { split as splitCmd } from 'split-cmd';
|
|
10
11
|
import { currentCommand } from '../bin.js';
|
|
@@ -211,17 +212,18 @@ class PnpmMonoRepo extends EnhancedAsyncDisposable {
|
|
|
211
212
|
txt = txt.slice(Math.max(lWidth - 20), 20).replace(unclosedColorReg, '');
|
|
212
213
|
psize = 4 + 2 + txt.replace(colorReg, '').length + 2;
|
|
213
214
|
}
|
|
214
|
-
return `\n${CSI}${barC}m ${CSI}0;${textC}m ${txt} ${CSI}0${barC}m${
|
|
215
|
+
return `\n${CSI}${barC}m ${CSI}0;${textC}m ${txt} ${CSI}0${barC}m${CSI}K${CSI}0m\n`;
|
|
215
216
|
}
|
|
216
217
|
|
|
217
218
|
for (const [project, text] of this.errorMessages.entries()) {
|
|
218
219
|
const block = text.replace(firstEmptyLine, '').trimEnd();
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
220
|
+
const exec = this.packageToWorker.get(project);
|
|
221
|
+
assert.ok(exec);
|
|
222
|
+
|
|
223
|
+
output += buildLine(`[@mpis/monorepo] 以下是项目 ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m 中此命令的输出: ${exec.commandline.join(' ')}`);
|
|
222
224
|
output += workingDirectory.escapeVscodeCwd(project.absolute);
|
|
223
225
|
output += `\nwd: ${project.absolute}\n${block}\n`.replace('\x1bc', '').replace(/^/gm, `${CSI}${barC}m ${CSI}0m `);
|
|
224
|
-
output += buildLine(`[@mpis/monorepo]
|
|
226
|
+
output += buildLine(`[@mpis/monorepo] 结束项目 ${CSI}38;5;14m${project.packageJson.name}${CSI}0;${textC}m 的输出`);
|
|
225
227
|
}
|
|
226
228
|
if (output) {
|
|
227
229
|
output += workingDirectory.escapeVscodeCwd(process.cwd());
|