@equinor/echo-cli 1.0.0-beta-32 → 1.0.0-beta-34
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/README.md +7 -3
- package/lib/config/common/buildAndCopyEchoHostForProd.js +2 -2
- package/lib/config/common/buildAndCopyEchoHostForProd.js.map +1 -1
- 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-dev-host.js +2 -2
- package/lib/echo-build-dev-host.js.map +1 -1
- package/lib/echo-dev-host/package-lock.json +91 -84
- package/lib/echo-dev-host/package.json +6 -6
- package/lib/echo-dev-host/webpack.config.js +5 -5
- package/lib/echo-update-dev-host-deps.d.ts +1 -0
- package/lib/echo-update-dev-host-deps.js +41 -16
- package/lib/echo-update-dev-host-deps.js.map +1 -1
- package/lib/tools/buildScripts/buildAndCopyDevHost.d.ts +1 -3
- package/lib/tools/buildScripts/buildAndCopyDevHost.js +13 -34
- package/lib/tools/buildScripts/buildAndCopyDevHost.js.map +1 -1
- package/lib/utils/printDevHostVersions.js +5 -0
- package/lib/utils/printDevHostVersions.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -23,9 +23,13 @@ In general it's safe to differ in an echo package patch version. For example if
|
|
|
23
23
|
<!-- prettier-ignore -->
|
|
24
24
|
| Cli | [Base](tree/master/libs/echo-base) | [Core](tree/master/libs/echo-core) | [Search](tree/master/libs/echo-search) | [Framework](tree/master/libs/echo-framework) | [Components](tree/master/libs/echo-components) | [Utils](tree/master/libs/echo-utils) | [EDS Core](https://github.com/equinor/design-system) | [EDS Icons](https://github.com/equinor/design-system/tree/develop/packages/eds-icons) | [EDS Utils](https://github.com/equinor/design-system/tree/develop/packages/eds-utils) | Notes
|
|
25
25
|
|--------|-------|-------|--------|-----------|--------|--------|----------|---------|-----|------|
|
|
26
|
-
|
|
|
27
|
-
|
|
|
28
|
-
|
|
|
26
|
+
| 0.21.6 | 1.0.0 | 1.0.0 | 1.0.0 | **1.1.0** | **1.0.0** | **1.1.0** | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
27
|
+
| 0.21.5 | 1.0.0 | 1.0.0 | 1.0.0 | **1.0.0** | **1.0.0** | **1.0.0** | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
28
|
+
| 0.21.4 | 0.26.9 | 0.26.10 | 0.26.8 | **0.26.11** | **0.26.10** | **0.26.11** | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
29
|
+
| 0.21.3 | **0.26.9** | **0.26.10** | **0.26.8** | **0.26.10** | **0.26.9** | **0.26.10** | 0.43.0 | 0.22.0 | 0.8.6 | version numbers are now aligned, according to our new release strategy
|
|
30
|
+
| 0.21.2 | **0.7.6** | **0.9.20** | 0.15.17 | **0.25.5** | 0.12.7 | **0.4.16** | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
31
|
+
| 0.21.1 | 0.7.5 | 0.9.19 | 0.15.17 | **0.25.3** | **0.12.7** | **0.4.15** | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
32
|
+
| 0.21.0 | 0.7.5 | 0.9.19 | 0.15.17 | **0.25.1** | **0.12.6** | **0.4.13** | 0.43.0 | 0.22.0 | 0.8.6 | Version numbers in bold: these have changed compared to the prev. release
|
|
29
33
|
| 0.20.0 | 0.7.5 | 0.9.19 | 0.15.17 | 0.24.2 | 0.12.5 | 0.4.11 | 0.43.0 | 0.22.0 | 0.8.6 | Security updates. Removed support for css less + node polyfill (stream, buffer, crypto). If you need these, you need to install it yourself and add it to your webpack config.
|
|
30
34
|
| 0.19.1 | 0.7.5 | 0.9.19 | 0.15.17 | 0.24.2 | 0.12.5 | 0.4.11 | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
31
35
|
| 0.19.0 | 0.7.5 | 0.9.19 | 0.15.17 | 0.24.0 | 0.12.4 | 0.4.11 | 0.43.0 | 0.22.0 | 0.8.6 |
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import { ECHO_HOST_TEMP_BUILD_FOLDER } from '../../const/common.js';
|
|
3
4
|
import { buildAndCopyDevHost } from '../../tools/buildScripts/buildAndCopyDevHost.js';
|
|
4
5
|
import { findTopNodeModulesWithEchoCli } from '../../utils/findTopLevelNodeModulesWithCli.js';
|
|
5
6
|
/**
|
|
@@ -29,9 +30,8 @@ export async function buildAndCopyEchoHostForProd(options) {
|
|
|
29
30
|
const cliNodeModules = path.resolve(topMostNodeModulesPathWithEchoCli, '@equinor', 'echo-cli');
|
|
30
31
|
await buildAndCopyDevHost({
|
|
31
32
|
cliNodeModules,
|
|
32
|
-
tmpDevHostFolder: path.resolve(options.currentDir,
|
|
33
|
+
tmpDevHostFolder: path.resolve(options.currentDir, ECHO_HOST_TEMP_BUILD_FOLDER),
|
|
33
34
|
finalOutputDir,
|
|
34
|
-
reuseTmpFolder: false,
|
|
35
35
|
skipFetchingLatestVersions: true,
|
|
36
36
|
installAndBuild: true
|
|
37
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildAndCopyEchoHostForProd.js","sourceRoot":"","sources":["../../../src/config/common/buildAndCopyEchoHostForProd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAG9F;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAA2B;IACzE,kCAAkC;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,6BAA6B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE5F,IAAI,CAAC,iCAAiC,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,CACT,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,kFAAkF,CAAC;YAC9F,KAAK,CAAC,MAAM,CACR,8GAA8G,CACjH,CACR,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iCAAiC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAE/F,MAAM,mBAAmB,CAAC;QACtB,cAAc;QACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"buildAndCopyEchoHostForProd.js","sourceRoot":"","sources":["../../../src/config/common/buildAndCopyEchoHostForProd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAG9F;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAA2B;IACzE,kCAAkC;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,6BAA6B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE5F,IAAI,CAAC,iCAAiC,EAAE,CAAC;QACrC,OAAO,CAAC,KAAK,CACT,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,kFAAkF,CAAC;YAC9F,KAAK,CAAC,MAAM,CACR,8GAA8G,CACjH,CACR,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iCAAiC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAE/F,MAAM,mBAAmB,CAAC;QACtB,cAAc;QACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,2BAA2B,CAAC;QAC/E,cAAc;QACd,0BAA0B,EAAE,IAAI;QAChC,eAAe,EAAE,IAAI;KACxB,CAAC,CAAC;AACP,CAAC"}
|
package/lib/const/common.d.ts
CHANGED
|
@@ -2,3 +2,4 @@ export declare const REQUIRED_REF = "echoDepLoader";
|
|
|
2
2
|
export declare const ECHO_MODULE_ID_PATH = "/echoModuleId.json";
|
|
3
3
|
export declare const ECHO_MODULE_CONFIG_PATH = "/echoModule.config.json";
|
|
4
4
|
export declare const ECHO_HOST_BUILD_OUTPUT_FOLDER = "echo-dev-host-build";
|
|
5
|
+
export declare const ECHO_HOST_TEMP_BUILD_FOLDER = "echo-dev-host-tmp";
|
package/lib/const/common.js
CHANGED
|
@@ -2,4 +2,5 @@ export const REQUIRED_REF = 'echoDepLoader';
|
|
|
2
2
|
export const ECHO_MODULE_ID_PATH = '/echoModuleId.json';
|
|
3
3
|
export const ECHO_MODULE_CONFIG_PATH = '/echoModule.config.json';
|
|
4
4
|
export const ECHO_HOST_BUILD_OUTPUT_FOLDER = 'echo-dev-host-build';
|
|
5
|
+
export const ECHO_HOST_TEMP_BUILD_FOLDER = 'echo-dev-host-tmp';
|
|
5
6
|
//# sourceMappingURL=common.js.map
|
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;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,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,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,2BAA2B,GAAG,mBAAmB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from '@oclif/core';
|
|
3
3
|
import path from 'path';
|
|
4
|
-
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from './const/common.js';
|
|
4
|
+
import { ECHO_HOST_BUILD_OUTPUT_FOLDER, ECHO_HOST_TEMP_BUILD_FOLDER } from './const/common.js';
|
|
5
5
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
6
6
|
export default class BuildDevHost extends Command {
|
|
7
7
|
static description = 'Build echo-dev-host locally with current echo lib versions';
|
|
@@ -10,7 +10,7 @@ export default class BuildDevHost extends Command {
|
|
|
10
10
|
const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
11
11
|
await buildAndCopyDevHost({
|
|
12
12
|
cliNodeModules,
|
|
13
|
-
tmpDevHostFolder: path.resolve(process.cwd(),
|
|
13
|
+
tmpDevHostFolder: path.resolve(process.cwd(), ECHO_HOST_TEMP_BUILD_FOLDER),
|
|
14
14
|
finalOutputDir: finalOutput
|
|
15
15
|
});
|
|
16
16
|
}
|
|
@@ -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,aAAa,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;
|
|
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,aAAa,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAElF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,OAAO;IAC7C,MAAM,CAAC,WAAW,GAAG,4DAA4D,CAAC;IAElF,KAAK,CAAC,GAAG;QACL,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,6BAA6B,CAAC,CAAC;QAE7E,MAAM,mBAAmB,CAAC;YACtB,cAAc;YACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC;YAC1E,cAAc,EAAE,WAAW;SAC9B,CAAC,CAAC;IACP,CAAC;;AAGL,YAAY,CAAC,GAAG,EAAE,CAAC"}
|
|
@@ -9,13 +9,13 @@
|
|
|
9
9
|
"version": "0.0.1",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@equinor/echo-base": "0.
|
|
13
|
-
"@equinor/echo-components": "0.
|
|
14
|
-
"@equinor/echo-core": "0.
|
|
15
|
-
"@equinor/echo-framework": "
|
|
12
|
+
"@equinor/echo-base": "1.0.0",
|
|
13
|
+
"@equinor/echo-components": "1.0.0",
|
|
14
|
+
"@equinor/echo-core": "1.0.0",
|
|
15
|
+
"@equinor/echo-framework": "1.1.0",
|
|
16
16
|
"@equinor/echo-scripts": "0.1.5",
|
|
17
|
-
"@equinor/echo-search": "0.
|
|
18
|
-
"@equinor/echo-utils": "
|
|
17
|
+
"@equinor/echo-search": "1.0.0",
|
|
18
|
+
"@equinor/echo-utils": "1.1.0",
|
|
19
19
|
"@equinor/eds-core-react": "0.43.0",
|
|
20
20
|
"@equinor/eds-icons": "0.22.0",
|
|
21
21
|
"@equinor/eds-utils": "0.8.6",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"zustand": "4.5.5"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@babel/core": "7.
|
|
39
|
+
"@babel/core": "7.28.0",
|
|
40
40
|
"@babel/plugin-transform-runtime": "7.27.1",
|
|
41
41
|
"@babel/polyfill": "7.12.1",
|
|
42
42
|
"@babel/preset-env": "7.27.2",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"version": "4.13.2",
|
|
82
82
|
"license": "MIT",
|
|
83
83
|
"dependencies": {
|
|
84
|
-
"@azure/msal-common": "15.
|
|
84
|
+
"@azure/msal-common": "15.8.1"
|
|
85
85
|
},
|
|
86
86
|
"engines": {
|
|
87
87
|
"node": ">=0.8.0"
|
|
@@ -119,14 +119,14 @@
|
|
|
119
119
|
"dependencies": {
|
|
120
120
|
"@ampproject/remapping": "^2.2.0",
|
|
121
121
|
"@babel/code-frame": "^7.27.1",
|
|
122
|
-
"@babel/generator": "^7.
|
|
123
|
-
"@babel/helper-compilation-targets": "^7.27.
|
|
124
|
-
"@babel/helper-module-transforms": "^7.27.
|
|
125
|
-
"@babel/helpers": "^7.27.
|
|
126
|
-
"@babel/parser": "^7.
|
|
127
|
-
"@babel/template": "^7.27.
|
|
128
|
-
"@babel/traverse": "^7.
|
|
129
|
-
"@babel/types": "^7.
|
|
122
|
+
"@babel/generator": "^7.28.0",
|
|
123
|
+
"@babel/helper-compilation-targets": "^7.27.2",
|
|
124
|
+
"@babel/helper-module-transforms": "^7.27.3",
|
|
125
|
+
"@babel/helpers": "^7.27.6",
|
|
126
|
+
"@babel/parser": "^7.28.0",
|
|
127
|
+
"@babel/template": "^7.27.2",
|
|
128
|
+
"@babel/traverse": "^7.28.0",
|
|
129
|
+
"@babel/types": "^7.28.0",
|
|
130
130
|
"convert-source-map": "^2.0.0",
|
|
131
131
|
"debug": "^4.1.0",
|
|
132
132
|
"gensync": "^1.0.0-beta.2",
|
|
@@ -145,10 +145,10 @@
|
|
|
145
145
|
"version": "7.27.1",
|
|
146
146
|
"license": "MIT",
|
|
147
147
|
"dependencies": {
|
|
148
|
-
"@babel/parser": "^7.
|
|
149
|
-
"@babel/types": "^7.
|
|
150
|
-
"@jridgewell/gen-mapping": "^0.3.
|
|
151
|
-
"@jridgewell/trace-mapping": "^0.3.
|
|
148
|
+
"@babel/parser": "^7.28.0",
|
|
149
|
+
"@babel/types": "^7.28.0",
|
|
150
|
+
"@jridgewell/gen-mapping": "^0.3.12",
|
|
151
|
+
"@jridgewell/trace-mapping": "^0.3.28",
|
|
152
152
|
"jsesc": "^3.0.2"
|
|
153
153
|
},
|
|
154
154
|
"engines": {
|
|
@@ -227,6 +227,15 @@
|
|
|
227
227
|
"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
|
|
228
228
|
}
|
|
229
229
|
},
|
|
230
|
+
"node_modules/@babel/helper-globals": {
|
|
231
|
+
"version": "7.28.0",
|
|
232
|
+
"resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
|
|
233
|
+
"integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
|
|
234
|
+
"license": "MIT",
|
|
235
|
+
"engines": {
|
|
236
|
+
"node": ">=6.9.0"
|
|
237
|
+
}
|
|
238
|
+
},
|
|
230
239
|
"node_modules/@babel/helper-member-expression-to-functions": {
|
|
231
240
|
"version": "7.27.1",
|
|
232
241
|
"license": "MIT",
|
|
@@ -255,7 +264,7 @@
|
|
|
255
264
|
"dependencies": {
|
|
256
265
|
"@babel/helper-module-imports": "^7.27.1",
|
|
257
266
|
"@babel/helper-validator-identifier": "^7.27.1",
|
|
258
|
-
"@babel/traverse": "^7.27.
|
|
267
|
+
"@babel/traverse": "^7.27.3"
|
|
259
268
|
},
|
|
260
269
|
"engines": {
|
|
261
270
|
"node": ">=6.9.0"
|
|
@@ -359,8 +368,8 @@
|
|
|
359
368
|
"version": "7.27.1",
|
|
360
369
|
"license": "MIT",
|
|
361
370
|
"dependencies": {
|
|
362
|
-
"@babel/template": "^7.27.
|
|
363
|
-
"@babel/types": "^7.
|
|
371
|
+
"@babel/template": "^7.27.2",
|
|
372
|
+
"@babel/types": "^7.28.2"
|
|
364
373
|
},
|
|
365
374
|
"engines": {
|
|
366
375
|
"node": ">=6.9.0"
|
|
@@ -370,7 +379,7 @@
|
|
|
370
379
|
"version": "7.27.2",
|
|
371
380
|
"license": "MIT",
|
|
372
381
|
"dependencies": {
|
|
373
|
-
"@babel/types": "^7.
|
|
382
|
+
"@babel/types": "^7.28.0"
|
|
374
383
|
},
|
|
375
384
|
"bin": {
|
|
376
385
|
"parser": "bin/babel-parser.js"
|
|
@@ -1641,12 +1650,12 @@
|
|
|
1641
1650
|
"license": "MIT",
|
|
1642
1651
|
"dependencies": {
|
|
1643
1652
|
"@babel/code-frame": "^7.27.1",
|
|
1644
|
-
"@babel/generator": "^7.
|
|
1645
|
-
"@babel/
|
|
1646
|
-
"@babel/
|
|
1647
|
-
"@babel/
|
|
1648
|
-
"
|
|
1649
|
-
"
|
|
1653
|
+
"@babel/generator": "^7.28.0",
|
|
1654
|
+
"@babel/helper-globals": "^7.28.0",
|
|
1655
|
+
"@babel/parser": "^7.28.0",
|
|
1656
|
+
"@babel/template": "^7.27.2",
|
|
1657
|
+
"@babel/types": "^7.28.0",
|
|
1658
|
+
"debug": "^4.3.1"
|
|
1650
1659
|
},
|
|
1651
1660
|
"engines": {
|
|
1652
1661
|
"node": ">=6.9.0"
|
|
@@ -1707,15 +1716,16 @@
|
|
|
1707
1716
|
"node_modules/@equinor/echo-components": {
|
|
1708
1717
|
"version": "0.12.7",
|
|
1709
1718
|
"dependencies": {
|
|
1710
|
-
"chart.js": "4.
|
|
1711
|
-
"react-datepicker": "7.
|
|
1719
|
+
"chart.js": "4.5.0",
|
|
1720
|
+
"react-datepicker": "8.7.0",
|
|
1712
1721
|
"react-swipeable": "7.0.2",
|
|
1713
1722
|
"react-window": "1.8.11"
|
|
1714
1723
|
},
|
|
1715
1724
|
"peerDependencies": {
|
|
1716
|
-
"@equinor/echo-utils": ">= 0.
|
|
1725
|
+
"@equinor/echo-utils": ">= 1.0.0 < 2.0.0",
|
|
1717
1726
|
"@equinor/eds-core-react": "0.43.0",
|
|
1718
1727
|
"@equinor/eds-icons": "0.22.0",
|
|
1728
|
+
"@equinor/eds-tokens": "0.9.2",
|
|
1719
1729
|
"classnames": "2.5.1",
|
|
1720
1730
|
"lodash": ">= 4.17.21 < 5",
|
|
1721
1731
|
"react": ">= 17.0.2",
|
|
@@ -1729,12 +1739,12 @@
|
|
|
1729
1739
|
"version": "0.9.20",
|
|
1730
1740
|
"license": "MIT",
|
|
1731
1741
|
"dependencies": {
|
|
1732
|
-
"@azure/msal-browser": "4.
|
|
1733
|
-
"@microsoft/applicationinsights-web": "3.3.
|
|
1742
|
+
"@azure/msal-browser": "4.15.0",
|
|
1743
|
+
"@microsoft/applicationinsights-web": "3.3.9",
|
|
1734
1744
|
"sha1": "1.1.1"
|
|
1735
1745
|
},
|
|
1736
1746
|
"peerDependencies": {
|
|
1737
|
-
"@equinor/echo-base": ">= 0.
|
|
1747
|
+
"@equinor/echo-base": ">= 1.0.0 < 2.0.0",
|
|
1738
1748
|
"@microsoft/microsoft-graph-types": "2.40.0",
|
|
1739
1749
|
"@microsoft/microsoft-graph-types-beta": "0.43.0-preview",
|
|
1740
1750
|
"@tanstack/react-query": ">= 5.24.1 < 6",
|
|
@@ -1746,22 +1756,22 @@
|
|
|
1746
1756
|
"node_modules/@equinor/echo-framework": {
|
|
1747
1757
|
"version": "0.25.5",
|
|
1748
1758
|
"dependencies": {
|
|
1749
|
-
"ag-charts-community": "
|
|
1750
|
-
"ag-charts-react": "
|
|
1751
|
-
"dexie": "4.0
|
|
1759
|
+
"ag-charts-community": "12.1.2",
|
|
1760
|
+
"ag-charts-react": "12.1.2",
|
|
1761
|
+
"dexie": "4.2.0",
|
|
1752
1762
|
"mark.js": "8.11.1"
|
|
1753
1763
|
},
|
|
1754
1764
|
"peerDependencies": {
|
|
1755
|
-
"@equinor/echo-base": ">= 0.
|
|
1756
|
-
"@equinor/echo-components": ">= 0.
|
|
1757
|
-
"@equinor/echo-core": ">= 0.
|
|
1758
|
-
"@equinor/echo-search": ">= 0.
|
|
1759
|
-
"@equinor/echo-utils": ">=
|
|
1765
|
+
"@equinor/echo-base": ">= 1.0.0 < 2.0.0",
|
|
1766
|
+
"@equinor/echo-components": ">= 1.0.0 < 2.0.0",
|
|
1767
|
+
"@equinor/echo-core": ">= 1.0.0 < 2.0.0",
|
|
1768
|
+
"@equinor/echo-search": ">= 1.0.0 < 2.0.0",
|
|
1769
|
+
"@equinor/echo-utils": ">= 1.1.0 < 2.0.0",
|
|
1760
1770
|
"@equinor/eds-core-react": "0.43.0",
|
|
1761
1771
|
"@equinor/eds-icons": "0.22.0",
|
|
1762
|
-
"@microsoft/signalr": "
|
|
1772
|
+
"@microsoft/signalr": "9.0.6",
|
|
1763
1773
|
"@tanstack/react-query": ">= 5.14.2 < 6",
|
|
1764
|
-
"ag-charts-enterprise": "
|
|
1774
|
+
"ag-charts-enterprise": "12.1.2",
|
|
1765
1775
|
"classnames": "2.5.1",
|
|
1766
1776
|
"history": "5.3.0",
|
|
1767
1777
|
"immer": "10.1.1",
|
|
@@ -1780,14 +1790,14 @@
|
|
|
1780
1790
|
"version": "0.15.17",
|
|
1781
1791
|
"dependencies": {
|
|
1782
1792
|
"comlink": "4.4.2",
|
|
1783
|
-
"dexie": "4.0
|
|
1793
|
+
"dexie": "4.2.0",
|
|
1784
1794
|
"rxjs": "7.8.2",
|
|
1785
1795
|
"worker-thread": "1.1.0"
|
|
1786
1796
|
},
|
|
1787
1797
|
"peerDependencies": {
|
|
1788
|
-
"@equinor/echo-core": ">= 0.
|
|
1789
|
-
"@equinor/echo-utils": ">= 0.
|
|
1790
|
-
"fake-indexeddb": "6.0.
|
|
1798
|
+
"@equinor/echo-core": ">= 1.0.0 < 2.0.0",
|
|
1799
|
+
"@equinor/echo-utils": ">= 1.0.0 < 2.0.0",
|
|
1800
|
+
"fake-indexeddb": ">=6.0.1 <7",
|
|
1791
1801
|
"lodash": ">= 4.17.21 < 5"
|
|
1792
1802
|
}
|
|
1793
1803
|
},
|
|
@@ -1810,7 +1820,7 @@
|
|
|
1810
1820
|
"license": "MIT",
|
|
1811
1821
|
"dependencies": {
|
|
1812
1822
|
"react-cool-onclickoutside": "1.7.0",
|
|
1813
|
-
"ua-parser-js": "2.0.
|
|
1823
|
+
"ua-parser-js": "2.0.4",
|
|
1814
1824
|
"uuid": "11.1.0"
|
|
1815
1825
|
},
|
|
1816
1826
|
"peerDependencies": {
|
|
@@ -1873,23 +1883,23 @@
|
|
|
1873
1883
|
"version": "1.7.0",
|
|
1874
1884
|
"license": "MIT",
|
|
1875
1885
|
"dependencies": {
|
|
1876
|
-
"@floating-ui/utils": "^0.2.
|
|
1886
|
+
"@floating-ui/utils": "^0.2.10"
|
|
1877
1887
|
}
|
|
1878
1888
|
},
|
|
1879
1889
|
"node_modules/@floating-ui/dom": {
|
|
1880
1890
|
"version": "1.7.0",
|
|
1881
1891
|
"license": "MIT",
|
|
1882
1892
|
"dependencies": {
|
|
1883
|
-
"@floating-ui/core": "^1.7.
|
|
1884
|
-
"@floating-ui/utils": "^0.2.
|
|
1893
|
+
"@floating-ui/core": "^1.7.3",
|
|
1894
|
+
"@floating-ui/utils": "^0.2.10"
|
|
1885
1895
|
}
|
|
1886
1896
|
},
|
|
1887
1897
|
"node_modules/@floating-ui/react": {
|
|
1888
1898
|
"version": "0.27.8",
|
|
1889
1899
|
"license": "MIT",
|
|
1890
1900
|
"dependencies": {
|
|
1891
|
-
"@floating-ui/react-dom": "^2.1.
|
|
1892
|
-
"@floating-ui/utils": "^0.2.
|
|
1901
|
+
"@floating-ui/react-dom": "^2.1.6",
|
|
1902
|
+
"@floating-ui/utils": "^0.2.10",
|
|
1893
1903
|
"tabbable": "^6.0.0"
|
|
1894
1904
|
},
|
|
1895
1905
|
"peerDependencies": {
|
|
@@ -1901,7 +1911,7 @@
|
|
|
1901
1911
|
"version": "2.1.2",
|
|
1902
1912
|
"license": "MIT",
|
|
1903
1913
|
"dependencies": {
|
|
1904
|
-
"@floating-ui/dom": "^1.
|
|
1914
|
+
"@floating-ui/dom": "^1.7.4"
|
|
1905
1915
|
},
|
|
1906
1916
|
"peerDependencies": {
|
|
1907
1917
|
"react": ">=16.8.0",
|
|
@@ -2526,12 +2536,8 @@
|
|
|
2526
2536
|
"version": "0.3.8",
|
|
2527
2537
|
"license": "MIT",
|
|
2528
2538
|
"dependencies": {
|
|
2529
|
-
"@jridgewell/
|
|
2530
|
-
"@jridgewell/sourcemap-codec": "^1.4.10",
|
|
2539
|
+
"@jridgewell/sourcemap-codec": "^1.5.0",
|
|
2531
2540
|
"@jridgewell/trace-mapping": "^0.3.24"
|
|
2532
|
-
},
|
|
2533
|
-
"engines": {
|
|
2534
|
-
"node": ">=6.0.0"
|
|
2535
2541
|
}
|
|
2536
2542
|
},
|
|
2537
2543
|
"node_modules/@jridgewell/resolve-uri": {
|
|
@@ -2633,8 +2639,8 @@
|
|
|
2633
2639
|
"version": "3.3.8",
|
|
2634
2640
|
"license": "MIT",
|
|
2635
2641
|
"dependencies": {
|
|
2636
|
-
"@microsoft/applicationinsights-common": "3.3.
|
|
2637
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2642
|
+
"@microsoft/applicationinsights-common": "3.3.9",
|
|
2643
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2638
2644
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2639
2645
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2640
2646
|
"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
|
|
@@ -2647,8 +2653,8 @@
|
|
|
2647
2653
|
"version": "3.3.8",
|
|
2648
2654
|
"license": "MIT",
|
|
2649
2655
|
"dependencies": {
|
|
2650
|
-
"@microsoft/applicationinsights-common": "3.3.
|
|
2651
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2656
|
+
"@microsoft/applicationinsights-common": "3.3.9",
|
|
2657
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2652
2658
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2653
2659
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2654
2660
|
"@nevware21/ts-async": ">= 0.5.4 < 2.x",
|
|
@@ -2662,8 +2668,8 @@
|
|
|
2662
2668
|
"version": "3.3.8",
|
|
2663
2669
|
"license": "MIT",
|
|
2664
2670
|
"dependencies": {
|
|
2665
|
-
"@microsoft/applicationinsights-common": "3.3.
|
|
2666
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2671
|
+
"@microsoft/applicationinsights-common": "3.3.9",
|
|
2672
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2667
2673
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2668
2674
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2669
2675
|
"@nevware21/ts-async": ">= 0.5.4 < 2.x",
|
|
@@ -2677,7 +2683,7 @@
|
|
|
2677
2683
|
"version": "3.3.8",
|
|
2678
2684
|
"license": "MIT",
|
|
2679
2685
|
"dependencies": {
|
|
2680
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2686
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2681
2687
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2682
2688
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2683
2689
|
"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
|
|
@@ -2703,8 +2709,8 @@
|
|
|
2703
2709
|
"version": "3.3.8",
|
|
2704
2710
|
"license": "MIT",
|
|
2705
2711
|
"dependencies": {
|
|
2706
|
-
"@microsoft/applicationinsights-common": "3.3.
|
|
2707
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2712
|
+
"@microsoft/applicationinsights-common": "3.3.9",
|
|
2713
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2708
2714
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2709
2715
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2710
2716
|
"@nevware21/ts-async": ">= 0.5.4 < 2.x",
|
|
@@ -2718,8 +2724,8 @@
|
|
|
2718
2724
|
"version": "3.3.8",
|
|
2719
2725
|
"license": "MIT",
|
|
2720
2726
|
"dependencies": {
|
|
2721
|
-
"@microsoft/applicationinsights-common": "3.3.
|
|
2722
|
-
"@microsoft/applicationinsights-core-js": "3.3.
|
|
2727
|
+
"@microsoft/applicationinsights-common": "3.3.9",
|
|
2728
|
+
"@microsoft/applicationinsights-core-js": "3.3.9",
|
|
2723
2729
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
2724
2730
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
2725
2731
|
"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
|
|
@@ -4980,7 +4986,7 @@
|
|
|
4980
4986
|
"license": "MIT",
|
|
4981
4987
|
"dependencies": {
|
|
4982
4988
|
"@types/node": "*",
|
|
4983
|
-
"form-data": "^4.0.
|
|
4989
|
+
"form-data": "^4.0.4"
|
|
4984
4990
|
}
|
|
4985
4991
|
},
|
|
4986
4992
|
"node_modules/@types/node-forge": {
|
|
@@ -5360,16 +5366,16 @@
|
|
|
5360
5366
|
"version": "11.3.2",
|
|
5361
5367
|
"license": "MIT",
|
|
5362
5368
|
"dependencies": {
|
|
5363
|
-
"ag-charts-core": "
|
|
5364
|
-
"ag-charts-locale": "
|
|
5365
|
-
"ag-charts-types": "
|
|
5369
|
+
"ag-charts-core": "12.1.2",
|
|
5370
|
+
"ag-charts-locale": "12.1.2",
|
|
5371
|
+
"ag-charts-types": "12.1.2"
|
|
5366
5372
|
}
|
|
5367
5373
|
},
|
|
5368
5374
|
"node_modules/ag-charts-core": {
|
|
5369
5375
|
"version": "11.3.2",
|
|
5370
5376
|
"license": "MIT",
|
|
5371
5377
|
"dependencies": {
|
|
5372
|
-
"ag-charts-types": "
|
|
5378
|
+
"ag-charts-types": "12.1.2"
|
|
5373
5379
|
}
|
|
5374
5380
|
},
|
|
5375
5381
|
"node_modules/ag-charts-enterprise": {
|
|
@@ -5377,8 +5383,8 @@
|
|
|
5377
5383
|
"license": "Commercial",
|
|
5378
5384
|
"peer": true,
|
|
5379
5385
|
"dependencies": {
|
|
5380
|
-
"ag-charts-community": "
|
|
5381
|
-
"ag-charts-core": "
|
|
5386
|
+
"ag-charts-community": "12.1.2",
|
|
5387
|
+
"ag-charts-core": "12.1.2"
|
|
5382
5388
|
}
|
|
5383
5389
|
},
|
|
5384
5390
|
"node_modules/ag-charts-locale": {
|
|
@@ -5389,7 +5395,7 @@
|
|
|
5389
5395
|
"version": "11.3.2",
|
|
5390
5396
|
"license": "MIT",
|
|
5391
5397
|
"dependencies": {
|
|
5392
|
-
"ag-charts-community": "
|
|
5398
|
+
"ag-charts-community": "12.1.2"
|
|
5393
5399
|
},
|
|
5394
5400
|
"peerDependencies": {
|
|
5395
5401
|
"react": "^18.0.0 || ^19.0.0"
|
|
@@ -7569,6 +7575,7 @@
|
|
|
7569
7575
|
"asynckit": "^0.4.0",
|
|
7570
7576
|
"combined-stream": "^1.0.8",
|
|
7571
7577
|
"es-set-tostringtag": "^2.1.0",
|
|
7578
|
+
"hasown": "^2.0.2",
|
|
7572
7579
|
"mime-types": "^2.1.12"
|
|
7573
7580
|
},
|
|
7574
7581
|
"engines": {
|
|
@@ -10170,7 +10177,7 @@
|
|
|
10170
10177
|
"version": "7.5.0",
|
|
10171
10178
|
"license": "MIT",
|
|
10172
10179
|
"dependencies": {
|
|
10173
|
-
"@floating-ui/react": "^0.
|
|
10180
|
+
"@floating-ui/react": "^0.27.15",
|
|
10174
10181
|
"clsx": "^2.1.1",
|
|
10175
10182
|
"date-fns": "^3.6.0",
|
|
10176
10183
|
"prop-types": "^15.8.1"
|
|
@@ -10189,8 +10196,8 @@
|
|
|
10189
10196
|
"tabbable": "^6.0.0"
|
|
10190
10197
|
},
|
|
10191
10198
|
"peerDependencies": {
|
|
10192
|
-
"react": "
|
|
10193
|
-
"react-dom": "
|
|
10199
|
+
"react": "^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc",
|
|
10200
|
+
"react-dom": "^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc"
|
|
10194
10201
|
}
|
|
10195
10202
|
},
|
|
10196
10203
|
"node_modules/react-dom": {
|
|
@@ -21,13 +21,13 @@
|
|
|
21
21
|
"author": "",
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@equinor/echo-base": "0.
|
|
25
|
-
"@equinor/echo-components": "0.
|
|
26
|
-
"@equinor/echo-core": "0.
|
|
27
|
-
"@equinor/echo-framework": "
|
|
24
|
+
"@equinor/echo-base": "1.0.0",
|
|
25
|
+
"@equinor/echo-components": "1.0.0",
|
|
26
|
+
"@equinor/echo-core": "1.0.0",
|
|
27
|
+
"@equinor/echo-framework": "1.1.0",
|
|
28
28
|
"@equinor/echo-scripts": "0.1.5",
|
|
29
|
-
"@equinor/echo-search": "0.
|
|
30
|
-
"@equinor/echo-utils": "
|
|
29
|
+
"@equinor/echo-search": "1.0.0",
|
|
30
|
+
"@equinor/echo-utils": "1.1.0",
|
|
31
31
|
"@equinor/eds-core-react": "0.43.0",
|
|
32
32
|
"@equinor/eds-icons": "0.22.0",
|
|
33
33
|
"@equinor/eds-utils": "0.8.6",
|
|
@@ -81,10 +81,10 @@ const webpackConfig = (env) => {
|
|
|
81
81
|
devServer: {
|
|
82
82
|
static: [
|
|
83
83
|
{
|
|
84
|
-
directory: path.join(
|
|
84
|
+
directory: path.join(__dirname, 'public')
|
|
85
85
|
},
|
|
86
86
|
{
|
|
87
|
-
directory: path.join(
|
|
87
|
+
directory: path.join(__dirname, 'build')
|
|
88
88
|
}
|
|
89
89
|
],
|
|
90
90
|
compress: true,
|
|
@@ -109,7 +109,7 @@ const webpackConfig = (env) => {
|
|
|
109
109
|
systemvars: false
|
|
110
110
|
}),
|
|
111
111
|
new HtmlWebpackPlugin({
|
|
112
|
-
template: path.resolve(
|
|
112
|
+
template: path.resolve(__dirname, './public/index.html')
|
|
113
113
|
}),
|
|
114
114
|
new WebpackBar({
|
|
115
115
|
name: 'Echo module',
|
|
@@ -119,11 +119,11 @@ const webpackConfig = (env) => {
|
|
|
119
119
|
new CopyPlugin({
|
|
120
120
|
patterns: [
|
|
121
121
|
{
|
|
122
|
-
from: path.resolve(
|
|
122
|
+
from: path.resolve(__dirname, './public/index.css'),
|
|
123
123
|
to: path.resolve(process.cwd(), buildOutputFolder, 'index.css')
|
|
124
124
|
},
|
|
125
125
|
{
|
|
126
|
-
from: path.resolve(
|
|
126
|
+
from: path.resolve(__dirname, './public/env-config.js'),
|
|
127
127
|
to: path.resolve(process.cwd(), buildOutputFolder, 'env-config.js')
|
|
128
128
|
}
|
|
129
129
|
]
|
|
@@ -30,3 +30,4 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
30
30
|
};
|
|
31
31
|
run(): Promise<void>;
|
|
32
32
|
}
|
|
33
|
+
export declare function updateEchoLibSection(consumerPkg: Record<string, any>, sectionName: 'dependencies' | 'devDependencies' | 'peerDependencies', echoLibs: string[], deps: Record<string, string>, changes: Record<string, string[]>): boolean;
|
|
@@ -5,7 +5,7 @@ import fs from 'fs-extra';
|
|
|
5
5
|
import inquirer from 'inquirer';
|
|
6
6
|
import ora from 'ora';
|
|
7
7
|
import path from 'path';
|
|
8
|
-
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from './const/common.js';
|
|
8
|
+
import { ECHO_HOST_BUILD_OUTPUT_FOLDER, ECHO_HOST_TEMP_BUILD_FOLDER } from './const/common.js';
|
|
9
9
|
import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
|
|
10
10
|
import { getLatestPkgVersion } from './utils/getLatestPkgVersion.js';
|
|
11
11
|
/**
|
|
@@ -119,9 +119,8 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
119
119
|
const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
120
120
|
await buildAndCopyDevHost({
|
|
121
121
|
cliNodeModules,
|
|
122
|
-
tmpDevHostFolder: path.resolve(process.cwd(),
|
|
123
|
-
finalOutputDir: finalOutput
|
|
124
|
-
reuseTmpFolder: false
|
|
122
|
+
tmpDevHostFolder: path.resolve(process.cwd(), ECHO_HOST_TEMP_BUILD_FOLDER),
|
|
123
|
+
finalOutputDir: finalOutput
|
|
125
124
|
});
|
|
126
125
|
// --- Update consumer app's package.json ---
|
|
127
126
|
const consumerPkgPath = path.resolve(process.cwd(), 'package.json');
|
|
@@ -133,19 +132,13 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
133
132
|
this.error(`Could not read consumer app package.json at ${chalk.yellow(consumerPkgPath)}.`);
|
|
134
133
|
return;
|
|
135
134
|
}
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
consumerUpdated = true;
|
|
142
|
-
this.log(chalk.yellow(`Updated ${lib} in consumer app to ${deps[lib]}`));
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
if (consumerUpdated) {
|
|
146
|
-
consumerPkg.dependencies = consumerDeps;
|
|
135
|
+
const echoLibVersionChangesBySection = {};
|
|
136
|
+
const updatedDeps = updateEchoLibSection(consumerPkg, 'dependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
137
|
+
const updatedDevDeps = updateEchoLibSection(consumerPkg, 'devDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
138
|
+
const updatedPeerDeps = updateEchoLibSection(consumerPkg, 'peerDependencies', echoLibs, deps, echoLibVersionChangesBySection);
|
|
139
|
+
if (updatedDeps || updatedDevDeps || updatedPeerDeps) {
|
|
147
140
|
fs.writeJsonSync(consumerPkgPath, consumerPkg, { spaces: 2 });
|
|
148
|
-
this.log
|
|
141
|
+
logGroupedEchoLibUpdates(echoLibVersionChangesBySection, this.log);
|
|
149
142
|
}
|
|
150
143
|
else {
|
|
151
144
|
this.log(chalk.gray('\nNo echo library versions needed updating in consumer app package.json.\n'));
|
|
@@ -158,4 +151,36 @@ export default class UpdateDevHostEchoLibVersions extends Command {
|
|
|
158
151
|
}
|
|
159
152
|
}
|
|
160
153
|
UpdateDevHostEchoLibVersions.run();
|
|
154
|
+
/**
|
|
155
|
+
* Logs grouped updates for echo libraries in consumer app package.json.
|
|
156
|
+
*/
|
|
157
|
+
function logGroupedEchoLibUpdates(changes, logFn) {
|
|
158
|
+
logFn(chalk.green("\nUpdated consumer app's echo lib versions:\n"));
|
|
159
|
+
['dependencies', 'devDependencies', 'peerDependencies'].forEach((section) => {
|
|
160
|
+
if (changes[section] && changes[section].length > 0) {
|
|
161
|
+
logFn(chalk.cyan(section));
|
|
162
|
+
changes[section].forEach((msg) => {
|
|
163
|
+
logFn(` - ${msg}`);
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
logFn('');
|
|
168
|
+
}
|
|
169
|
+
export function updateEchoLibSection(consumerPkg, sectionName, echoLibs, deps, changes) {
|
|
170
|
+
const section = consumerPkg[sectionName] || {};
|
|
171
|
+
let sectionUpdated = false;
|
|
172
|
+
for (const lib of echoLibs) {
|
|
173
|
+
if (section[lib] && section[lib] !== deps[lib]) {
|
|
174
|
+
section[lib] = deps[lib];
|
|
175
|
+
sectionUpdated = true;
|
|
176
|
+
if (!changes[sectionName])
|
|
177
|
+
changes[sectionName] = [];
|
|
178
|
+
changes[sectionName].push(`${lib} to ${deps[lib]}`);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
if (sectionUpdated) {
|
|
182
|
+
consumerPkg[sectionName] = section;
|
|
183
|
+
}
|
|
184
|
+
return sectionUpdated;
|
|
185
|
+
}
|
|
161
186
|
//# sourceMappingURL=echo-update-dev-host-deps.js.map
|
|
@@ -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,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,MAAM,mBAAmB,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,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,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE;;;;;;;;;;;;;;;;;;;;;;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,KAAK,EACL,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,CAAC,kCAAkC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,4BAA4B,CAAC,CAAC;YACvG,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,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClE,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,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CACR,6FAA6F;gBACzF,4DAA4D,CACnE,CACJ,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACjC;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,gCAAgC;oBACzC,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,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;YACrE,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,6BAA6B,CAAC,CAAC;YAC7E,MAAM,mBAAmB,CAAC;gBACtB,cAAc;gBACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC;gBAC1E,cAAc,EAAE,WAAW;aAC9B,CAAC,CAAC;YAEH,6CAA6C;YAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;YACpE,IAAI,WAAW,CAAC;YAEhB,IAAI,CAAC;gBACD,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,CAAC,+CAA+C,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;gBAC5F,OAAO;YACX,CAAC;YAED,MAAM,8BAA8B,GAA6B,EAAE,CAAC;YACpE,MAAM,WAAW,GAAG,oBAAoB,CACpC,WAAW,EACX,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,8BAA8B,CACjC,CAAC;YACF,MAAM,cAAc,GAAG,oBAAoB,CACvC,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,IAAI,EACJ,8BAA8B,CACjC,CAAC;YACF,MAAM,eAAe,GAAG,oBAAoB,CACxC,WAAW,EACX,kBAAkB,EAClB,QAAQ,EACR,IAAI,EACJ,8BAA8B,CACjC,CAAC;YAEF,IAAI,WAAW,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;gBACnD,EAAE,CAAC,aAAa,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9D,wBAAwB,CAAC,8BAA8B,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC,CAAC;YACvG,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;QAC7E,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;;AAGL,4BAA4B,CAAC,GAAG,EAAE,CAAC;AAEnC;;GAEG;AACH,SAAS,wBAAwB,CAAC,OAAiC,EAAE,KAA4B;IAC7F,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC;IACnE,CAAC,cAAc,EAAE,iBAAiB,EAAE,kBAAkB,CAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnF,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3B,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC7B,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAChC,WAAgC,EAChC,WAAoE,EACpE,QAAkB,EAClB,IAA4B,EAC5B,OAAiC;IAEjC,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,cAAc,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;gBAAE,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YACrD,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IACD,IAAI,cAAc,EAAE,CAAC;QACjB,WAAW,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;IACvC,CAAC;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC"}
|
|
@@ -10,15 +10,13 @@
|
|
|
10
10
|
* @param params.tmpDevHostFolder - The path to the temporary dev host folder. This is where the dev host source code is copied to, and build output is generated.
|
|
11
11
|
* @param params.finalOutputDir - The directory where the build output should be copied.
|
|
12
12
|
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder. Defaults to `true`.
|
|
13
|
-
* @param params.reuseTmpFolder - Whether to reuse the existing temporary folder. If undefined and the folder exists, prompts the user.
|
|
14
13
|
*
|
|
15
14
|
* @returns A promise that resolves when the build and copy process is complete.
|
|
16
15
|
*/
|
|
17
|
-
export declare function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, installAndBuild, skipFetchingLatestVersions
|
|
16
|
+
export declare function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, installAndBuild, skipFetchingLatestVersions }: {
|
|
18
17
|
cliNodeModules: string;
|
|
19
18
|
tmpDevHostFolder: string;
|
|
20
19
|
finalOutputDir: string;
|
|
21
20
|
installAndBuild?: boolean;
|
|
22
21
|
skipFetchingLatestVersions?: boolean;
|
|
23
|
-
reuseTmpFolder?: boolean;
|
|
24
22
|
}): Promise<void>;
|
|
@@ -2,7 +2,6 @@ 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';
|
|
6
5
|
import path from 'path';
|
|
7
6
|
import { ECHO_HOST_BUILD_OUTPUT_FOLDER } from '../../const/common.js';
|
|
8
7
|
import { printDevHostVersions } from '../../utils/printDevHostVersions.js';
|
|
@@ -18,11 +17,11 @@ import { printDevHostVersions } from '../../utils/printDevHostVersions.js';
|
|
|
18
17
|
* @param params.tmpDevHostFolder - The path to the temporary dev host folder. This is where the dev host source code is copied to, and build output is generated.
|
|
19
18
|
* @param params.finalOutputDir - The directory where the build output should be copied.
|
|
20
19
|
* @param params.installAndBuild - Whether to run `npm install` and `npm run build` in the temporary folder. Defaults to `true`.
|
|
21
|
-
* @param params.reuseTmpFolder - Whether to reuse the existing temporary folder. If undefined and the folder exists, prompts the user.
|
|
22
20
|
*
|
|
23
21
|
* @returns A promise that resolves when the build and copy process is complete.
|
|
24
22
|
*/
|
|
25
|
-
|
|
23
|
+
// ...existing code...
|
|
24
|
+
export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, installAndBuild = true, skipFetchingLatestVersions = false }) {
|
|
26
25
|
console.log(`${chalk.cyan.bold('echo-dev-host')} - by Echo Core Team`);
|
|
27
26
|
console.log('Minimalistic host application for local development of Echo applications.\n');
|
|
28
27
|
console.log(figlet.textSync('Echo Dev Host', {
|
|
@@ -33,41 +32,17 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
|
|
|
33
32
|
const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
|
|
34
33
|
const buildOutput = path.join(tmpDevHostFolder, ECHO_HOST_BUILD_OUTPUT_FOLDER);
|
|
35
34
|
const srcPkgJson = path.join(devHostSrc, 'package.json');
|
|
36
|
-
|
|
37
|
-
if (fs.existsSync(tmpDevHostFolder)
|
|
38
|
-
console.log(chalk.
|
|
39
|
-
|
|
40
|
-
`If you chose 'No', it will be removed and a new one will be created.\n`));
|
|
41
|
-
const answer = await inquirer.prompt([
|
|
42
|
-
{
|
|
43
|
-
type: 'confirm',
|
|
44
|
-
name: 'reuse',
|
|
45
|
-
message: `Reuse existing folder?`,
|
|
46
|
-
default: true
|
|
47
|
-
}
|
|
48
|
-
]);
|
|
49
|
-
shouldReuse = answer.reuse;
|
|
50
|
-
}
|
|
51
|
-
// 1. Prepare echo-dev-host-tmp
|
|
52
|
-
if (!fs.existsSync(tmpDevHostFolder) || shouldReuse === false) {
|
|
53
|
-
if (fs.existsSync(tmpDevHostFolder) && shouldReuse === false) {
|
|
54
|
-
console.log(chalk.yellowBright.bold(`\n[echo-dev-host] Removing existing temporary folder "${tmpDevHostFolder}"...\n`));
|
|
55
|
-
fs.removeSync(tmpDevHostFolder);
|
|
56
|
-
}
|
|
57
|
-
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Copying echo-dev-host source to ${chalk.yellow(tmpDevHostFolder)}...\n`));
|
|
58
|
-
fs.copySync(devHostSrc, tmpDevHostFolder);
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Temporary folder "${tmpDevHostFolder}" exists. Reusing it.\n`));
|
|
62
|
-
// Always copy (overwrite) package.json from source to tmpDevHostFolder
|
|
63
|
-
const srcPkgJson = path.join(devHostSrc, 'package.json');
|
|
64
|
-
const destPkgJson = path.join(tmpDevHostFolder, 'package.json');
|
|
65
|
-
fs.copySync(srcPkgJson, destPkgJson, { overwrite: true });
|
|
35
|
+
// Always remove and recreate the temporary folder
|
|
36
|
+
if (fs.existsSync(tmpDevHostFolder)) {
|
|
37
|
+
console.log(chalk.yellowBright.bold(`\n[echo-dev-host] Removing existing temporary folder "${tmpDevHostFolder}"...\n`));
|
|
38
|
+
fs.removeSync(tmpDevHostFolder);
|
|
66
39
|
}
|
|
40
|
+
console.log(chalk.blueBright.bold(`\n[echo-dev-host] Copying echo-dev-host source to ${chalk.yellow(tmpDevHostFolder)}...\n`));
|
|
41
|
+
fs.copySync(devHostSrc, tmpDevHostFolder);
|
|
67
42
|
// 2. npm install & build
|
|
68
43
|
if (installAndBuild) {
|
|
69
44
|
console.log(chalk.greenBright.bold('[echo-dev-host] Installing dependencies and building echo-dev-host...\n'));
|
|
70
|
-
console.log(chalk.greenBright.bold('[echo-dev-host] Using the following versions of echo libraries
|
|
45
|
+
console.log(chalk.greenBright.bold('[echo-dev-host] Using the following versions of echo libraries'));
|
|
71
46
|
await printDevHostVersions({ devHostPkgPath: srcPkgJson, fetchLatest: !skipFetchingLatestVersions });
|
|
72
47
|
execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
73
48
|
execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
|
|
@@ -75,6 +50,10 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
|
|
|
75
50
|
// 3. Copy build output to final output directory
|
|
76
51
|
console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Copying build output back to ${chalk.yellow(finalOutputDir)}...\n`));
|
|
77
52
|
fs.copySync(buildOutput, finalOutputDir);
|
|
53
|
+
if (fs.existsSync(tmpDevHostFolder)) {
|
|
54
|
+
console.log(chalk.yellowBright.bold(`\n[echo-dev-host] Removing temporary folder "${tmpDevHostFolder}" used for the build...\n`));
|
|
55
|
+
fs.removeSync(tmpDevHostFolder);
|
|
56
|
+
}
|
|
78
57
|
console.log(chalk.green.bold('[echo-dev-host] Build and copy complete! Now you can start your Echo app with "npm start"\n'));
|
|
79
58
|
}
|
|
80
59
|
//# sourceMappingURL=buildAndCopyDevHost.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"buildAndCopyDevHost.js","sourceRoot":"","sources":["../../../src/tools/buildScripts/buildAndCopyDevHost.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ export async function printDevHostVersions(args) {
|
|
|
28
28
|
spinner = ora();
|
|
29
29
|
console.log(chalk.yellow(`Fetching latest versions for echo libraries...`));
|
|
30
30
|
}
|
|
31
|
+
let hasOutdatedLibs = false;
|
|
31
32
|
for (const [name, version] of echoLibs) {
|
|
32
33
|
if (fetchLatest) {
|
|
33
34
|
const latest = await getLatestPkgVersion(name, spinner);
|
|
@@ -40,6 +41,7 @@ export async function printDevHostVersions(args) {
|
|
|
40
41
|
}
|
|
41
42
|
else {
|
|
42
43
|
statusText = chalk.red(`(latest: ${latest})`); // orange
|
|
44
|
+
hasOutdatedLibs = true;
|
|
43
45
|
}
|
|
44
46
|
console.log(chalk.yellow(`${name}: ${version} `) + statusText);
|
|
45
47
|
}
|
|
@@ -49,6 +51,9 @@ export async function printDevHostVersions(args) {
|
|
|
49
51
|
}
|
|
50
52
|
if (spinner)
|
|
51
53
|
spinner.stop();
|
|
54
|
+
if (hasOutdatedLibs) {
|
|
55
|
+
console.log(chalk.hex('#FFA500')('Updates available for echo libraries. Run npx update-echo-dev-host-deps to upgrade.'));
|
|
56
|
+
}
|
|
52
57
|
}
|
|
53
58
|
else {
|
|
54
59
|
console.log(chalk.gray(`No @equinor/echo- libraries found in ${devHostPkgPath}.`));
|
|
@@ -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;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAAuD;IAC9F,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC7C,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,IAAI,OAAO,CAAC;gBACZ,IAAI,WAAW,EAAE,CAAC;oBACd,OAAO,GAAG,GAAG,EAAE,CAAC;oBAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,gDAAgD,CAAC,CAAC,CAAC;gBAChF,CAAC;gBACD,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;oBACrC,IAAI,WAAW,EAAE,CAAC;wBACd,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBACxD,IAAI,UAAkB,CAAC;wBACvB,IAAI,CAAC,MAAM,EAAE,CAAC;4BACV,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;wBACxD,CAAC;6BAAM,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;4BAC5B,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;wBAC7C,CAAC;6BAAM,CAAC;4BACJ,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,MAAM,GAAG,CAAC,CAAC,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"printDevHostVersions.js","sourceRoot":"","sources":["../../src/utils/printDevHostVersions.ts"],"names":[],"mappings":"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"}
|