@yarn-tool/fix-all 3.0.7 → 3.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,38 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [3.0.10](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/fix-all@3.0.9...@yarn-tool/fix-all@3.0.10) (2026-03-09)
7
+
8
+ **Note:** Version bump only for package @yarn-tool/fix-all
9
+
10
+
11
+
12
+
13
+
14
+ ## [3.0.9](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/fix-all@3.0.8...@yarn-tool/fix-all@3.0.9) (2026-03-09)
15
+
16
+ **Note:** Version bump only for package @yarn-tool/fix-all
17
+
18
+
19
+
20
+
21
+
22
+ ## [3.0.8](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/fix-all@3.0.7...@yarn-tool/fix-all@3.0.8) (2026-03-09)
23
+
24
+
25
+
26
+ ### ✨ Features
27
+
28
+ * **fix-all:** add Lerna testing utilities and improve `lerna.json` handling ([72ea5ed](https://github.com/bluelovers/ws-yarn-workspaces/commit/72ea5edb51ce911951f76ca312d9d177678fe5e0))
29
+
30
+
31
+ ### ♻️ Chores
32
+
33
+ * **deps:** 更新 workspace 依賴版本並新增 CI 安裝腳本 ([fbb5b0b](https://github.com/bluelovers/ws-yarn-workspaces/commit/fbb5b0b32cab8cdd34c1f5b5f9a6f8c54213e738))
34
+ * **deps:** 更新 monorepo 依賴版本 ([e44dff2](https://github.com/bluelovers/ws-yarn-workspaces/commit/e44dff29d5d6b7eb7c77acb8414e73f70feff649))
35
+
36
+
37
+
6
38
  ## [3.0.7](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/fix-all@3.0.6...@yarn-tool/fix-all@3.0.7) (2026-03-04)
7
39
 
8
40
 
package/lib/root/index.js CHANGED
@@ -55,6 +55,7 @@ function _fixWsRoot(options) {
55
55
  '@yarn-tool/ws-find-up-paths',
56
56
  '@types/node',
57
57
  '@bluelovers/tsconfig',
58
+ '@yarn-tool/require-resolve',
58
59
  ].forEach(name => {
59
60
  var _a;
60
61
  var _b;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAWA,4BAkCC;AAED,gCA2CC;AAzFD,gEAA0F;AAC1F,mCAA8B;AAC9B,0DAA+D;AAC/D,qEAA4D;AAC5D,kDAAsD;AACtD,2DAAqD;AACrD,kGAA2G;AAC3G,8EAAsF;AACtF,0DAAsE;AAEtE,SAAgB,QAAQ,CAAC,OAA4C;IAEpE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAErF,MAAM,sBAAsB,GAAG,IAAA,aAAI,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,aAAa,GAAG,IAAI,2CAAiB,CAAC,sBAAsB,CAAC,CAAC;IAElE,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,IAAA,mCAAoB,GAAE,EAAC;IAEzC,IAAI,aAAa,EACjB,CAAC;QACA,IAAA,mCAAiB,EAAC,aAAa,CAAC,IAAI,EAAE;YACrC,SAAS;YACT,QAAQ;YACR,aAAa;YACb,MAAM;YACN,sBAAsB;SACtB,CAAC,CAAC;QAEH,aAAa,CAAC,IAAI,GAAG,IAAA,oCAAe,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEzD,aAAa,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,OAAO;QACN,sBAAsB;QACtB,aAAa;QACb,SAAS;QACT,QAAQ;QACR,aAAa;QACb,MAAM;QACN,sBAAsB;KACtB,CAAA;AACF,CAAC;AAED,SAAgB,UAAU,CAAC,OAAuH;;IAEjJ,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,EAAE,0CAAE,MAAM,CAAA,EAChC,CAAC;QACA,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,OAAO,GAAG,QAAQ,CAAC;QACtB,GAAG,OAAO;QACV,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;KAC9B,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,IAAA,wBAAgB,EAAC,IAAA,6CAA2B,GAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;;QAExF,YAAA,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAC,GAAG,wCAAH,GAAG,IAAM,KAAK,EAAC;IACnD,CAAC,CAAC,CAAC;IAEH;QACC,6BAA6B;QAC7B,aAAa;QACb,sBAAsB;KACtB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;;QAChB,MAAM,MAAM,GAAG,IAAA,0CAA2B,EAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE;YACtE,iBAAiB;YACjB,cAAc;SACd,EAAE,IAAI,CAAC,CAAC;QAET,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,CAAC;YACA,YAAA,OAAO,CAAC,aAAa,CAAC,IAAI,EAAC,eAAe,uCAAf,eAAe,GAAK,EAAE,EAAC;YAClD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QACxD,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,IAAA,oCAAe,EAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAEzE,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAE9B,IAAI,GAAG,GAAG,IAAI,0BAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnD,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;IAEX,OAAO,OAAO,CAAA;AACf,CAAC","sourcesContent":["import { ITSRequiredPick } from 'ts-type/lib/type/record';\nimport { fillPkgHostedInfo, IFillPkgHostedInfoOptions } from '@yarn-tool/pkg-hosted-info';\nimport { join } from 'upath2';\nimport { npmHostedGitInfoLazy } from '@yarn-tool/pkg-git-info';\nimport { PackageJsonLoader } from 'npm-package-json-loader';\nimport { WorkspacesScope } from '@yarn-tool/ws-scope';\nimport { sortPackageJson } from 'sort-package-json3';\nimport { defaultWorkspaceRootScripts } from '@yarn-tool/pkg-entry-util/lib/preset/scripts/ws-root-scripts';\nimport { fillDummyScripts } from '@yarn-tool/pkg-entry-util/lib/preset/scripts/dummy';\nimport { _checkDependenciesExistsAll } from '@yarn-tool/pkg-deps-add';\n\nexport function _fixRoot(options: Required<IFillPkgHostedInfoOptions>)\n{\n\tlet { rootData, branch, overwriteHostedGitInfo, hostedGitInfo, targetDir } = options;\n\n\tconst root_file_package_json = join(targetDir, 'package.json');\n\n\tlet root_pkg_json = new PackageJsonLoader(root_file_package_json);\n\n\thostedGitInfo ??= npmHostedGitInfoLazy();\n\n\tif (hostedGitInfo)\n\t{\n\t\tfillPkgHostedInfo(root_pkg_json.data, {\n\t\t\ttargetDir,\n\t\t\trootData,\n\t\t\thostedGitInfo,\n\t\t\tbranch,\n\t\t\toverwriteHostedGitInfo,\n\t\t});\n\n\t\troot_pkg_json.data = sortPackageJson(root_pkg_json.data);\n\n\t\troot_pkg_json.write();\n\t}\n\n\treturn {\n\t\troot_file_package_json,\n\t\troot_pkg_json,\n\t\ttargetDir,\n\t\trootData,\n\t\thostedGitInfo,\n\t\tbranch,\n\t\toverwriteHostedGitInfo,\n\t}\n}\n\nexport function _fixWsRoot(options: ITSRequiredPick<IFillPkgHostedInfoOptions, 'hostedGitInfo' | 'rootData' | 'overwriteHostedGitInfo' | 'branch'>)\n{\n\tif (!options.rootData.ws?.length)\n\t{\n\t\tthrow new Error(`Invalid workspaces`)\n\t}\n\n\tlet runtime = _fixRoot({\n\t\t...options,\n\t\ttargetDir: options.rootData.ws,\n\t});\n\n\tObject.entries(fillDummyScripts(defaultWorkspaceRootScripts())).forEach(([key, value]) =>\n\t{\n\t\truntime.root_pkg_json.data.scripts[key] ??= value;\n\t});\n\n\t[\n\t\t'@yarn-tool/ws-find-up-paths',\n\t\t'@types/node',\n\t\t'@bluelovers/tsconfig',\n\t].forEach(name => {\n\t\tconst _check = _checkDependenciesExistsAll(runtime.root_pkg_json.data, [\n\t\t\t'devDependencies',\n\t\t\t'dependencies',\n\t\t], name);\n\n\t\tif (!_check._exists)\n\t\t{\n\t\t\truntime.root_pkg_json.data.devDependencies ??= {};\n\t\t\truntime.root_pkg_json.data.devDependencies[name] = '*';\n\t\t}\n\t});\n\n\truntime.root_pkg_json.data = sortPackageJson(runtime.root_pkg_json.data);\n\n\truntime.root_pkg_json.write();\n\n\tlet wss = new WorkspacesScope(runtime.rootData.ws);\n\twss.syncValue();\n\twss.save();\n\n\treturn runtime\n}\n"]}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAWA,4BAkCC;AAED,gCA4CC;AA1FD,gEAA0F;AAC1F,mCAA8B;AAC9B,0DAA+D;AAC/D,qEAA4D;AAC5D,kDAAsD;AACtD,2DAAqD;AACrD,kGAA2G;AAC3G,8EAAsF;AACtF,0DAAsE;AAEtE,SAAgB,QAAQ,CAAC,OAA4C;IAEpE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAErF,MAAM,sBAAsB,GAAG,IAAA,aAAI,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,aAAa,GAAG,IAAI,2CAAiB,CAAC,sBAAsB,CAAC,CAAC;IAElE,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,IAAA,mCAAoB,GAAE,EAAC;IAEzC,IAAI,aAAa,EACjB,CAAC;QACA,IAAA,mCAAiB,EAAC,aAAa,CAAC,IAAI,EAAE;YACrC,SAAS;YACT,QAAQ;YACR,aAAa;YACb,MAAM;YACN,sBAAsB;SACtB,CAAC,CAAC;QAEH,aAAa,CAAC,IAAI,GAAG,IAAA,oCAAe,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEzD,aAAa,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,OAAO;QACN,sBAAsB;QACtB,aAAa;QACb,SAAS;QACT,QAAQ;QACR,aAAa;QACb,MAAM;QACN,sBAAsB;KACtB,CAAA;AACF,CAAC;AAED,SAAgB,UAAU,CAAC,OAAuH;;IAEjJ,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,EAAE,0CAAE,MAAM,CAAA,EAChC,CAAC;QACA,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,OAAO,GAAG,QAAQ,CAAC;QACtB,GAAG,OAAO;QACV,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;KAC9B,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,IAAA,wBAAgB,EAAC,IAAA,6CAA2B,GAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;;QAExF,YAAA,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAC,GAAG,wCAAH,GAAG,IAAM,KAAK,EAAC;IACnD,CAAC,CAAC,CAAC;IAEH;QACC,6BAA6B;QAC7B,aAAa;QACb,sBAAsB;QACtB,4BAA4B;KAC5B,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;;QAChB,MAAM,MAAM,GAAG,IAAA,0CAA2B,EAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE;YACtE,iBAAiB;YACjB,cAAc;SACd,EAAE,IAAI,CAAC,CAAC;QAET,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,CAAC;YACA,YAAA,OAAO,CAAC,aAAa,CAAC,IAAI,EAAC,eAAe,uCAAf,eAAe,GAAK,EAAE,EAAC;YAClD,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QACxD,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,IAAA,oCAAe,EAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAEzE,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAE9B,IAAI,GAAG,GAAG,IAAI,0BAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnD,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;IAEX,OAAO,OAAO,CAAA;AACf,CAAC","sourcesContent":["import { ITSRequiredPick } from 'ts-type/lib/type/record';\nimport { fillPkgHostedInfo, IFillPkgHostedInfoOptions } from '@yarn-tool/pkg-hosted-info';\nimport { join } from 'upath2';\nimport { npmHostedGitInfoLazy } from '@yarn-tool/pkg-git-info';\nimport { PackageJsonLoader } from 'npm-package-json-loader';\nimport { WorkspacesScope } from '@yarn-tool/ws-scope';\nimport { sortPackageJson } from 'sort-package-json3';\nimport { defaultWorkspaceRootScripts } from '@yarn-tool/pkg-entry-util/lib/preset/scripts/ws-root-scripts';\nimport { fillDummyScripts } from '@yarn-tool/pkg-entry-util/lib/preset/scripts/dummy';\nimport { _checkDependenciesExistsAll } from '@yarn-tool/pkg-deps-add';\n\nexport function _fixRoot(options: Required<IFillPkgHostedInfoOptions>)\n{\n\tlet { rootData, branch, overwriteHostedGitInfo, hostedGitInfo, targetDir } = options;\n\n\tconst root_file_package_json = join(targetDir, 'package.json');\n\n\tlet root_pkg_json = new PackageJsonLoader(root_file_package_json);\n\n\thostedGitInfo ??= npmHostedGitInfoLazy();\n\n\tif (hostedGitInfo)\n\t{\n\t\tfillPkgHostedInfo(root_pkg_json.data, {\n\t\t\ttargetDir,\n\t\t\trootData,\n\t\t\thostedGitInfo,\n\t\t\tbranch,\n\t\t\toverwriteHostedGitInfo,\n\t\t});\n\n\t\troot_pkg_json.data = sortPackageJson(root_pkg_json.data);\n\n\t\troot_pkg_json.write();\n\t}\n\n\treturn {\n\t\troot_file_package_json,\n\t\troot_pkg_json,\n\t\ttargetDir,\n\t\trootData,\n\t\thostedGitInfo,\n\t\tbranch,\n\t\toverwriteHostedGitInfo,\n\t}\n}\n\nexport function _fixWsRoot(options: ITSRequiredPick<IFillPkgHostedInfoOptions, 'hostedGitInfo' | 'rootData' | 'overwriteHostedGitInfo' | 'branch'>)\n{\n\tif (!options.rootData.ws?.length)\n\t{\n\t\tthrow new Error(`Invalid workspaces`)\n\t}\n\n\tlet runtime = _fixRoot({\n\t\t...options,\n\t\ttargetDir: options.rootData.ws,\n\t});\n\n\tObject.entries(fillDummyScripts(defaultWorkspaceRootScripts())).forEach(([key, value]) =>\n\t{\n\t\truntime.root_pkg_json.data.scripts[key] ??= value;\n\t});\n\n\t[\n\t\t'@yarn-tool/ws-find-up-paths',\n\t\t'@types/node',\n\t\t'@bluelovers/tsconfig',\n\t\t'@yarn-tool/require-resolve',\n\t].forEach(name => {\n\t\tconst _check = _checkDependenciesExistsAll(runtime.root_pkg_json.data, [\n\t\t\t'devDependencies',\n\t\t\t'dependencies',\n\t\t], name);\n\n\t\tif (!_check._exists)\n\t\t{\n\t\t\truntime.root_pkg_json.data.devDependencies ??= {};\n\t\t\truntime.root_pkg_json.data.devDependencies[name] = '*';\n\t\t}\n\t});\n\n\truntime.root_pkg_json.data = sortPackageJson(runtime.root_pkg_json.data);\n\n\truntime.root_pkg_json.write();\n\n\tlet wss = new WorkspacesScope(runtime.rootData.ws);\n\twss.syncValue();\n\twss.save();\n\n\treturn runtime\n}\n"]}
package/lib/ws/lerna.d.ts CHANGED
@@ -1,5 +1,48 @@
1
1
  import { ITSRequiredPick } from 'ts-type/lib/type/record';
2
2
  import { IFillPkgHostedInfoOptions } from '@yarn-tool/pkg-hosted-info';
3
3
  import { ILernaJson } from '@ts-type/package-dts/lerna-json';
4
- export declare function _fixLernaJsonCore(current: ILernaJson, tpl: ILernaJson): ILernaJson;
5
- export declare function _fixLernaJson(options: ITSRequiredPick<IFillPkgHostedInfoOptions, 'rootData'>): void;
4
+ /**
5
+ * Lerna 修復選項型別
6
+ * Lerna fix options type
7
+ *
8
+ * 從 IFillPkgHostedInfoOptions 中選取必需的 rootData 屬性
9
+ * Picks the required rootData property from IFillPkgHostedInfoOptions
10
+ */
11
+ export type IOptionsFixLerna = ITSRequiredPick<IFillPkgHostedInfoOptions, 'rootData'>;
12
+ /**
13
+ * 合併 Lerna 設定核心邏輯
14
+ * Core logic for merging Lerna configuration
15
+ *
16
+ * 將模板中的命令設定與現有設定進行深度合併,並處理 publish.ignoreChanges 的清單合併與去重
17
+ * Performs deep merge of command settings from template with existing config, and handles merging and deduplication of publish.ignoreChanges list
18
+ *
19
+ * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object
20
+ * @param tpl - 模板 lerna.json 設定物件 / Template lerna.json configuration object
21
+ * @returns 合併後的 lerna.json 設定物件 / Merged lerna.json configuration object
22
+ */
23
+ export declare function _fixLernaJsonCore(currentLernaJson: ILernaJson, tpl: ILernaJson): ILernaJson;
24
+ /**
25
+ * 處理 Lerna 已棄用屬性的核心邏輯
26
+ * Core logic for handling deprecated Lerna properties
27
+ *
28
+ * 檢測 Lerna 版本,若為 7.0.0 以上版本則移除 useWorkspaces 屬性
29
+ * Detects Lerna version and removes useWorkspaces property if version is 7.0.0 or higher
30
+ *
31
+ * Lerna 7.0.0 開始強制使用 workspaces,useWorkspaces 屬性已無意義
32
+ * Since Lerna 7.0.0, workspaces are mandatory and useWorkspaces property is no longer meaningful
33
+ *
34
+ * @param options - 修復選項,包含 rootData 資訊 / Fix options containing rootData information
35
+ * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object
36
+ * @returns 處理後的 lerna.json 設定物件 / Processed lerna.json configuration object
37
+ */
38
+ export declare function _fixLernaDeprecatedCore(options: IOptionsFixLerna, currentLernaJson: ILernaJson): ILernaJson;
39
+ /**
40
+ * 修復專案中的 lerna.json 檔案
41
+ * Fix lerna.json file in the project
42
+ *
43
+ * 讀取專案根目錄的 lerna.json,與模板進行合併,並處理已棄用的屬性
44
+ * Reads lerna.json from project root, merges with template, and handles deprecated properties
45
+ *
46
+ * @param options - 修復選項,必須包含 rootData.root(專案根目錄) / Fix options, must contain rootData.root (project root directory)
47
+ */
48
+ export declare function _fixLernaJson(options: IOptionsFixLerna): void;
package/lib/ws/lerna.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports._fixLernaJsonCore = _fixLernaJsonCore;
4
+ exports._fixLernaDeprecatedCore = _fixLernaDeprecatedCore;
4
5
  exports._fixLernaJson = _fixLernaJson;
5
6
  const path_1 = require("path");
6
7
  const fs_extra_1 = require("fs-extra");
@@ -8,19 +9,95 @@ const lodash_1 = require("lodash");
8
9
  const __root_1 = require("@yarn-tool/static-file/__root");
9
10
  const write_package_json_1 = require("@yarn-tool/write-package-json");
10
11
  const array_hyper_unique_1 = require("array-hyper-unique");
11
- function _fixLernaJsonCore(current, tpl) {
12
- current.command = (0, lodash_1.defaultsDeep)(current.command, tpl.command);
13
- current.command.publish.ignoreChanges = current.command.publish.ignoreChanges.concat(tpl.command.publish.ignoreChanges);
14
- (0, array_hyper_unique_1.array_unique_overwrite)(current.command.publish.ignoreChanges);
15
- return current;
12
+ const package_1 = require("@yarn-tool/require-resolve/lib/package");
13
+ const semver_1 = require("semver");
14
+ /**
15
+ * 合併 Lerna 設定核心邏輯
16
+ * Core logic for merging Lerna configuration
17
+ *
18
+ * 將模板中的命令設定與現有設定進行深度合併,並處理 publish.ignoreChanges 的清單合併與去重
19
+ * Performs deep merge of command settings from template with existing config, and handles merging and deduplication of publish.ignoreChanges list
20
+ *
21
+ * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object
22
+ * @param tpl - 模板 lerna.json 設定物件 / Template lerna.json configuration object
23
+ * @returns 合併後的 lerna.json 設定物件 / Merged lerna.json configuration object
24
+ */
25
+ function _fixLernaJsonCore(currentLernaJson, tpl) {
26
+ // 使用 defaultsDeep 進行命令設定的深度合併,確保現有設定優先,缺失值從模板補充
27
+ // Use defaultsDeep for deep merging command settings, ensuring existing config takes precedence while filling missing values from template
28
+ currentLernaJson.command = (0, lodash_1.defaultsDeep)(currentLernaJson.command, tpl.command);
29
+ // 合併 publish.ignoreChanges 陣列:將模板的忽略規則附加到現有規則之後
30
+ // Merge publish.ignoreChanges arrays: append template ignore rules after existing rules
31
+ currentLernaJson.command.publish['ignoreChanges'] = currentLernaJson.command.publish['ignoreChanges'].concat(tpl.command.publish['ignoreChanges']);
32
+ // 對合併後的 ignoreChanges 進行去重處理,避免重複的忽略規則
33
+ // Deduplicate the merged ignoreChanges to avoid duplicate ignore rules
34
+ (0, array_hyper_unique_1.array_unique_overwrite)(currentLernaJson.command.publish['ignoreChanges']);
35
+ return currentLernaJson;
16
36
  }
37
+ /**
38
+ * 處理 Lerna 已棄用屬性的核心邏輯
39
+ * Core logic for handling deprecated Lerna properties
40
+ *
41
+ * 檢測 Lerna 版本,若為 7.0.0 以上版本則移除 useWorkspaces 屬性
42
+ * Detects Lerna version and removes useWorkspaces property if version is 7.0.0 or higher
43
+ *
44
+ * Lerna 7.0.0 開始強制使用 workspaces,useWorkspaces 屬性已無意義
45
+ * Since Lerna 7.0.0, workspaces are mandatory and useWorkspaces property is no longer meaningful
46
+ *
47
+ * @param options - 修復選項,包含 rootData 資訊 / Fix options containing rootData information
48
+ * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object
49
+ * @returns 處理後的 lerna.json 設定物件 / Processed lerna.json configuration object
50
+ */
51
+ function _fixLernaDeprecatedCore(options, currentLernaJson) {
52
+ try {
53
+ // 解析本機或全域安裝的 lerna 套件資訊
54
+ // Resolve locally or globally installed lerna package information
55
+ let result = (0, package_1.resolvePackage)('lerna', {
56
+ includeGlobal: true,
57
+ includeCurrentDirectory: true,
58
+ });
59
+ // 若 Lerna 版本 >= 7.0.0,移除 useWorkspaces 屬性
60
+ // Remove useWorkspaces property if Lerna version >= 7.0.0
61
+ if ((0, semver_1.gte)(result.pkg.version, '7.0.0')) {
62
+ delete currentLernaJson['useWorkspaces'];
63
+ }
64
+ }
65
+ // 若無法解析 lerna 套件(未安裝),靜默忽略錯誤
66
+ // Silently ignore error if lerna package cannot be resolved (not installed)
67
+ catch (e) { }
68
+ return currentLernaJson;
69
+ }
70
+ /**
71
+ * 修復專案中的 lerna.json 檔案
72
+ * Fix lerna.json file in the project
73
+ *
74
+ * 讀取專案根目錄的 lerna.json,與模板進行合併,並處理已棄用的屬性
75
+ * Reads lerna.json from project root, merges with template, and handles deprecated properties
76
+ *
77
+ * @param options - 修復選項,必須包含 rootData.root(專案根目錄) / Fix options, must contain rootData.root (project root directory)
78
+ */
17
79
  function _fixLernaJson(options) {
80
+ // 組合 lerna.json 的完整路徑
81
+ // Compose the full path to lerna.json
18
82
  const file = (0, path_1.resolve)(options.rootData.root, 'lerna.json');
83
+ // 只有當 lerna.json 存在時才進行處理
84
+ // Only process if lerna.json exists
19
85
  if ((0, fs_extra_1.existsSync)(file)) {
20
- let json = (0, fs_extra_1.readJSONSync)(file);
86
+ // 讀取現有的 lerna.json
87
+ // Read existing lerna.json
88
+ let currentLernaJson = (0, fs_extra_1.readJSONSync)(file);
89
+ // 讀取靜態模板檔案作為合併基準
90
+ // Read static template file as merge baseline
21
91
  let json2 = (0, fs_extra_1.readJSONSync)((0, path_1.resolve)(__root_1.__STATIC_ROOT, 'file/lerna.json.tpl'));
22
- json = _fixLernaJsonCore(json, json2);
23
- (0, write_package_json_1.writePackageJSONSync)(file, json);
92
+ // 執行核心合併邏輯
93
+ // Execute core merge logic
94
+ currentLernaJson = _fixLernaJsonCore(currentLernaJson, json2);
95
+ // 處理已棄用的屬性
96
+ // Handle deprecated properties
97
+ currentLernaJson = _fixLernaDeprecatedCore(options, currentLernaJson);
98
+ // 將合併後的結果寫回檔案
99
+ // Write merged result back to file
100
+ (0, write_package_json_1.writePackageJSONSync)(file, currentLernaJson);
24
101
  }
25
102
  }
26
103
  //# sourceMappingURL=lerna.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lerna.js","sourceRoot":"","sources":["lerna.ts"],"names":[],"mappings":";;AAUA,8CASC;AAED,sCAaC;AAhCD,+BAA+B;AAC/B,uCAAoD;AACpD,mCAA6C;AAC7C,0DAA8D;AAC9D,sEAAqE;AAErE,2DAA4D;AAE5D,SAAgB,iBAAiB,CAAC,OAAmB,EAAE,GAAe;IAErE,OAAO,CAAC,OAAO,GAAG,IAAA,qBAAY,EAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7D,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,GAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAA0B,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,aAAyB,CAAC,CAAC;IAElJ,IAAA,2CAAsB,EAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAA;AACf,CAAC;AAED,SAAgB,aAAa,CAAC,OAA+D;IAE5F,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE1D,IAAI,IAAA,qBAAU,EAAC,IAAI,CAAC,EACpB,CAAC;QACA,IAAI,IAAI,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,IAAA,uBAAY,EAAC,IAAA,cAAO,EAAC,sBAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAExE,IAAI,GAAG,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEtC,IAAA,yCAAoB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;AACF,CAAC","sourcesContent":["import { ITSRequiredPick } from 'ts-type/lib/type/record';\nimport { IFillPkgHostedInfoOptions } from '@yarn-tool/pkg-hosted-info';\nimport { resolve } from 'path';\nimport { existsSync, readJSONSync } from 'fs-extra';\nimport { defaultsDeep, merge } from 'lodash';\nimport { __STATIC_ROOT } from '@yarn-tool/static-file/__root';\nimport { writePackageJSONSync } from '@yarn-tool/write-package-json';\nimport { ILernaJson } from '@ts-type/package-dts/lerna-json';\nimport { array_unique_overwrite } from 'array-hyper-unique';\n\nexport function _fixLernaJsonCore(current: ILernaJson, tpl: ILernaJson)\n{\n\tcurrent.command = defaultsDeep(current.command, tpl.command);\n\n\tcurrent.command.publish.ignoreChanges = (current.command.publish.ignoreChanges as string[]).concat(tpl.command.publish.ignoreChanges as string[]);\n\n\tarray_unique_overwrite(current.command.publish.ignoreChanges);\n\n\treturn current\n}\n\nexport function _fixLernaJson(options: ITSRequiredPick<IFillPkgHostedInfoOptions, 'rootData'>)\n{\n\tconst file = resolve(options.rootData.root, 'lerna.json');\n\n\tif (existsSync(file))\n\t{\n\t\tlet json = readJSONSync(file);\n\t\tlet json2 = readJSONSync(resolve(__STATIC_ROOT, 'file/lerna.json.tpl'));\n\n\t\tjson = _fixLernaJsonCore(json, json2);\n\n\t\twritePackageJSONSync(file, json);\n\t}\n}\n"]}
1
+ {"version":3,"file":"lerna.js","sourceRoot":"","sources":["lerna.ts"],"names":[],"mappings":";;AAgCA,8CAeC;AAgBD,0DAwBC;AAWD,sCA8BC;AA9HD,+BAA+B;AAC/B,uCAAoD;AACpD,mCAA6C;AAC7C,0DAA8D;AAC9D,sEAAqE;AAErE,2DAA4D;AAC5D,oEAAwE;AACxE,mCAA6B;AAW7B;;;;;;;;;;GAUG;AACH,SAAgB,iBAAiB,CAAC,gBAA4B,EAAE,GAAe;IAE9E,gDAAgD;IAChD,2IAA2I;IAC3I,gBAAgB,CAAC,OAAO,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAE/E,gDAAgD;IAChD,wFAAwF;IACxF,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAc,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAa,CAAC,CAAC;IAE7K,uCAAuC;IACvC,uEAAuE;IACvE,IAAA,2CAAsB,EAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAE1E,OAAO,gBAAgB,CAAA;AACxB,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,uBAAuB,CAAC,OAAyB,EAAE,gBAA4B;IAE9F,IACA,CAAC;QACA,wBAAwB;QACxB,kEAAkE;QAClE,IAAI,MAAM,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE;YACpC,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;SAC7B,CAAC,CAAC;QAEH,0CAA0C;QAC1C,0DAA0D;QAC1D,IAAI,IAAA,YAAG,EAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EACpC,CAAC;YACA,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAA;QACzC,CAAC;IACF,CAAC;IACD,6BAA6B;IAC7B,4EAA4E;IAC5E,OAAO,CAAC,EACR,CAAC,CAAA,CAAC;IAEF,OAAO,gBAAgB,CAAA;AACxB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,aAAa,CAAC,OAAyB;IAEtD,sBAAsB;IACtB,sCAAsC;IACtC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE1D,0BAA0B;IAC1B,oCAAoC;IACpC,IAAI,IAAA,qBAAU,EAAC,IAAI,CAAC,EACpB,CAAC;QACA,mBAAmB;QACnB,2BAA2B;QAC3B,IAAI,gBAAgB,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;QAE1C,iBAAiB;QACjB,8CAA8C;QAC9C,IAAI,KAAK,GAAG,IAAA,uBAAY,EAAC,IAAA,cAAO,EAAC,sBAAa,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAExE,WAAW;QACX,2BAA2B;QAC3B,gBAAgB,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAE9D,WAAW;QACX,+BAA+B;QAC/B,gBAAgB,GAAG,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEtE,cAAc;QACd,mCAAmC;QACnC,IAAA,yCAAoB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9C,CAAC;AACF,CAAC","sourcesContent":["import { ITSRequiredPick } from 'ts-type/lib/type/record';\nimport { IFillPkgHostedInfoOptions } from '@yarn-tool/pkg-hosted-info';\nimport { resolve } from 'path';\nimport { existsSync, readJSONSync } from 'fs-extra';\nimport { defaultsDeep, merge } from 'lodash';\nimport { __STATIC_ROOT } from '@yarn-tool/static-file/__root';\nimport { writePackageJSONSync } from '@yarn-tool/write-package-json';\nimport { ILernaJson } from '@ts-type/package-dts/lerna-json';\nimport { array_unique_overwrite } from 'array-hyper-unique';\nimport { resolvePackage } from '@yarn-tool/require-resolve/lib/package';\nimport { gte } from 'semver';\n\n/**\n * Lerna 修復選項型別\n * Lerna fix options type\n *\n * 從 IFillPkgHostedInfoOptions 中選取必需的 rootData 屬性\n * Picks the required rootData property from IFillPkgHostedInfoOptions\n */\nexport type IOptionsFixLerna = ITSRequiredPick<IFillPkgHostedInfoOptions, 'rootData'>;\n\n/**\n * 合併 Lerna 設定核心邏輯\n * Core logic for merging Lerna configuration\n *\n * 將模板中的命令設定與現有設定進行深度合併,並處理 publish.ignoreChanges 的清單合併與去重\n * Performs deep merge of command settings from template with existing config, and handles merging and deduplication of publish.ignoreChanges list\n *\n * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object\n * @param tpl - 模板 lerna.json 設定物件 / Template lerna.json configuration object\n * @returns 合併後的 lerna.json 設定物件 / Merged lerna.json configuration object\n */\nexport function _fixLernaJsonCore(currentLernaJson: ILernaJson, tpl: ILernaJson)\n{\n\t// 使用 defaultsDeep 進行命令設定的深度合併,確保現有設定優先,缺失值從模板補充\n\t// Use defaultsDeep for deep merging command settings, ensuring existing config takes precedence while filling missing values from template\n\tcurrentLernaJson.command = defaultsDeep(currentLernaJson.command, tpl.command);\n\n\t// 合併 publish.ignoreChanges 陣列:將模板的忽略規則附加到現有規則之後\n\t// Merge publish.ignoreChanges arrays: append template ignore rules after existing rules\n\tcurrentLernaJson.command.publish['ignoreChanges'] = (currentLernaJson.command.publish['ignoreChanges'] as string[]).concat(tpl.command.publish['ignoreChanges'] as string[]);\n\n\t// 對合併後的 ignoreChanges 進行去重處理,避免重複的忽略規則\n\t// Deduplicate the merged ignoreChanges to avoid duplicate ignore rules\n\tarray_unique_overwrite(currentLernaJson.command.publish['ignoreChanges']);\n\n\treturn currentLernaJson\n}\n\n/**\n * 處理 Lerna 已棄用屬性的核心邏輯\n * Core logic for handling deprecated Lerna properties\n *\n * 檢測 Lerna 版本,若為 7.0.0 以上版本則移除 useWorkspaces 屬性\n * Detects Lerna version and removes useWorkspaces property if version is 7.0.0 or higher\n *\n * Lerna 7.0.0 開始強制使用 workspaces,useWorkspaces 屬性已無意義\n * Since Lerna 7.0.0, workspaces are mandatory and useWorkspaces property is no longer meaningful\n *\n * @param options - 修復選項,包含 rootData 資訊 / Fix options containing rootData information\n * @param currentLernaJson - 當前的 lerna.json 設定物件 / Current lerna.json configuration object\n * @returns 處理後的 lerna.json 設定物件 / Processed lerna.json configuration object\n */\nexport function _fixLernaDeprecatedCore(options: IOptionsFixLerna, currentLernaJson: ILernaJson)\n{\n\ttry\n\t{\n\t\t// 解析本機或全域安裝的 lerna 套件資訊\n\t\t// Resolve locally or globally installed lerna package information\n\t\tlet result = resolvePackage('lerna', {\n\t\t\tincludeGlobal: true,\n\t\t\tincludeCurrentDirectory: true,\n\t\t});\n\n\t\t// 若 Lerna 版本 >= 7.0.0,移除 useWorkspaces 屬性\n\t\t// Remove useWorkspaces property if Lerna version >= 7.0.0\n\t\tif (gte(result.pkg.version, '7.0.0'))\n\t\t{\n\t\t\tdelete currentLernaJson['useWorkspaces']\n\t\t}\n\t}\n\t// 若無法解析 lerna 套件(未安裝),靜默忽略錯誤\n\t// Silently ignore error if lerna package cannot be resolved (not installed)\n\tcatch (e)\n\t{}\n\n\treturn currentLernaJson\n}\n\n/**\n * 修復專案中的 lerna.json 檔案\n * Fix lerna.json file in the project\n *\n * 讀取專案根目錄的 lerna.json,與模板進行合併,並處理已棄用的屬性\n * Reads lerna.json from project root, merges with template, and handles deprecated properties\n *\n * @param options - 修復選項,必須包含 rootData.root(專案根目錄) / Fix options, must contain rootData.root (project root directory)\n */\nexport function _fixLernaJson(options: IOptionsFixLerna)\n{\n\t// 組合 lerna.json 的完整路徑\n\t// Compose the full path to lerna.json\n\tconst file = resolve(options.rootData.root, 'lerna.json');\n\n\t// 只有當 lerna.json 存在時才進行處理\n\t// Only process if lerna.json exists\n\tif (existsSync(file))\n\t{\n\t\t// 讀取現有的 lerna.json\n\t\t// Read existing lerna.json\n\t\tlet currentLernaJson = readJSONSync(file);\n\n\t\t// 讀取靜態模板檔案作為合併基準\n\t\t// Read static template file as merge baseline\n\t\tlet json2 = readJSONSync(resolve(__STATIC_ROOT, 'file/lerna.json.tpl'));\n\n\t\t// 執行核心合併邏輯\n\t\t// Execute core merge logic\n\t\tcurrentLernaJson = _fixLernaJsonCore(currentLernaJson, json2);\n\n\t\t// 處理已棄用的屬性\n\t\t// Handle deprecated properties\n\t\tcurrentLernaJson = _fixLernaDeprecatedCore(options, currentLernaJson);\n\n\t\t// 將合併後的結果寫回檔案\n\t\t// Write merged result back to file\n\t\twritePackageJSONSync(file, currentLernaJson);\n\t}\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yarn-tool/fix-all",
3
- "version": "3.0.7",
3
+ "version": "3.0.10",
4
4
  "description": "一站式自動修復工具,支援 git 資訊更新、靜態檔案同步、版本修正與 workspace 管理 (All-in-one auto-fix tool for git info update, static file sync, version fix, and workspace management)",
5
5
  "keywords": [
6
6
  "fix-all",
@@ -63,34 +63,36 @@
63
63
  "tsc:showConfig": "ynpx get-current-tsconfig -p"
64
64
  },
65
65
  "dependencies": {
66
- "@ts-type/package-dts": "^2.0.8",
67
- "@yarn-tool/find-root": "^2.0.17",
68
- "@yarn-tool/fix-ws-versions": "^3.0.5",
69
- "@yarn-tool/normalize-deps-value": "^2.0.4",
70
- "@yarn-tool/pkg-git-info": "^2.0.5",
71
- "@yarn-tool/pkg-hosted-info": "^3.0.5",
72
- "@yarn-tool/pkg-readme-tpl": "^1.0.1",
73
- "@yarn-tool/static-file": "^3.0.6",
74
- "@yarn-tool/write-package-json": "^1.0.14",
75
- "@yarn-tool/ws-scope": "^3.0.5",
66
+ "@ts-type/package-dts": "^3.0.6",
67
+ "@yarn-tool/find-root": "^2.0.21",
68
+ "@yarn-tool/fix-ws-versions": "^3.0.8",
69
+ "@yarn-tool/normalize-deps-value": "^2.0.6",
70
+ "@yarn-tool/pkg-git-info": "^2.0.6",
71
+ "@yarn-tool/pkg-hosted-info": "^3.0.8",
72
+ "@yarn-tool/pkg-readme-tpl": "^1.0.5",
73
+ "@yarn-tool/require-resolve": "^4.0.5",
74
+ "@yarn-tool/static-file": "^3.0.10",
75
+ "@yarn-tool/write-package-json": "^1.0.15",
76
+ "@yarn-tool/ws-scope": "^3.0.8",
76
77
  "array-hyper-unique": "^2.1.6",
77
78
  "bluebird": "^3.7.2",
78
- "cache-path": "^4.0.5",
79
+ "cache-path": "^4.0.8",
79
80
  "debug-color2": "^1.3.2",
80
- "fs-extra": "^11.3.3",
81
+ "fs-extra": "^11.3.4",
81
82
  "fs-remove-extra": "^1.0.8",
82
83
  "lazy-aggregate-error": "^1.0.21",
83
84
  "lodash": "^4.17.23",
84
- "npm-package-json-loader": "^3.0.6",
85
+ "npm-package-json-loader": "^3.0.10",
85
86
  "progress-estimator": "^0.3.1",
86
- "sort-package-json3": "^3.0.4",
87
- "ts-type": "^3.0.1",
87
+ "semver": "^7.7.4",
88
+ "sort-package-json3": "^3.0.8",
89
+ "ts-type": "^3.0.8",
88
90
  "tslib": ">=2",
89
91
  "upath2": "^3.1.23",
90
- "ws-pkg-list": "^3.0.5"
92
+ "ws-pkg-list": "^3.0.8"
91
93
  },
92
94
  "publishConfig": {
93
95
  "access": "public"
94
96
  },
95
- "gitHead": "c4f430d52167892d911abbb9af9ef6d80e2355da"
97
+ "gitHead": "ca3fae2bbdf31ed1ce9bab14793912026200767e"
96
98
  }