@build-script/package-tools 0.0.15 → 0.0.17

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.
Files changed (36) hide show
  1. package/lib/commands/monorepo-invalid.js +3 -3
  2. package/lib/commands/monorepo-invalid.js.map +1 -1
  3. package/lib/commands/monorepo-link-binaries.d.ts.map +1 -1
  4. package/lib/commands/monorepo-link-binaries.js +35 -24
  5. package/lib/commands/monorepo-link-binaries.js.map +1 -1
  6. package/lib/commands/monorepo-publish.d.ts.map +1 -1
  7. package/lib/commands/monorepo-publish.js +9 -0
  8. package/lib/commands/monorepo-publish.js.map +1 -1
  9. package/lib/commands/monorepo-tsconfig.d.ts +5 -0
  10. package/lib/commands/monorepo-tsconfig.d.ts.map +1 -1
  11. package/lib/commands/monorepo-tsconfig.js +13 -5
  12. package/lib/commands/monorepo-tsconfig.js.map +1 -1
  13. package/lib/commands.generated.d.ts.map +1 -1
  14. package/lib/commands.generated.js +9 -4
  15. package/lib/commands.generated.js.map +1 -1
  16. package/lib/common/package-manager/driver.abstract.d.ts +1 -1
  17. package/lib/common/package-manager/driver.abstract.d.ts.map +1 -1
  18. package/lib/common/package-manager/driver.abstract.js +10 -6
  19. package/lib/common/package-manager/driver.abstract.js.map +1 -1
  20. package/lib/common/package-manager/package-json.d.ts.map +1 -1
  21. package/lib/common/package-manager/package-json.js +15 -1
  22. package/lib/common/package-manager/package-json.js.map +1 -1
  23. package/lib/common/shared-jobs/detect-change-job.js +1 -1
  24. package/lib/common/shared-jobs/detect-change-job.js.map +1 -1
  25. package/lib/common/version.generated.d.ts +1 -1
  26. package/lib/common/version.generated.js +1 -1
  27. package/package.json +24 -24
  28. package/src/commands/monorepo-invalid.ts +3 -3
  29. package/src/commands/monorepo-link-binaries.ts +49 -27
  30. package/src/commands/monorepo-publish.ts +13 -0
  31. package/src/commands/monorepo-tsconfig.ts +12 -4
  32. package/src/commands.generated.ts +9 -4
  33. package/src/common/package-manager/driver.abstract.ts +11 -6
  34. package/src/common/package-manager/package-json.ts +20 -3
  35. package/src/common/shared-jobs/detect-change-job.ts +1 -1
  36. package/src/common/version.generated.ts +1 -1
@@ -1,7 +1,7 @@
1
1
  import { createWorkspace } from '@build-script/monorepo-lib';
2
2
  import { CommandDefine, logger } from '@idlebox/cli';
3
3
  import { PackageManagerUsageKind } from '../common/package-manager/driver.abstract.js';
4
- import { NPM } from '../common/package-manager/driver.npm.js';
4
+ import { createPackageManager } from '../common/package-manager/package-manager.js';
5
5
  export class Command extends CommandDefine {
6
6
  _usage = '';
7
7
  _description = '从npm缓存中删除关于本monorepo的数据,以便安装最新版本';
@@ -9,8 +9,8 @@ export class Command extends CommandDefine {
9
9
  }
10
10
  export async function main() {
11
11
  const workspace = await createWorkspace();
12
- const packageManager = new NPM(PackageManagerUsageKind.Read, workspace);
13
- const cache = await packageManager.createCacheHandler();
12
+ const pm = await createPackageManager(PackageManagerUsageKind.Read, workspace);
13
+ const cache = await pm.createCacheHandler();
14
14
  const list = await workspace.listPackages();
15
15
  logger.log('删除%d个项目在 %s 的npm缓存', list.length, cache.path);
16
16
  for (const data of list) {
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-invalid.js","sourceRoot":"","sources":["../../src/commands/monorepo-invalid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,GAAG,EAAE,MAAM,yCAAyC,CAAC;AAE9D,MAAM,OAAO,OAAQ,SAAQ,aAAa;IACb,MAAM,GAAG,EAAE,CAAC;IACZ,YAAY,GAAG,kCAAkC,CAAC;IAClD,KAAK,GAAG,EAAE,CAAC;CACvC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI;IACzB,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,CAAC;IAExD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;IAE5C,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"monorepo-invalid.js","sourceRoot":"","sources":["../../src/commands/monorepo-invalid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AAEpF,MAAM,OAAO,OAAQ,SAAQ,aAAa;IACb,MAAM,GAAG,EAAE,CAAC;IACZ,YAAY,GAAG,kCAAkC,CAAC;IAClD,KAAK,GAAG,EAAE,CAAC;CACvC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI;IACzB,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/E,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,kBAAkB,EAAE,CAAC;IAE5C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;IAE5C,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;AACF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-link-binaries.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-link-binaries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAQ7C,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,MAAM;IACxC,mBAA4B,YAAY,gIAAqD;IAC7F,mBAA4B,KAAK,4FAAgC;IACjE,mBAA4B,UAAU;;;;;;;;;;;;;;;MAepC;CACF;AAaD,wBAAsB,IAAI,kBAoDzB"}
1
+ {"version":3,"file":"monorepo-link-binaries.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-link-binaries.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,aAAa,EAAU,MAAM,cAAc,CAAC;AAO3D,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,MAAM;IACxC,mBAA4B,YAAY,gIAAqD;IAC7F,mBAA4B,KAAK,4FAAgC;IACjE,mBAA4B,UAAU;;;;;;;;;;;;;;;MAepC;CACF;AAyBD,wBAAsB,IAAI,kBAoDzB"}
@@ -1,8 +1,6 @@
1
1
  import { createWorkspace } from '@build-script/monorepo-lib';
2
- import { argv } from '@idlebox/cli';
3
- import { CommandDefine } from '@idlebox/cli';
2
+ import { argv, CommandDefine, logger } from '@idlebox/cli';
4
3
  import { ensureLinkTargetSync } from '@idlebox/ensure-symlink';
5
- import { logger } from '@idlebox/cli';
6
4
  import { relativePath } from '@idlebox/node';
7
5
  import { readFileSync } from 'node:fs';
8
6
  import { basename, resolve } from 'node:path';
@@ -14,16 +12,16 @@ export class Command extends CommandDefine {
14
12
  '--from': {
15
13
  usage: true,
16
14
  flag: false,
17
- description: '将<value>视为各个项目的直接依赖 (必须是至少一个项目的依赖,否则找不到)',
15
+ description: '将外部依赖视为直接依赖 (必须是至少一个项目的依赖,否则找不到)',
18
16
  },
19
17
  '--transparent': {
20
18
  flag: false,
21
- description: '将<value>的所有直接依赖视为此项目的直接依赖',
19
+ description: '将workspace中其他项目的依赖视为此项目的',
22
20
  },
23
21
  '--recursive': {
24
22
  usage: true,
25
23
  flag: true,
26
- description: '在每个项目中运行,而非当前项目',
24
+ description: '在workspace的每个项目中分别运行此命令',
27
25
  },
28
26
  };
29
27
  }
@@ -52,14 +50,14 @@ export async function main() {
52
50
  throw new Error('--from can not be a local package');
53
51
  }
54
52
  }
55
- const locals = await createBins(workspace, localPackages);
56
- const globals = await createBins(workspace, [...additionalPackages]);
53
+ const locals = await collectBinaryByName(workspace, localPackages);
54
+ const globals = await collectBinaryByName(workspace, [...additionalPackages]);
57
55
  if (recursiveMode) {
58
56
  for (const pkg of projectList) {
59
- const current = await createBins(workspace, depNames(pkg.packageJson));
57
+ const current = await collectBinaryByName(workspace, depNames(pkg.packageJson));
60
58
  await execute({
61
- deps: current,
62
- globalDeps: globals,
59
+ direct: current,
60
+ manual: globals,
63
61
  monorepo: locals,
64
62
  packageRoot: pkg.absolute,
65
63
  });
@@ -67,23 +65,24 @@ export async function main() {
67
65
  }
68
66
  else {
69
67
  const pkg = await workspace.getNearestPackage(process.cwd());
70
- const current = await createBins(workspace, depNames(pkg.packageJson));
68
+ const current = await collectBinaryByName(workspace, depNames(pkg.packageJson));
71
69
  await execute({
72
- deps: current,
73
- globalDeps: globals,
70
+ direct: current,
71
+ manual: globals,
74
72
  monorepo: locals,
75
73
  packageRoot: pkg.absolute,
76
74
  });
77
75
  }
78
76
  }
79
77
  async function execute(ctx) {
80
- logger.log `linking binaries in project long<${ctx.packageRoot}>`;
81
78
  const final = new Map();
82
- for (const list of [ctx.globalDeps, ctx.deps, ctx.monorepo]) {
79
+ for (const list of [ctx.manual, ctx.monorepo, ctx.direct]) {
83
80
  for (const bin of list) {
84
81
  final.set(bin.name, bin.absolutePath);
85
82
  }
86
83
  }
84
+ logger.log `linking ${final.size} binaries in project long<${ctx.packageRoot}>`;
85
+ logger.verbose `mappinglist<${final}>`;
87
86
  const dry = argv.flag(['--dry']) > 0;
88
87
  const bindir = resolve(ctx.packageRoot, 'node_modules/.bin');
89
88
  for (const [name, target] of final) {
@@ -115,25 +114,37 @@ function depNames(pkgJson) {
115
114
  }
116
115
  return r;
117
116
  }
118
- async function createBins(workspace, names) {
117
+ /**
118
+ * 收集指定名称的二进制文件
119
+ */
120
+ async function collectBinaryByName(workspace, names) {
121
+ if (names.length === 0)
122
+ return [];
119
123
  const bins = [];
120
- const packageList = workspace.listPackages();
121
- for (const want of names) {
122
- for (const proj of await packageList) {
124
+ const packageList = await workspace.listPackages();
125
+ for (const proj of packageList) {
126
+ for (const want of names) {
123
127
  if (proj.name === want) {
124
- makeBinMap(bins, proj.absolute, proj.packageJson);
128
+ binariesInPackage(bins, proj.absolute, proj.packageJson);
125
129
  }
126
130
  const deps = depNames(proj.packageJson);
127
131
  if (deps.includes(want)) {
128
132
  const depRoot = resolve(proj.absolute, 'node_modules', want);
129
- const pkgJson = JSON.parse(readFileSync(resolve(depRoot, 'package.json'), 'utf-8'));
130
- makeBinMap(bins, depRoot, pkgJson);
133
+ let pkgJson;
134
+ try {
135
+ pkgJson = JSON.parse(readFileSync(resolve(depRoot, 'package.json'), 'utf-8'));
136
+ }
137
+ catch (e) {
138
+ logger.warn `dependency ${want} is invalid (in ${proj.name}), skipping: ${e}`;
139
+ continue;
140
+ }
141
+ binariesInPackage(bins, depRoot, pkgJson);
131
142
  }
132
143
  }
133
144
  }
134
145
  return bins;
135
146
  }
136
- function makeBinMap(result, absolute, json) {
147
+ function binariesInPackage(result, absolute, json) {
137
148
  if (!json.bin)
138
149
  return;
139
150
  let bins = {};
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-link-binaries.js","sourceRoot":"","sources":["../../src/commands/monorepo-link-binaries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monorepo-link-binaries.js","sourceRoot":"","sources":["../../src/commands/monorepo-link-binaries.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-publish.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,aAAa,EAAe,MAAM,cAAc,CAAC;AAkBrE,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,SAA2C;IAC7E,mBAA4B,YAAY,wGAA6B;IACrE,mBAA4B,KAAK,MAAM;IACvC,mBAA4B,UAAU;;;;;;;;;;;;;;;;;MAMpC;CACF;AAqND,wBAAsB,IAAI,kBAiHzB"}
1
+ {"version":3,"file":"monorepo-publish.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,aAAa,EAAe,MAAM,cAAc,CAAC;AAmBrE,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,SAA2C;IAC7E,mBAA4B,YAAY,wGAA6B;IACrE,mBAA4B,KAAK,MAAM;IACvC,mBAA4B,UAAU;;;;;;;;;;;;;;;;;MAMpC;CACF;AAqND,wBAAsB,IAAI,kBA6HzB"}
@@ -2,6 +2,7 @@ import { applyPublishWorkspace, createWorkspace, normalizePackageName } from '@b
2
2
  import { app, argv, CommandDefine, CSI, logger } from '@idlebox/cli';
3
3
  import { prettyPrintError } from '@idlebox/common';
4
4
  import { Job, JobGraphBuilder, JobState } from '@idlebox/dependency-graph';
5
+ import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
5
6
  import { commandInPath, emptyDir, setExitCodeIfNot, shutdown, workingDirectory, writeFileIfChange } from '@idlebox/node';
6
7
  import { FsNodeType, spawnReadonlyFileSystemWithCommand } from '@idlebox/unshare';
7
8
  import { execaNode } from 'execa';
@@ -221,6 +222,7 @@ export async function main() {
221
222
  await workspace.decoupleDependencies();
222
223
  const pm = await createPackageManager(PackageManagerUsageKind.Write, workspace, zipDir);
223
224
  await prepareTempFolder(zipDir, pm);
225
+ const tempPackageJson = await loadJsonFile(resolve(zipDir, 'package.json'));
224
226
  const projects = await workspace.listPackages();
225
227
  let concurrency = Number.parseInt(argv.single(['--concurrency']) || '0', 10) || 5;
226
228
  if (app.debug) {
@@ -278,6 +280,13 @@ export async function main() {
278
280
  packageToPublish.push({ name: node.name, pack });
279
281
  }
280
282
  console.log(`✅ 打包阶段结束,有 ${packageToPublish.length} 个包需要发布`);
283
+ const scripts = tempPackageJson.scripts ?? {};
284
+ for (const { name, pack } of packageToPublish) {
285
+ scripts[`publish:${name}`] = `npm publish ${pack} --access public --no-git-checks`;
286
+ }
287
+ scripts['publish'] = "pnpm run '/^publish:.*/'";
288
+ tempPackageJson.scripts = scripts;
289
+ await writeJsonFileBack(tempPackageJson);
281
290
  if (opts.dryRun) {
282
291
  console.log(`中断并退出(--dry)`);
283
292
  throw shutdown(0);
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-publish.js","sourceRoot":"","sources":["../../src/commands/monorepo-publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,oBAAoB,EAA6C,MAAM,4BAA4B,CAAC;AACrJ,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACzH,OAAO,EAAE,UAAU,EAAE,kCAAkC,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAuB,MAAM,8CAA8C,CAAC;AAC5G,OAAO,EAAE,IAAI,EAAE,MAAM,0CAA0C,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAEjF,MAAM,OAAO,OAAQ,SAAQ,aAAa;IACb,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;IACjD,YAAY,GAAG,yBAAyB,CAAC;IACzC,KAAK,GAAG,EAAE,CAAC;IACX,UAAU,GAAG;QACxC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE;QAChD,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,0BAA0B,EAAE;QAChE,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,mBAAmB,EAAE;QAC7D,eAAe,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE;QACzD,4EAA4E;KAC5E,CAAC;CACF;AAED,MAAM,eAAgB,SAAQ,GAAS;IAMpB;IACA;IANV,aAAa,GAAG,EAAE,CAAC;IAE3B,YACC,IAAY,EACZ,IAAuB,EACN,OAAqB,EACrB,SAA4B,EAC7C,eAAwB;QAExB,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAJD,YAAO,GAAP,OAAO,CAAc;QACrB,cAAS,GAAT,SAAS,CAAmB;QAK7C,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;QACxE,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IACnE,CAAC;IAEgB,OAAO,GAAa,EAAE,CAAC;IACxC,GAAG,CAAC,IAAY;QACf,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,QAAQ;QACP,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,cAAc;QACb,OAAO,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;IACxC,CAAC;IAEgB,MAAM,CAA6B;IAE5C,KAAK,CAAC,cAAc;QAC3B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAuB,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,EAAE;YAClH,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE;gBACJ,aAAa,EAAE,kBAAkB,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAC/E,+CAA+C;aAC/C;YACD,GAAG,EAAE,IAAI;SACT,CAAC,CAAC;QAEH,IAAI,MAA+B,CAAC;QACpC,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,OAAO,CAAC;QACxB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,GAAG,SAAU,CAAS,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACtF,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;QACnD,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,EAAkB;QAC5C,OAAO,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEgB,IAAI,CAAyB;IAEtC,KAAK,CAAC,YAAY,CAAC,GAAmB,EAAE,QAAgB;QAC/D,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,kCAAkC,CACjD;YACC,OAAO,EAAE;gBACR,OAAO,EAAE;oBACR,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE;oBACxD,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE;oBAC1D,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE;iBACtD;gBACD,OAAO,EAAE,IAAI;aACb;YACD,OAAO,EAAE;gBACR,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3B,IAAI,EAAE,CAAC,sBAAsB,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;aAC/F;SACD,EACD;YACC,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,IAAI;YACT,GAAG,EAAE;gBACJ,aAAa,EAAE,gBAAgB,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;aAC7E;SACD,CACD,CAAC;QAEF,IAAI,MAA+B,CAAC;QACpC,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,OAAO,CAAC;QACxB,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,GAAG,SAAU,CAAS,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,GAAG,SAAS,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,EAAkB,EAAE,QAAgB;QAC5D,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAEkB,KAAK,CAAC,QAAQ;QAChC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,cAAc,GAAG,IAAI,CAAC,CAAC;YAE7C,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5G,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1F,MAAM,aAAa,GAAG,SAAS,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;YAC3D,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;YAEpD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,mBAAmB,YAAY,CAAC,MAAM,SAAS,CAAC,CAAC;gBAC1D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;oBACjC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;oBACxB,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;wBAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;oBAChC,CAAC;gBACF,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,GAAG,CAAC,UAAU,YAAY,CAAC,MAAM,YAAY,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClI,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACtB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAC;gBAC/C,YAAY,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,aAAa,IAAI,OAAO,CAAC,CAAC;gBAC5E,IAAI,CAAC,GAAG,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;YAC/C,CAAC;YACD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC;gBAChD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBACtC,OAAO;YACR,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,YAAY,MAAM,CAAC,CAAC;YACxH,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,aAAa,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAE3E,IAAI,aAAa,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,mBAAmB,YAAY,cAAc,aAAa,KAAK,CAAC,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,GAAG,CAAC,oBAAoB,YAAY,KAAK,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;CACD;AAED,SAAS,OAAO;IACf,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;IAExC,OAAO;QACN,MAAM,EAAE,MAAM;KACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,EAAkB;IAChE,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,KAAK,CAAA,oBAAoB,KAAK,IAAI,CAAC;IAC3C,CAAC;IAED,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACxB,MAAM,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QACxE,MAAM,qBAAqB,CAAC;YAC3B,UAAU,EAAE,aAAa;YACzB,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI;IACzB,MAAM,SAAS,GAAG,MAAM,eAAe,EAAE,CAAC;IAC1C,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAElD,MAAM,SAAS,CAAC,oBAAoB,EAAE,CAAC;IACvC,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACxF,MAAM,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAEpC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;IAEhD,IAAI,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,WAAW,GAAG,CAAC,CAAC;QAChB,MAAM,CAAC,IAAI,CAAA,0BAA0B,CAAC;IACvC,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAEzD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,MAAM,qBAAqB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QACzD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAE5C,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,2BAA2B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7D,KAAK,MAAM,OAAO,IAAI,qBAAqB,EAAE,CAAC;QAC7C,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAElG,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;YACtB,IAAI,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;gBACrB,YAAY,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,QAAQ,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,qBAAqB,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtH,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAEf,MAAM,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC7B,IAAI,CAAC,EAAE,CAAC;oBACP,gBAAgB,CAAC,kBAAkB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;gBACvD,CAAC;YACF,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAAE,YAAY,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAErB,KAAK,EAAE,CAAC;IACT,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEjC,SAAS,YAAY;QACpB,MAAM,IAAI,GAAG,KAAK,EAAE,kBAAkB,EAAE,CAAC;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IAEtB,MAAM,gBAAgB,GAAqC,EAAE,CAAC;IAC9D,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,CAAC,IAAI,YAAY,eAAe,CAAC;YAAE,SAAS;QAEjD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,cAAc,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC;IAE5D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC5B,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACpD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,IAAI,CAAC;QACJ,KAAK,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;YACvF,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3C,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErB,KAAK,EAAE,CAAC;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,kBAAkB,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACjB,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACjC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;YAAS,CAAC;QACV,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAC9E,MAAM,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAErC,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC/E,MAAM,iBAAiB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IACD,QAAQ,CAAC,CAAC,CAAC,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"monorepo-publish.js","sourceRoot":"","sources":["../../src/commands/monorepo-publish.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,11 @@ export declare class Command extends CommandDefine {
9
9
  flag: boolean;
10
10
  description: string;
11
11
  };
12
+ '--force': {
13
+ usage: boolean;
14
+ flag: boolean;
15
+ description: string;
16
+ };
12
17
  };
13
18
  }
14
19
  export declare function main(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-tsconfig.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-tsconfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,aAAa,EAAU,MAAM,cAAc,CAAC;AAO3D,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,MAAM;IACxC,mBAA4B,YAAY,6FAA2C;IACnF,mBAA4B,KAAK,2LAA2G;IAC5I,mBAA4B,UAAU;;;;;;MAMpC;CACF;AAQD,wBAAsB,IAAI,kBA+GzB"}
1
+ {"version":3,"file":"monorepo-tsconfig.d.ts","sourceRoot":"","sources":["../../src/commands/monorepo-tsconfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,aAAa,EAAU,MAAM,cAAc,CAAC;AAO3D,qBAAa,OAAQ,SAAQ,aAAa;IACzC,mBAA4B,MAAM,MAAM;IACxC,mBAA4B,YAAY,6FAA2C;IACnF,mBAA4B,KAAK,2LAA2G;IAC5I,mBAA4B,UAAU;;;;;;;;;;;MAWpC;CACF;AAQD,wBAAsB,IAAI,kBAkHzB"}
@@ -15,17 +15,25 @@ export class Command extends CommandDefine {
15
15
  flag: true,
16
16
  description: '也将devDependencies中的包添加到references中',
17
17
  },
18
+ '--force': {
19
+ usage: true,
20
+ flag: true,
21
+ description: '强制修改,忽略git状态',
22
+ },
18
23
  };
19
24
  }
20
25
  const path_element_id = 'package-tools/monorepo-tsconfig';
21
26
  export async function main() {
22
27
  const includeDev = argv.flag(['--dev']) > 0;
28
+ const force = argv.flag(['--force']) > 0;
23
29
  const repo = await createWorkspace();
24
- try {
25
- await repo.requireGitClean();
26
- }
27
- catch (e) {
28
- logger.fatal(e.message);
30
+ if (!force) {
31
+ try {
32
+ await repo.requireGitClean();
33
+ }
34
+ catch (e) {
35
+ logger.fatal(e.message);
36
+ }
29
37
  }
30
38
  const list = await repo.listPackages();
31
39
  const configAbsMap = new Map();
@@ -1 +1 @@
1
- {"version":3,"file":"monorepo-tsconfig.js","sourceRoot":"","sources":["../../src/commands/monorepo-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAqB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,OAAO,OAAQ,SAAQ,aAAa;IACb,MAAM,GAAG,EAAE,CAAC;IACZ,YAAY,GAAG,uCAAuC,CAAC;IACvD,KAAK,GAAG,uGAAuG,CAAC;IAChH,UAAU,GAAG;QACxC,OAAO,EAAE;YACR,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,oCAAoC;SACjD;KACD,CAAC;CACF;AAED,MAAM,eAAe,GAAG,iCAAiC,CAAC;AAM1D,MAAM,CAAC,KAAK,UAAU,IAAI;IACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;IAE5C,MAAM,IAAI,GAAG,MAAM,eAAe,EAAE,CAAC;IAErC,IAAI,CAAC;QACJ,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAwB,CAAC;IACrD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;IACpD,YAAY;IAEZ,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,0BAA0B,CAAC,CAAC;IACtD,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACzB,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjC,IAAI,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACjG,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YACzF,IAAI,IAAI,EAAE,CAAC;gBACV,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;gBACrD,SAAS;YACV,CAAC;QACF,CAAC;QAED,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACnD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC7B,SAAS;QACV,CAAC;QAED,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;QACtD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC7B,SAAS;QACV,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,kBAAkB,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC/C,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClD,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAElC,IAAI,CAAC,YAAY,CAAC,UAAU;YAAE,YAAY,CAAC,UAAU,GAAG,EAAE,CAAC;QAC3D,MAAM,UAAU,GAAiB,YAAY,CAAC,UAAU,CAAC;QAEzD,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,UAAU,EAAE,CAAC;YAChB,aAAa,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,0BAA0B,IAAI,EAAE,CAAC,CAAC;YAChE,CAAC;YAED,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW;gBAAE,SAAS;YAE3B,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,KAAK;gBAAE,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAEvC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;YAC3C,IAAI,GAAG,CAAC,GAAG,KAAK,eAAe;gBAAE,SAAS;YAE1C,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC5C,SAAS;YACT,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1C,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5B,MAAM,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,YAAY,CAAC,UAAU,GAAG,SAAS,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,gBAAgB,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;IACpE,MAAM,UAAU,GAAiB,EAAE,CAAC;IACpC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,aAAa,CAAC,YAAY,EAAE;QACjC,eAAe,EAAE;YAChB,eAAe,EAAE,IAAI;YACrB,MAAM,EAAE,OAAO;YACf,gBAAgB,EAAE,MAAM;YACxB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,QAAQ;SAChB;QACD,UAAU;KACV,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,GAAiB,EAAE,KAAa;IACjD,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACd,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,YAAoC;IACzD,kBAAkB;IAClB,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"monorepo-tsconfig.js","sourceRoot":"","sources":["../../src/commands/monorepo-tsconfig.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"commands.generated.d.ts","sourceRoot":"","sources":["../src/commands.generated.ts"],"names":[],"mappings":"AAKA;;;;;;;gFAOgF;AAGhF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAC9D,eAAO,MAAM,YAAY,EAAE,SAAS,yBAAyB,EA0P5D,CAAC;AACF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcd,CAAC"}
1
+ {"version":3,"file":"commands.generated.d.ts","sourceRoot":"","sources":["../src/commands.generated.ts"],"names":[],"mappings":"AAKA;;;;;;;gFAOgF;AAGhF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAC9D,eAAO,MAAM,YAAY,EAAE,SAAS,yBAAyB,EA+P5D,CAAC;AACF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcd,CAAC"}
@@ -84,16 +84,16 @@ export const cli_commands = [
84
84
  "--from": {
85
85
  "usage": true,
86
86
  "flag": false,
87
- "description": "将<value>视为各个项目的直接依赖 (必须是至少一个项目的依赖,否则找不到)"
87
+ "description": "将外部依赖视为直接依赖 (必须是至少一个项目的依赖,否则找不到)"
88
88
  },
89
89
  "--transparent": {
90
90
  "flag": false,
91
- "description": "将<value>的所有直接依赖视为此项目的直接依赖"
91
+ "description": "将workspace中其他项目的依赖视为此项目的"
92
92
  },
93
93
  "--recursive": {
94
94
  "usage": true,
95
95
  "flag": true,
96
- "description": "在每个项目中运行,而非当前项目"
96
+ "description": "在workspace的每个项目中分别运行此命令"
97
97
  }
98
98
  },
99
99
  "commonArgs": {},
@@ -162,13 +162,18 @@ export const cli_commands = [
162
162
  {
163
163
  "command": "monorepo-tsconfig",
164
164
  "help": "查找tsconfig.json和src/tsconfig.json\n 如果不在这里,可以在package.json中设置exports['./tsconfig.json'] = './xxxx'",
165
- "usage": "\u001b[14;3m--dev\u001b[0m ",
165
+ "usage": "\u001b[14;3m--dev\u001b[0m \u001b[14;3m--force\u001b[0m ",
166
166
  "description": "为所有项目的 tsconfig.json 添加 references 字段",
167
167
  "args": {
168
168
  "--dev": {
169
169
  "usage": true,
170
170
  "flag": true,
171
171
  "description": "也将devDependencies中的包添加到references中"
172
+ },
173
+ "--force": {
174
+ "usage": true,
175
+ "flag": true,
176
+ "description": "强制修改,忽略git状态"
172
177
  }
173
178
  },
174
179
  "commonArgs": {},
@@ -1 +1 @@
1
- {"version":3,"file":"commands.generated.js","sourceRoot":"","sources":["../src/commands.generated.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commands.generated.js","sourceRoot":"","sources":["../src/commands.generated.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,7 @@ export declare abstract class PackageManager {
28
28
  private _get_config;
29
29
  protected abstract _uploadTarball(pack: string, cwd: string): Promise<IUploadResult>;
30
30
  uploadTarball(pack: string, cwd?: string): Promise<IUploadResult>;
31
- protected _execGetOut(cwd: string, cmds: string[], reject?: boolean): Promise<{
31
+ protected _execGetOut(cwd: string, cmds: string[], reject?: boolean, binary?: string): Promise<{
32
32
  readonly stdout: string;
33
33
  readonly stderr: string;
34
34
  readonly all: string;
@@ -1 +1 @@
1
- {"version":3,"file":"driver.abstract.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/driver.abstract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAOhE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACnB;AAED,oBAAY,uBAAuB;IAClC,IAAI,IAAI;IACR,KAAK,IAAI;CACT;AAED,8BAAsB,cAAc;aAMlB,SAAS,EAAE,uBAAuB;aAClC,SAAS,EAAE,aAAa;IANzC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACjC,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAGX,SAAS,EAAE,uBAAuB,EAClC,SAAS,EAAE,aAAa,EACxC,MAAM,SAAgB;IAShB,OAAO;;;;IAID,IAAI,CAAC,MAAM,EAAE,MAAM;IAuBhC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnD,eAAe;IAIf,QAAQ;IAeR,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YAe5B,WAAW;IAczB,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IACvE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAyB;cAYvD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,UAAO;;;;;IAuBtE,OAAO,CAAC,UAAU,CAAC,CAAS;IACf,cAAc;IAkB3B,OAAO,CAAC,cAAc,CAAC,CAAkB;IACnC,kBAAkB;CAWxB"}
1
+ {"version":3,"file":"driver.abstract.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/driver.abstract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAOhE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACnB;AAED,oBAAY,uBAAuB;IAClC,IAAI,IAAI;IACR,KAAK,IAAI;CACT;AAED,8BAAsB,cAAc;aAMlB,SAAS,EAAE,uBAAuB;aAClC,SAAS,EAAE,aAAa;IANzC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACjC,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAGX,SAAS,EAAE,uBAAuB,EAClC,SAAS,EAAE,aAAa,EACxC,MAAM,SAAgB;IAShB,OAAO;;;;IAID,IAAI,CAAC,MAAM,EAAE,MAAM;IAuBhC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnD,eAAe;IAIf,QAAQ;IAeR,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;YAe5B,WAAW;IAmBzB,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IACvE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAyB;cAYvD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,UAAO,EAAE,MAAM,SAAc;;;;;IAuB5F,OAAO,CAAC,UAAU,CAAC,CAAS;IACf,cAAc;IAkB3B,OAAO,CAAC,cAAc,CAAC,CAAkB;IACnC,kBAAkB;CAWxB"}
@@ -82,16 +82,20 @@ export class PackageManager {
82
82
  return this._get_config(this.configTemp.path, key);
83
83
  }
84
84
  async _get_config(cwd, key) {
85
+ let binary = this.binary;
86
+ if (key === 'cache') {
87
+ binary = 'npm';
88
+ }
85
89
  const scope = await this.getScope();
86
90
  if (scope) {
87
- const { stdout } = await this._execGetOut(cwd, ['config', 'get', `${scope}:${key}`]);
88
- logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', this.binary, scope, key, stdout, cwd);
91
+ const { stdout } = await this._execGetOut(cwd, ['config', 'get', `${scope}:${key}`], true, binary);
92
+ logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', binary, scope, key, stdout, cwd);
89
93
  if (`${stdout}` !== 'undefined') {
90
94
  return stdout;
91
95
  }
92
96
  }
93
- const { stdout } = await this._execGetOut(cwd, ['config', 'get', key]);
94
- logger.debug('$ %s config get %s -> %s (cwd: %s)', this.binary, key, stdout, cwd);
97
+ const { stdout } = await this._execGetOut(cwd, ['config', 'get', key], true, binary);
98
+ logger.debug('$ %s config get %s -> %s (cwd: %s)', binary, key, stdout, cwd);
95
99
  return stdout === 'undefined' ? undefined : stdout;
96
100
  }
97
101
  async uploadTarball(pack, cwd = this.projectPath) {
@@ -106,8 +110,8 @@ export class PackageManager {
106
110
  throw e;
107
111
  }
108
112
  }
109
- async _execGetOut(cwd, cmds, reject = true) {
110
- const result = await execa(this.binary, cmds, {
113
+ async _execGetOut(cwd, cmds, reject = true, binary = this.binary) {
114
+ const result = await execa(binary, cmds, {
111
115
  stdio: ['ignore', 'pipe', 'pipe'],
112
116
  cwd: cwd,
113
117
  reject: reject,
@@ -1 +1 @@
1
- {"version":3,"file":"driver.abstract.js","sourceRoot":"","sources":["../../../src/common/package-manager/driver.abstract.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.abstract.js","sourceRoot":"","sources":["../../../src/common/package-manager/driver.abstract.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/package-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwBpD,wBAAsB,+BAA+B,CAAC,IAAI,EAAE,MAAM,iBAQjE;AAGD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAS3E;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,mBAUvE"}
1
+ {"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/package-json.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAuBpD,wBAAsB,+BAA+B,CAAC,IAAI,EAAE,MAAM,iBAajE;AAGD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAS3E;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,mBAUvE"}
@@ -1,5 +1,5 @@
1
- import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
2
1
  import { logger } from '@idlebox/cli';
2
+ import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
3
3
  import { readFile, writeFile } from 'node:fs/promises';
4
4
  import { resolve } from 'node:path';
5
5
  import { inc } from 'semver';
@@ -23,6 +23,9 @@ export async function makePackageJsonOrderConsistence(root) {
23
23
  const filepath = resolve(root, 'package.json');
24
24
  const data = JSON.parse(await readFile(filepath, 'utf-8'));
25
25
  delete data.devDependencies;
26
+ rewritePackageVersions(data.dependencies);
27
+ rewritePackageVersions(data.optionalDependencies);
28
+ rewritePackageVersions(data.peerDependencies);
26
29
  const json = sort(data);
27
30
  await writeFile(filepath, JSON.stringify(json, null, 2), 'utf-8');
28
31
  delete pkgCache[filepath];
@@ -48,4 +51,15 @@ export async function increaseVersion(pkg, current) {
48
51
  logger.debug('package.json回写: %s', ch);
49
52
  return v;
50
53
  }
54
+ const caretVersion = /^\^(\d+\.\d+)\.\d+/;
55
+ function rewritePackageVersions(deps) {
56
+ if (!deps)
57
+ return;
58
+ for (const [k, v] of Object.entries(deps)) {
59
+ const m = caretVersion.exec(v);
60
+ if (m) {
61
+ deps[k] = `^${m[1]}.*`;
62
+ }
63
+ }
64
+ }
51
65
  //# sourceMappingURL=package-json.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/common/package-manager/package-json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,SAAS,IAAI,CAAC,MAAW;IACxB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAChC,wBAAwB;QACxB,OAAO,MAAM,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,EAAE,CAAC;IACZ,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAC,IAAY;IACjE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,eAAe,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAElE,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,QAAQ,GAAiC,EAAE,CAAC;AAClD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY;IACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACtB,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAiB,EAAE,OAAe;IACvE,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,CAAC,EAAE,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC,IAAI,SAAS,OAAO,QAAQ,CAAC,CAAC;IAC1D,CAAC;IACD,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC;IAChB,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,CAAC;AACV,CAAC"}
1
+ {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/common/package-manager/package-json.ts"],"names":[],"mappings":"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"}
@@ -30,7 +30,7 @@ export async function executeChangeDetect(pm, options = {}) {
30
30
  logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
31
31
  if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
32
32
  logger.debug('本地版本 (%s) 已经大于远程版本 (%s),无需进一步检测', packageJson.version, remotePackage?.version);
33
- return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version, packageJsonDiff: '"version" already mismatch' };
33
+ return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version, packageJsonDiff: `短路检测: "version" 本地为 ${packageJson.version}, 远程版本为 ${remotePackage?.version}` };
34
34
  }
35
35
  logger.debug('本地版本 (%s) 小于或等于远程版本 (%s),尝试检测更改...', packageJson.version, remotePackage.version);
36
36
  const tarball = await cache.downloadTarball(packageJson.name, distTagInput);
@@ -1 +1 @@
1
- {"version":3,"file":"detect-change-job.js","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"detect-change-job.js","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@
6
6
  * https://github.com/GongT/baobao
7
7
  *
8
8
  ******************************************************************************/
9
- export declare const self_package_version = "0.0.15";
9
+ export declare const self_package_version = "0.0.17";
10
10
  export declare const self_package_name = "@build-script/package-tools";
11
11
  export declare const self_package_repository = "undefined";
12
12
  //# sourceMappingURL=version.generated.d.ts.map
@@ -10,7 +10,7 @@
10
10
  * https://github.com/GongT/baobao
11
11
  *
12
12
  ******************************************************************************/
13
- export const self_package_version = "0.0.15";
13
+ export const self_package_version = "0.0.17";
14
14
  export const self_package_name = "@build-script/package-tools";
15
15
  export const self_package_repository = "undefined";
16
16
  //# sourceMappingURL=version.generated.js.map
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@build-script/package-tools",
3
3
  "type": "module",
4
- "version": "0.0.15",
4
+ "version": "0.0.17",
5
5
  "description": "A Node.js package managing tool",
6
6
  "bin": {
7
7
  "package-tools": "./load.js",
@@ -11,40 +11,40 @@
11
11
  "./package.json": "./package.json"
12
12
  },
13
13
  "dependencies": {
14
- "cacache": "^19.0.1",
15
- "execa": "^9.6.0",
16
- "make-fetch-happen": "^14.0.3",
17
- "minimatch": "^10.0.3",
18
- "npm-registry-fetch": "^18.0.2",
19
- "pacote": "^21.0.0",
20
- "semver": "^7.7.2",
14
+ "cacache": "^20.0.3",
15
+ "execa": "^9.6.1",
16
+ "make-fetch-happen": "^15.0.3",
17
+ "minimatch": "^10.1.1",
18
+ "npm-registry-fetch": "^19.1.1",
19
+ "pacote": "^21.0.4",
20
+ "semver": "^7.7.3",
21
21
  "split-cmd": "^1.1.0",
22
22
  "targz": "^1.0.1",
23
23
  "tiny-async-pool": "^2.1.0",
24
- "@build-script/monorepo-lib": "^0.0.14",
25
- "@idlebox/cli": "^0.0.8",
26
- "@idlebox/dependency-graph": "^0.0.12",
27
- "@idlebox/common": "^1.5.10",
24
+ "@build-script/monorepo-lib": "^0.0.15",
25
+ "@idlebox/dependency-graph": "^0.0.13",
26
+ "@idlebox/common": "^1.5.11",
27
+ "@idlebox/cli": "^0.0.9",
28
28
  "@idlebox/ensure-symlink": "^1.0.38",
29
- "@idlebox/json-edit": "^0.0.7",
30
- "@idlebox/node": "^1.4.19",
31
- "@idlebox/source-map-support": "^0.0.13",
32
- "@idlebox/unshare": "^0.0.6"
29
+ "@idlebox/json-edit": "^0.0.8",
30
+ "@idlebox/node": "^1.4.20",
31
+ "@idlebox/source-map-support": "^0.0.14",
32
+ "@idlebox/unshare": "^0.0.7"
33
33
  },
34
34
  "devDependencies": {
35
- "@types/cacache": "^19.0.0",
35
+ "@types/cacache": "^20.0.0",
36
36
  "@types/global-agent": "^3.0.0",
37
- "@types/node": "^24.0.14",
38
- "@types/npm-registry-fetch": "^8.0.8",
39
- "@types/request": "^2.48.12",
40
- "@types/semver": "^7.7.0",
37
+ "@types/node": "^25.0.8",
38
+ "@types/npm-registry-fetch": "^8.0.9",
39
+ "@types/request": "^2.48.13",
40
+ "@types/semver": "^7.7.1",
41
41
  "@types/targz": "^1.0.5",
42
42
  "@types/tiny-async-pool": "^2.0.3",
43
43
  "@types/tinycolor2": "^1.4.6",
44
- "@build-script/codegen": "^1.0.15",
45
44
  "@build-script/single-dog-asset": "latest",
46
- "@idlebox/cli-static-generator": "^0.0.7",
47
- "@mpis/run": "^0.0.16"
45
+ "@idlebox/cli-static-generator": "^0.0.8",
46
+ "@build-script/codegen": "^1.0.16",
47
+ "@mpis/run": "^0.0.17"
48
48
  },
49
49
  "sideEffects": false,
50
50
  "license": "MIT",
@@ -1,7 +1,7 @@
1
1
  import { createWorkspace } from '@build-script/monorepo-lib';
2
2
  import { CommandDefine, logger } from '@idlebox/cli';
3
3
  import { PackageManagerUsageKind } from '../common/package-manager/driver.abstract.js';
4
- import { NPM } from '../common/package-manager/driver.npm.js';
4
+ import { createPackageManager } from '../common/package-manager/package-manager.js';
5
5
 
6
6
  export class Command extends CommandDefine {
7
7
  protected override readonly _usage = '';
@@ -11,8 +11,8 @@ export class Command extends CommandDefine {
11
11
 
12
12
  export async function main() {
13
13
  const workspace = await createWorkspace();
14
- const packageManager = new NPM(PackageManagerUsageKind.Read, workspace);
15
- const cache = await packageManager.createCacheHandler();
14
+ const pm = await createPackageManager(PackageManagerUsageKind.Read, workspace);
15
+ const cache = await pm.createCacheHandler();
16
16
 
17
17
  const list = await workspace.listPackages();
18
18
 
@@ -1,9 +1,7 @@
1
1
  import { createWorkspace, type MonorepoWorkspace } from '@build-script/monorepo-lib';
2
- import { argv } from '@idlebox/cli';
3
- import { CommandDefine } from '@idlebox/cli';
2
+ import { argv, CommandDefine, logger } from '@idlebox/cli';
4
3
  import type { DeepReadonly, IPackageJson } from '@idlebox/common';
5
4
  import { ensureLinkTargetSync } from '@idlebox/ensure-symlink';
6
- import { logger } from '@idlebox/cli';
7
5
  import { relativePath } from '@idlebox/node';
8
6
  import { readFileSync } from 'node:fs';
9
7
  import { basename, resolve } from 'node:path';
@@ -16,16 +14,16 @@ export class Command extends CommandDefine {
16
14
  '--from': {
17
15
  usage: true,
18
16
  flag: false,
19
- description: '将<value>视为各个项目的直接依赖 (必须是至少一个项目的依赖,否则找不到)',
17
+ description: '将外部依赖视为直接依赖 (必须是至少一个项目的依赖,否则找不到)',
20
18
  },
21
19
  '--transparent': {
22
20
  flag: false,
23
- description: '将<value>的所有直接依赖视为此项目的直接依赖',
21
+ description: '将workspace中其他项目的依赖视为此项目的',
24
22
  },
25
23
  '--recursive': {
26
24
  usage: true,
27
25
  flag: true,
28
- description: '在每个项目中运行,而非当前项目',
26
+ description: '在workspace的每个项目中分别运行此命令',
29
27
  },
30
28
  };
31
29
  }
@@ -35,9 +33,21 @@ interface BinaryDefine {
35
33
  readonly absolutePath: string;
36
34
  }
37
35
  interface IJobContext {
36
+ /**
37
+ * 连接到哪里(接收者)
38
+ */
38
39
  readonly packageRoot: string;
39
- readonly deps: readonly BinaryDefine[];
40
- readonly globalDeps: readonly BinaryDefine[];
40
+ /**
41
+ * 当前项目依赖
42
+ */
43
+ readonly direct: readonly BinaryDefine[];
44
+ /**
45
+ * 命令行要求的外部依赖
46
+ */
47
+ readonly manual: readonly BinaryDefine[];
48
+ /**
49
+ * workspace中其他项目依赖
50
+ */
41
51
  readonly monorepo: readonly BinaryDefine[];
42
52
  }
43
53
 
@@ -70,25 +80,25 @@ export async function main() {
70
80
  }
71
81
  }
72
82
 
73
- const locals = await createBins(workspace, localPackages);
74
- const globals = await createBins(workspace, [...additionalPackages]);
83
+ const locals = await collectBinaryByName(workspace, localPackages);
84
+ const globals = await collectBinaryByName(workspace, [...additionalPackages]);
75
85
 
76
86
  if (recursiveMode) {
77
87
  for (const pkg of projectList) {
78
- const current = await createBins(workspace, depNames(pkg.packageJson));
88
+ const current = await collectBinaryByName(workspace, depNames(pkg.packageJson));
79
89
  await execute({
80
- deps: current,
81
- globalDeps: globals,
90
+ direct: current,
91
+ manual: globals,
82
92
  monorepo: locals,
83
93
  packageRoot: pkg.absolute,
84
94
  });
85
95
  }
86
96
  } else {
87
97
  const pkg = await workspace.getNearestPackage(process.cwd());
88
- const current = await createBins(workspace, depNames(pkg.packageJson));
98
+ const current = await collectBinaryByName(workspace, depNames(pkg.packageJson));
89
99
  await execute({
90
- deps: current,
91
- globalDeps: globals,
100
+ direct: current,
101
+ manual: globals,
92
102
  monorepo: locals,
93
103
  packageRoot: pkg.absolute,
94
104
  });
@@ -96,15 +106,16 @@ export async function main() {
96
106
  }
97
107
 
98
108
  async function execute(ctx: IJobContext) {
99
- logger.log`linking binaries in project long<${ctx.packageRoot}>`;
100
-
101
109
  const final = new Map<string, string>();
102
- for (const list of [ctx.globalDeps, ctx.deps, ctx.monorepo]) {
110
+ for (const list of [ctx.manual, ctx.monorepo, ctx.direct]) {
103
111
  for (const bin of list) {
104
112
  final.set(bin.name, bin.absolutePath);
105
113
  }
106
114
  }
107
115
 
116
+ logger.log`linking ${final.size} binaries in project long<${ctx.packageRoot}>`;
117
+ logger.verbose`mappinglist<${final}>`;
118
+
108
119
  const dry = argv.flag(['--dry']) > 0;
109
120
  const bindir = resolve(ctx.packageRoot, 'node_modules/.bin');
110
121
  for (const [name, target] of final) {
@@ -135,20 +146,31 @@ function depNames(pkgJson: DeepReadonly<IPackageJson>) {
135
146
  return r;
136
147
  }
137
148
 
138
- async function createBins(workspace: MonorepoWorkspace, names: string[]) {
149
+ /**
150
+ * 收集指定名称的二进制文件
151
+ */
152
+ async function collectBinaryByName(workspace: MonorepoWorkspace, names: string[]) {
153
+ if(names.length === 0) return [];
154
+
139
155
  const bins: BinaryDefine[] = [];
140
- const packageList = workspace.listPackages();
156
+ const packageList = await workspace.listPackages();
141
157
 
142
- for (const want of names) {
143
- for (const proj of await packageList) {
158
+ for (const proj of packageList) {
159
+ for (const want of names) {
144
160
  if (proj.name === want) {
145
- makeBinMap(bins, proj.absolute, proj.packageJson);
161
+ binariesInPackage(bins, proj.absolute, proj.packageJson);
146
162
  }
147
163
  const deps = depNames(proj.packageJson);
148
164
  if (deps.includes(want)) {
149
165
  const depRoot = resolve(proj.absolute, 'node_modules', want);
150
- const pkgJson: IPackageJson = JSON.parse(readFileSync(resolve(depRoot, 'package.json'), 'utf-8'));
151
- makeBinMap(bins, depRoot, pkgJson);
166
+ let pkgJson: IPackageJson;
167
+ try{
168
+ pkgJson = JSON.parse(readFileSync(resolve(depRoot, 'package.json'), 'utf-8'));
169
+ } catch (e) {
170
+ logger.warn`dependency ${want} is invalid (in ${proj.name}), skipping: ${e}`;
171
+ continue;
172
+ }
173
+ binariesInPackage(bins, depRoot, pkgJson);
152
174
  }
153
175
  }
154
176
  }
@@ -156,7 +178,7 @@ async function createBins(workspace: MonorepoWorkspace, names: string[]) {
156
178
  return bins;
157
179
  }
158
180
 
159
- function makeBinMap(result: BinaryDefine[], absolute: string, json: DeepReadonly<IPackageJson>) {
181
+ function binariesInPackage(result: BinaryDefine[], absolute: string, json: DeepReadonly<IPackageJson>) {
160
182
  if (!json.bin) return;
161
183
 
162
184
  let bins: Record<string, string> = {};
@@ -2,6 +2,7 @@ import { applyPublishWorkspace, createWorkspace, normalizePackageName, type IPac
2
2
  import { app, argv, CommandDefine, CSI, logger } from '@idlebox/cli';
3
3
  import { prettyPrintError } from '@idlebox/common';
4
4
  import { Job, JobGraphBuilder, JobState } from '@idlebox/dependency-graph';
5
+ import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
5
6
  import { commandInPath, emptyDir, setExitCodeIfNot, shutdown, workingDirectory, writeFileIfChange } from '@idlebox/node';
6
7
  import { FsNodeType, spawnReadonlyFileSystemWithCommand } from '@idlebox/unshare';
7
8
  import { execaNode } from 'execa';
@@ -250,6 +251,8 @@ export async function main() {
250
251
  const pm = await createPackageManager(PackageManagerUsageKind.Write, workspace, zipDir);
251
252
  await prepareTempFolder(zipDir, pm);
252
253
 
254
+ const tempPackageJson = await loadJsonFile(resolve(zipDir, 'package.json'));
255
+
253
256
  const projects = await workspace.listPackages();
254
257
 
255
258
  let concurrency = Number.parseInt(argv.single(['--concurrency']) || '0', 10) || 5;
@@ -318,6 +321,16 @@ export async function main() {
318
321
  }
319
322
  console.log(`✅ 打包阶段结束,有 ${packageToPublish.length} 个包需要发布`);
320
323
 
324
+ const scripts = tempPackageJson.scripts ?? {};
325
+
326
+ for (const { name, pack } of packageToPublish) {
327
+ scripts[`publish:${name}`] = `npm publish ${pack} --access public --no-git-checks`;
328
+ }
329
+ scripts['publish'] = "pnpm run '/^publish:.*/'";
330
+
331
+ tempPackageJson.scripts = scripts;
332
+ await writeJsonFileBack(tempPackageJson);
333
+
321
334
  if (opts.dryRun) {
322
335
  console.log(`中断并退出(--dry)`);
323
336
  throw shutdown(0);
@@ -16,6 +16,11 @@ export class Command extends CommandDefine {
16
16
  flag: true,
17
17
  description: '也将devDependencies中的包添加到references中',
18
18
  },
19
+ '--force': {
20
+ usage: true,
21
+ flag: true,
22
+ description: '强制修改,忽略git状态',
23
+ },
19
24
  };
20
25
  }
21
26
 
@@ -27,13 +32,16 @@ interface IReference {
27
32
 
28
33
  export async function main() {
29
34
  const includeDev = argv.flag(['--dev']) > 0;
35
+ const force = argv.flag(['--force']) > 0;
30
36
 
31
37
  const repo = await createWorkspace();
32
38
 
33
- try {
34
- await repo.requireGitClean();
35
- } catch (e: any) {
36
- logger.fatal(e.message);
39
+ if (!force) {
40
+ try {
41
+ await repo.requireGitClean();
42
+ } catch (e: any) {
43
+ logger.fatal(e.message);
44
+ }
37
45
  }
38
46
 
39
47
  const list = await repo.listPackages();
@@ -96,16 +96,16 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
96
96
  "--from": {
97
97
  "usage": true,
98
98
  "flag": false,
99
- "description": "将<value>视为各个项目的直接依赖 (必须是至少一个项目的依赖,否则找不到)"
99
+ "description": "将外部依赖视为直接依赖 (必须是至少一个项目的依赖,否则找不到)"
100
100
  },
101
101
  "--transparent": {
102
102
  "flag": false,
103
- "description": "将<value>的所有直接依赖视为此项目的直接依赖"
103
+ "description": "将workspace中其他项目的依赖视为此项目的"
104
104
  },
105
105
  "--recursive": {
106
106
  "usage": true,
107
107
  "flag": true,
108
- "description": "在每个项目中运行,而非当前项目"
108
+ "description": "在workspace的每个项目中分别运行此命令"
109
109
  }
110
110
  },
111
111
  "commonArgs": {},
@@ -174,13 +174,18 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
174
174
  {
175
175
  "command": "monorepo-tsconfig",
176
176
  "help": "查找tsconfig.json和src/tsconfig.json\n 如果不在这里,可以在package.json中设置exports['./tsconfig.json'] = './xxxx'",
177
- "usage": "\u001b[14;3m--dev\u001b[0m ",
177
+ "usage": "\u001b[14;3m--dev\u001b[0m \u001b[14;3m--force\u001b[0m ",
178
178
  "description": "为所有项目的 tsconfig.json 添加 references 字段",
179
179
  "args": {
180
180
  "--dev": {
181
181
  "usage": true,
182
182
  "flag": true,
183
183
  "description": "也将devDependencies中的包添加到references中"
184
+ },
185
+ "--force": {
186
+ "usage": true,
187
+ "flag": true,
188
+ "description": "强制修改,忽略git状态"
184
189
  }
185
190
  },
186
191
  "commonArgs": {},
@@ -103,16 +103,21 @@ export abstract class PackageManager {
103
103
  }
104
104
 
105
105
  private async _get_config(cwd: string, key: string) {
106
+ let binary = this.binary;
107
+ if (key === 'cache') {
108
+ binary = 'npm';
109
+ }
110
+
106
111
  const scope = await this.getScope();
107
112
  if (scope) {
108
- const { stdout } = await this._execGetOut(cwd, ['config', 'get', `${scope}:${key}`]);
109
- logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', this.binary, scope, key, stdout, cwd);
113
+ const { stdout } = await this._execGetOut(cwd, ['config', 'get', `${scope}:${key}`], true, binary);
114
+ logger.debug('$ %s config get %s:%s -> %s (cwd: %s)', binary, scope, key, stdout, cwd);
110
115
  if (`${stdout}` !== 'undefined') {
111
116
  return stdout;
112
117
  }
113
118
  }
114
- const { stdout } = await this._execGetOut(cwd, ['config', 'get', key]);
115
- logger.debug('$ %s config get %s -> %s (cwd: %s)', this.binary, key, stdout, cwd);
119
+ const { stdout } = await this._execGetOut(cwd, ['config', 'get', key], true, binary);
120
+ logger.debug('$ %s config get %s -> %s (cwd: %s)', binary, key, stdout, cwd);
116
121
  return stdout === 'undefined' ? undefined : stdout;
117
122
  }
118
123
 
@@ -129,8 +134,8 @@ export abstract class PackageManager {
129
134
  }
130
135
  }
131
136
 
132
- protected async _execGetOut(cwd: string, cmds: string[], reject = true) {
133
- const result = await execa(this.binary, cmds, {
137
+ protected async _execGetOut(cwd: string, cmds: string[], reject = true, binary = this.binary) {
138
+ const result = await execa(binary, cmds, {
134
139
  stdio: ['ignore', 'pipe', 'pipe'],
135
140
  cwd: cwd,
136
141
  reject: reject,
@@ -1,6 +1,6 @@
1
+ import { logger } from '@idlebox/cli';
1
2
  import type { IPackageJson } from '@idlebox/common';
2
3
  import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
3
- import { logger } from '@idlebox/cli';
4
4
  import { readFile, writeFile } from 'node:fs/promises';
5
5
  import { resolve } from 'node:path';
6
6
  import { inc } from 'semver';
@@ -24,8 +24,13 @@ function sort(object: any): any {
24
24
 
25
25
  export async function makePackageJsonOrderConsistence(root: string) {
26
26
  const filepath = resolve(root, 'package.json');
27
- const data = JSON.parse(await readFile(filepath, 'utf-8'));
28
- delete data.devDependencies;
27
+ const data: IPackageJson = JSON.parse(await readFile(filepath, 'utf-8'));
28
+ delete (data as any).devDependencies;
29
+
30
+ rewritePackageVersions(data.dependencies);
31
+ rewritePackageVersions(data.optionalDependencies);
32
+ rewritePackageVersions(data.peerDependencies);
33
+
29
34
  const json = sort(data);
30
35
  await writeFile(filepath, JSON.stringify(json, null, 2), 'utf-8');
31
36
 
@@ -55,3 +60,15 @@ export async function increaseVersion(pkg: IPackageJson, current: string) {
55
60
  logger.debug('package.json回写: %s', ch);
56
61
  return v;
57
62
  }
63
+
64
+ const caretVersion = /^\^(\d+\.\d+)\.\d+/;
65
+ function rewritePackageVersions(deps: Record<string, string>) {
66
+ if (!deps) return;
67
+
68
+ for (const [k, v] of Object.entries(deps)) {
69
+ const m = caretVersion.exec(v);
70
+ if (m) {
71
+ deps[k] = `^${m[1]}.*`;
72
+ }
73
+ }
74
+ }
@@ -48,7 +48,7 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
48
48
 
49
49
  if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
50
50
  logger.debug('本地版本 (%s) 已经大于远程版本 (%s),无需进一步检测', packageJson.version, remotePackage?.version);
51
- return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version, packageJsonDiff: '"version" already mismatch' };
51
+ return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version, packageJsonDiff: `短路检测: "version" 本地为 ${packageJson.version}, 远程版本为 ${remotePackage?.version}` };
52
52
  }
53
53
  logger.debug('本地版本 (%s) 小于或等于远程版本 (%s),尝试检测更改...', packageJson.version, remotePackage.version);
54
54
 
@@ -13,7 +13,7 @@
13
13
  ******************************************************************************/
14
14
 
15
15
 
16
- export const self_package_version = "0.0.15";
16
+ export const self_package_version = "0.0.17";
17
17
  export const self_package_name = "@build-script/package-tools";
18
18
  export const self_package_repository = "undefined";
19
19