@unisphere/cli 1.54.0 → 1.55.1
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/package.json
CHANGED
|
@@ -28,6 +28,7 @@ function findWorkspaceLibraries(dir) {
|
|
|
28
28
|
}
|
|
29
29
|
function fixPackageDistJson(targetPath) {
|
|
30
30
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
31
|
+
var _a, _b, _c, _d, _e, _f;
|
|
31
32
|
debug(`Fixing package.json in ${targetPath}`);
|
|
32
33
|
if (!targetPath) {
|
|
33
34
|
throw new Error('Target path is required');
|
|
@@ -50,35 +51,77 @@ function fixPackageDistJson(targetPath) {
|
|
|
50
51
|
delete packageJson.main;
|
|
51
52
|
delete packageJson.exports;
|
|
52
53
|
if (packageJson.dependencies || packageJson.peerDependencies) {
|
|
53
|
-
packageJson.peerDependencies =
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
54
|
+
// packageJson.peerDependencies = {
|
|
55
|
+
// ...packageJson.peerDependencies,
|
|
56
|
+
// ...packageJson.dependencies,
|
|
57
|
+
// };
|
|
58
|
+
// if (packageJson.dependencies) {
|
|
59
|
+
// delete packageJson.dependencies;
|
|
60
|
+
// }
|
|
57
61
|
const bundledDependencies = require(path.join(__dirname, '../../../../bundler/package/bundled-dependencies.js'));
|
|
58
62
|
// Remove bundled dependencies from peerDependencies
|
|
59
63
|
bundledDependencies.forEach((dep) => {
|
|
60
|
-
|
|
64
|
+
var _a, _b;
|
|
65
|
+
if ((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a[dep]) {
|
|
66
|
+
delete packageJson.peerDependencies[dep];
|
|
67
|
+
}
|
|
68
|
+
if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[dep]) {
|
|
69
|
+
delete packageJson.dependencies[dep];
|
|
70
|
+
}
|
|
61
71
|
});
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
72
|
+
// Extract React major version and create version range
|
|
73
|
+
let expectedReactVersion = '';
|
|
74
|
+
// Check existing React version in dependencies or peerDependencies
|
|
75
|
+
const existingReactVersion = ((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['react']) || ((_b = packageJson.peerDependencies) === null || _b === void 0 ? void 0 : _b['react']);
|
|
76
|
+
if (existingReactVersion) {
|
|
77
|
+
// Extract major version from existing version (e.g., "18.2.1" -> "18", "^18.0.0" -> "18")
|
|
78
|
+
const versionMatch = existingReactVersion.match(/(\d+)/);
|
|
79
|
+
if (versionMatch) {
|
|
80
|
+
const majorVersion = versionMatch[1];
|
|
81
|
+
expectedReactVersion = `^${majorVersion}.0.0`;
|
|
82
|
+
}
|
|
65
83
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
packageJson.peerDependencies
|
|
84
|
+
if (expectedReactVersion) {
|
|
85
|
+
// Set React peer dependency version range
|
|
86
|
+
if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c['react']) {
|
|
87
|
+
packageJson.peerDependencies['react'] = expectedReactVersion;
|
|
88
|
+
}
|
|
89
|
+
if ((_d = packageJson.dependencies) === null || _d === void 0 ? void 0 : _d['react']) {
|
|
90
|
+
packageJson.dependencies['react'] = expectedReactVersion;
|
|
91
|
+
}
|
|
92
|
+
// Set React DOM version range (same as React)
|
|
93
|
+
if ((_e = packageJson.peerDependencies) === null || _e === void 0 ? void 0 : _e['react-dom']) {
|
|
94
|
+
packageJson.peerDependencies['react-dom'] = expectedReactVersion;
|
|
95
|
+
}
|
|
96
|
+
if ((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f['react-dom']) {
|
|
97
|
+
packageJson.dependencies['react-dom'] = expectedReactVersion;
|
|
98
|
+
}
|
|
69
99
|
}
|
|
70
100
|
// Update workspace package versions
|
|
71
101
|
workspacePackages.forEach((pkg) => {
|
|
72
|
-
|
|
102
|
+
var _a, _b;
|
|
103
|
+
if ((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a[pkg.name]) {
|
|
73
104
|
packageJson.peerDependencies[pkg.name] = pkg.version;
|
|
74
105
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
Object.entries(packageJson.peerDependencies).forEach(([key, value]) => {
|
|
78
|
-
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
79
|
-
packageJson.peerDependencies[key] = `^${value}`;
|
|
106
|
+
if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[pkg.name]) {
|
|
107
|
+
packageJson.dependencies[pkg.name] = pkg.version;
|
|
80
108
|
}
|
|
81
109
|
});
|
|
110
|
+
// Ensure all versions have caret
|
|
111
|
+
if (packageJson.peerDependencies) {
|
|
112
|
+
Object.entries(packageJson.peerDependencies).forEach(([key, value]) => {
|
|
113
|
+
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
114
|
+
packageJson.peerDependencies[key] = `^${value}`;
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
if (packageJson.dependencies) {
|
|
119
|
+
Object.entries(packageJson.dependencies).forEach(([key, value]) => {
|
|
120
|
+
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
121
|
+
packageJson.dependencies[key] = `^${value}`;
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
82
125
|
}
|
|
83
126
|
try {
|
|
84
127
|
yield fs.promises.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-package-dist-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/fix-package-dist-package-json.ts"],"names":[],"mappings":";;AA0CA,
|
|
1
|
+
{"version":3,"file":"fix-package-dist-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/utils/unisphere/fix-package-dist-package-json.ts"],"names":[],"mappings":";;AA0CA,gDAkIC;;AA5KD,yBAAyB;AACzB,6BAA6B;AAC7B,iCAA0B;AAG1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,kCAAkC,CAAC,CAAC;AAQxD,SAAe,sBAAsB,CACnC,GAAW;;QAEX,MAAM,YAAY,GAAuB,EAAE,CAAC;QAE5C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,GAAG,EACH,KAAK,CAAC,IAAI,EACV,cAAc,CACf,CAAC;gBACF,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CACxC,wBAAwB,EACxB,MAAM,CACP,CAAC;oBACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC9C,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC;gBACvE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,oEAAoE;gBACtE,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CAAA;AAED,SAAsB,kBAAkB,CAAC,UAAkB;;;QACzD,KAAK,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,sBAAsB,CACpD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAChC,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAE9D,KAAK,CAAC,8BAA8B,eAAe,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,WAAgB,CAAC;QACrB,IAAI,CAAC;YACH,WAAW,GAAG,IAAI,CAAC,KAAK,CACtB,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CACpD,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACxD,WAAW,CAAC,KAAK,GAAG,kBAAkB,CAAC;QACvC,OAAO,WAAW,CAAC,IAAI,CAAC;QACxB,OAAO,WAAW,CAAC,OAAO,CAAC;QAE3B,IAAI,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;YAC7D,mCAAmC;YACnC,qCAAqC;YACrC,iCAAiC;YACjC,KAAK;YAEL,kCAAkC;YAClC,qCAAqC;YACrC,IAAI;YAEJ,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAC3C,SAAS,EACT,qDAAqD,CACtD,CAAC,CAAC;YACH,oDAAoD;YACpD,mBAAmB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;gBAClC,IAAI,MAAA,WAAW,CAAC,gBAAgB,0CAAG,GAAG,CAAC,EAAE,CAAC;oBACxC,OAAO,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBAC3C,CAAC;gBACD,IAAI,MAAA,WAAW,CAAC,YAAY,0CAAG,GAAG,CAAC,EAAE,CAAC;oBACpC,OAAO,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,uDAAuD;YACvD,IAAI,oBAAoB,GAAG,EAAE,CAAC;YAE9B,mEAAmE;YACnE,MAAM,oBAAoB,GAAG,CAAA,MAAA,WAAW,CAAC,YAAY,0CAAG,OAAO,CAAC,MAAI,MAAA,WAAW,CAAC,gBAAgB,0CAAG,OAAO,CAAC,CAAA,CAAC;YAC5G,IAAI,oBAAoB,EAAE,CAAC;gBACzB,0FAA0F;gBAC1F,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACzD,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;oBACrC,oBAAoB,GAAG,IAAI,YAAY,MAAM,CAAC;gBAChD,CAAC;YACH,CAAC;YAED,IAAI,oBAAoB,EAAE,CAAC;gBAEzB,0CAA0C;gBAC1C,IAAI,MAAA,WAAW,CAAC,gBAAgB,0CAAG,OAAO,CAAC,EAAE,CAAC;oBAC5C,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC;gBAC/D,CAAC;gBAED,IAAI,MAAA,WAAW,CAAC,YAAY,0CAAG,OAAO,CAAC,EAAE,CAAC;oBACxC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC;gBAC3D,CAAC;gBAED,8CAA8C;gBAC9C,IAAI,MAAA,WAAW,CAAC,gBAAgB,0CAAG,WAAW,CAAC,EAAE,CAAC;oBAChD,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC;gBACnE,CAAC;gBAED,IAAI,MAAA,WAAW,CAAC,YAAY,0CAAG,WAAW,CAAC,EAAE,CAAC;oBAC5C,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC;gBAC/D,CAAC;YACH,CAAC;YAED,oCAAoC;YACpC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;gBAChC,IAAI,MAAA,WAAW,CAAC,gBAAgB,0CAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC7C,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;gBACvD,CAAC;gBAED,IAAI,MAAA,WAAW,CAAC,YAAY,0CAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;gBACnD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,iCAAiC;YACjC,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC;gBACjC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACpE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACxD,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC;oBAClD,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;gBAC7B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACxD,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC;oBAC9C,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CACzB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EACpC,MAAM,CACP,CAAC;YACF,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;CAAA"}
|