@unisphere/cli 1.53.1 → 1.55.0
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 +1 -1
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/commands/application/serve-command.js +10 -2
- package/src/lib/commands/application/serve-command.js.map +1 -1
- package/src/lib/utils/unisphere/fix-package-dist-package-json.js +43 -10
- package/src/lib/utils/unisphere/fix-package-dist-package-json.js.map +1 -1
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -7,4 +7,5 @@ tslib_1.__exportStar(require("./lib/utils/get-cli-version"), exports);
|
|
|
7
7
|
tslib_1.__exportStar(require("./lib/utils/unisphere/get-global-file"), exports);
|
|
8
8
|
tslib_1.__exportStar(require("./lib/utils/unisphere/get-widget-name"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./lib/utils/unisphere/get-unisphere-packages-marketplace"), exports);
|
|
10
|
+
// 2
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/unisphere-cli/src/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,sDAA4B;AAC5B,sEAA4C;AAC5C,gFAAsD;AACtD,gFAAsD;AACtD,mGAAyE"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/unisphere-cli/src/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,sDAA4B;AAC5B,sEAA4C;AAC5C,gFAAsD;AACtD,gFAAsD;AACtD,mGAAyE;AAEzE,IAAI"}
|
|
@@ -17,12 +17,13 @@ const createServeCommand = (parentCommand) => {
|
|
|
17
17
|
.description('serve a unisphere application element')
|
|
18
18
|
.option('--verbose', 'output debug logs', false)
|
|
19
19
|
.addArgument(new commander_1.Argument('application', 'the application to serve'))
|
|
20
|
+
.option('--https', 'use secure protocol')
|
|
20
21
|
.option('--cwd <name>', 'the working directory')
|
|
21
22
|
.option('--port <port>', 'the port to serve the application on')
|
|
22
23
|
.hook('preAction', utils_1.printVerboseHook)
|
|
23
24
|
.action((application, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
24
25
|
var _a, _b;
|
|
25
|
-
const { verbose, cwd, port,
|
|
26
|
+
const { verbose, cwd, port, https } = options;
|
|
26
27
|
const workingDirectory = cwd || process.cwd();
|
|
27
28
|
const servePort = port || '4200';
|
|
28
29
|
try {
|
|
@@ -37,7 +38,14 @@ const createServeCommand = (parentCommand) => {
|
|
|
37
38
|
throw new Error(`No .unisphere file found in the directory`);
|
|
38
39
|
}
|
|
39
40
|
const applicationNxProjectName = (_b = (_a = workspace.config.elements.applications) === null || _a === void 0 ? void 0 : _a[application]) === null || _b === void 0 ? void 0 : _b.nxProjectName;
|
|
40
|
-
const serverProcess = execa('npx', [
|
|
41
|
+
const serverProcess = execa('npx', [
|
|
42
|
+
'nx',
|
|
43
|
+
'serve',
|
|
44
|
+
applicationNxProjectName,
|
|
45
|
+
'--port',
|
|
46
|
+
servePort,
|
|
47
|
+
https ? '--https' : null,
|
|
48
|
+
].filter(Boolean), {
|
|
41
49
|
cwd: workingDirectory,
|
|
42
50
|
stdio: 'inherit',
|
|
43
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/application/serve-command.ts"],"names":[],"mappings":";;;;AAAA,yCAAsD;AACtD,iCAA0B;AAC1B,6CAAqD;AACrD,+BAA+B;AAC/B,+DAAwE;AACxE,yDAAiE;AAGjE,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,6BAA6B,CAAC,CAAC;AACnD,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,YAAY;AAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,YAAY;AAEhC,MAAM,kBAAkB,GAAG,CAAC,aAAsB,EAAW,EAAE;IACpE,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/C,OAAO;SACJ,WAAW,CAAC,uCAAuC,CAAC;SACpD,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,KAAK,CAAC;SAC/C,WAAW,CAAC,IAAI,oBAAQ,CAAC,aAAa,EAAE,0BAA0B,CAAC,CAAC;SACpE,MAAM,CAAC,cAAc,EAAE,uBAAuB,CAAC;SAC/C,MAAM,CAAC,eAAe,EAAE,sCAAsC,CAAC;SAC/D,IAAI,CAAC,WAAW,EAAE,wBAAgB,CAAC;SACnC,MAAM,CACL,CACE,WAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"serve-command.js","sourceRoot":"","sources":["../../../../../../../packages/unisphere-cli/src/lib/commands/application/serve-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
31
32
|
debug(`Fixing package.json in ${targetPath}`);
|
|
32
33
|
if (!targetPath) {
|
|
33
34
|
throw new Error('Target path is required');
|
|
@@ -50,28 +51,55 @@ 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
|
delete packageJson.peerDependencies[dep];
|
|
65
|
+
delete packageJson.dependencies[dep];
|
|
61
66
|
});
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
67
|
+
// Extract React major version and create version range
|
|
68
|
+
let expectedReactVersion = '';
|
|
69
|
+
// Check existing React version in dependencies or peerDependencies
|
|
70
|
+
const existingReactVersion = ((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['react']) || ((_b = packageJson.peerDependencies) === null || _b === void 0 ? void 0 : _b['react']);
|
|
71
|
+
if (existingReactVersion) {
|
|
72
|
+
// Extract major version from existing version (e.g., "18.2.1" -> "18", "^18.0.0" -> "18")
|
|
73
|
+
const versionMatch = existingReactVersion.match(/(\d+)/);
|
|
74
|
+
if (versionMatch) {
|
|
75
|
+
const majorVersion = versionMatch[1];
|
|
76
|
+
expectedReactVersion = `^${majorVersion}.0.0`;
|
|
77
|
+
}
|
|
65
78
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
packageJson.peerDependencies['react
|
|
79
|
+
if (expectedReactVersion) {
|
|
80
|
+
// Set React peer dependency version range
|
|
81
|
+
if (packageJson.peerDependencies['react']) {
|
|
82
|
+
packageJson.peerDependencies['react'] = expectedReactVersion;
|
|
83
|
+
}
|
|
84
|
+
if (packageJson.dependencies['react']) {
|
|
85
|
+
packageJson.dependencies['react'] = expectedReactVersion;
|
|
86
|
+
}
|
|
87
|
+
// Set React DOM version range (same as React)
|
|
88
|
+
if (packageJson.peerDependencies['react-dom']) {
|
|
89
|
+
packageJson.peerDependencies['react-dom'] = expectedReactVersion;
|
|
90
|
+
}
|
|
91
|
+
if (packageJson.dependencies['react-dom']) {
|
|
92
|
+
packageJson.dependencies['react-dom'] = expectedReactVersion;
|
|
93
|
+
}
|
|
69
94
|
}
|
|
70
95
|
// Update workspace package versions
|
|
71
96
|
workspacePackages.forEach((pkg) => {
|
|
72
97
|
if (packageJson.peerDependencies[pkg.name]) {
|
|
73
98
|
packageJson.peerDependencies[pkg.name] = pkg.version;
|
|
74
99
|
}
|
|
100
|
+
if (packageJson.dependencies[pkg.name]) {
|
|
101
|
+
packageJson.dependencies[pkg.name] = pkg.version;
|
|
102
|
+
}
|
|
75
103
|
});
|
|
76
104
|
// Ensure all versions have caret
|
|
77
105
|
Object.entries(packageJson.peerDependencies).forEach(([key, value]) => {
|
|
@@ -79,6 +107,11 @@ function fixPackageDistJson(targetPath) {
|
|
|
79
107
|
packageJson.peerDependencies[key] = `^${value}`;
|
|
80
108
|
}
|
|
81
109
|
});
|
|
110
|
+
Object.entries(packageJson.dependencies).forEach(([key, value]) => {
|
|
111
|
+
if (typeof value === 'string' && !value.startsWith('^')) {
|
|
112
|
+
packageJson.dependencies[key] = `^${value}`;
|
|
113
|
+
}
|
|
114
|
+
});
|
|
82
115
|
}
|
|
83
116
|
try {
|
|
84
117
|
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":"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"}
|