@equinor/echo-cli 1.0.0-beta-13 → 1.0.0-beta-15
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/echo-dev-host/webpack.config.js +6 -3
- package/lib/const/common.d.ts +1 -0
- package/lib/const/common.js +1 -0
- package/lib/const/common.js.map +1 -1
- package/lib/echo-build.d.ts +22 -0
- package/lib/echo-build.js +33 -1
- package/lib/echo-build.js.map +1 -1
- package/lib/echo-dev-host/webpack.config.js +6 -3
- package/lib/echo-update-dev-host-deps.js +4 -3
- package/lib/echo-update-dev-host-deps.js.map +1 -1
- package/lib/tools/buildScripts/buildAndCopyDevHost.js +3 -2
- package/lib/tools/buildScripts/buildAndCopyDevHost.js.map +1 -1
- package/lib/utils/printDevHostVersions.d.ts +1 -1
- package/lib/utils/printDevHostVersions.js +4 -7
- package/lib/utils/printDevHostVersions.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,13 +6,16 @@ import WebpackBar from 'webpackbar';
|
|
|
6
6
|
|
|
7
7
|
const webpackConfig = (env) => {
|
|
8
8
|
console.log('Building the dev host application for EchoCli.');
|
|
9
|
+
|
|
10
|
+
const buildOutputFolder = 'echo-dev-host-build';
|
|
11
|
+
|
|
9
12
|
return {
|
|
10
13
|
entry: ['@babel/polyfill', './src/index.tsx'],
|
|
11
14
|
mode: 'production',
|
|
12
15
|
devtool: 'source-map',
|
|
13
16
|
output: {
|
|
14
17
|
clean: true,
|
|
15
|
-
path: path.resolve(process.cwd(),
|
|
18
|
+
path: path.resolve(process.cwd(), buildOutputFolder),
|
|
16
19
|
filename: '[name].echo.bundle.js',
|
|
17
20
|
chunkFilename: 'assets/[name].[contenthash].chunk.js',
|
|
18
21
|
publicPath: '/'
|
|
@@ -117,11 +120,11 @@ const webpackConfig = (env) => {
|
|
|
117
120
|
patterns: [
|
|
118
121
|
{
|
|
119
122
|
from: path.resolve(import.meta.dirname, './public/index.css'),
|
|
120
|
-
to: path.resolve(process.cwd(),
|
|
123
|
+
to: path.resolve(process.cwd(), buildOutputFolder, 'index.css')
|
|
121
124
|
},
|
|
122
125
|
{
|
|
123
126
|
from: path.resolve(import.meta.dirname, './public/env-config.js'),
|
|
124
|
-
to: path.resolve(process.cwd(),
|
|
127
|
+
to: path.resolve(process.cwd(), buildOutputFolder, 'env-config.js')
|
|
125
128
|
}
|
|
126
129
|
]
|
|
127
130
|
})
|
package/lib/const/common.d.ts
CHANGED
package/lib/const/common.js
CHANGED
package/lib/const/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/const/common.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/const/common.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AACjE,MAAM,CAAC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC"}
|
package/lib/echo-build.d.ts
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from '@oclif/core';
|
|
3
|
+
/**
|
|
4
|
+
* @class CreateBundle
|
|
5
|
+
* @extends Command
|
|
6
|
+
* @description
|
|
7
|
+
* Command-line utility for creating an Echo Bundle. This command provides options to serve the Echo Client,
|
|
8
|
+
* build in development mode, copy the client to the build folder, and analyze the bundle with an interactive treemap.
|
|
9
|
+
*
|
|
10
|
+
* @flags
|
|
11
|
+
* - `--serve, -s`: Add the serve Echo Client with the app.
|
|
12
|
+
* - `--isDevelopment, -d`: Build in development mode (production is default).
|
|
13
|
+
* - `--copy, -c`: Copy the client to the build folder.
|
|
14
|
+
* - `--analyze, -b`: Analyze the bundle with an interactive treemap.
|
|
15
|
+
*
|
|
16
|
+
* @remarks
|
|
17
|
+
* The command checks for the presence of the `echo-dev-host` folder before proceeding.
|
|
18
|
+
* If not found, it prompts the user to build it. It also prints the versions of echo libraries used by the dev host.
|
|
19
|
+
*
|
|
20
|
+
* @example
|
|
21
|
+
* ```sh
|
|
22
|
+
* npx echo-build --serve --isDevelopment
|
|
23
|
+
* ```
|
|
24
|
+
*/
|
|
3
25
|
export default class CreateBundle extends Command {
|
|
4
26
|
static description: string;
|
|
5
27
|
static flags: {
|
package/lib/echo-build.js
CHANGED
|
@@ -1,9 +1,33 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command, Flags } from '@oclif/core';
|
|
3
3
|
import chalk from 'chalk';
|
|
4
|
+
import fs from 'fs-extra';
|
|
5
|
+
import path from 'path';
|
|
4
6
|
import { echoWebpackBuild } from './tools/buildScripts/webpackBuilds.js';
|
|
5
7
|
import { echoCliLogo } from './utils/logo.js';
|
|
6
8
|
import { printDevHostVersions } from './utils/printDevHostVersions.js';
|
|
9
|
+
/**
|
|
10
|
+
* @class CreateBundle
|
|
11
|
+
* @extends Command
|
|
12
|
+
* @description
|
|
13
|
+
* Command-line utility for creating an Echo Bundle. This command provides options to serve the Echo Client,
|
|
14
|
+
* build in development mode, copy the client to the build folder, and analyze the bundle with an interactive treemap.
|
|
15
|
+
*
|
|
16
|
+
* @flags
|
|
17
|
+
* - `--serve, -s`: Add the serve Echo Client with the app.
|
|
18
|
+
* - `--isDevelopment, -d`: Build in development mode (production is default).
|
|
19
|
+
* - `--copy, -c`: Copy the client to the build folder.
|
|
20
|
+
* - `--analyze, -b`: Analyze the bundle with an interactive treemap.
|
|
21
|
+
*
|
|
22
|
+
* @remarks
|
|
23
|
+
* The command checks for the presence of the `echo-dev-host` folder before proceeding.
|
|
24
|
+
* If not found, it prompts the user to build it. It also prints the versions of echo libraries used by the dev host.
|
|
25
|
+
*
|
|
26
|
+
* @example
|
|
27
|
+
* ```sh
|
|
28
|
+
* npx echo-build --serve --isDevelopment
|
|
29
|
+
* ```
|
|
30
|
+
*/
|
|
7
31
|
export default class CreateBundle extends Command {
|
|
8
32
|
static description = 'Creates Echo Bundle';
|
|
9
33
|
static flags = {
|
|
@@ -26,9 +50,17 @@ export default class CreateBundle extends Command {
|
|
|
26
50
|
};
|
|
27
51
|
async run() {
|
|
28
52
|
const options = await this.parse(CreateBundle);
|
|
53
|
+
const echoDevHostPath = path.resolve(__dirname, './echo-dev-host');
|
|
54
|
+
if (!fs.existsSync(echoDevHostPath)) {
|
|
55
|
+
this.log(chalk.red(`\n[echo-cli] The echo-dev-host folder was not found at ${echoDevHostPath}.\n` +
|
|
56
|
+
'Please ensure echo-dev-host is built and present in node_modules/@equinor/echo-cli before running this command.\n' +
|
|
57
|
+
'You can do this by running: npx echo-build-dev-host\n'));
|
|
58
|
+
process.exit(1);
|
|
59
|
+
}
|
|
29
60
|
echoCliLogo();
|
|
30
61
|
console.log(chalk.cyan('echo-cli runs your echo application with echo-dev-host, which is using the following echo lib versions:'));
|
|
31
|
-
|
|
62
|
+
// path determined from the script perspective
|
|
63
|
+
printDevHostVersions(path.resolve(echoDevHostPath, 'package.json'));
|
|
32
64
|
await echoWebpackBuild(options.flags, options.flags.isDevelopment);
|
|
33
65
|
}
|
|
34
66
|
}
|
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;QAEF,oBAAoB,EAAE,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,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,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,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACnE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,GAAG,CACJ,KAAK,CAAC,GAAG,CACL,0DAA0D,eAAe,KAAK;gBAC1E,mHAAmH;gBACnH,uDAAuD,CAC9D,CACJ,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAED,WAAW,EAAE,CAAC;QAEd,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,IAAI,CACN,yGAAyG,CAC5G,CACJ,CAAC;QAEF,8CAA8C;QAC9C,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;QAEpE,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -6,13 +6,16 @@ import WebpackBar from 'webpackbar';
|
|
|
6
6
|
|
|
7
7
|
const webpackConfig = (env) => {
|
|
8
8
|
console.log('Building the dev host application for EchoCli.');
|
|
9
|
+
|
|
10
|
+
const buildOutputFolder = 'echo-dev-host-build';
|
|
11
|
+
|
|
9
12
|
return {
|
|
10
13
|
entry: ['@babel/polyfill', './src/index.tsx'],
|
|
11
14
|
mode: 'production',
|
|
12
15
|
devtool: 'source-map',
|
|
13
16
|
output: {
|
|
14
17
|
clean: true,
|
|
15
|
-
path: path.resolve(process.cwd(),
|
|
18
|
+
path: path.resolve(process.cwd(), buildOutputFolder),
|
|
16
19
|
filename: '[name].echo.bundle.js',
|
|
17
20
|
chunkFilename: 'assets/[name].[contenthash].chunk.js',
|
|
18
21
|
publicPath: '/'
|
|
@@ -117,11 +120,11 @@ const webpackConfig = (env) => {
|
|
|
117
120
|
patterns: [
|
|
118
121
|
{
|
|
119
122
|
from: path.resolve(import.meta.dirname, './public/index.css'),
|
|
120
|
-
to: path.resolve(process.cwd(),
|
|
123
|
+
to: path.resolve(process.cwd(), buildOutputFolder, 'index.css')
|
|
121
124
|
},
|
|
122
125
|
{
|
|
123
126
|
from: path.resolve(import.meta.dirname, './public/env-config.js'),
|
|
124
|
-
to: path.resolve(process.cwd(),
|
|
127
|
+
to: path.resolve(process.cwd(), buildOutputFolder, 'env-config.js')
|
|
125
128
|
}
|
|
126
129
|
]
|
|
127
130
|
})
|
|
@@ -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 { BUILD_OUTPUT_FOLDER } from './const/common.js';
|
|
9
10
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
10
11
|
/**
|
|
11
12
|
* @class UpdateDevHostEchoLibVersions
|
|
@@ -40,7 +41,7 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
40
41
|
};
|
|
41
42
|
async run() {
|
|
42
43
|
const { flags } = await this.parse(UpdateDevHostEchoLibVersions);
|
|
43
|
-
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli',
|
|
44
|
+
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', BUILD_OUTPUT_FOLDER, 'package.json');
|
|
44
45
|
this.log(chalk.cyan(`Trying to load echo lib dependencies from: ${chalk.yellow(devHostPkgPath)}`));
|
|
45
46
|
let pkg;
|
|
46
47
|
try {
|
|
@@ -81,7 +82,7 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
81
82
|
{
|
|
82
83
|
type: 'confirm',
|
|
83
84
|
name: 'autoBump',
|
|
84
|
-
message: `Do you want to automatically update all outdated echo libraries to their latest versions
|
|
85
|
+
message: `Do you want to automatically update all outdated echo libraries to their latest versions?\nIf you choose 'No', you will be prompted for each library.`,
|
|
85
86
|
default: true
|
|
86
87
|
}
|
|
87
88
|
]);
|
|
@@ -113,7 +114,7 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
113
114
|
fs.writeJsonSync(devHostPkgPath, pkg, { spaces: 2 });
|
|
114
115
|
this.log('Dependencies updated. Rebuilding echo-dev-host...');
|
|
115
116
|
const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
|
|
116
|
-
const finalOutput = path.join(cliNodeModules,
|
|
117
|
+
const finalOutput = path.join(cliNodeModules, BUILD_OUTPUT_FOLDER);
|
|
117
118
|
await buildAndCopyDevHost({
|
|
118
119
|
consumerRoot: process.cwd(),
|
|
119
120
|
finalOutputDir: finalOutput,
|
|
@@ -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;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,
|
|
1
|
+
{"version":3,"file":"echo-update-dev-host-deps.js","sourceRoot":"","sources":["../src/echo-update-dev-host-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import figlet from 'figlet';
|
|
|
4
4
|
import fs from 'fs-extra';
|
|
5
5
|
import inquirer from 'inquirer';
|
|
6
6
|
import path from 'path';
|
|
7
|
+
import { BUILD_OUTPUT_FOLDER } from '../../const/common.js';
|
|
7
8
|
import { printDevHostVersions } from '../../utils/printDevHostVersions.js';
|
|
8
9
|
/**
|
|
9
10
|
* Builds and copies the Echo Dev Host application for local development.
|
|
@@ -31,7 +32,7 @@ export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, instal
|
|
|
31
32
|
const cliNodeModules = path.resolve(consumerRoot, 'node_modules', '@equinor', 'echo-cli');
|
|
32
33
|
const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
|
|
33
34
|
const tmpDevHostFolder = path.resolve(consumerRoot, 'echo-dev-host-tmp');
|
|
34
|
-
const buildOutput = path.join(tmpDevHostFolder,
|
|
35
|
+
const buildOutput = path.join(tmpDevHostFolder, BUILD_OUTPUT_FOLDER);
|
|
35
36
|
let shouldReuse = reuseTmpFolder;
|
|
36
37
|
if (fs.existsSync(tmpDevHostFolder) && typeof shouldReuse === 'undefined') {
|
|
37
38
|
const answer = await inquirer.prompt([
|
|
@@ -64,7 +65,7 @@ export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, instal
|
|
|
64
65
|
if (installAndBuild) {
|
|
65
66
|
console.log(chalk.greenBright.bold('[echo-dev-host] Installing dependencies and building echo-dev-host...\n'));
|
|
66
67
|
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:'));
|
|
67
|
-
printDevHostVersions();
|
|
68
|
+
printDevHostVersions(devHostSrc);
|
|
68
69
|
execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
69
70
|
execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
70
71
|
}
|
|
@@ -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,QAAQ,MAAM,UAAU,CAAC;AAChC,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,EACtB,cAAc,EAMjB;IACG,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;IAC3F,OAAO,CAAC,GAAG,CACP,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE;QAC7B,IAAI,EAAE,UAAU;QAChB,gBAAgB,EAAE,SAAS;QAC3B,cAAc,EAAE,SAAS;KAC5B,CAAC,CACL,CAAC;IAEF,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function printDevHostVersions(): void;
|
|
1
|
+
export declare function printDevHostVersions(devHostPkgPath: string): void;
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import fs from 'fs-extra';
|
|
3
|
-
|
|
4
|
-
export function printDevHostVersions() {
|
|
5
|
-
// Check for node_modules/@equinor/echo-cli/echo-dev-host/package.json
|
|
6
|
-
const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', 'echo-dev-host', 'package.json');
|
|
3
|
+
export function printDevHostVersions(devHostPkgPath) {
|
|
7
4
|
if (fs.existsSync(devHostPkgPath)) {
|
|
8
5
|
try {
|
|
9
6
|
const pkg = fs.readJsonSync(devHostPkgPath);
|
|
@@ -14,15 +11,15 @@ export function printDevHostVersions() {
|
|
|
14
11
|
});
|
|
15
12
|
}
|
|
16
13
|
else {
|
|
17
|
-
console.log(chalk.gray(
|
|
14
|
+
console.log(chalk.gray(`No @equinor/echo- libraries found in ${devHostPkgPath}.`));
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
17
|
catch (err) {
|
|
21
|
-
console.log(chalk.red(
|
|
18
|
+
console.log(chalk.red(`Could not read ${devHostPkgPath}. Is it valid JSON?`));
|
|
22
19
|
}
|
|
23
20
|
}
|
|
24
21
|
else {
|
|
25
|
-
console.log(chalk.red(
|
|
22
|
+
console.log(chalk.red(`Could not read echo lib version numbers: ${devHostPkgPath} not found.`));
|
|
26
23
|
}
|
|
27
24
|
}
|
|
28
25
|
//# sourceMappingURL=printDevHostVersions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printDevHostVersions.js","sourceRoot":"","sources":["../../src/utils/printDevHostVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"printDevHostVersions.js","sourceRoot":"","sources":["../../src/utils/printDevHostVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,UAAU,oBAAoB,CAAC,cAAsB;IACvD,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CACtE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CACpC,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;oBACjC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,wCAAwC,cAAc,GAAG,CAAC,CAAC,CAAC;YACvF,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,cAAc,qBAAqB,CAAC,CAAC,CAAC;QAClF,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4CAA4C,cAAc,aAAa,CAAC,CAAC,CAAC;IACpG,CAAC;AACL,CAAC"}
|