@build-script/package-tools 0.0.15 → 0.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/monorepo-invalid.js +3 -3
- package/lib/commands/monorepo-invalid.js.map +1 -1
- package/lib/common/package-manager/driver.abstract.d.ts +1 -1
- package/lib/common/package-manager/driver.abstract.d.ts.map +1 -1
- package/lib/common/package-manager/driver.abstract.js +10 -6
- package/lib/common/package-manager/driver.abstract.js.map +1 -1
- package/lib/common/package-manager/package-json.d.ts.map +1 -1
- package/lib/common/package-manager/package-json.js +15 -1
- package/lib/common/package-manager/package-json.js.map +1 -1
- package/lib/common/version.generated.d.ts +1 -1
- package/lib/common/version.generated.js +1 -1
- package/package.json +5 -5
- package/src/commands/monorepo-invalid.ts +3 -3
- package/src/common/package-manager/driver.abstract.ts +11 -6
- package/src/common/package-manager/package-json.ts +20 -3
- 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 {
|
|
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
|
|
13
|
-
const cache = await
|
|
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,
|
|
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"}
|
|
@@ -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;
|
|
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)',
|
|
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)',
|
|
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(
|
|
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":"
|
|
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":"
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/common/package-manager/package-json.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.
|
|
9
|
+
export declare const self_package_version = "0.0.16";
|
|
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.
|
|
13
|
+
export const self_package_version = "0.0.16";
|
|
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.
|
|
4
|
+
"version": "0.0.16",
|
|
5
5
|
"description": "A Node.js package managing tool",
|
|
6
6
|
"bin": {
|
|
7
7
|
"package-tools": "./load.js",
|
|
@@ -23,13 +23,13 @@
|
|
|
23
23
|
"tiny-async-pool": "^2.1.0",
|
|
24
24
|
"@build-script/monorepo-lib": "^0.0.14",
|
|
25
25
|
"@idlebox/cli": "^0.0.8",
|
|
26
|
-
"@idlebox/dependency-graph": "^0.0.12",
|
|
27
26
|
"@idlebox/common": "^1.5.10",
|
|
27
|
+
"@idlebox/dependency-graph": "^0.0.12",
|
|
28
28
|
"@idlebox/ensure-symlink": "^1.0.38",
|
|
29
29
|
"@idlebox/json-edit": "^0.0.7",
|
|
30
30
|
"@idlebox/node": "^1.4.19",
|
|
31
|
-
"@idlebox/
|
|
32
|
-
"@idlebox/
|
|
31
|
+
"@idlebox/unshare": "^0.0.6",
|
|
32
|
+
"@idlebox/source-map-support": "^0.0.13"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/cacache": "^19.0.0",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"@types/tiny-async-pool": "^2.0.3",
|
|
43
43
|
"@types/tinycolor2": "^1.4.6",
|
|
44
44
|
"@build-script/codegen": "^1.0.15",
|
|
45
|
-
"@build-script/single-dog-asset": "latest",
|
|
46
45
|
"@idlebox/cli-static-generator": "^0.0.7",
|
|
46
|
+
"@build-script/single-dog-asset": "latest",
|
|
47
47
|
"@mpis/run": "^0.0.16"
|
|
48
48
|
},
|
|
49
49
|
"sideEffects": false,
|
|
@@ -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 {
|
|
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
|
|
15
|
-
const cache = await
|
|
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
|
|
|
@@ -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)',
|
|
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)',
|
|
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(
|
|
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
|
+
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
******************************************************************************/
|
|
14
14
|
|
|
15
15
|
|
|
16
|
-
export const self_package_version = "0.0.
|
|
16
|
+
export const self_package_version = "0.0.16";
|
|
17
17
|
export const self_package_name = "@build-script/package-tools";
|
|
18
18
|
export const self_package_repository = "undefined";
|
|
19
19
|
|