@unisphere/cli 1.55.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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unisphere/cli",
3
- "version": "1.55.0",
3
+ "version": "1.55.1",
4
4
  "bin": {
5
5
  "unisphere": "./src/cli.js"
6
6
  },
@@ -28,7 +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
+ var _a, _b, _c, _d, _e, _f;
32
32
  debug(`Fixing package.json in ${targetPath}`);
33
33
  if (!targetPath) {
34
34
  throw new Error('Target path is required');
@@ -61,8 +61,13 @@ function fixPackageDistJson(targetPath) {
61
61
  const bundledDependencies = require(path.join(__dirname, '../../../../bundler/package/bundled-dependencies.js'));
62
62
  // Remove bundled dependencies from peerDependencies
63
63
  bundledDependencies.forEach((dep) => {
64
- delete packageJson.peerDependencies[dep];
65
- delete packageJson.dependencies[dep];
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
+ }
66
71
  });
67
72
  // Extract React major version and create version range
68
73
  let expectedReactVersion = '';
@@ -78,40 +83,45 @@ function fixPackageDistJson(targetPath) {
78
83
  }
79
84
  if (expectedReactVersion) {
80
85
  // Set React peer dependency version range
81
- if (packageJson.peerDependencies['react']) {
86
+ if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c['react']) {
82
87
  packageJson.peerDependencies['react'] = expectedReactVersion;
83
88
  }
84
- if (packageJson.dependencies['react']) {
89
+ if ((_d = packageJson.dependencies) === null || _d === void 0 ? void 0 : _d['react']) {
85
90
  packageJson.dependencies['react'] = expectedReactVersion;
86
91
  }
87
92
  // Set React DOM version range (same as React)
88
- if (packageJson.peerDependencies['react-dom']) {
93
+ if ((_e = packageJson.peerDependencies) === null || _e === void 0 ? void 0 : _e['react-dom']) {
89
94
  packageJson.peerDependencies['react-dom'] = expectedReactVersion;
90
95
  }
91
- if (packageJson.dependencies['react-dom']) {
96
+ if ((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f['react-dom']) {
92
97
  packageJson.dependencies['react-dom'] = expectedReactVersion;
93
98
  }
94
99
  }
95
100
  // Update workspace package versions
96
101
  workspacePackages.forEach((pkg) => {
97
- if (packageJson.peerDependencies[pkg.name]) {
102
+ var _a, _b;
103
+ if ((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a[pkg.name]) {
98
104
  packageJson.peerDependencies[pkg.name] = pkg.version;
99
105
  }
100
- if (packageJson.dependencies[pkg.name]) {
106
+ if ((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b[pkg.name]) {
101
107
  packageJson.dependencies[pkg.name] = pkg.version;
102
108
  }
103
109
  });
104
110
  // Ensure all versions have caret
105
- Object.entries(packageJson.peerDependencies).forEach(([key, value]) => {
106
- if (typeof value === 'string' && !value.startsWith('^')) {
107
- packageJson.peerDependencies[key] = `^${value}`;
108
- }
109
- });
110
- Object.entries(packageJson.dependencies).forEach(([key, value]) => {
111
- if (typeof value === 'string' && !value.startsWith('^')) {
112
- packageJson.dependencies[key] = `^${value}`;
113
- }
114
- });
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
+ }
115
125
  }
116
126
  try {
117
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":"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"}
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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"}