@deppon/create-deppon-app 2.4.15 → 2.4.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/deppon.js +42 -1
- package/package.json +1 -1
- package/template/package.json +11 -11
package/deppon.js
CHANGED
|
@@ -70,6 +70,42 @@ async function getPackageVersion(packageName, defaultVersion) {
|
|
|
70
70
|
return defaultVersion;
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
+
/**
|
|
74
|
+
* 与内置 template/package.json 中声明的范围一致(作兜底,避免发版后因无法读本地 monorepo、registry 失败而写死旧版)
|
|
75
|
+
* @returns {string}
|
|
76
|
+
*/
|
|
77
|
+
function getBundledTemplateDepponSkillsRange() {
|
|
78
|
+
const templatePkgPath = path.join(__dirname, 'template', 'package.json');
|
|
79
|
+
try {
|
|
80
|
+
if (fs.existsSync(templatePkgPath)) {
|
|
81
|
+
const templatePkg = JSON.parse(fs.readFileSync(templatePkgPath, 'utf-8'));
|
|
82
|
+
const range =
|
|
83
|
+
templatePkg.devDependencies?.['@deppon/deppon-skills'] ??
|
|
84
|
+
templatePkg.dependencies?.['@deppon/deppon-skills'];
|
|
85
|
+
if (typeof range === 'string' && range.trim()) {
|
|
86
|
+
return range.trim();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
} catch (_) {
|
|
90
|
+
/* ignore */
|
|
91
|
+
}
|
|
92
|
+
return `^${pkg.version}`;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* 取语义版本更高的一侧(保留该侧原始 range 写法,如 ^2.4.15)
|
|
97
|
+
* @param {string} a
|
|
98
|
+
* @param {string} b
|
|
99
|
+
* @returns {string}
|
|
100
|
+
*/
|
|
101
|
+
function pickHigherSemverRange(a, b) {
|
|
102
|
+
const va = semver.coerce(a);
|
|
103
|
+
const vb = semver.coerce(b);
|
|
104
|
+
if (!va) return b;
|
|
105
|
+
if (!vb) return a;
|
|
106
|
+
return semver.gt(va, vb) ? a : b;
|
|
107
|
+
}
|
|
108
|
+
|
|
73
109
|
/**
|
|
74
110
|
* 检测 Yarn 版本
|
|
75
111
|
* @returns {Promise<string|null>} Yarn 版本号或 null(如果未安装)
|
|
@@ -333,7 +369,12 @@ async function mergeDepponSkillsIntoProject(root) {
|
|
|
333
369
|
if (!fs.existsSync(pkgPath)) return;
|
|
334
370
|
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
|
|
335
371
|
pkg.devDependencies = pkg.devDependencies || {};
|
|
336
|
-
const
|
|
372
|
+
const bundledSkillsRange = getBundledTemplateDepponSkillsRange();
|
|
373
|
+
let skillsVersion = await getPackageVersion('@deppon/deppon-skills', bundledSkillsRange);
|
|
374
|
+
const existingSkills = pkg.devDependencies['@deppon/deppon-skills'];
|
|
375
|
+
if (existingSkills) {
|
|
376
|
+
skillsVersion = pickHigherSemverRange(skillsVersion, existingSkills);
|
|
377
|
+
}
|
|
337
378
|
pkg.devDependencies['@deppon/deppon-skills'] = skillsVersion;
|
|
338
379
|
delete pkg.devDependencies['deppon-skills'];
|
|
339
380
|
pkg.scripts = pkg.scripts || {};
|
package/package.json
CHANGED
package/template/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "2.4.
|
|
4
|
+
"version": "2.4.16",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"postinstall": "deppon-skills-install",
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
"format": "prettier --write **/*.{js,ts,vue} && eslint . --ext js,ts,vue --fix"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@deppon/deppon-assets": "^2.4.
|
|
21
|
-
"@deppon/deppon-auth": "^2.4.
|
|
22
|
-
"@deppon/deppon-pinia": "^2.4.
|
|
23
|
-
"@deppon/deppon-request": "^2.4.
|
|
24
|
-
"@deppon/deppon-router": "^2.4.
|
|
25
|
-
"@deppon/deppon-template": "^2.4.
|
|
26
|
-
"@deppon/deppon-ui": "^2.4.
|
|
27
|
-
"@deppon/deppon-utils": "^2.4.
|
|
20
|
+
"@deppon/deppon-assets": "^2.4.16",
|
|
21
|
+
"@deppon/deppon-auth": "^2.4.16",
|
|
22
|
+
"@deppon/deppon-pinia": "^2.4.16",
|
|
23
|
+
"@deppon/deppon-request": "^2.4.16",
|
|
24
|
+
"@deppon/deppon-router": "^2.4.16",
|
|
25
|
+
"@deppon/deppon-template": "^2.4.16",
|
|
26
|
+
"@deppon/deppon-ui": "^2.4.16",
|
|
27
|
+
"@deppon/deppon-utils": "^2.4.16",
|
|
28
28
|
"dayjs": "^1.11.19",
|
|
29
29
|
"echarts": "^6.0.0",
|
|
30
30
|
"element-plus": "^2.11.7",
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"vue": "^3.5.24"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@deppon/deppon-skills": "^2.4.
|
|
39
|
-
"@deppon/deppon-eslint-config": "^2.4.
|
|
38
|
+
"@deppon/deppon-skills": "^2.4.16",
|
|
39
|
+
"@deppon/deppon-eslint-config": "^2.4.16",
|
|
40
40
|
"@types/node": "^24.10.1",
|
|
41
41
|
"@types/nprogress": "^0.2.3",
|
|
42
42
|
"@vitejs/plugin-legacy": "^5.4.0",
|