@equinor/echo-cli 1.0.0-beta-11 → 1.0.0-beta-13
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/echo-build.js +0 -2
- package/lib/echo-build.js.map +1 -1
- package/lib/echo-update-dev-host-deps.d.ts +1 -1
- package/lib/echo-update-dev-host-deps.js +40 -11
- package/lib/echo-update-dev-host-deps.js.map +1 -1
- package/lib/tools/buildScripts/buildAndCopyDevHost.d.ts +11 -10
- package/lib/tools/buildScripts/buildAndCopyDevHost.js +36 -15
- package/lib/tools/buildScripts/buildAndCopyDevHost.js.map +1 -1
- package/package.json +2 -1
package/lib/echo-build.js
CHANGED
|
@@ -28,8 +28,6 @@ export default class CreateBundle extends Command {
|
|
|
28
28
|
const options = await this.parse(CreateBundle);
|
|
29
29
|
echoCliLogo();
|
|
30
30
|
console.log(chalk.cyan('echo-cli runs your echo application with echo-dev-host, which is using the following echo lib versions:'));
|
|
31
|
-
// TODO: actually this should get the version numbers from node_modules/@equinor/echo-cli/echo-dev-host/package.json
|
|
32
|
-
// probably this function needs to recieve a path to the package.json file
|
|
33
31
|
printDevHostVersions();
|
|
34
32
|
await echoWebpackBuild(options.flags, options.flags.isDevelopment);
|
|
35
33
|
}
|
package/lib/echo-build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo-build.js","sourceRoot":"","sources":["../src/echo-build.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IACtC,MAAM,CAAC,WAAW,GAAG,qBAAqB,CAAC;IAE3C,MAAM,CAAC,KAAK,GAAG;QAClB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oCAAoC;SACpD,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oDAAoD;SACpE,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAChB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0CAA0C;SAC1D,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uDAAuD;SACvE,CAAC;KACL,CAAC;IAEK,KAAK,CAAC,GAAG;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAE/C,WAAW,EAAE,CAAC;QAEd,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,IAAI,CACN,yGAAyG,CAC5G,CACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"echo-build.js","sourceRoot":"","sources":["../src/echo-build.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IACtC,MAAM,CAAC,WAAW,GAAG,qBAAqB,CAAC;IAE3C,MAAM,CAAC,KAAK,GAAG;QAClB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oCAAoC;SACpD,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,oDAAoD;SACpE,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAChB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,0CAA0C;SAC1D,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uDAAuD;SACvE,CAAC;KACL,CAAC;IAEK,KAAK,CAAC,GAAG;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAE/C,WAAW,EAAE,CAAC;QAEd,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,IAAI,CACN,yGAAyG,CAC5G,CACJ,CAAC;QAEF,oBAAoB,EAAE,CAAC;QAEvB,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -26,7 +26,7 @@ import { Command } from '@oclif/core';
|
|
|
26
26
|
export default class UpdateDevHostEchoLibVersions extends Command {
|
|
27
27
|
static description: string;
|
|
28
28
|
static flags: {
|
|
29
|
-
all: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
29
|
+
all: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
|
|
30
30
|
};
|
|
31
31
|
run(): Promise<void>;
|
|
32
32
|
}
|
|
@@ -6,6 +6,7 @@ import fs from 'fs-extra';
|
|
|
6
6
|
import inquirer from 'inquirer';
|
|
7
7
|
import ora from 'ora';
|
|
8
8
|
import path from 'path';
|
|
9
|
+
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
9
10
|
/**
|
|
10
11
|
* @class UpdateDevHostEchoLibVersions
|
|
11
12
|
* @extends Command
|
|
@@ -39,18 +40,17 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
39
40
|
};
|
|
40
41
|
async run() {
|
|
41
42
|
const { flags } = await this.parse(UpdateDevHostEchoLibVersions);
|
|
42
|
-
const
|
|
43
|
-
this.log(chalk.cyan(`Trying to load echo lib dependencies from: ${chalk.yellow(
|
|
43
|
+
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', 'echo-dev-host', 'package.json');
|
|
44
|
+
this.log(chalk.cyan(`Trying to load echo lib dependencies from: ${chalk.yellow(devHostPkgPath)}`));
|
|
44
45
|
let pkg;
|
|
45
46
|
try {
|
|
46
|
-
pkg = fs.readJsonSync(
|
|
47
|
+
pkg = fs.readJsonSync(devHostPkgPath);
|
|
47
48
|
}
|
|
48
49
|
catch (error) {
|
|
49
|
-
this.error(`Could not read package.json at ${chalk.yellow(
|
|
50
|
+
this.error(`Could not read package.json at ${chalk.yellow(devHostPkgPath)}. You need to run "npx echo-build-dev-host" first to create the echo-dev-host-tmp folder and its package.json file.`);
|
|
50
51
|
return;
|
|
51
52
|
}
|
|
52
53
|
const deps = pkg.dependencies || {};
|
|
53
|
-
// Find echo libraries
|
|
54
54
|
const echoLibs = Object.keys(deps).filter((name) => name.startsWith('@equinor/echo-'));
|
|
55
55
|
if (echoLibs.length === 0) {
|
|
56
56
|
this.log('No echo libraries found in dependencies.');
|
|
@@ -64,11 +64,34 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
64
64
|
latestVersions[lib] = await getLatestVersion(lib, spinner);
|
|
65
65
|
}
|
|
66
66
|
spinner.succeed('Fetched latest echo library versions.');
|
|
67
|
-
|
|
67
|
+
// Determine which libs are up to date and which are outdated
|
|
68
|
+
const upToDateLibs = echoLibs.filter((lib) => deps[lib] === latestVersions[lib]);
|
|
69
|
+
const outdatedLibs = echoLibs.filter((lib) => deps[lib] !== latestVersions[lib]);
|
|
70
|
+
// Log up-to-date libs
|
|
71
|
+
upToDateLibs.forEach((lib) => {
|
|
72
|
+
this.log(chalk.gray(`${lib} is already at latest version (${deps[lib]}), skipping.`));
|
|
73
|
+
});
|
|
74
|
+
if (outdatedLibs.length === 0) {
|
|
75
|
+
this.log(chalk.green('All echo libraries are already at their latest versions. No update needed.'));
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
let autoBump = flags.all;
|
|
79
|
+
if (!flags.all) {
|
|
80
|
+
const answer = await inquirer.prompt([
|
|
81
|
+
{
|
|
82
|
+
type: 'confirm',
|
|
83
|
+
name: 'autoBump',
|
|
84
|
+
message: `Do you want to automatically update all outdated echo libraries to their latest versions? If you choose 'No', you will be prompted for each library.`,
|
|
85
|
+
default: true
|
|
86
|
+
}
|
|
87
|
+
]);
|
|
88
|
+
autoBump = answer.autoBump;
|
|
89
|
+
}
|
|
90
|
+
for (const lib of outdatedLibs) {
|
|
68
91
|
const current = deps[lib];
|
|
69
92
|
const latest = latestVersions[lib];
|
|
70
93
|
let newVersion = latest;
|
|
71
|
-
if (!
|
|
94
|
+
if (!autoBump) {
|
|
72
95
|
const answer = await inquirer.prompt([
|
|
73
96
|
{
|
|
74
97
|
type: 'input',
|
|
@@ -82,14 +105,20 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
82
105
|
if (newVersion !== current) {
|
|
83
106
|
deps[lib] = newVersion;
|
|
84
107
|
updated = true;
|
|
85
|
-
this.log(`Updated ${lib} to ${newVersion}`);
|
|
108
|
+
this.log(chalk.yellow(`Updated ${lib} to ${newVersion}`));
|
|
86
109
|
}
|
|
87
110
|
}
|
|
88
111
|
if (updated) {
|
|
89
112
|
pkg.dependencies = deps;
|
|
90
|
-
fs.writeJsonSync(
|
|
91
|
-
this.log('Dependencies updated.
|
|
92
|
-
|
|
113
|
+
fs.writeJsonSync(devHostPkgPath, pkg, { spaces: 2 });
|
|
114
|
+
this.log('Dependencies updated. Rebuilding echo-dev-host...');
|
|
115
|
+
const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
|
|
116
|
+
const finalOutput = path.join(cliNodeModules, 'echo-dev-host');
|
|
117
|
+
await buildAndCopyDevHost({
|
|
118
|
+
consumerRoot: process.cwd(),
|
|
119
|
+
finalOutputDir: finalOutput,
|
|
120
|
+
reuseTmpFolder: false
|
|
121
|
+
});
|
|
93
122
|
}
|
|
94
123
|
else {
|
|
95
124
|
this.log('No changes made to dependencies.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo-update-dev-host-deps.js","sourceRoot":"","sources":["../src/echo-update-dev-host-deps.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,GAAY,MAAM,KAAK,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"echo-update-dev-host-deps.js","sourceRoot":"","sources":["../src/echo-update-dev-host-deps.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,GAAY,MAAM,KAAK,CAAC;AAC/B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,OAAO;IAC7D,MAAM,CAAC,WAAW,GAAG,iEAAiE,CAAC;IAEvF,MAAM,CAAC,KAAK,GAAG;QACX,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC;YACf,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,uDAAuD;SACvE,CAAC;KACL,CAAC;IAEF,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAC/B,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,CACjB,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,8CAA8C,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;QACnG,IAAI,GAAG,CAAC;QACR,IAAI,CAAC;YACD,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CACN,kCAAkC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,qHAAqH,CACtL,CAAC;YACF,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEvF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACrD,OAAO;QACX,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,OAAO,GAAG,GAAG,CAAC,0CAA0C,CAAC,CAAC,KAAK,EAAE,CAAC;QACxE,MAAM,cAAc,GAA2B,EAAE,CAAC;QAElD,yCAAyC;QACzC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YACzB,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;QAEzD,6DAA6D;QAC7D,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QACjF,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjF,sBAAsB;QACtB,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,kCAAkC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC,CAAC;YACpG,OAAO;QACX,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACjC;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,sJAAsJ;oBAC/J,OAAO,EAAE,IAAI;iBAChB;aACJ,CAAC,CAAC;YACH,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAC/B,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YAEnC,IAAI,UAAU,GAAG,MAAM,CAAC;YACxB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBACjC;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,GAAG,GAAG,aAAa,OAAO,YAAY,MAAM,KAAK,MAAM,IAAI;wBACpE,OAAO,EAAE,MAAM;qBAClB;iBACJ,CAAC,CAAC;gBACH,UAAU,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;YAC1C,CAAC;YACD,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC;gBACvB,OAAO,GAAG,IAAI,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,GAAG,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACV,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;YACxB,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;YAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAC/D,MAAM,mBAAmB,CAAC;gBACtB,YAAY,EAAE,OAAO,CAAC,GAAG,EAAE;gBAC3B,cAAc,EAAE,WAAW;gBAC3B,cAAc,EAAE,KAAK;aACxB,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;;AAGL,KAAK,UAAU,gBAAgB,CAAC,GAAW,EAAE,OAAY;IACrD,IAAI,CAAC;QACD,OAAO,CAAC,IAAI,GAAG,+BAA+B,GAAG,KAAK,CAAC;QACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,GAAG,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;aACpF,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,wBAAwB,GAAG,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,sCAAsC,GAAG,GAAG,CAAC,CAAC;QAC3D,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED,4BAA4B,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Builds and copies the
|
|
2
|
+
* Builds and copies the Echo Dev Host application for local development.
|
|
3
3
|
*
|
|
4
|
-
* This function
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* 3. Copies the build output to the specified final output directory, replacing any existing content.
|
|
4
|
+
* This function prepares a temporary folder for the dev host, optionally installs dependencies and builds the project,
|
|
5
|
+
* and then copies the build output to the specified final output directory. It can reuse an existing temporary folder
|
|
6
|
+
* or prompt the user for confirmation if not specified.
|
|
8
7
|
*
|
|
9
|
-
* @param params - The parameters for
|
|
10
|
-
* @param params.consumerRoot - The root directory of the consumer project
|
|
11
|
-
* @param params.finalOutputDir - The directory where the
|
|
12
|
-
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder
|
|
8
|
+
* @param params - The parameters for building and copying the dev host.
|
|
9
|
+
* @param params.consumerRoot - The root directory of the consumer project.
|
|
10
|
+
* @param params.finalOutputDir - The directory where the build output should be copied.
|
|
11
|
+
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder. Defaults to `true`.
|
|
12
|
+
* @param params.reuseTmpFolder - Whether to reuse the existing temporary folder. If undefined and the folder exists, prompts the user.
|
|
13
13
|
*
|
|
14
14
|
* @returns A promise that resolves when the build and copy process is complete.
|
|
15
15
|
*/
|
|
16
|
-
export declare function buildAndCopyDevHost({ consumerRoot, finalOutputDir, installAndBuild }: {
|
|
16
|
+
export declare function buildAndCopyDevHost({ consumerRoot, finalOutputDir, installAndBuild, reuseTmpFolder }: {
|
|
17
17
|
consumerRoot: string;
|
|
18
18
|
finalOutputDir: string;
|
|
19
19
|
installAndBuild?: boolean;
|
|
20
|
+
reuseTmpFolder?: boolean;
|
|
20
21
|
}): Promise<void>;
|
|
@@ -2,24 +2,25 @@ import chalk from 'chalk';
|
|
|
2
2
|
import { execSync } from 'child_process';
|
|
3
3
|
import figlet from 'figlet';
|
|
4
4
|
import fs from 'fs-extra';
|
|
5
|
+
import inquirer from 'inquirer';
|
|
5
6
|
import path from 'path';
|
|
6
7
|
import { printDevHostVersions } from '../../utils/printDevHostVersions.js';
|
|
7
8
|
/**
|
|
8
|
-
* Builds and copies the
|
|
9
|
+
* Builds and copies the Echo Dev Host application for local development.
|
|
9
10
|
*
|
|
10
|
-
* This function
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* 3. Copies the build output to the specified final output directory, replacing any existing content.
|
|
11
|
+
* This function prepares a temporary folder for the dev host, optionally installs dependencies and builds the project,
|
|
12
|
+
* and then copies the build output to the specified final output directory. It can reuse an existing temporary folder
|
|
13
|
+
* or prompt the user for confirmation if not specified.
|
|
14
14
|
*
|
|
15
|
-
* @param params - The parameters for
|
|
16
|
-
* @param params.consumerRoot - The root directory of the consumer project
|
|
17
|
-
* @param params.finalOutputDir - The directory where the
|
|
18
|
-
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder
|
|
15
|
+
* @param params - The parameters for building and copying the dev host.
|
|
16
|
+
* @param params.consumerRoot - The root directory of the consumer project.
|
|
17
|
+
* @param params.finalOutputDir - The directory where the build output should be copied.
|
|
18
|
+
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder. Defaults to `true`.
|
|
19
|
+
* @param params.reuseTmpFolder - Whether to reuse the existing temporary folder. If undefined and the folder exists, prompts the user.
|
|
19
20
|
*
|
|
20
21
|
* @returns A promise that resolves when the build and copy process is complete.
|
|
21
22
|
*/
|
|
22
|
-
export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, installAndBuild = true }) {
|
|
23
|
+
export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, installAndBuild = true, reuseTmpFolder }) {
|
|
23
24
|
console.log(`${chalk.cyan.bold('echo-dev-host')} - by Echo Core Team`);
|
|
24
25
|
console.log('Minimalistic host application for local development of Echo applications.\n');
|
|
25
26
|
console.log(figlet.textSync('Echo Dev Host', {
|
|
@@ -31,24 +32,44 @@ export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, instal
|
|
|
31
32
|
const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
|
|
32
33
|
const tmpDevHostFolder = path.resolve(consumerRoot, 'echo-dev-host-tmp');
|
|
33
34
|
const buildOutput = path.join(tmpDevHostFolder, 'echo-dev-host');
|
|
35
|
+
let shouldReuse = reuseTmpFolder;
|
|
36
|
+
if (fs.existsSync(tmpDevHostFolder) && typeof shouldReuse === 'undefined') {
|
|
37
|
+
const answer = await inquirer.prompt([
|
|
38
|
+
{
|
|
39
|
+
type: 'confirm',
|
|
40
|
+
name: 'reuse',
|
|
41
|
+
message: `Temporary folder "${tmpDevHostFolder}" exists. Do you want to reuse it to build echo-dev-host? If you chose 'No', it will be removed and a new one will be created.`,
|
|
42
|
+
default: true
|
|
43
|
+
}
|
|
44
|
+
]);
|
|
45
|
+
shouldReuse = answer.reuse;
|
|
46
|
+
}
|
|
34
47
|
// 1. Prepare echo-dev-host-tmp
|
|
35
|
-
if (!fs.existsSync(tmpDevHostFolder)) {
|
|
36
|
-
|
|
48
|
+
if (!fs.existsSync(tmpDevHostFolder) || shouldReuse === false) {
|
|
49
|
+
if (fs.existsSync(tmpDevHostFolder) && shouldReuse === false) {
|
|
50
|
+
console.log(chalk.yellowBright.bold(`\n[echo-dev-host] Removing existing temporary folder "${tmpDevHostFolder}"...\n`));
|
|
51
|
+
fs.removeSync(tmpDevHostFolder);
|
|
52
|
+
}
|
|
53
|
+
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Copying echo-dev-host source to ${chalk.yellow(tmpDevHostFolder)}...\n`));
|
|
37
54
|
fs.copySync(devHostSrc, tmpDevHostFolder);
|
|
38
55
|
}
|
|
39
56
|
else {
|
|
40
|
-
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Temporary folder exists. Reusing
|
|
57
|
+
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Temporary folder "${tmpDevHostFolder}" exists. Reusing it.\n`));
|
|
58
|
+
// Always copy (overwrite) package.json from source to tmpDevHostFolder
|
|
59
|
+
const srcPkgJson = path.join(devHostSrc, 'package.json');
|
|
60
|
+
const destPkgJson = path.join(tmpDevHostFolder, 'package.json');
|
|
61
|
+
fs.copySync(srcPkgJson, destPkgJson, { overwrite: true });
|
|
41
62
|
}
|
|
42
63
|
// 2. npm install & build
|
|
43
64
|
if (installAndBuild) {
|
|
44
65
|
console.log(chalk.greenBright.bold('[echo-dev-host] Installing dependencies and building echo-dev-host...\n'));
|
|
45
|
-
console.log(chalk.greenBright.bold('[echo-dev-host] Using the following versions of echo libraries - run `npx echo-
|
|
66
|
+
console.log(chalk.greenBright.bold('[echo-dev-host] Using the following versions of echo libraries - run `npx update-echo-dev-host-deps` to update them:'));
|
|
46
67
|
printDevHostVersions();
|
|
47
68
|
execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
48
69
|
execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
49
70
|
}
|
|
50
71
|
// 3. Copy build output to final output directory
|
|
51
|
-
console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Copying build output to ${chalk.yellow(finalOutputDir)}...\n`));
|
|
72
|
+
console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Copying build output back to ${chalk.yellow(finalOutputDir)}...\n`));
|
|
52
73
|
fs.copySync(buildOutput, finalOutputDir);
|
|
53
74
|
console.log(chalk.green.bold('[echo-dev-host] Build and copy complete!\n'));
|
|
54
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACtC,YAAY,EACZ,cAAc,EACd,eAAe,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/echo-cli",
|
|
3
|
-
"version": "1.0.0-beta-
|
|
3
|
+
"version": "1.0.0-beta-13",
|
|
4
4
|
"description": "Command line interface for Echo Apps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"source": "src/test.js",
|
|
@@ -60,6 +60,7 @@
|
|
|
60
60
|
"express": "5.1.0",
|
|
61
61
|
"figlet": "1.8.1",
|
|
62
62
|
"file-loader": "6.2.0",
|
|
63
|
+
"fs-extra": "11.3.1",
|
|
63
64
|
"html-webpack-plugin": "5.6.3",
|
|
64
65
|
"inquirer": "12.6.1",
|
|
65
66
|
"listr2": "8.3.3",
|