@equinor/echo-cli 1.0.0-beta-4 → 1.0.0-beta-5
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/config/common/copyFile.d.ts +1 -1
- package/lib/config/common/copyFile.js +17 -7
- package/lib/config/common/copyFile.js.map +1 -1
- package/lib/config/common/echoManifest.d.ts +1 -1
- package/lib/config/common/echoManifest.js +1 -17
- package/lib/config/common/echoManifest.js.map +1 -1
- package/lib/config/common/initOptions.d.ts +0 -2
- package/lib/config/common/initOptions.js +0 -1
- package/lib/config/common/initOptions.js.map +1 -1
- package/lib/echo-build-dev-host.js +12 -21
- package/lib/echo-build-dev-host.js.map +1 -1
- package/lib/echo-build.d.ts +0 -1
- package/lib/echo-build.js +0 -11
- package/lib/echo-build.js.map +1 -1
- package/lib/tools/buildScripts/buildAndCopyDevHost.d.ts +5 -0
- package/lib/tools/buildScripts/buildAndCopyDevHost.js +31 -0
- package/lib/tools/buildScripts/buildAndCopyDevHost.js.map +1 -0
- package/lib/tools/buildScripts/webpackBuilds.js +3 -3
- package/lib/tools/buildScripts/webpackBuilds.js.map +1 -1
- package/lib/utils/logo.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { EchoWebpackOptions } from './initOptions.js';
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function buildAndCopyEchoHostForProd(options: EchoWebpackOptions): Promise<void>;
|
|
@@ -1,10 +1,20 @@
|
|
|
1
|
-
import ncp from 'ncp';
|
|
2
|
-
import { promisify } from 'util';
|
|
3
|
-
const copy = promisify(ncp);
|
|
4
|
-
export async function copyClientFiles(options) {
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
// import ncp from 'ncp';
|
|
2
|
+
// import { promisify } from 'util';
|
|
3
|
+
// const copy = promisify(ncp);
|
|
4
|
+
// export async function copyClientFiles(options: EchoWebpackOptions): Promise<boolean> {
|
|
5
|
+
// const success = await copy(options.wwwRoot, options.currentDir + options.echoModuleConfig.server.contentBase, {
|
|
6
|
+
// clobber: false
|
|
7
|
+
// });
|
|
8
|
+
// return success;
|
|
9
|
+
// }
|
|
10
|
+
import path from 'path';
|
|
11
|
+
import { buildAndCopyDevHost } from '../../tools/buildScripts/buildAndCopyDevHost.js';
|
|
12
|
+
// New re-usable function for echo-dev-host
|
|
13
|
+
export async function buildAndCopyEchoHostForProd(options) {
|
|
14
|
+
await buildAndCopyDevHost({
|
|
15
|
+
consumerRoot: options.currentDir,
|
|
16
|
+
finalOutputDir: path.resolve(options.currentDir, options.echoModuleConfig.server.contentBase),
|
|
17
|
+
installAndBuild: true
|
|
7
18
|
});
|
|
8
|
-
return success;
|
|
9
19
|
}
|
|
10
20
|
//# sourceMappingURL=copyFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copyFile.js","sourceRoot":"","sources":["../../../src/config/common/copyFile.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"copyFile.js","sourceRoot":"","sources":["../../../src/config/common/copyFile.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,oCAAoC;AAEpC,+BAA+B;AAE/B,yFAAyF;AACzF,sHAAsH;AACtH,yBAAyB;AACzB,UAAU;AACV,sBAAsB;AACtB,IAAI;AAEJ,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAGtF,2CAA2C;AAC3C,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAA2B;IACzE,MAAM,mBAAmB,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC,UAAU;QAChC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC;QAC7F,eAAe,EAAE,IAAI;KACxB,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { EchoModuleConfig } from './echoModuleConfig.js';
|
|
2
|
-
export declare function createEchoModuleManifest(echoModuleConfig: EchoModuleConfig, currentPath?: string, requireRef?: string
|
|
2
|
+
export declare function createEchoModuleManifest(echoModuleConfig: EchoModuleConfig, currentPath?: string, requireRef?: string): Promise<void>;
|
|
3
3
|
export declare function getFileUriPath(filePath: string): string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import * as fs from 'fs';
|
|
3
3
|
import getPackageJson from './getPackageJson.js';
|
|
4
|
-
export async function createEchoModuleManifest(echoModuleConfig, currentPath, requireRef
|
|
4
|
+
export async function createEchoModuleManifest(echoModuleConfig, currentPath, requireRef) {
|
|
5
5
|
if (!currentPath) {
|
|
6
6
|
console.error('%s The current path is undefined ', chalk.red.bold('ERROR'));
|
|
7
7
|
return;
|
|
@@ -31,22 +31,6 @@ export async function createEchoModuleManifest(echoModuleConfig, currentPath, re
|
|
|
31
31
|
requireRef
|
|
32
32
|
}
|
|
33
33
|
];
|
|
34
|
-
if (adminModule === true && adminModulePath) {
|
|
35
|
-
newEchoModuleManifest.push({
|
|
36
|
-
name: 'Echo Administration',
|
|
37
|
-
key: 'EchoAdmin',
|
|
38
|
-
shortName: 'EchoAdmin',
|
|
39
|
-
fileUri: adminModulePath,
|
|
40
|
-
devFileUri: echoModuleConfig.manifest.devFileUri,
|
|
41
|
-
qaFileUri: echoModuleConfig.manifest.qaFileUri,
|
|
42
|
-
testFileUri: echoModuleConfig.manifest.testFileUri,
|
|
43
|
-
test2FileUri: echoModuleConfig.manifest.test2FileUri,
|
|
44
|
-
path: '/admin',
|
|
45
|
-
version: '1.0.0',
|
|
46
|
-
private: false,
|
|
47
|
-
requireRef
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
34
|
fs.writeFileSync(filePath, JSON.stringify(newEchoModuleManifest, null, 4));
|
|
51
35
|
}
|
|
52
36
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echoManifest.js","sourceRoot":"","sources":["../../../src/config/common/echoManifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC1C,gBAAkC,EAClC,WAAoB,EACpB,UAAmB
|
|
1
|
+
{"version":3,"file":"echoManifest.js","sourceRoot":"","sources":["../../../src/config/common/echoManifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC1C,gBAAkC,EAClC,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5E,OAAO;IACX,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,GAAG,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IACzE,MAAM,QAAQ,GAAG,GAAG,SAAS,0BAA0B,CAAC;IAExD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE;YACpB,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC;QACD,MAAM,qBAAqB,GAAG;YAC1B;gBACI,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,IAAI;gBACpC,GAAG,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG;gBAClC,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,SAAS;gBAC9C,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,OAAO;gBAC1C,UAAU,EAAE,gBAAgB,CAAC,QAAQ,CAAC,UAAU;gBAChD,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,SAAS;gBAC9C,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,WAAW;gBAClD,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC,YAAY;gBACpD,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,IAAI;gBACpC,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,OAAO;gBAC1C,UAAU;aACb;SACJ,CAAC;QACF,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,OAAO,IAAI,QAAQ,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -19,7 +19,6 @@ export async function defineInitOptions(echoBundleOptions, isDevelopment) {
|
|
|
19
19
|
dependencies: pkj.dependencies,
|
|
20
20
|
devDependencies: pkj.devDependencies,
|
|
21
21
|
wwwRoot: path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', 'echo-dev-host'),
|
|
22
|
-
adminModulePath: path.resolve(__dirname, '../../../', 'admin'),
|
|
23
22
|
requireRef: REQUIRED_REF,
|
|
24
23
|
envPath: await getFilePath(currentDir, '/.env'),
|
|
25
24
|
echoModuleConfig
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initOptions.js","sourceRoot":"","sources":["../../../src/config/common/initOptions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,WAAW,EAAE,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAGjD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"initOptions.js","sourceRoot":"","sources":["../../../src/config/common/initOptions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,WAAW,EAAE,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAGjD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAyB3C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACnC,iBAA6C,EAC7C,aAAuB;IAEvB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAqB,MAAM,OAAO,CAAmB,UAAU,EAAE,uBAAuB,CAAC,CAAC;IAChH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;IAE7C,OAAO;QACH,GAAG,iBAAiB;QACpB,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QAC1C,UAAU;QACV,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;QACtC,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,CAAC;QAC7F,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,MAAM,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC;QAC/C,gBAAgB;KACnB,CAAC;AACN,CAAC"}
|
|
@@ -1,34 +1,25 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from '@oclif/command';
|
|
3
|
-
import
|
|
4
|
-
import fs from 'fs-extra';
|
|
3
|
+
import figlet from 'figlet';
|
|
5
4
|
import path from 'path';
|
|
5
|
+
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost';
|
|
6
6
|
export default class BuildDevHost extends Command {
|
|
7
7
|
static description = 'Build echo-dev-host locally with current echo lib versions';
|
|
8
8
|
async run() {
|
|
9
|
+
console.log(figlet.textSync('Echo Dev Host', {
|
|
10
|
+
font: '3D-ASCII',
|
|
11
|
+
horizontalLayout: 'default',
|
|
12
|
+
verticalLayout: 'default'
|
|
13
|
+
}));
|
|
9
14
|
// Paths
|
|
10
15
|
const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
|
|
11
|
-
const devHostSrc = path.join(cliNodeModules, './lib/echo-dev-host');
|
|
12
|
-
const tmpDevHost = path.resolve(process.cwd(), 'echo-dev-host-tmp');
|
|
13
|
-
const buildOutput = path.join(tmpDevHost, 'echo-dev-host');
|
|
14
16
|
const finalOutput = path.join(cliNodeModules, 'echo-dev-host');
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
this.log(`echo-dev-host-tmp exists. Reusing it.`);
|
|
22
|
-
}
|
|
23
|
-
// 2. Run npm install and build in temp folder
|
|
24
|
-
this.log('Installing dependencies and building echo-dev-host...');
|
|
25
|
-
execSync('npm install', { cwd: tmpDevHost, stdio: 'inherit' });
|
|
26
|
-
execSync('npm run build', { cwd: tmpDevHost, stdio: 'inherit' });
|
|
27
|
-
// 3. Copy build output back to echo-cli's client folder
|
|
28
|
-
this.log(`Copying build output to ${finalOutput}...`);
|
|
29
|
-
fs.removeSync(finalOutput);
|
|
30
|
-
fs.copySync(buildOutput, finalOutput);
|
|
17
|
+
await buildAndCopyDevHost({
|
|
18
|
+
consumerRoot: process.cwd(),
|
|
19
|
+
finalOutputDir: finalOutput
|
|
20
|
+
});
|
|
31
21
|
this.log('echo-dev-host build complete.');
|
|
22
|
+
this.log();
|
|
32
23
|
}
|
|
33
24
|
}
|
|
34
25
|
BuildDevHost.run();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echo-build-dev-host.js","sourceRoot":"","sources":["../src/echo-build-dev-host.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"echo-build-dev-host.js","sourceRoot":"","sources":["../src/echo-build-dev-host.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC7C,MAAM,CAAC,WAAW,GAAG,4DAA4D,CAAC;IAElF,KAAK,CAAC,GAAG;QACL,OAAO,CAAC,GAAG,CACP,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC7B,IAAI,EAAE,UAAU;YAChB,gBAAgB,EAAE,SAAS;YAC3B,cAAc,EAAE,SAAS;SAC5B,CAAC,CACL,CAAC;QACF,QAAQ;QACR,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAE/D,MAAM,mBAAmB,CAAC;YACtB,YAAY,EAAE,OAAO,CAAC,GAAG,EAAE;YAC3B,cAAc,EAAE,WAAW;SAC9B,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
package/lib/echo-build.d.ts
CHANGED
|
@@ -5,7 +5,6 @@ export default class CreateBundle extends Command {
|
|
|
5
5
|
static flags: {
|
|
6
6
|
serve: import("@oclif/parser/lib/flags.js").IBooleanFlag<boolean>;
|
|
7
7
|
isDevelopment: import("@oclif/parser/lib/flags.js").IBooleanFlag<boolean>;
|
|
8
|
-
adminModule: import("@oclif/parser/lib/flags.js").IBooleanFlag<boolean>;
|
|
9
8
|
copy: import("@oclif/parser/lib/flags.js").IBooleanFlag<boolean>;
|
|
10
9
|
analyze: import("@oclif/parser/lib/flags.js").IBooleanFlag<boolean>;
|
|
11
10
|
};
|
package/lib/echo-build.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command, flags } from '@oclif/command';
|
|
3
|
-
import { ECHO_MODULE_CONFIG_PATH } from './const/common.js';
|
|
4
3
|
import { echoWebpackBuild } from './tools/buildScripts/webpackBuilds.js';
|
|
5
|
-
import { getFile } from './utils/getFile.js';
|
|
6
4
|
import { echoCliLogo } from './utils/logo.js';
|
|
7
5
|
export default class CreateBundle extends Command {
|
|
8
6
|
static description = 'Creates Echo Bundle';
|
|
@@ -15,10 +13,6 @@ export default class CreateBundle extends Command {
|
|
|
15
13
|
char: 'd',
|
|
16
14
|
description: 'Production is default, add -d flag for development'
|
|
17
15
|
}),
|
|
18
|
-
adminModule: flags.boolean({
|
|
19
|
-
char: 'a',
|
|
20
|
-
description: 'Add the administration module to the development with the -a flag'
|
|
21
|
-
}),
|
|
22
16
|
copy: flags.boolean({
|
|
23
17
|
char: 'c',
|
|
24
18
|
description: 'Will copy the client to the build folder'
|
|
@@ -30,11 +24,6 @@ export default class CreateBundle extends Command {
|
|
|
30
24
|
};
|
|
31
25
|
async run() {
|
|
32
26
|
const options = this.parse(CreateBundle);
|
|
33
|
-
const currentDir = process.cwd();
|
|
34
|
-
const echoModuleConfig = await getFile(currentDir, ECHO_MODULE_CONFIG_PATH);
|
|
35
|
-
if (!echoModuleConfig.bundler) {
|
|
36
|
-
console.error('Please define the bundler option in your echoModule.config.json');
|
|
37
|
-
}
|
|
38
27
|
echoCliLogo();
|
|
39
28
|
await echoWebpackBuild(options.flags, options.flags.isDevelopment);
|
|
40
29
|
}
|
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,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"echo-build.js","sourceRoot":"","sources":["../src/echo-build.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,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,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzC,WAAW,EAAE,CAAC;QAEd,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { execSync } from 'child_process';
|
|
3
|
+
import fs from 'fs-extra';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
export async function buildAndCopyDevHost({ consumerRoot, finalOutputDir, installAndBuild = true }) {
|
|
6
|
+
// Constants
|
|
7
|
+
const cliNodeModules = path.resolve(consumerRoot, 'node_modules', '@equinor', 'echo-cli');
|
|
8
|
+
const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
|
|
9
|
+
const tmpDevHostFolder = path.resolve(consumerRoot, 'echo-dev-host-tmp');
|
|
10
|
+
const buildOutput = path.join(tmpDevHostFolder, 'echo-dev-host');
|
|
11
|
+
// 1. Prepare echo-dev-host-tmp
|
|
12
|
+
if (!fs.existsSync(tmpDevHostFolder)) {
|
|
13
|
+
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Temporary folder does not exist. Copying source to ${chalk.yellow(tmpDevHostFolder)}...\n`));
|
|
14
|
+
fs.copySync(devHostSrc, tmpDevHostFolder);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Temporary folder exists. Reusing ${chalk.yellow(tmpDevHostFolder)}.\n`));
|
|
18
|
+
}
|
|
19
|
+
// 2. npm install & build
|
|
20
|
+
if (installAndBuild) {
|
|
21
|
+
console.log(chalk.greenBright.bold('[echo-dev-host] Installing dependencies and building echo-dev-host...\n'));
|
|
22
|
+
execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
23
|
+
execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
24
|
+
}
|
|
25
|
+
// 3. Copy build output to final output directory
|
|
26
|
+
console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Copying build output to ${chalk.yellow(finalOutputDir)}...\n`));
|
|
27
|
+
fs.removeSync(finalOutputDir);
|
|
28
|
+
fs.copySync(buildOutput, finalOutputDir);
|
|
29
|
+
console.log(chalk.green.bold('[echo-dev-host] Build and copy complete!\n'));
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=buildAndCopyDevHost.js.map
|
|
@@ -0,0 +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,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACtC,YAAY,EACZ,cAAc,EACd,eAAe,GAAG,IAAI,EAKzB;IACG,YAAY;IACZ,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,eAAe,CAAC,CAAC;IAEjE,+BAA+B;IAC/B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,UAAU,CAAC,IAAI,CACjB,wEAAwE,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAChH,CACJ,CAAC;QACF,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,UAAU,CAAC,IAAI,CACjB,sDAAsD,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAC5F,CACJ,CAAC;IACN,CAAC;IAED,yBAAyB;IACzB,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC,CAAC;QAC/G,QAAQ,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACrE,QAAQ,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IACjD,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,6CAA6C,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAC7G,CAAC;IACF,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC9B,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAEzC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;AAChF,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Listr } from 'listr2';
|
|
3
3
|
import webpack from 'webpack';
|
|
4
4
|
import { merge } from 'webpack-merge';
|
|
5
|
-
import {
|
|
5
|
+
import { buildAndCopyEchoHostForProd } from '../../config/common/copyFile.js';
|
|
6
6
|
import { createEchoModuleManifest } from '../../config/common/echoManifest.js';
|
|
7
7
|
import { defineInitOptions } from '../../config/common/initOptions.js';
|
|
8
8
|
import { defineWebpackConfig } from '../../config/webpack/config.js';
|
|
@@ -67,9 +67,9 @@ async function runBuild(options) {
|
|
|
67
67
|
}
|
|
68
68
|
compiler.close(() => {
|
|
69
69
|
if (options.copy) {
|
|
70
|
-
|
|
70
|
+
buildAndCopyEchoHostForProd(options);
|
|
71
71
|
}
|
|
72
|
-
createEchoModuleManifest(options.echoModuleConfig, options.currentDir, options.requireRef
|
|
72
|
+
createEchoModuleManifest(options.echoModuleConfig, options.currentDir, options.requireRef)
|
|
73
73
|
.then(() => {
|
|
74
74
|
console.log('Echo Manifest file created successfully!');
|
|
75
75
|
console.log('Build Done!');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpackBuilds.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/webpackBuilds.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"webpackBuilds.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/webpackBuilds.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/logo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,UAAU,WAAW;IACvB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CACP,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,IAAI,EAAE,UAAU;QAChB,gBAAgB,EAAE,SAAS;QAC3B,cAAc,EAAE,SAAS;KAC5B,CAAC,CACL,CAAC;AACN,CAAC"}
|