@simplysm/sd-cli 14.1.11 → 14.1.13

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 (72) hide show
  1. package/dist/capacitor/capacitor-icon.js +2 -2
  2. package/dist/capacitor/capacitor-icon.js.map +1 -1
  3. package/dist/capacitor/capacitor-npm-config.d.ts +1 -1
  4. package/dist/capacitor/capacitor-npm-config.d.ts.map +1 -1
  5. package/dist/capacitor/capacitor-npm-config.js +11 -6
  6. package/dist/capacitor/capacitor-npm-config.js.map +1 -1
  7. package/dist/capacitor/capacitor.d.ts +1 -1
  8. package/dist/capacitor/capacitor.js +2 -2
  9. package/dist/capacitor/capacitor.js.map +1 -1
  10. package/dist/commands/device.js +2 -2
  11. package/dist/commands/device.js.map +1 -1
  12. package/dist/commands/init/generators/root.d.ts.map +1 -1
  13. package/dist/commands/init/generators/root.js +1 -0
  14. package/dist/commands/init/generators/root.js.map +1 -1
  15. package/dist/commands/init/init-client.js +1 -1
  16. package/dist/commands/init/init-client.js.map +1 -1
  17. package/dist/commands/init/init.js +2 -2
  18. package/dist/commands/init/init.js.map +1 -1
  19. package/dist/commands/publish/npm-publisher.js +3 -3
  20. package/dist/commands/publish/npm-publisher.js.map +1 -1
  21. package/dist/commands/publish/publish-command.js +1 -1
  22. package/dist/commands/publish/publish-command.js.map +1 -1
  23. package/dist/commands/publish/version-upgrade.d.ts.map +1 -1
  24. package/dist/commands/publish/version-upgrade.js +0 -50
  25. package/dist/commands/publish/version-upgrade.js.map +1 -1
  26. package/dist/deps/replace-deps/collect-deps.js +1 -1
  27. package/dist/deps/replace-deps/replace-deps-resolve.d.ts +2 -2
  28. package/dist/deps/replace-deps/replace-deps-resolve.js +2 -2
  29. package/dist/deps/replace-deps/replace-deps.d.ts +2 -2
  30. package/dist/deps/replace-deps/replace-deps.js +2 -2
  31. package/dist/deps/server-externals/server-production-files.d.ts +3 -3
  32. package/dist/deps/server-externals/server-production-files.d.ts.map +1 -1
  33. package/dist/deps/server-externals/server-production-files.js +17 -24
  34. package/dist/deps/server-externals/server-production-files.js.map +1 -1
  35. package/dist/electron/electron.d.ts.map +1 -1
  36. package/dist/electron/electron.js +11 -6
  37. package/dist/electron/electron.js.map +1 -1
  38. package/dist/utils/package-utils.d.ts +1 -1
  39. package/dist/utils/package-utils.js +1 -1
  40. package/dist/utils/workspace-utils.d.ts +2 -2
  41. package/dist/utils/workspace-utils.d.ts.map +1 -1
  42. package/dist/utils/workspace-utils.js +7 -6
  43. package/dist/utils/workspace-utils.js.map +1 -1
  44. package/package.json +9 -9
  45. package/src/capacitor/capacitor-icon.ts +2 -2
  46. package/src/capacitor/capacitor-npm-config.ts +12 -6
  47. package/src/capacitor/capacitor.ts +2 -2
  48. package/src/commands/device.ts +2 -2
  49. package/src/commands/init/generators/root.ts +1 -0
  50. package/src/commands/init/init-client.ts +1 -1
  51. package/src/commands/init/init.ts +2 -2
  52. package/src/commands/init/templates/workspace-root/mise.toml.hbs +1 -1
  53. package/src/commands/init/templates/workspace-root/package.json.hbs +0 -1
  54. package/src/commands/init/templates/workspace-root/pnpm-workspace.yaml +3 -0
  55. package/src/commands/publish/npm-publisher.ts +3 -3
  56. package/src/commands/publish/publish-command.ts +1 -1
  57. package/src/commands/publish/version-upgrade.ts +0 -51
  58. package/src/deps/replace-deps/collect-deps.ts +1 -1
  59. package/src/deps/replace-deps/replace-deps-resolve.ts +2 -2
  60. package/src/deps/replace-deps/replace-deps.ts +2 -2
  61. package/src/deps/server-externals/server-production-files.ts +18 -31
  62. package/src/electron/electron.ts +13 -7
  63. package/src/utils/package-utils.ts +1 -1
  64. package/src/utils/workspace-utils.ts +7 -10
  65. package/tests/capacitor/capacitor-npm-config.acc.spec.ts +114 -114
  66. package/tests/commands/publish-manifest.acc.spec.ts +3 -3
  67. package/tests/deps/server-externals/server-production-files.spec.ts +26 -28
  68. package/tests/electron/electron.spec.ts +13 -13
  69. package/tests/utils/workspace-utils.spec.ts +6 -9
  70. package/tests/ts-compiler/fixtures/non-angular-pkg/.cache/typecheck-browser.tsbuildinfo +0 -1
  71. package/tests/ts-compiler/fixtures/non-angular-pkg/.cache/typecheck-node.tsbuildinfo +0 -1
  72. package/tests/ts-compiler/fixtures/non-angular-pkg/.cache/typecheck.tsbuildinfo +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"server-production-files.d.ts","sourceRoot":"","sources":["../../../src/deps/server-externals/server-production-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAUzE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM,EAAE,GACzB;IAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAAC,gBAAgB,EAAE,MAAM,EAAE,CAAA;CAAE,CAS3D;AAiBD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBtE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,EAAE,GAClB,IAAI,CAkGN"}
1
+ {"version":3,"file":"server-production-files.d.ts","sourceRoot":"","sources":["../../../src/deps/server-externals/server-production-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAUzE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM,EAAE,GACzB;IAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAAC,gBAAgB,EAAE,MAAM,EAAE,CAAA;CAAE,CAS3D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAwBtE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,EAAE,GAClB,IAAI,CAkGN"}
@@ -21,42 +21,35 @@ export function collectAllExternals(pkgDir, manualExternals) {
21
21
  prodDependencies: [...new Set([...nativeModules, ...manual])],
22
22
  };
23
23
  }
24
- function parsePackageReferenceVersion(reference) {
25
- const normalized = reference.split("(")[0];
26
- const match = /^(.+?)@(\d[^@]*)$/.exec(normalized);
27
- return match?.[2];
28
- }
29
- function parsePackageKeyName(key) {
30
- const match = /^(.+?)@(\d.+)$/.exec(key);
31
- return match?.[1] ?? key;
32
- }
33
24
  /**
34
- * bun.lock의 packages 섹션을 파싱하여 name→version 맵을 생성한다.
35
- * 키 형태는 일반 패키지명 또는 alias이고, 실제 버전은 package entry의 resolution에서 확인한다.
25
+ * pnpm-lock.yaml의 packages 섹션을 파싱하여 name→version 맵을 생성한다.
26
+ * 키 형태: "name@version" · "@scope/name@version" · "name@version(peer@ver)..."
36
27
  */
37
28
  export function parseLockfileVersions(cwd) {
38
- const lockfilePath = path.join(cwd, "bun.lock");
29
+ const lockfilePath = path.join(cwd, "pnpm-lock.yaml");
39
30
  if (!fsx.existsSync(lockfilePath)) {
40
- throw new Error(`bun.lock not found in ${cwd}. Run "bun install" first.`);
31
+ throw new Error(`pnpm-lock.yaml not found in ${cwd}. Run "pnpm install" first.`);
41
32
  }
42
33
  const content = fsx.readSync(lockfilePath);
43
34
  const parsed = YAML.parse(content);
44
35
  const map = new Map();
45
- for (const [key, entry] of Object.entries(parsed.packages ?? {})) {
46
- if (!Array.isArray(entry) || typeof entry[0] !== "string")
47
- continue;
48
- const version = parsePackageReferenceVersion(entry[0]);
49
- if (version == null)
36
+ for (const key of Object.keys(parsed.packages ?? {})) {
37
+ // 첫 번째 @숫자 기준으로 name / version 분리 (scope 패키지의 선두 @ 보존)
38
+ const m = /^(.+?)@(\d.+)$/.exec(key);
39
+ if (m == null)
50
40
  continue;
51
- const keyName = parsePackageKeyName(key);
52
- if (!map.has(keyName)) {
53
- map.set(keyName, version);
41
+ const name = m[1];
42
+ // peerDep suffix "(peer@ver)..." 제거
43
+ const parenIdx = m[2].indexOf("(");
44
+ const version = parenIdx === -1 ? m[2] : m[2].substring(0, parenIdx);
45
+ if (!map.has(name)) {
46
+ map.set(name, version);
54
47
  }
55
48
  }
56
49
  return map;
57
50
  }
58
51
  /**
59
- * bun.lock에서 주어진 모든 패키지의 잠긴 버전을 확인한다.
52
+ * pnpm-lock.yaml에서 주어진 모든 패키지의 잠긴 버전을 확인한다.
60
53
  * lockfile에서 패키지를 찾을 수 없으면 에러를 던진다.
61
54
  */
62
55
  export function resolveLockedVersions(cwd, pkgNames) {
@@ -65,8 +58,8 @@ export function resolveLockedVersions(cwd, pkgNames) {
65
58
  for (const name of pkgNames) {
66
59
  const version = versionMap.get(name);
67
60
  if (version == null) {
68
- throw new Error(`External dependency "${name}" not found in bun.lock. ` +
69
- `Run "bun install" and try again.`);
61
+ throw new Error(`External dependency "${name}" not found in pnpm-lock.yaml. ` +
62
+ `Run "pnpm install" and try again.`);
70
63
  }
71
64
  result[name] = version;
72
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server-production-files.js","sourceRoot":"","sources":["../../../src/deps/server-externals/server-production-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-production-files.js","sourceRoot":"","sources":["../../../src/deps/server-externals/server-production-files.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAE7E,MAAM,MAAM,GAAG,YAAY,CAAC,gCAAgC,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,eAA0B;IAE1B,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAElF,MAAM,MAAM,GAAG,eAAe,IAAI,EAAE,CAAC;IACrC,OAAO;QACL,eAAe,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QACjF,gBAAgB,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;KAC9D,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,6BAA6B,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA2C,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACrD,uDAAuD;QACvD,MAAM,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI;YAAE,SAAS;QACxB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,oCAAoC;QACpC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW,EAAE,QAAkB;IACnE,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,iCAAiC;gBAC3D,mCAAmC,CACtC,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAAqB,EACrB,SAAmB;IAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAEjF,oBAAoB;IACpB,MAAM,WAAW,GAA4B;QAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;IACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,WAAW,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,IAAI,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChE,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/C,CAAC;IACD,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7F,iBAAiB;IACjB,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1D,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YACnD,2EAA2E;YAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAkC,CAAC;YAC5E,IAAI,UAAU,CAAC,KAAK,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;gBACnC,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;YACtC,CAAC;QACH,CAAC;QACD,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,oBAAoB,WAAW,KAAK,CAAC,CAAC;IACvF,CAAC;IAED,mBAAmB;IACnB,GAAG,CAAC,SAAS,CACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,EACjC;QACE,4BAA4B;QAC5B,EAAE;QACF,gBAAgB;QAChB,2BAA2B;QAC3B,qBAAqB;QACrB,EAAE;QACF,iBAAiB;QACjB,wBAAwB;QACxB,sBAAsB;QACtB,EAAE;QACF,gBAAgB;QAChB,cAAc;QACd,EAAE;QACF,eAAe;QACf,cAAc;QACd,EAAE;QACF,YAAY;QACZ,sCAAsC;QACtC,EAAE;QACF,uBAAuB;QACvB,qCAAqC;KACtC,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;IAEF,sBAAsB;IACtB,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,cAAc;YACd,KAAK;YACL,OAAO;YACP,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,MAAM,GAA2B;YACrC,QAAQ,EAAE,YAAY;YACtB,EAAE,EAAE,YAAY;YAChB,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;SACpB,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAEpD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,KAAK,OAAO,CAAC;QAEvD,MAAM,SAAS,GAAG;YAChB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,oBAAoB;YACpB,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG;YACrC,sBAAsB;YACtB,gBAAgB;YAChB,sBAAsB;YACtB,mBAAmB,WAAW,GAAG;YACjC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,kEAAkE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/F,qDAAqD;YACrD,UAAU,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG;YAC1C,2BAA2B;YAC3B,2BAA2B;YAC3B,IAAI;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzE,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAElE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO;WAUM,MAAM,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,QAAQ,CAAC;IAOpB,OAAO,CAAC,MAAM,CAAC,eAAe;YAMhB,KAAK;IAmBb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiG/B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YA4B7B,aAAa;IAqD3B;;;OAGG;YACW,yBAAyB;YA6BzB,kBAAkB;YAUlB,iBAAiB;YAcjB,cAAc;IAW5B,OAAO,CAAC,MAAM,CAAC,iBAAiB;YAiBlB,mBAAmB;YAyCnB,gBAAgB;CA+B/B"}
1
+ {"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzE,qBAAa,QAAQ;IAOjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAElE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAElC,OAAO;WAUM,MAAM,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,QAAQ,CAAC;IAOpB,OAAO,CAAC,MAAM,CAAC,eAAe;YAMhB,KAAK;IAmBb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiG/B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YA4B7B,aAAa;IAqD3B;;;OAGG;YACW,yBAAyB;YA6BzB,kBAAkB;YAUlB,iBAAiB;YAcjB,cAAc;IAW5B,OAAO,CAAC,MAAM,CAAC,iBAAiB;YAiBlB,mBAAmB;YAyCnB,gBAAgB;CA+B/B"}
@@ -49,13 +49,18 @@ export class Electron {
49
49
  Electron._logger.debug("package.json 설정 시작");
50
50
  await this._setupNpmConf();
51
51
  Electron._logger.debug("package.json 설정 완료");
52
- Electron._logger.debug("bun install 시작");
53
- await this._exec("bun", ["install"], this._srcPath);
54
- Electron._logger.debug("bun install 완료");
52
+ // pnpm-workspace.yaml 생성 (상위 workspace 탐색 차단)
53
+ const workspaceYamlPath = pathx.posixResolve(this._srcPath, "pnpm-workspace.yaml");
54
+ if (!(await fsx.exists(workspaceYamlPath))) {
55
+ await fsx.write(workspaceYamlPath, "");
56
+ }
57
+ Electron._logger.debug("pnpm install 시작");
58
+ await this._exec("pnpm", ["install", "--config.dangerously-allow-all-builds=true"], this._srcPath);
59
+ Electron._logger.debug("pnpm install 완료");
55
60
  const reinstallDeps = this._config.reinstallDependencies ?? [];
56
61
  if (reinstallDeps.length > 0) {
57
62
  Electron._logger.debug(`electron-rebuild 시작 (${reinstallDeps.join(", ")})`);
58
- await this._exec("bun", ["run", "electron-rebuild"], this._srcPath);
63
+ await this._exec("pnpm", ["exec", "electron-rebuild"], this._srcPath);
59
64
  Electron._logger.debug("electron-rebuild 완료");
60
65
  }
61
66
  Electron._logger.success("initialize 완료");
@@ -71,7 +76,7 @@ export class Electron {
71
76
  let resolveTermination = null;
72
77
  const spawnElectron = () => {
73
78
  Electron._logger.debug("Electron 프로세스 시작");
74
- currentElectron = shellSpawn("bun", ["run", "electron", "."], {
79
+ currentElectron = shellSpawn("pnpm", ["exec", "electron", "."], {
75
80
  cwd: this._srcPath,
76
81
  stdio: "inherit",
77
82
  reject: false,
@@ -309,7 +314,7 @@ export class Electron {
309
314
  const configFilePath = pathx.posixResolve(this._electronPath, "builder-config.json");
310
315
  await fsx.writeJson(configFilePath, builderConfig, { space: 2 });
311
316
  Electron._logger.debug(`electron-builder 설정: ${configFilePath}`);
312
- await this._exec("bun", ["run", "electron-builder", "--win", "--config", configFilePath], this._srcPath);
317
+ await this._exec("pnpm", ["exec", "electron-builder", "--win", "--config", configFilePath], this._srcPath);
313
318
  }
314
319
  async _copyBuildOutput(outPath) {
315
320
  const distPath = pathx.posixResolve(this._electronPath, "dist");
@@ -1 +1 @@
1
- {"version":3,"file":"electron.js","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"electron.js","sourceRoot":"","sources":["../../src/electron/electron.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import type { SdPackageConfig } from "../sd-config.types";
4
4
  */
5
5
  export declare function findPackageRoot(startDir: string): string;
6
6
  /**
7
- * package.json#workspaces의 모든 워크스페이스 패키지를 탐색한다.
7
+ * pnpm-workspace.yaml의 모든 워크스페이스 패키지를 탐색한다.
8
8
  * 디렉토리명 → 상대 경로의 맵을 반환한다 (예: "orm" → "tests/orm", "sd" → "plugins/sd").
9
9
  * packages/·tests/·plugins/ 등 종류를 가리지 않고 포함하며, 배포/검사 대상 구분은 소비자가 relPath로 판단한다.
10
10
  */
@@ -15,7 +15,7 @@ export function findPackageRoot(startDir) {
15
15
  return pathx.posix(path.dirname(match));
16
16
  }
17
17
  /**
18
- * package.json#workspaces의 모든 워크스페이스 패키지를 탐색한다.
18
+ * pnpm-workspace.yaml의 모든 워크스페이스 패키지를 탐색한다.
19
19
  * 디렉토리명 → 상대 경로의 맵을 반환한다 (예: "orm" → "tests/orm", "sd" → "plugins/sd").
20
20
  * packages/·tests/·plugins/ 등 종류를 가리지 않고 포함하며, 배포/검사 대상 구분은 소비자가 relPath로 판단한다.
21
21
  */
@@ -5,13 +5,13 @@ export interface WorkspacePackageDir {
5
5
  absPath: string;
6
6
  }
7
7
  /**
8
- * root package.json의 workspaces 값을 Bun workspace 패턴 배열로 정규화한다.
8
+ * 워크스페이스 정의 값(배열 또는 { packages: [...] })을 패턴 배열로 정규화한다.
9
9
  */
10
10
  export declare function parsePackageJsonWorkspaces(workspaces: unknown): string[];
11
11
  export declare function readWorkspacePatterns(workspaceRoot: string): string[];
12
12
  export declare function findWorkspaceRoot(startDir: string): string | undefined;
13
13
  /**
14
- * Bun workspace root의 package.json#workspaces 기준으로 실제 패키지 디렉터리를 수집한다.
14
+ * 워크스페이스 root의 pnpm-workspace.yaml(packages) 기준으로 실제 패키지 디렉터리를 수집한다.
15
15
  */
16
16
  export declare function collectWorkspacePackages(workspaceRoot: string): WorkspacePackageDir[];
17
17
  //# sourceMappingURL=workspace-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-utils.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-utils.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAUD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,CAWxE;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAMrE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAetE;AAkBD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,mBAAmB,EAAE,CAoCrF"}
1
+ {"version":3,"file":"workspace-utils.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-utils.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,CAWxE;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAMrE;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAetE;AAkBD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,mBAAmB,EAAE,CAoCrF"}
@@ -1,9 +1,10 @@
1
1
  import fs from "fs";
2
2
  import path from "path";
3
3
  import { globSync } from "glob";
4
+ import YAML from "yaml";
4
5
  import { pathx } from "@simplysm/core-node";
5
6
  /**
6
- * root package.json의 workspaces 값을 Bun workspace 패턴 배열로 정규화한다.
7
+ * 워크스페이스 정의 값(배열 또는 { packages: [...] })을 패턴 배열로 정규화한다.
7
8
  */
8
9
  export function parsePackageJsonWorkspaces(workspaces) {
9
10
  const rawPatterns = Array.isArray(workspaces)
@@ -17,11 +18,11 @@ export function parsePackageJsonWorkspaces(workspaces) {
17
18
  .filter((item) => item !== "");
18
19
  }
19
20
  export function readWorkspacePatterns(workspaceRoot) {
20
- const packageJsonPath = path.join(workspaceRoot, "package.json");
21
- if (!fs.existsSync(packageJsonPath))
21
+ const workspaceYamlPath = path.join(workspaceRoot, "pnpm-workspace.yaml");
22
+ if (!fs.existsSync(workspaceYamlPath))
22
23
  return [];
23
- const pkgJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
24
- return parsePackageJsonWorkspaces(pkgJson.workspaces);
24
+ const parsed = YAML.parse(fs.readFileSync(workspaceYamlPath, "utf-8"));
25
+ return parsePackageJsonWorkspaces(parsed);
25
26
  }
26
27
  export function findWorkspaceRoot(startDir) {
27
28
  let current = path.resolve(startDir);
@@ -54,7 +55,7 @@ function splitWorkspacePatterns(patterns) {
54
55
  return { include, exclude };
55
56
  }
56
57
  /**
57
- * Bun workspace root의 package.json#workspaces 기준으로 실제 패키지 디렉터리를 수집한다.
58
+ * 워크스페이스 root의 pnpm-workspace.yaml(packages) 기준으로 실제 패키지 디렉터리를 수집한다.
58
59
  */
59
60
  export function collectWorkspacePackages(workspaceRoot) {
60
61
  const root = pathx.posix(path.resolve(workspaceRoot));
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-utils.js","sourceRoot":"","sources":["../../src/utils/workspace-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace-utils.js","sourceRoot":"","sources":["../../src/utils/workspace-utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "14.1.11",
3
+ "version": "14.1.13",
4
4
  "description": "Simplysm package - CLI tool",
5
5
  "author": "simplysm",
6
6
  "license": "Apache-2.0",
@@ -18,17 +18,11 @@
18
18
  "tests"
19
19
  ],
20
20
  "sideEffects": false,
21
- "bin": {
22
- "sd-cli": "./dist/sd-cli.js"
23
- },
24
21
  "dependencies": {
25
22
  "@angular/build": "^22.0.4",
26
23
  "@angular/compiler-cli": "^22.0.4",
27
24
  "@fastify/http-proxy": "^11.5.0",
28
25
  "@inquirer/prompts": "^8.5.2",
29
- "@simplysm/core-common": "14.1.11",
30
- "@simplysm/core-node": "14.1.11",
31
- "@simplysm/storage": "14.1.11",
32
26
  "acorn": "^8.17.0",
33
27
  "acorn-walk": "^8.3.5",
34
28
  "browserslist-to-esbuild": "^2.1.1",
@@ -49,7 +43,10 @@
49
43
  "typescript": "~6.0.3",
50
44
  "ws": "^8.21.0",
51
45
  "yaml": "^2.9.0",
52
- "yargs": "^18.0.0"
46
+ "yargs": "^18.0.0",
47
+ "@simplysm/core-common": "14.1.13",
48
+ "@simplysm/storage": "14.1.13",
49
+ "@simplysm/core-node": "14.1.13"
53
50
  },
54
51
  "devDependencies": {
55
52
  "@angular/core": "^22.0.4",
@@ -59,5 +56,8 @@
59
56
  "@types/ws": "^8.18.1",
60
57
  "@types/yargs": "^17.0.35",
61
58
  "vite": "^8.1.0"
59
+ },
60
+ "bin": {
61
+ "sd-cli": "./dist/sd-cli.js"
62
62
  }
63
- }
63
+ }
@@ -51,9 +51,9 @@ export async function setupIcon(
51
51
  // capacitor-assets로 모든 해상도 아이콘/스플래시 생성
52
52
  const isDebug = consola.level >= LogLevels.debug;
53
53
  await cpx.spawn(
54
- "bun",
54
+ "pnpm",
55
55
  [
56
- "run",
56
+ "exec",
57
57
  "capacitor-assets",
58
58
  "generate",
59
59
  "--iconBackgroundColor",
@@ -116,7 +116,7 @@ export async function setupCapNpmConfig(
116
116
  }
117
117
 
118
118
  /**
119
- * Capacitor 프로젝트 NPM 초기화 (bun install, cap init, www placeholder).
119
+ * Capacitor 프로젝트 NPM 초기화 (pnpm install, cap init, www placeholder).
120
120
  * 의존성 변경 시 true를 반환한다.
121
121
  */
122
122
  export async function initCapNpmProject(
@@ -137,20 +137,26 @@ export async function initCapNpmProject(
137
137
  return false;
138
138
  }
139
139
 
140
- // bun install
140
+ // pnpm-workspace.yaml 생성 (상위 workspace 탐색 차단)
141
+ const workspaceYamlPath = pathx.posixResolve(capPath, "pnpm-workspace.yaml");
142
+ if (!(await fsx.exists(workspaceYamlPath))) {
143
+ await fsx.write(workspaceYamlPath, "");
144
+ }
145
+
146
+ // pnpm install (빌드 스크립트 자동 승인)
141
147
  const isDebug = consola.level >= LogLevels.debug;
142
- logger.debug("bun install 시작");
143
- await shellSpawn("bun", ["install"], {
148
+ logger.debug("pnpm install 시작");
149
+ await shellSpawn("pnpm", ["install", "--config.dangerously-allow-all-builds=true"], {
144
150
  cwd: capPath,
145
151
  ...(isDebug ? { stdio: ["ignore", "inherit", "inherit"] } : {}),
146
152
  });
147
- logger.debug("bun install 완료");
153
+ logger.debug("pnpm install 완료");
148
154
 
149
155
  // 멱등성: capacitor.config.ts가 없을 때만 cap init 실행
150
156
  const configPath = pathx.posixResolve(capPath, "capacitor.config.ts");
151
157
  if (!(await fsx.exists(configPath))) {
152
158
  logger.debug("cap init 시작");
153
- await shellSpawn("bun", ["run", "cap", "init", config.appId, config.appId], {
159
+ await shellSpawn("pnpm", ["exec", "cap", "init", config.appId, config.appId], {
154
160
  cwd: capPath,
155
161
  ...(isDebug ? { stdio: ["ignore", "inherit", "inherit"] } : {}),
156
162
  });
@@ -160,10 +160,10 @@ export class Capacitor {
160
160
  //#region Private - 명령어 실행
161
161
 
162
162
  /**
163
- * Capacitor CLI 명령어를 Bun PM 실행 흐름으로 실행
163
+ * Capacitor CLI 명령어를 pnpm exec로 실행
164
164
  */
165
165
  private async _execCap(args: string[]): Promise<string> {
166
- return this._exec("bun", ["run", "cap", ...args], this._capPath);
166
+ return this._exec("pnpm", ["exec", "cap", ...args], this._capPath);
167
167
  }
168
168
 
169
169
  /**
@@ -72,7 +72,7 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
72
72
  portStr = fsx.readSync(portFile).trim();
73
73
  } catch {
74
74
  throw new SdError(
75
- "dev 서버가 실행 중이 아닙니다. 먼저 bun run dev를 실행해주세요.",
75
+ "dev 서버가 실행 중이 아닙니다. 먼저 pnpm dev를 실행해주세요.",
76
76
  );
77
77
  }
78
78
  const port = Number(portStr);
@@ -93,7 +93,7 @@ export async function runDevice(options: DeviceOptions): Promise<void> {
93
93
  const alive = await checkDevServer(serverUrl);
94
94
  if (!alive) {
95
95
  throw new SdError(
96
- "dev 서버가 응답하지 않습니다. bun run dev를 다시 실행해주세요.",
96
+ "dev 서버가 응답하지 않습니다. pnpm dev를 다시 실행해주세요.",
97
97
  );
98
98
  }
99
99
  }
@@ -13,6 +13,7 @@ const FIXED: (string | [string, string])[] = [
13
13
  ["gitignore", ".gitignore"],
14
14
  ".prettierrc.yaml",
15
15
  "eslint.config.ts",
16
+ "pnpm-workspace.yaml",
16
17
  ];
17
18
 
18
19
  const HBS = [
@@ -140,7 +140,7 @@ export async function runInitClient(opts: InitClientOptions): Promise<void> {
140
140
  }
141
141
 
142
142
  logger.info("의존성 설치 중...");
143
- await shellSpawn("bun", ["install"], {
143
+ await shellSpawn("pnpm", ["install", "--config.dangerously-allow-all-builds=true"], {
144
144
  cwd: opts.cwd,
145
145
  stdio: "inherit",
146
146
  });
@@ -45,8 +45,8 @@ export async function runInit(opts: InitOptions): Promise<void> {
45
45
  logger.info("의존성 설치 및 도구 준비 중...");
46
46
  await shellSpawn("mise", ["trust"], { cwd: opts.cwd, stdio: "inherit" });
47
47
  await shellSpawn("mise", ["install"], { cwd: opts.cwd, stdio: "inherit" });
48
- await shellSpawn("bun", ["install"], { cwd: opts.cwd, stdio: "inherit" });
49
- await shellSpawn("bun", ["update", "--recursive"], { cwd: opts.cwd, stdio: "inherit" });
48
+ await shellSpawn("pnpm", ["install", "--config.dangerously-allow-all-builds=true"], { cwd: opts.cwd, stdio: "inherit" });
49
+ await shellSpawn("pnpm", ["up", "-r"], { cwd: opts.cwd, stdio: "inherit" });
50
50
  logger.info("의존성 설치 및 도구 준비 완료.");
51
51
 
52
52
  const steps: string[] = [];
@@ -1,6 +1,6 @@
1
1
  [tools]
2
2
  node = "24"
3
- bun = "1"
3
+ pnpm = "11"
4
4
  python = "3"
5
5
  {{#if hasMobile}}
6
6
  java = "temurin-21"
@@ -5,7 +5,6 @@
5
5
  "license": "UNLICENSED",
6
6
  "type": "module",
7
7
  "private": true,
8
- "workspaces": ["packages/*", "tests/*"],
9
8
  "scripts": {
10
9
  "dev": "sd-cli dev",
11
10
  "build": "sd-cli build",
@@ -0,0 +1,3 @@
1
+ packages:
2
+ - packages/*
3
+ - tests/*
@@ -21,10 +21,10 @@ export async function publishNpm(
21
21
 
22
22
  if (dryRun) {
23
23
  args.push("--dry-run");
24
- logger.info(`[DRY-RUN] [${pkgName}] bun ${args.join(" ")}`);
24
+ logger.info(`[DRY-RUN] [${pkgName}] pnpm ${args.join(" ")}`);
25
25
  } else {
26
- logger.debug(`[${pkgName}] bun ${args.join(" ")}`);
26
+ logger.debug(`[${pkgName}] pnpm ${args.join(" ")}`);
27
27
  }
28
28
 
29
- await shellSpawn("bun", args, { cwd: pkgPath });
29
+ await shellSpawn("pnpm", args, { cwd: pkgPath });
30
30
  }
@@ -76,7 +76,7 @@ export async function runPublish(options: PublishOptions): Promise<void> {
76
76
  const projPkgPath = path.resolve(cwd, "package.json");
77
77
  const projPkg = await fsx.readJson<PackageJson>(projPkgPath);
78
78
 
79
- // package.json#workspaces에서 워크스페이스 패키지 경로 수집
79
+ // pnpm-workspace.yaml에서 워크스페이스 패키지 경로 수집
80
80
  const allPkgPaths = collectWorkspacePackages(cwd).map((item) => item.absPath);
81
81
 
82
82
  // publish 설정이 있는 패키지 필터링
@@ -15,46 +15,6 @@ export interface PackageJson {
15
15
  optionalDependencies?: Record<string, string>;
16
16
  }
17
17
 
18
- /**
19
- * bun.lock의 workspaces 섹션에 스냅샷된 각 워크스페이스 패키지 version을 새 버전으로 맞춘다.
20
- *
21
- * bun publish/pack은 `workspace:*` 의존성을 치환할 때 대상 패키지의 package.json이 아니라
22
- * bun.lock의 `workspaces.<dir>.version`을 읽는다 (bun 1.2.8+, oven-sh/bun#20477). 또한 version만
23
- * bump하면 `bun install`이 lock의 워크스페이스 version을 갱신하지 않으므로 (oven-sh/bun#18906),
24
- * package.json만 올리면 lock이 뒤처져 이전 버전으로 치환된다. 이를 막기 위해 lock을 직접 맞춘다.
25
- *
26
- * `"version"` 키는 workspaces 섹션에만 나타나므로(packages 섹션의 의존성은 `"name@ver"` 배열 형태),
27
- * workspaces 객체 범위 안의 `"version"` 값만 새 버전으로 치환한다. 값이 아닌 위치 기준이라
28
- * lock이 몇 버전 뒤처져 있든 정확히 맞춰진다.
29
- */
30
- function syncBunLockWorkspaceVersions(content: string, newVersion: string): string {
31
- const wsKeyIdx = content.indexOf('"workspaces":');
32
- if (wsKeyIdx === -1) return content;
33
-
34
- const braceStart = content.indexOf("{", wsKeyIdx);
35
- if (braceStart === -1) return content;
36
-
37
- // balanced brace로 workspaces 객체의 끝을 찾는다 (값 문자열에 중괄호가 없어 안전).
38
- let depth = 0;
39
- let braceEnd = -1;
40
- for (let i = braceStart; i < content.length; i++) {
41
- const ch = content[i];
42
- if (ch === "{") depth++;
43
- else if (ch === "}") {
44
- depth--;
45
- if (depth === 0) {
46
- braceEnd = i;
47
- break;
48
- }
49
- }
50
- }
51
- if (braceEnd === -1) return content;
52
-
53
- const section = content.slice(braceStart, braceEnd + 1);
54
- const newSection = section.replace(/("version"\s*:\s*)"[^"]*"/g, `$1"${newVersion}"`);
55
- return content.slice(0, braceStart) + newSection + content.slice(braceEnd + 1);
56
- }
57
-
58
18
  /**
59
19
  * 프로젝트 및 패키지 버전 업그레이드
60
20
  * @param dryRun true이면 파일을 수정하지 않고 새 버전만 계산
@@ -98,17 +58,6 @@ export async function upgradeVersion(
98
58
  );
99
59
  changedFiles.push(...pkgChangedFiles);
100
60
 
101
- // bun.lock의 워크스페이스 version 동기화 (bun publish가 lock을 읽어 workspace:* 를 치환하므로)
102
- const bunLockPath = path.resolve(cwd, "bun.lock");
103
- if (await fsx.exists(bunLockPath)) {
104
- const lockContent = await fsx.read(bunLockPath);
105
- const newLockContent = syncBunLockWorkspaceVersions(lockContent, newVersion);
106
- if (newLockContent !== lockContent) {
107
- await fsx.write(bunLockPath, newLockContent);
108
- changedFiles.push(bunLockPath);
109
- }
110
- }
111
-
112
61
  // 템플릿 파일의 @simplysm 패키지 버전 동기화
113
62
  const templateFiles = await fsx.glob(path.resolve(cwd, "packages/sd-cli/templates/**/*.hbs"));
114
63
  const versionRegex = /("@simplysm\/[^"]+"\s*:\s*)"~[^"]+"/g;
@@ -11,7 +11,7 @@ export interface DepsResult {
11
11
  }
12
12
 
13
13
  /**
14
- * package.json#workspaces 기반으로 packages/(배포 대상) 패키지의 name → 상대 디렉토리 맵을 구성한다.
14
+ * pnpm-workspace.yaml 기반으로 packages/(배포 대상) 패키지의 name → 상대 디렉토리 맵을 구성한다.
15
15
  * packages/ 가 아닌 워크스페이스(tests/·plugins/ 등)는 제외된다.
16
16
  * 예: "@simplysm/core-node" → "packages/core-node"
17
17
  */