@equinor/echo-cli 1.0.0-beta-40 → 1.0.0-beta-41
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/update-echo-libs.js
CHANGED
|
@@ -9,6 +9,7 @@ import { ECHO_HOST_BUILD_OUTPUT_FOLDER, ECHO_HOST_TEMP_BUILD_FOLDER } from './co
|
|
|
9
9
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
10
10
|
import { findConsumerAppPackageJson } from './utils/findConsumerAppPackageJson.js';
|
|
11
11
|
import { getLatestPkgVersion } from './utils/getLatestPkgVersion.js';
|
|
12
|
+
import { printEchoLibsVersions } from './utils/printEchoLibsVersions.js';
|
|
12
13
|
/**
|
|
13
14
|
* @class UpdateDevHostEchoLibVersions
|
|
14
15
|
* @extends Command
|
|
@@ -58,6 +59,17 @@ export default class UpdateEchoLibs extends Command {
|
|
|
58
59
|
this.log('No echo libraries found in dependencies.');
|
|
59
60
|
return;
|
|
60
61
|
}
|
|
62
|
+
// --- Print current echo lib versions before update ---
|
|
63
|
+
const consumerPkgPath = findConsumerAppPackageJson(process.cwd());
|
|
64
|
+
if (!consumerPkgPath) {
|
|
65
|
+
console.error('Could not find a package.json either in the root folder, or subfolders with @equinor/echo-* dependencies.');
|
|
66
|
+
process.exit(1);
|
|
67
|
+
}
|
|
68
|
+
await printEchoLibsVersions({
|
|
69
|
+
devHostPkgPath,
|
|
70
|
+
appPkgPath: consumerPkgPath,
|
|
71
|
+
fetchLatest: true
|
|
72
|
+
});
|
|
61
73
|
let updated = false;
|
|
62
74
|
const spinner = ora('Fetching latest echo library versions...').start();
|
|
63
75
|
const latestVersions = {};
|
|
@@ -73,45 +85,44 @@ export default class UpdateEchoLibs extends Command {
|
|
|
73
85
|
upToDateLibs.forEach((lib) => {
|
|
74
86
|
this.log(chalk.gray(`${lib} is already at latest version (${deps[lib]}), skipping.`));
|
|
75
87
|
});
|
|
76
|
-
if (outdatedLibs.length === 0) {
|
|
77
|
-
this.log(chalk.green('All echo libraries are already at their latest versions. No update needed.'));
|
|
78
|
-
return;
|
|
79
|
-
}
|
|
80
88
|
let autoBump = flags.all;
|
|
81
|
-
if (
|
|
82
|
-
|
|
83
|
-
`
|
|
84
|
-
|
|
85
|
-
{
|
|
86
|
-
type: 'confirm',
|
|
87
|
-
name: 'autoBump',
|
|
88
|
-
message: `Proceed with automatic update?`,
|
|
89
|
-
default: true
|
|
90
|
-
}
|
|
91
|
-
]);
|
|
92
|
-
autoBump = answer.autoBump;
|
|
93
|
-
}
|
|
94
|
-
for (const lib of outdatedLibs) {
|
|
95
|
-
const current = deps[lib];
|
|
96
|
-
const latest = latestVersions[lib];
|
|
97
|
-
let newVersion = latest;
|
|
98
|
-
if (!autoBump) {
|
|
89
|
+
if (outdatedLibs.length > 0) {
|
|
90
|
+
if (!flags.all) {
|
|
91
|
+
console.log(chalk.yellow(`Do you want to automatically update all outdated echo libraries to their latest versions?\n` +
|
|
92
|
+
`If you choose 'No', you will be prompted for each library.`));
|
|
99
93
|
const answer = await inquirer.prompt([
|
|
100
94
|
{
|
|
101
|
-
type: '
|
|
102
|
-
name: '
|
|
103
|
-
message:
|
|
104
|
-
default:
|
|
95
|
+
type: 'confirm',
|
|
96
|
+
name: 'autoBump',
|
|
97
|
+
message: `Proceed with automatic update?`,
|
|
98
|
+
default: true
|
|
105
99
|
}
|
|
106
100
|
]);
|
|
107
|
-
|
|
101
|
+
autoBump = answer.autoBump;
|
|
108
102
|
}
|
|
109
|
-
|
|
110
|
-
deps[lib]
|
|
111
|
-
|
|
112
|
-
|
|
103
|
+
for (const lib of outdatedLibs) {
|
|
104
|
+
const current = deps[lib];
|
|
105
|
+
const latest = latestVersions[lib];
|
|
106
|
+
let newVersion = latest;
|
|
107
|
+
if (!autoBump) {
|
|
108
|
+
const answer = await inquirer.prompt([
|
|
109
|
+
{
|
|
110
|
+
type: 'input',
|
|
111
|
+
name: 'version',
|
|
112
|
+
message: `${lib}: current ${current}, latest ${latest} [${latest}]:`,
|
|
113
|
+
default: latest
|
|
114
|
+
}
|
|
115
|
+
]);
|
|
116
|
+
newVersion = answer.version || latest;
|
|
117
|
+
}
|
|
118
|
+
if (newVersion !== current) {
|
|
119
|
+
deps[lib] = newVersion;
|
|
120
|
+
updated = true;
|
|
121
|
+
this.log(chalk.yellow(`Updated ${lib} to ${newVersion}`));
|
|
122
|
+
}
|
|
113
123
|
}
|
|
114
124
|
}
|
|
125
|
+
// Always update dev host if needed
|
|
115
126
|
if (updated) {
|
|
116
127
|
pkg.dependencies = deps;
|
|
117
128
|
fs.writeJsonSync(devHostPkgPath, pkg, { spaces: 2 });
|
|
@@ -123,37 +134,38 @@ export default class UpdateEchoLibs extends Command {
|
|
|
123
134
|
tmpDevHostFolder: path.resolve(process.cwd(), ECHO_HOST_TEMP_BUILD_FOLDER),
|
|
124
135
|
finalOutputDir: finalOutput
|
|
125
136
|
});
|
|
126
|
-
// --- Update consumer app's package.json ---
|
|
127
|
-
const consumerPkgPath = findConsumerAppPackageJson(process.cwd());
|
|
128
|
-
if (!consumerPkgPath) {
|
|
129
|
-
console.error('Could not find a package.json either in the root folder, or subfolders with @equinor/echo-* dependencies.');
|
|
130
|
-
process.exit(1);
|
|
131
|
-
}
|
|
132
|
-
let consumerPkg;
|
|
133
|
-
try {
|
|
134
|
-
consumerPkg = fs.readJsonSync(consumerPkgPath);
|
|
135
|
-
this.log(chalk.cyan(`Updating echo libs in the consumer app, using following file: ${chalk.yellow(consumerPkgPath)}`));
|
|
136
|
-
}
|
|
137
|
-
catch (error) {
|
|
138
|
-
this.error(`Could not read consumer app package.json at ${chalk.yellow(consumerPkgPath)}.`);
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
const echoLibVersionChangesBySection = {};
|
|
142
|
-
const updatedDeps = updateEchoLibSection(consumerPkg, 'dependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
143
|
-
const updatedDevDeps = updateEchoLibSection(consumerPkg, 'devDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
144
|
-
const updatedPeerDeps = updateEchoLibSection(consumerPkg, 'peerDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
145
|
-
if (updatedDeps || updatedDevDeps || updatedPeerDeps) {
|
|
146
|
-
fs.writeJsonSync(consumerPkgPath, consumerPkg, { spaces: 2 });
|
|
147
|
-
logGroupedEchoLibUpdates(echoLibVersionChangesBySection, this.log);
|
|
148
|
-
}
|
|
149
|
-
else {
|
|
150
|
-
this.log(chalk.gray('\nNo echo library versions needed updating in consumer app package.json.\n'));
|
|
151
|
-
}
|
|
152
|
-
console.log(`\nDon't forget to run npm install in your consumer app!\n`);
|
|
153
137
|
}
|
|
154
138
|
else {
|
|
155
|
-
console.log(`\nNo changes made to dependencies.\n`);
|
|
139
|
+
console.log(`\nNo changes made to echo-dev-host dependencies.\n`);
|
|
140
|
+
}
|
|
141
|
+
// --- Always update consumer app's package.json ---
|
|
142
|
+
let consumerPkg;
|
|
143
|
+
try {
|
|
144
|
+
consumerPkg = fs.readJsonSync(consumerPkgPath);
|
|
145
|
+
this.log(chalk.cyan(`Updating echo libs in the consumer app, using following file: ${chalk.yellow(consumerPkgPath)}`));
|
|
156
146
|
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
this.error(`Could not read consumer app package.json at ${chalk.yellow(consumerPkgPath)}.`);
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
const echoLibVersionChangesBySection = {};
|
|
152
|
+
const updatedDeps = updateEchoLibSection(consumerPkg, 'dependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
153
|
+
const updatedDevDeps = updateEchoLibSection(consumerPkg, 'devDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
154
|
+
const updatedPeerDeps = updateEchoLibSection(consumerPkg, 'peerDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
155
|
+
if (updatedDeps || updatedDevDeps || updatedPeerDeps) {
|
|
156
|
+
fs.writeJsonSync(consumerPkgPath, consumerPkg, { spaces: 2 });
|
|
157
|
+
logGroupedEchoLibUpdates(echoLibVersionChangesBySection, this.log);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
this.log(chalk.gray('\nNo echo library versions needed updating in consumer app package.json.\n'));
|
|
161
|
+
}
|
|
162
|
+
console.log(`\nDon't forget to run npm install in your consumer app!\n`);
|
|
163
|
+
// --- Print echo lib versions after update ---
|
|
164
|
+
await printEchoLibsVersions({
|
|
165
|
+
devHostPkgPath,
|
|
166
|
+
appPkgPath: consumerPkgPath,
|
|
167
|
+
fetchLatest: true
|
|
168
|
+
});
|
|
157
169
|
}
|
|
158
170
|
}
|
|
159
171
|
UpdateEchoLibs.run();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-echo-libs.js","sourceRoot":"","sources":["../src/update-echo-libs.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-echo-libs.js","sourceRoot":"","sources":["../src/update-echo-libs.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,10 +108,13 @@ function padCell(str, len) {
|
|
|
108
108
|
return str + ' '.repeat(Math.max(0, len - realLen));
|
|
109
109
|
}
|
|
110
110
|
function printEchoLibsTable({ allLibs, versions, appName, fetchLatest }) {
|
|
111
|
+
// Add extra spaces between columns for better separation
|
|
111
112
|
const col1 = 'Echo Library';
|
|
112
113
|
const col2 = `${appName} Version`;
|
|
113
114
|
const col3 = 'Dev Host Version';
|
|
114
|
-
const
|
|
115
|
+
const gap = 4; // Number of spaces between columns
|
|
116
|
+
// Adjust column widths for more space and add gap
|
|
117
|
+
const col1w = 28 + gap, col2w = 28 + gap, col3w = 24;
|
|
115
118
|
console.log(chalk.bold(padCell(col1, col1w) + padCell(col2, col2w) + padCell(col3, col3w)));
|
|
116
119
|
console.log('-'.repeat(col1w + col2w + col3w));
|
|
117
120
|
for (const lib of Array.from(allLibs).sort()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printEchoLibsVersions.js","sourceRoot":"","sources":["../../src/utils/printEchoLibsVersions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"printEchoLibsVersions.js","sourceRoot":"","sources":["../../src/utils/printEchoLibsVersions.ts"],"names":[],"mappings":"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"}
|